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.

d1c365e7

Commit d1c365e7 authored 14 years ago by brad kittenbrink

Downloads
- Plain Diff

Merge latest lindenlab/viewer-development with mani_linden/viewer-development.

parents 169fe36f 124a5926

No related branches found

No related tags found

Loading

Changes 97

Hide whitespace changes

Inline Side-by-side

Showing

.hgtags 2 additions, 0 deletions

.hgtags
doc/contributions.txt 8 additions, 0 deletions

doc/contributions.txt
indra/cmake/Variables.cmake 1 addition, 1 deletion

indra/cmake/Variables.cmake
indra/llcommon/llapp.cpp 32 additions, 0 deletions

indra/llcommon/llapp.cpp
indra/llcommon/llapp.h 6 additions, 0 deletions

indra/llcommon/llapp.h
indra/llcommon/lldictionary.h 3 additions, 1 deletion

indra/llcommon/lldictionary.h
indra/llcommon/llsys.cpp 20 additions, 0 deletions

indra/llcommon/llsys.cpp
indra/llcommon/llsys.h 3 additions, 0 deletions

indra/llcommon/llsys.h
indra/llimage/llimagedimensionsinfo.cpp 15 additions, 1 deletion

indra/llimage/llimagedimensionsinfo.cpp
indra/llmessage/llcachename.cpp 26 additions, 13 deletions

indra/llmessage/llcachename.cpp
indra/llrender/llgl.cpp 27 additions, 0 deletions

indra/llrender/llgl.cpp
indra/llrender/llgl.h 1 addition, 0 deletions

indra/llrender/llgl.h
indra/llrender/llimagegl.cpp 14 additions, 0 deletions

indra/llrender/llimagegl.cpp
indra/llrender/llimagegl.h 1 addition, 0 deletions

indra/llrender/llimagegl.h
indra/llrender/llrender.cpp 3 additions, 0 deletions

indra/llrender/llrender.cpp
indra/llrender/llrendertarget.cpp 0 additions, 11 deletions

indra/llrender/llrendertarget.cpp
indra/llrender/llvertexbuffer.cpp 11 additions, 1 deletion

indra/llrender/llvertexbuffer.cpp
indra/llui/llaccordionctrltab.cpp 25 additions, 30 deletions

indra/llui/llaccordionctrltab.cpp
indra/llui/llpanel.cpp 1 addition, 1 deletion

indra/llui/llpanel.cpp
indra/llui/lluistring.h 6 additions, 4 deletions

indra/llui/lluistring.h

with 205 additions and 63 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