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.

e15c9740

Commit e15c9740 authored 13 years ago by Richard Linden

Downloads
- Plain Diff

Automated merge with http://hg.secondlife.com/viewer-development

parents f40d2c5a cc4e7088

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

doc/contributions.txt 1 addition, 0 deletions

doc/contributions.txt
indra/llcommon/llsdserialize.cpp 0 additions, 2 deletions

indra/llcommon/llsdserialize.cpp
indra/llcommon/llsdserialize_xml.cpp 14 additions, 9 deletions

indra/llcommon/llsdserialize_xml.cpp
indra/newview/llfasttimerview.cpp 9 additions, 1 deletion

indra/newview/llfasttimerview.cpp
indra/newview/llfolderview.cpp 5 additions, 10 deletions

indra/newview/llfolderview.cpp
indra/newview/lltooldraganddrop.cpp 1 addition, 0 deletions

indra/newview/lltooldraganddrop.cpp
indra/newview/skins/default/xui/en/panel_status_bar.xml 5 additions, 5 deletions

indra/newview/skins/default/xui/en/panel_status_bar.xml
indra/newview/skins/minimal/xui/en/panel_status_bar.xml 2 additions, 2 deletions

indra/newview/skins/minimal/xui/en/panel_status_bar.xml

with 37 additions and 29 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