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.

1fb3bfea

Commit 1fb3bfea authored 15 years ago by angela

Downloads
- Plain Diff

Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/

parents 98ca90be 33e1cae5

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

indra/llui/lluicolortable.cpp 10 additions, 3 deletions

indra/llui/lluicolortable.cpp
indra/newview/llfloaterpreference.cpp 14 additions, 55 deletions

indra/newview/llfloaterpreference.cpp
indra/newview/llfloaterpreference.h 4 additions, 1 deletion

indra/newview/llfloaterpreference.h
indra/newview/lltexturecache.cpp 2 additions, 0 deletions

indra/newview/lltexturecache.cpp
indra/newview/skins/default/xui/en/panel_bottomtray.xml 7 additions, 4 deletions

indra/newview/skins/default/xui/en/panel_bottomtray.xml
indra/newview/skins/default/xui/en/panel_preferences_chat.xml 65 additions, 17 deletions

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

with 102 additions and 80 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