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.

a85f2b4b

Commit a85f2b4b authored 15 years ago by Denis Serdjuk

Downloads
- Plain Diff

Merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/

--HG--
branch : product-engine

parents ebfe3d93 db6fb220

Branches

Tags

No related merge requests found

Changes 7

Show whitespace changes

Inline Side-by-side

Showing

indra/integration_tests/CMakeLists.txt 1 addition, 1 deletion

indra/integration_tests/CMakeLists.txt
indra/newview/llnearbychatbar.cpp 4 additions, 0 deletions

indra/newview/llnearbychatbar.cpp
indra/newview/skins/default/xui/en/floater_im_session.xml 5 additions, 5 deletions

indra/newview/skins/default/xui/en/floater_im_session.xml
indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml 3 additions, 2 deletions

...ewview/skins/default/xui/en/panel_adhoc_control_panel.xml
indra/newview/skins/default/xui/en/panel_group_control_panel.xml 3 additions, 3 deletions

...ewview/skins/default/xui/en/panel_group_control_panel.xml
indra/newview/skins/default/xui/en/panel_im_control_panel.xml 1 addition, 1 deletion

...a/newview/skins/default/xui/en/panel_im_control_panel.xml
indra/newview/skins/default/xui/en/widgets/gesture_combo_box.xml 5 additions, 5 deletions

...ewview/skins/default/xui/en/widgets/gesture_combo_box.xml

with 22 additions and 17 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