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.

471b8f71

Commit 471b8f71 authored 15 years ago by Tofu Linden

Downloads
- Plain Diff

Merge conflict resolution.

parents 6ff6ed4d 1d512c59

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/app_settings/settings.xml 0 additions, 11 deletions

indra/newview/app_settings/settings.xml
indra/newview/llfloaterpreference.cpp 15 additions, 14 deletions

indra/newview/llfloaterpreference.cpp
indra/newview/llfloaterpreference.h 1 addition, 0 deletions

indra/newview/llfloaterpreference.h
indra/newview/llviewermedia.cpp 0 additions, 2 deletions

indra/newview/llviewermedia.cpp
indra/newview/llviewerparcelmedia.cpp 1 addition, 1 deletion

indra/newview/llviewerparcelmedia.cpp
indra/newview/llviewertexture.cpp 0 additions, 1 deletion

indra/newview/llviewertexture.cpp
indra/newview/skins/default/xui/en/panel_preferences_privacy.xml 16 additions, 4 deletions

...ewview/skins/default/xui/en/panel_preferences_privacy.xml
indra/newview/skins/default/xui/en/panel_preferences_setup.xml 1 addition, 1 deletion

.../newview/skins/default/xui/en/panel_preferences_setup.xml

with 34 additions and 34 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