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.

1733be96

Commit 1733be96 authored 11 years ago by Richard Linden

Downloads
- Plain Diff

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

parents 458990b4 4db06820

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

indra/llui/llstatbar.cpp 6 additions, 6 deletions

indra/llui/llstatbar.cpp
indra/llvfs/llvfile.cpp 2 additions, 2 deletions

indra/llvfs/llvfile.cpp
indra/newview/llfloaterjoystick.cpp 5 additions, 5 deletions

indra/newview/llfloaterjoystick.cpp
indra/newview/skins/default/xui/en/floater_joystick.xml 5 additions, 0 deletions

indra/newview/skins/default/xui/en/floater_joystick.xml

with 18 additions and 13 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