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.

fde14fa5

Commit fde14fa5 authored 14 years ago by Oz Linden

Downloads
- Plain Diff

merge changes for storm-243

parents fd95de0e b2e4486c

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 2 additions, 0 deletions

doc/contributions.txt
indra/llimage/llpngwrapper.cpp 4 additions, 14 deletions

indra/llimage/llpngwrapper.cpp
indra/llimage/llpngwrapper.h 0 additions, 3 deletions

indra/llimage/llpngwrapper.h
indra/newview/lllogininstance.cpp 43 additions, 51 deletions

indra/newview/lllogininstance.cpp
indra/newview/lllogininstance.h 0 additions, 7 deletions

indra/newview/lllogininstance.h
indra/newview/llpanelobjectinventory.cpp 5 additions, 15 deletions

indra/newview/llpanelobjectinventory.cpp
indra/newview/llstartup.cpp 0 additions, 1 deletion

indra/newview/llstartup.cpp
indra/newview/skins/default/xui/en/floater_web_content.xml 34 additions, 34 deletions

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

with 88 additions and 125 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