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.

4166c3d0

Commit 4166c3d0 authored 13 years ago by Richard Linden

Downloads
- Plain Diff

Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui

parents bd124dea 2cc43211

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

indra/llxuixml/llxuiparser.cpp 44 additions, 45 deletions

indra/llxuixml/llxuiparser.cpp
indra/newview/llfloaterinventory.cpp 9 additions, 0 deletions

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

indra/newview/llfloaterinventory.h
indra/newview/skins/default/xui/en/floater_my_inventory.xml 1 addition, 1 deletion

indra/newview/skins/default/xui/en/floater_my_inventory.xml
indra/newview/skins/default/xui/en/floater_voice_controls.xml 2 additions, 0 deletions

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

with 57 additions and 46 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