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.

aa96d1fd

Commit aa96d1fd authored 18 years ago by Steven Bennetts

Downloads
- Patches
- Plain Diff

merge -r 59337:59951 Branch_1-14-0 -> release.

parent 992de40c

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/English.lproj/InfoPlist.strings 2 additions, 2 deletions

indra/newview/English.lproj/InfoPlist.strings
indra/newview/Info-SecondLife.plist 1 addition, 1 deletion

indra/newview/Info-SecondLife.plist
indra/newview/featuretable.txt 1 addition, 1 deletion

indra/newview/featuretable.txt
indra/newview/featuretable_mac.txt 2 additions, 2 deletions

indra/newview/featuretable_mac.txt
indra/newview/lleventpoll.cpp 3 additions, 3 deletions

indra/newview/lleventpoll.cpp
indra/newview/llflexibleobject.cpp 1 addition, 0 deletions

indra/newview/llflexibleobject.cpp
indra/newview/llstartup.cpp 8 additions, 0 deletions

indra/newview/llstartup.cpp
indra/newview/llviewerstats.cpp 26 additions, 26 deletions

indra/newview/llviewerstats.cpp
indra/newview/llviewerthrottle.cpp 5 additions, 1 deletion

indra/newview/llviewerthrottle.cpp
indra/newview/llvlcomposition.cpp 14 additions, 3 deletions

indra/newview/llvlcomposition.cpp

with 63 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