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.

d67c3958

Commit d67c3958 authored 14 years ago by Oz Linden

Downloads
- Plain Diff

merge fix for STORM-654

parents 3eb31982 d701824c

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/llfloaterpreference.cpp 80 additions, 1 deletion

indra/newview/llfloaterpreference.cpp
indra/newview/llfloaterpreference.h 11 additions, 0 deletions

indra/newview/llfloaterpreference.h
indra/newview/llpanelmaininventory.cpp 44 additions, 3 deletions

indra/newview/llpanelmaininventory.cpp
indra/newview/llpanelmaininventory.h 1 addition, 0 deletions

indra/newview/llpanelmaininventory.h
indra/newview/llviewermenu.cpp 0 additions, 10 deletions

indra/newview/llviewermenu.cpp
indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml 21 additions, 4 deletions

...view/skins/default/xui/en/menu_inventory_gear_default.xml
indra/newview/skins/default/xui/en/menu_viewer.xml 0 additions, 20 deletions

indra/newview/skins/default/xui/en/menu_viewer.xml
indra/newview/skins/default/xui/en/panel_preferences_move.xml 6 additions, 3 deletions

...a/newview/skins/default/xui/en/panel_preferences_move.xml

with 163 additions and 41 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