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.

1f3f660c

Commit 1f3f660c authored 11 years ago by Richard Linden

Downloads
- Plain Diff

Automated merge with http://bitbucket.org/lindenlab/viewer-interesting

parents cb8c94cc 8535b875

Branches

Tags

No related merge requests found

Changes 8

Show whitespace changes

Inline Side-by-side

Showing

indra/llcommon/llerror.h 7 additions, 7 deletions

indra/llcommon/llerror.h
indra/llcommon/llmemory.cpp 2 additions, 2 deletions

indra/llcommon/llmemory.cpp
indra/llcommon/llpreprocessor.h 13 additions, 0 deletions

indra/llcommon/llpreprocessor.h
indra/llcommon/llunit.h 17 additions, 23 deletions

indra/llcommon/llunit.h
indra/llcommon/tests/llunits_test.cpp 0 additions, 1 deletion

indra/llcommon/tests/llunits_test.cpp
indra/llui/llstatbar.cpp 1 addition, 1 deletion

indra/llui/llstatbar.cpp
indra/newview/llscenemonitor.cpp 25 additions, 6 deletions

indra/newview/llscenemonitor.cpp
indra/newview/llviewermessage.cpp 2 additions, 2 deletions

indra/newview/llviewermessage.cpp

with 67 additions and 42 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