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.

4a2d57ad

Commit 4a2d57ad authored 15 years ago by skolb

Downloads
- Plain Diff

Merge

parents 93f827ec caaf0173

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/llmediadataclient.cpp 1 addition, 1 deletion

indra/newview/llmediadataclient.cpp
indra/newview/llpanelmediasettingsgeneral.cpp 0 additions, 6 deletions

indra/newview/llpanelmediasettingsgeneral.cpp
indra/newview/llpanelmediasettingsgeneral.h 0 additions, 2 deletions

indra/newview/llpanelmediasettingsgeneral.h
indra/newview/llpanelmediasettingspermissions.cpp 29 additions, 17 deletions

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

indra/newview/llpanelmediasettingspermissions.h
indra/newview/lltoolpie.cpp 3 additions, 5 deletions

indra/newview/lltoolpie.cpp
indra/newview/llviewermedia.cpp 14 additions, 0 deletions

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

indra/newview/llviewermedia.h
indra/newview/llviewermediafocus.cpp 13 additions, 3 deletions

indra/newview/llviewermediafocus.cpp
indra/newview/llvovolume.cpp 5 additions, 2 deletions

indra/newview/llvovolume.cpp
indra/newview/skins/default/xui/en/panel_media_settings_general.xml 0 additions, 30 deletions

...iew/skins/default/xui/en/panel_media_settings_general.xml
indra/newview/skins/default/xui/en/panel_media_settings_permissions.xml 36 additions, 7 deletions

...skins/default/xui/en/panel_media_settings_permissions.xml

with 104 additions and 73 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