Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Alchemy Viewer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

80f2836a

Commit 80f2836a authored 13 years ago by Oz Linden

Downloads
- Plain Diff

merge changes for vmrg-231

parents 373ee3dd 1effb127

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/llinventorybridge.cpp 1 addition, 1 deletion

indra/newview/llinventorybridge.cpp
indra/newview/llmarketplacefunctions.cpp 15 additions, 0 deletions

indra/newview/llmarketplacefunctions.cpp
indra/newview/skins/default/xui/en/floater_merchant_outbox.xml 5 additions, 5 deletions

.../newview/skins/default/xui/en/floater_merchant_outbox.xml
indra/newview/skins/default/xui/en/menu_viewer.xml 7 additions, 0 deletions

indra/newview/skins/default/xui/en/menu_viewer.xml
indra/newview/skins/default/xui/en/sidepanel_inventory.xml 1 addition, 1 deletion

indra/newview/skins/default/xui/en/sidepanel_inventory.xml
indra/newview/skins/default/xui/en/strings.xml 1 addition, 1 deletion

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

with 30 additions and 8 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