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.

28f9d147

Commit 28f9d147 authored 13 years ago by callum

Downloads
- Plain Diff

Merge with head

parents ade39d16 27bfdfea

No related branches found

No related tags found

No related merge requests found

Changes 6

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
indra/newview/skins/default/xui/en/panel_chat_item.xml 1 addition, 0 deletions

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

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