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.

a7bca705

Commit a7bca705 authored 15 years ago by Tofu Linden

Downloads
- Plain Diff

PE merge. Conflict resolved.

parents 245fe3ed 1d45b1ed

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

indra/llui/llscrolllistctrl.h 0 additions, 2 deletions

indra/llui/llscrolllistctrl.h
indra/llui/lltabcontainer.cpp 1 addition, 1 deletion

indra/llui/lltabcontainer.cpp
indra/newview/lllogchat.cpp 10 additions, 0 deletions

indra/newview/lllogchat.cpp
indra/newview/llnearbychathandler.cpp 3 additions, 2 deletions

indra/newview/llnearbychathandler.cpp
indra/newview/llpanelgroupgeneral.h 0 additions, 1 deletion

indra/newview/llpanelgroupgeneral.h
indra/newview/llviewermenu.cpp 12 additions, 26 deletions

indra/newview/llviewermenu.cpp
indra/newview/skins/default/xui/en/floater_preferences.xml 1 addition, 0 deletions

indra/newview/skins/default/xui/en/floater_preferences.xml
indra/newview/skins/default/xui/en/menu_object.xml 20 additions, 8 deletions

indra/newview/skins/default/xui/en/menu_object.xml
indra/newview/skins/default/xui/en/menu_viewer.xml 20 additions, 10 deletions

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

with 67 additions and 50 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