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.

f27aff45

Commit f27aff45 authored 15 years ago by angela

Downloads
- Plain Diff

Automated merge with ssh://angela@hg.lindenlab.com/james/gooey

parents 65fd784f cfccf4d5

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

indra/llui/llsliderctrl.cpp 2 additions, 1 deletion

indra/llui/llsliderctrl.cpp
indra/llui/llsliderctrl.h 3 additions, 1 deletion

indra/llui/llsliderctrl.h
indra/llui/lltexteditor.cpp 19 additions, 7 deletions

indra/llui/lltexteditor.cpp
indra/newview/llchathistory.cpp 5 additions, 7 deletions

indra/newview/llchathistory.cpp
indra/newview/llpanelprofileview.cpp 1 addition, 1 deletion

indra/newview/llpanelprofileview.cpp
indra/newview/skins/default/xui/en/floater_test_slider.xml 14 additions, 1 deletion

indra/newview/skins/default/xui/en/floater_test_slider.xml
indra/newview/skins/default/xui/en/panel_chat_header.xml 13 additions, 11 deletions

indra/newview/skins/default/xui/en/panel_chat_header.xml
indra/newview/skins/default/xui/en/panel_profile_view.xml 4 additions, 3 deletions

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

with 61 additions and 32 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