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.

f1c27071

Commit f1c27071 authored 13 years ago by Richard Linden

Downloads
- Plain Diff

Automated merge with https://bitbucket.org/lindenlab/viewer-development

parents 3dfb1536 26829e6f

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

indra/llcommon/llsys.cpp 14 additions, 4 deletions

indra/llcommon/llsys.cpp
indra/llui/lltoolbar.cpp 8 additions, 1 deletion

indra/llui/lltoolbar.cpp
indra/llui/lltoolbar.h 1 addition, 0 deletions

indra/llui/lltoolbar.h
indra/llui/llview.cpp 5 additions, 6 deletions

indra/llui/llview.cpp
indra/llwindow/llwindowwin32.cpp 31 additions, 0 deletions

indra/llwindow/llwindowwin32.cpp
indra/newview/llfloaterimagepreview.cpp 6 additions, 5 deletions

indra/newview/llfloaterimagepreview.cpp
indra/newview/llinventorymodel.h 1 addition, 0 deletions

indra/newview/llinventorymodel.h
indra/newview/llviewerwindow.cpp 2 additions, 1 deletion

indra/newview/llviewerwindow.cpp
indra/newview/skins/default/xui/en/floater_model_wizard.xml 16 additions, 16 deletions

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

with 84 additions and 33 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