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.

b5df0872

Commit b5df0872 authored 14 years ago by Vadim Savchuk

Downloads
- Plain Diff

Merge from default branch

--HG--
branch : product-engine

parents ed5212f0 4db872e1

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

indra/llcommon/llapr.cpp 10 additions, 2 deletions

indra/llcommon/llapr.cpp
indra/newview/llpaneloutfitedit.cpp 1 addition, 1 deletion

indra/newview/llpaneloutfitedit.cpp
indra/newview/llpanelprimmediacontrols.cpp 7 additions, 0 deletions

indra/newview/llpanelprimmediacontrols.cpp
indra/newview/lltexturecache.cpp 76 additions, 11 deletions

indra/newview/lltexturecache.cpp
indra/newview/lltexturecache.h 4 additions, 3 deletions

indra/newview/lltexturecache.h
indra/newview/lltoolpie.cpp 0 additions, 1 deletion

indra/newview/lltoolpie.cpp
indra/newview/llviewermedia.cpp 12 additions, 7 deletions

indra/newview/llviewermedia.cpp
indra/newview/llvoavatar.cpp 6 additions, 4 deletions

indra/newview/llvoavatar.cpp
indra/newview/skins/default/xui/fr/floater_preview_gesture.xml 2 additions, 2 deletions

.../newview/skins/default/xui/fr/floater_preview_gesture.xml
indra/newview/skins/default/xui/fr/menu_gesture_gear.xml 1 addition, 1 deletion

indra/newview/skins/default/xui/fr/menu_gesture_gear.xml
indra/newview/skins/default/xui/fr/panel_nearby_media.xml 1 addition, 1 deletion

indra/newview/skins/default/xui/fr/panel_nearby_media.xml

with 120 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