Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Alchemy Viewer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

d9b8f65c

Commit d9b8f65c authored 15 years ago by Loren Shih

Downloads
- Plain Diff

automated merge viewer2.0->viewer2.0

parents cdb158e9 447a908a

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/app_settings/ignorable_dialogs.xml 2 additions, 13 deletions

indra/newview/app_settings/ignorable_dialogs.xml
indra/newview/llappviewer.cpp 1 addition, 2 deletions

indra/newview/llappviewer.cpp
indra/newview/llviewermedia.cpp 0 additions, 73 deletions

indra/newview/llviewermedia.cpp
indra/newview/llviewermedia.h 0 additions, 4 deletions

indra/newview/llviewermedia.h
indra/newview/llviewerparcelmedia.cpp 17 additions, 2 deletions

indra/newview/llviewerparcelmedia.cpp
indra/newview/llviewerparcelmgr.cpp 15 additions, 9 deletions

indra/newview/llviewerparcelmgr.cpp

with 35 additions and 103 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