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.

c8293e29

Commit c8293e29 authored 14 years ago by Loren Shih

Downloads
- Plain Diff

Automated merge up from viewer-development into mesh-development

parents 94b0ce6d 76a325b8

Branches

Tags

No related merge requests found

Changes 132

Show whitespace changes

Inline Side-by-side

Showing

.hgtags 1 addition, 0 deletions

.hgtags
doc/contributions.txt 864 additions, 857 deletions

doc/contributions.txt
indra/CMakeLists.txt 2 additions, 2 deletions

indra/CMakeLists.txt
indra/llcommon/llavatarname.cpp 6 additions, 4 deletions

indra/llcommon/llavatarname.cpp
indra/llcommon/llversionviewer.h 2 additions, 2 deletions

indra/llcommon/llversionviewer.h
indra/llinventory/llparcel.cpp 5 additions, 10 deletions

indra/llinventory/llparcel.cpp
indra/llinventory/llparcel.h 1 addition, 6 deletions

indra/llinventory/llparcel.h
indra/llrender/llvertexbuffer.cpp 12 additions, 1 deletion

indra/llrender/llvertexbuffer.cpp
indra/llui/llcombobox.cpp 23 additions, 6 deletions

indra/llui/llcombobox.cpp
indra/llui/llcombobox.h 3 additions, 0 deletions

indra/llui/llcombobox.h
indra/llui/lldockcontrol.cpp 3 additions, 1 deletion

indra/llui/lldockcontrol.cpp
indra/llui/lllayoutstack.cpp 5 additions, 5 deletions

indra/llui/lllayoutstack.cpp
indra/llvfs/lldir_linux.h 7 additions, 3 deletions

indra/llvfs/lldir_linux.h
indra/llvfs/lldir_mac.h 5 additions, 1 deletion

indra/llvfs/lldir_mac.h
indra/llvfs/lldir_solaris.h 6 additions, 2 deletions

indra/llvfs/lldir_solaris.h
indra/llvfs/lldir_win32.h 5 additions, 1 deletion

indra/llvfs/lldir_win32.h
indra/newview/llbottomtray.cpp 109 additions, 31 deletions

indra/newview/llbottomtray.cpp
indra/newview/llbottomtray.h 19 additions, 0 deletions

indra/newview/llbottomtray.h
indra/newview/llfloaterauction.cpp 2 additions, 2 deletions

indra/newview/llfloaterauction.cpp
indra/newview/llfloatertools.cpp 15 additions, 1 deletion

indra/newview/llfloatertools.cpp

with 1095 additions and 935 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