Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Alchemy Viewer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Releases
- Package registry
- Terraform modules

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

662a9278

Commit 662a9278 authored 13 years ago by Oz Linden

Downloads
- Plain Diff

merge changes for shining branch

parents 6be68618 7a85df94

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

indra/llcharacter/llcharacter.cpp 19 additions, 6 deletions

indra/llcharacter/llcharacter.cpp
indra/llcharacter/llcharacter.h 1 addition, 0 deletions

indra/llcharacter/llcharacter.h
indra/llrender/llgl.cpp 7 additions, 0 deletions

indra/llrender/llgl.cpp
indra/llrender/llglslshader.cpp 10 additions, 0 deletions

indra/llrender/llglslshader.cpp
indra/llrender/llshadermgr.cpp 32 additions, 10 deletions

indra/llrender/llshadermgr.cpp
indra/newview/featuretable.txt 2 additions, 1 deletion

indra/newview/featuretable.txt
indra/newview/featuretable_xp.txt 2 additions, 1 deletion

indra/newview/featuretable_xp.txt
indra/newview/llviewershadermgr.cpp 7 additions, 2 deletions

indra/newview/llviewershadermgr.cpp
indra/newview/llviewertexturelist.cpp 5 additions, 14 deletions

indra/newview/llviewertexturelist.cpp
indra/newview/llviewertexturelist.h 2 additions, 5 deletions

indra/newview/llviewertexturelist.h
indra/newview/llvoavatar.cpp 4 additions, 0 deletions

indra/newview/llvoavatar.cpp
indra/newview/llvovolume.cpp 5 additions, 0 deletions

indra/newview/llvovolume.cpp

with 96 additions and 39 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment