Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Alchemy Viewer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

d5c37e8b

Commit d5c37e8b authored 14 years ago by Richard Linden

Downloads
- Plain Diff

Automated merge with http://hg.secondlife.com/viewer-pre-beta

parents 313b77fd a024493c

No related branches found

No related tags found

No related merge requests found

Changes 10

Expand all Hide whitespace changes

Inline Side-by-side

Showing

indra/llui/lldockcontrol.cpp 361 additions, 361 deletions

indra/llui/lldockcontrol.cpp
indra/media_plugins/winmmshim/CMakeLists.txt 6 additions, 6 deletions

indra/media_plugins/winmmshim/CMakeLists.txt
indra/newview/llappviewer.cpp 5137 additions, 5137 deletions

indra/newview/llappviewer.cpp
indra/newview/llbottomtray.cpp 1850 additions, 1850 deletions

indra/newview/llbottomtray.cpp
indra/newview/llpanellogin.cpp 1183 additions, 1183 deletions

indra/newview/llpanellogin.cpp
indra/newview/llviewermenu.cpp 8183 additions, 8174 deletions

indra/newview/llviewermenu.cpp
indra/newview/llviewermessage.cpp 6908 additions, 6908 deletions

indra/newview/llviewermessage.cpp
indra/newview/llviewerwindow.cpp 5034 additions, 5034 deletions

indra/newview/llviewerwindow.cpp
indra/newview/pipeline.cpp 9024 additions, 9024 deletions

indra/newview/pipeline.cpp
indra/newview/viewer_manifest.py 975 additions, 975 deletions

indra/newview/viewer_manifest.py

with 38661 additions and 38652 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