From 5b25ee1f6a3488f16a68e436a0bcec79636a11e6 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Mon, 27 Feb 2012 05:01:01 +1000
Subject: Fix a bug preventning seeing nearby sims, or TPing to other sims.

After some investigation, McCabe and I narrowed it down to this if statement.
We still don't know why, but at least it fixes the problem.  To be investiganted more later.
---
 linden/indra/llcommon/llsdserialize_xml.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/linden/indra/llcommon/llsdserialize_xml.cpp b/linden/indra/llcommon/llsdserialize_xml.cpp
index 3545309..7c3dcbf 100644
--- a/linden/indra/llcommon/llsdserialize_xml.cpp
+++ b/linden/indra/llcommon/llsdserialize_xml.cpp
@@ -394,7 +394,9 @@ S32 LLSDXMLParser::Impl::parse(std::istream& input, LLSD& data)
 		if (status == XML_STATUS_ERROR)
 		{
 			std::string error_string(XML_ErrorString(XML_GetErrorCode( mParser )));
-			if (input.gcount() == 0)
+			// I know, this if seems odd, but it fixes a problem with not being able to see nearby sims, or TP to other sims.
+			// No idea why.
+			if (input && (input.gcount() == 0))
 			{
 				// nothing to do -- MC
 				data = LLSD();
-- 
cgit v1.1


From f41b446898cd53e7984d03b8b1bfa781028e47fd Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Mon, 27 Feb 2012 23:02:32 +1000
Subject: Fixes http://redmine.kokuaviewer.org/issues/354

I similar fix should be applied to Gemini and Dark, but that should wait for the decision to move artwork into the repo.
---
 linden/indra/newview/skins/silver/colors.xml      |  99 +++++++++++
 linden/indra/newview/skins/silver/colors_base.xml | 201 ----------------------
 2 files changed, 99 insertions(+), 201 deletions(-)
 delete mode 100644 linden/indra/newview/skins/silver/colors_base.xml

diff --git a/linden/indra/newview/skins/silver/colors.xml b/linden/indra/newview/skins/silver/colors.xml
index cf9466f..bc9221e 100644
--- a/linden/indra/newview/skins/silver/colors.xml
+++ b/linden/indra/newview/skins/silver/colors.xml
@@ -1,3 +1,102 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings version = "101">
+
+ <!-- Additional comments by McCabe Maxsted -->
+  
+ <!-- WINDOWS -->
+<TitleBarFocusColor value="50, 115, 185, 120" />        <!-- Focused window title bar highlight, no equivalent for unfocused windows -->
+<FloaterFocusBorderColor value="50, 115, 185, 75" />    <!-- Focused window border color -->
+<FloaterUnfocusBorderColor value="110, 110, 110, 60" /> <!-- Unfocused window border color -->
+<FocusBackgroundColor value="165, 180, 200, 245" />     <!-- Background color of focused windows -->
+<DefaultBackgroundColor value="165, 180, 200, 128" />   <!-- Background color for unfocused windows -->
+<DefaultHighlightDark value="50, 115, 185, 255" />
+<DefaultHighlightLight value="50, 115, 185, 255" />     <!-- Unfocused border, bottom portion -->
+<DefaultShadowDark value="50, 115, 185, 255" />         <!-- Unfocused border, top portion -->
+<DefaultShadowLight value="50, 115, 185, 255" />        <!-- Tab area border for IMs -->
+  
+ <!-- WINDOW LABELS -->
+<LabelDisabledColor value="0, 30, 60, 128" />               <!-- Color for unfocused window titles -->
+<LabelTextColor value="0, 30, 60, 255" />                   <!-- Color for window labels and titles -->
+  
+ <!-- BUTTONS -->
+<ButtonLabelColor value="0, 30, 60, 255" />                 <!-- Label text color for buttons, like the "OK" text -->
+<ButtonLabelSelectedColor value="255, 255, 255, 255" />     <!-- Label text color when button selected -->
+<ButtonLabelDisabledColor value="0, 30, 60, 128" />         <!-- Label text color when button disabled -->
+<ButtonLabelSelectedDisabledColor value="0, 30, 60, 128" /> <!-- Label text color when button disabled but selected -->
+
+ <!-- SLIDERS, single line -->
+<SliderThumbCenterColor value="255, 255, 255, 255" />       <!-- Unfocused slider thumb color -->
+<SliderThumbOutlineColor value="37, 64, 99, 255" />         <!-- Focused slider thumb color -->
+<SliderTrackColor value="37, 64, 99, 255" />                <!-- Not used -->
+  
+ <!-- TEXTFIELDS -->
+<TextBgFocusColor value="255, 255, 255, 255" />             <!-- Text field background when receiving input (focused) -->
+<TextBgReadOnlyColor value="255, 255, 255, 140" />          <!-- Text field background when read-only -->
+<TextBgWriteableColor value="255, 255, 255, 255" />         <!-- Text field background when not receiving input (unfocused) -->
+<TextFgColor value="48, 48, 45, 255" />                     <!-- Text color for all text entry fields; cursor color for line editors -->
+<TextFgReadOnlyColor value="0, 0, 0, 200" />                <!-- Text color in read-only fields -->
+<TextLinkColor value="0, 20, 255, 255"/>
+<TextLinkHoverColor value="0, 50, 255, 255"/>
+ 
+ <!-- LISTBOXES -->
+<ScrollBgReadOnlyColor value="255, 255, 255, 140" />    <!-- Background of read only lists -->
+<ScrollBgWriteableColor value="255, 255, 255, 140" />   <!-- Background of editable lists, e.g. groups-->
+<ScrollBGStripeColor value="145, 180, 220, 60" />       <!-- Background stripes in sortable lists, e.g. Events Search -->
+<ScrollSelectedBGColor value="50, 115, 185, 150" />     <!-- Selected item in a list highlight -->
+<ScrollSelectedFGColor value="0, 30, 60, 255" />        <!-- Text color -->
+<ScrollUnselectedColor value="0, 30, 60, 255" />        <!-- Text color -->
+<ScrollHighlightedColor value="145, 180, 220, 128" />   <!-- Hover color -->
+<ScrollbarThumbColor value="120, 160, 200, 255" />      <!-- Scroll bar -->
+<ScrollbarTrackColor value="183, 202, 220, 255" />      <!-- Scroll bar background -->
+<ScrollReadOnlyColor value="180, 180, 180, 255" />      <!-- Color for inactive but not disabled lists -->
+  
+ <!-- MENUS -->
+<MenuBarBgColor value="185, 200, 220, 230" />               <!-- Menu bar background -->
+<MenuBarGodBgColor value="100, 200, 130, 230" />            <!-- Menu bar background with God Mode enabled -->
+<MenuNonProductionGodBgColor value="100, 200, 130, 230" />  <!-- Beta viewer menu bar background -->
+<MenuNonProductionBgColor value="230, 70, 70, 230" />       <!-- Beta viewer menu bar background with God Mode enabled -->
+<MenuDefaultBgColor value="210, 220, 230, 245" />           <!-- Menu background -->
+<MenuItemDisabledColor value="0, 30, 60, 128" />            <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
+<MenuItemEnabledColor value="0, 30, 60, 255" />             <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
+<MenuItemHighlightBgColor value="50, 115, 185, 100" />      <!-- Highlighted menu item background color -->
+<MenuItemHighlightFgColor value="0, 30, 60, 255" />         <!-- Highlighted menu item text color; also treeview node selection highlight -->
+<MenuPopupBgColor value="197, 217, 234, 240" />             <!-- Right-click menu background -->
+  
+ <!--  PIE MENUS -->
+<PieMenuBgColor value="118, 156, 201, 230" />           <!-- Color of pie menu -->
+<PieMenuLineColor value="255, 255, 255, 60" />          <!-- Color of pie menu slice separators -->
+<PieMenuSelectedColor value="185, 200, 220, 120" />     <!-- Color of pie menu slice when selected -->
+  
+ <!-- MENU BAR -->
+<ParcelTextColor value="40, 40, 90, 255" />		<!-- Parcel name on menu bar, normal state -->
+<ParcelHoverColor value="70, 70, 100, 255" />		<!-- Parcel name on menu bar, hover state -->
+<TimeTextColor value="0, 30, 60, 255" />		<!-- SL Time on menu bar -->
+<BalanceTextColor value="0, 100, 40, 255" />		<!-- Linden dollar balance on menu bar -->
+<HealthTextColor value="110, 15, 15, 255" />		<!-- Damage meter text on menu bar -->
+  
+ <!-- TOOLTIPS -->
+<ToolTipBgColor value="250, 255, 225, 230" />           <!-- Tool tips, i.e. "Hover Tips" -->
+  
+ <!-- NOTIFICATION POP-UPS -->
+<NotifyBoxColor value="170, 210, 255, 240" />           <!-- Notification background, i.e. tp requests -->
+<NotifyTextColor value="0, 30, 60, 255" />              <!-- Notification text -->
+<GroupNotifyBoxColor value="170, 210, 255, 240" />      <!-- Group notices background -->
+  
+ <!-- ALERT BOX COLORS -->
+<AlertBoxColor value="165, 180, 200, 245" />            <!-- Alert floaters, like the warning before returning objects -->
+<AlertTextColor value="0, 30, 60, 255" />               <!-- Alert floater text -->
+  
+ <!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
+<ChatHistoryBgColor value="0, 30, 80, 200" />           <!-- Local Chat background -->
+ 
+   <!-- INVENTORY -->
+<InventoryBackgroundColor value="255, 255, 255, 80"/>           <!-- Inventory floater background -->
+<InventoryItemSuffixColor value="120, 70, 55, 255"/>            <!-- "worn", "no modify", etc -->
+<FilterBackgroundColor value="75, 75, 150, 180" />              <!-- Inventory search background -->
+<InventorySearchStatusColor value="0, 0, 0, 255" />             <!-- "Searching..." -->
+  
+ <!-- MISC -->
+<FloaterButtonImageColor value="255, 255, 255, 255" />  <!-- The floater buttons (like the close box) are white images that receive this color. -->
+<ButtonCautionImageColor value="255, 255,  255, 255" /> <!-- Match the caution dialog buttons to the default -->
+
 </settings>
diff --git a/linden/indra/newview/skins/silver/colors_base.xml b/linden/indra/newview/skins/silver/colors_base.xml
deleted file mode 100644
index f9bf283..0000000
--- a/linden/indra/newview/skins/silver/colors_base.xml
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<settings version = "101">
-<!-- Additional comments by McCabe Maxsted -->
- 
-<!-- WINDOWS -->
-<TitleBarFocusColor value="50, 115, 185, 120" />        <!-- Focused window title bar highlight, no equivalent for unfocused windows -->
-<FloaterFocusBorderColor value="50, 115, 185, 75" />    <!-- Focused window border color -->
-<FloaterUnfocusBorderColor value="110, 110, 110, 60" /> <!-- Unfocused window border color -->
-<FocusBackgroundColor value="165, 180, 200, 245" />     <!-- Background color of focused windows -->
-<DefaultBackgroundColor value="165, 180, 200, 128" />   <!-- Background color for unfocused windows -->
-<ColorDropShadow value="0, 0, 0, 200" />                <!-- The drop shadow behind windows and menus -->
-<DefaultHighlightDark value="50, 115, 185, 255" />
-<DefaultHighlightLight value="50, 115, 185, 255" />     <!-- Unfocused border, bottom portion -->
-<DefaultShadowDark value="50, 115, 185, 255" />         <!-- Unfocused border, top portion -->
-<DefaultShadowLight value="50, 115, 185, 255" />        <!-- Tab area border for IMs -->
- 
-<!-- WINDOW LABELS -->
-<LabelDisabledColor value="0, 30, 60, 128" />               <!-- Color for unfocused window titles -->
-<LabelSelectedColor value="255, 255, 255, 255" />           <!-- Color for mouseovered clickable labels, e.g. version info on the login screen -->
-<LabelSelectedDisabledColor value="164, 190, 237, 128" />
-<LabelTextColor value="0, 30, 60, 255" />                   <!-- Color for window labels and titles -->
- 
-<!-- LOGIN -->
-<LoginProgressBarBgColor value="255, 255, 255, 255" />      <!-- Login progress bar background -->
-<LoginProgressBarFgColor value="255, 255, 255, 255" />      <!-- Login progress bar -->
-<LoginProgressBoxBorderColor value="0, 30, 60, 0" />        <!-- Login progress box border -->
-<LoginProgressBoxCenterColor value="0, 0, 0, 200" />        <!-- Login progress box background -->
-<LoginProgressBoxShadowColor value="0, 0, 0, 200" />        <!-- Login progress box shadow -->
-<LoginProgressBoxTextColor value="255, 255, 255, 255"/>     <!-- Login progress text -->
- 
-<!-- BUTTONS -->
-<ButtonLabelColor value="0, 30, 60, 255" />                 <!-- Label text color for buttons, like the "OK" text -->
-<ButtonLabelSelectedColor value="255, 255, 255, 255" />     <!-- Label text color when button selected -->
-<ButtonLabelDisabledColor value="0, 30, 60, 128" />         <!-- Label text color when button disabled -->
-<ButtonLabelSelectedDisabledColor value="0, 30, 60, 128" /> <!-- Label text color when button disabled but selected -->
-<ButtonSelectedBgColor value="62, 62, 62, 255" />           <!-- Not used -->
-<ButtonSelectedColor value="255, 255, 255, 255" />          <!-- Not used -->
-<ButtonUnselectedBgColor value="62, 62, 62, 255" />         <!-- Not used -->
-<ButtonUnselectedFgColor value="255, 255, 255, 255" />      <!-- Not used -->
-<ButtonBorderColor value="239, 156, 0, 255" />              <!-- Not used -->
-<ButtonFlashBgColor value="255, 190, 62, 127" />            <!-- Color of tab flashing on incoming IM -->
-<ButtonColor value="255, 255, 255, 255" />                  <!-- Blended with button art, usually left as opaque white -->
-<ButtonImageColor value="255, 255, 255, 255" />             <!-- Button color override (also checkboxes and scroll arrows).
-                                                                 Blended with button art, usually left as opaque white -->
- 
-<!-- SLIDERS, single line -->
-<SliderDisabledThumbColor value="0, 0, 0, 255" />           <!-- Not used -->
-<SliderThumbCenterColor value="255, 255, 255, 255" />       <!-- Unfocused slider thumb color -->
-<SliderThumbOutlineColor value="37, 64, 99, 255" />         <!-- Focused slider thumb color -->
-<SliderTrackColor value="37, 64, 99, 255" />                <!-- Not used -->
- 
-<!-- SLIDERS, multi line (as in the sky editor) -->
-<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/>           <!-- Not used -->       
-<MultiSliderThumbCenterColor value="183, 184, 188, 255"/>       <!-- Not used -->   
-<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/>            <!-- Not used -->
-<MultiSliderTrackColor value="30, 30, 30, 255"/>                <!-- Not used -->
-<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/> <!-- Not used -->
-<MultiSliderTriangleColor value="255, 255, 50, 255"/>           <!-- Not used -->
- 
-<!-- TEXTFIELDS -->
-<TextBgFocusColor value="255, 255, 255, 255" />             <!-- Text field background when receiving input (focused) -->
-<TextBgReadOnlyColor value="255, 255, 255, 140" />          <!-- Text field background when read-only -->
-<TextBgWriteableColor value="255, 255, 255, 255" />         <!-- Text field background when not receiving input (unfocused) -->
-<TextCursorColor value="0, 0, 0, 255" />                    <!-- Cursor color in notecards and scripts only -->
-<TextFgColor value="48, 48, 45, 255" />                     <!-- Text color for all text entry fields; cursor color for line editors -->
-<TextFgReadOnlyColor value="0, 0, 0, 200" />                <!-- Text color in read-only fields -->
-<TextFgTentativeColor value="0, 0, 0, 128" />               <!-- Initial entry in text entry fields, e.g. "Click here to chat." -->
-<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255" /> <!-- Text of read-only items embedded in notecards -->
-<TextEmbeddedItemColor value="0, 0, 128, 255" />            <!-- Text of items embedded in notecards -->
-<TextDefaultColor value="0, 20, 0, 255"/>                   <!-- Non-keyword text in the script editor -->
-<TextLinkColor value="0, 20, 255, 255"/>
-<TextLinkHoverColor value="0, 50, 255, 255"/>
- 
-<!-- LISTBOXES -->
-<ScrollBgReadOnlyColor value="255, 255, 255, 140" />    <!-- Background of read only lists -->
-<ScrollBgWriteableColor value="255, 255, 255, 140" />   <!-- Background of editable lists, e.g. groups-->
-<ScrollBGStripeColor value="145, 180, 220, 60" />       <!-- Background stripes in sortable lists, e.g. Events Search -->
-<ScrollDisabledColor value="128, 128, 128, 204" />      
-<ScrollSelectedBGColor value="50, 115, 185, 150" />     <!-- Selected item in a list highlight -->
-<ScrollSelectedFGColor value="0, 30, 60, 255" />        <!-- Text color -->
-<ScrollUnselectedColor value="0, 30, 60, 255" />        <!-- Text color -->
-<ScrollHighlightedColor value="145, 180, 220, 128" />   <!-- Hover color -->
-<ScrollbarThumbColor value="120, 160, 200, 255" />      <!-- Scroll bar -->
-<ScrollbarTrackColor value="183, 202, 220, 255" />      <!-- Scroll bar background -->
-<ScrollReadOnlyColor value="180, 180, 180, 255" />      <!-- Color for inactive but not disabled lists -->
-  
-<!-- MENUS -->
-<MenuBarBgColor value="185, 200, 220, 230" />               <!-- Menu bar background -->
-<MenuBarGodBgColor value="100, 200, 130, 230" />            <!-- Menu bar background with God Mode enabled -->
-<MenuNonProductionGodBgColor value="100, 200, 130, 230" />  <!-- Beta viewer menu bar background -->
-<MenuNonProductionBgColor value="230, 70, 70, 230" />       <!-- Beta viewer menu bar background with God Mode enabled -->
-<MenuDefaultBgColor value="210, 220, 230, 245" />           <!-- Menu background -->
-<MenuItemDisabledColor value="0, 30, 60, 128" />            <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
-<MenuItemEnabledColor value="0, 30, 60, 255" />             <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
-<MenuItemHighlightBgColor value="50, 115, 185, 100" />      <!-- Highlighted menu item background color -->
-<MenuItemHighlightFgColor value="0, 30, 60, 255" />         <!-- Highlighted menu item text color; also treeview node selection highlight -->
-<MenuPopupBgColor value="197, 217, 234, 240" />             <!-- Right-click menu background -->
- 
-<!--  PIE MENUS -->
-<PieMenuBgColor value="118, 156, 201, 230" />           <!-- Color of pie menu -->
-<PieMenuLineColor value="255, 255, 255, 60" />          <!-- Color of pie menu slice separators -->
-<PieMenuSelectedColor value="185, 200, 220, 120" />     <!-- Color of pie menu slice when selected -->
- 
-<!-- MENU BAR -->
-<ParcelTextColor value="40, 40, 90, 255" />		  <!-- Parcel name on menu bar, normal state -->
-<ParcelHoverColor value="70, 70, 100, 255" />		<!-- Parcel name on menu bar, hover state -->
-<TimeTextColor value="0, 30, 60, 255" />		    <!-- SL Time on menu bar -->
-<BalanceTextColor value="0, 100, 40, 255" />		<!-- Linden dollar balance on menu bar -->
-<HealthTextColor value="110, 15, 15, 255" />		<!-- Damage meter text on menu bar -->
- 
-<!-- TOOLTIPS -->
-<ToolTipBgColor value="250, 255, 225, 230" />           <!-- Tool tips, i.e. "Hover Tips" -->
-<ToolTipBorderColor value="171, 212, 245, 255" />       <!-- Not used -->
-<ToolTipTextColor value="0, 0, 0, 255" />               <!-- Tool tips text color -->
- 
-<!-- NOTIFICATION POP-UPS -->
-<NotifyBoxColor value="170, 210, 255, 240" />           <!-- Notification background, i.e. tp requests -->
-<NotifyTextColor value="0, 30, 60, 255" />              <!-- Notification text -->
-<NotifyCautionBoxColor value="254, 209, 118, 255" />    <!-- Background color of caution permissions prompts -->
-<NotifyCautionWarnColor value="0, 0, 0, 255" />         <!-- Foreground color of the special title text in caution permissions prompts -->
-<GroupNotifyBoxColor value="170, 210, 255, 240" />      <!-- Group notices background -->
-<GroupNotifyTextColor value="0, 30, 60, 255" />         <!-- Group notices text -->
- 
-<!-- ALERT BOX COLORS -->
-<AlertBoxColor value="165, 180, 200, 245" />            <!-- Alert floaters, like the warning before returning objects -->
-<AlertTextColor value="0, 30, 60, 255" />               <!-- Alert floater text -->
-<AlertCautionBoxColor value="254, 209, 118, 255" />     <!-- Background color of caution alerts -->
-<AlertCautionTextColor value="0, 0, 0, 255" />          <!-- Foreground color of the special title text in caution alerts -->
- 
-<!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
-<ChatHistoryBgColor value="0, 30, 80, 200" />           <!-- Local Chat background -->
-<ChatHistoryTextColor value="255, 255, 255, 255" />     <!-- Local Chat text -->
-<IMHistoryBgColor value="0, 30, 80, 200" />             <!-- Instant Message background -->
-<IMHistoryTextColor value="255, 255, 255, 255" />       <!-- Instant Message text -->
- 
-<!-- IN-WORLD SELECTION -->
-<SilhouetteParentColor value="255, 255, 0, 255" />      <!-- Root prim selection outline -->
-<SilhouetteChildColor value="32, 106, 196, 255" />      <!-- Child prim selection outline -->
-<HighlightParentColor value="171, 212, 245, 255" />
-<HighlightChildColor value="171, 212, 245, 255" />
-<HighlightInspectColor value="255, 0, 255, 255" />      <!-- Selection outline when inspecting -->
- 
-<!-- EDIT MODE GRID -->
-<GridFocusPointColor value="255, 255, 255, 128" />      <!-- Not used -->
-<GridlineColor value="255, 255, 255, 255" />            <!-- Grid color -->
-<GridlineBGColor value="235, 235, 255, 200" />          <!-- Grid background color -->
-<GridlineShadowColor value="0, 0, 0, 80" />             <!-- Grid drop shadow -->
- 
-<!-- PROPERTY LINES -->
-<PropertyColorAvail value="0, 0, 0, 0" />               
-<PropertyColorGroup value="0, 184, 184, 102" />         <!-- Property group owns -->
-<PropertyColorOther value="255, 0, 0, 102" />           <!-- Property others own -->
-<PropertyColorSelf value="0, 255, 0, 102" />            <!-- Property you own -->
-<PropertyColorForSale value="255, 128, 0, 102" />       <!-- Property for sale -->
-<PropertyColorAuction value="128, 0, 255, 102" />       <!-- Match the color on the world map -->
- 
-<!-- MEDIA ICONS -->
-<IconEnabledColor value="255, 255, 255, 255"/>          <!-- Media/music icon enabled -->
-<IconDisabledColor value="147, 169, 213, 200"/>         <!-- Media/music icon disabled -->
-
-<!-- MAP -->
-<MapAvatar value="0, 255, 0, 255" />                    <!-- Your avatar's glyph color -->
-<MapFriend value="255, 255, 0, 255" />                  <!-- Your friends' glyph color -->
-<MapMuted value="128, 128, 128, 255" />                 <!-- Muted avatars' glyph color -->
-<MapSelected value="255, 0, 0, 255" />                  <!-- Selected avatars' glyph color -->
-<MapImpDev value="90, 45, 101, 255" />                  <!-- Imprudence developers glyph color -->
-<MapPartner value="214, 40, 107, 255" />                <!-- (unused) Your avatar's partner's glyph color -->
- 
-<!-- MINI-MAP -->
-<NetMapBackgroundColor value="0, 0, 0, 77" />           <!-- Mini-map floater background -->
-<NetMapYouOwnAboveWater value="0, 255, 255, 255" />     <!-- Objects owned by you above water -->
-<NetMapYouOwnBelowWater value="0, 200, 200, 255" />     <!-- Objects owned by you below water -->
-<NetMapGroupOwnAboveWater value="255, 0, 255, 255" />   <!-- Group owned objects above water -->
-<NetMapGroupOwnBelowWater value="200, 0, 200, 255" />   <!-- Group owned objects below water -->
-<NetMapOtherOwnAboveWater value="60, 60, 60, 255" />    <!-- Objects owned by others above water -->
-<NetMapOtherOwnBelowWater value="30, 30, 30, 255" />    <!-- Objects owned by others below water -->
-<NetMapThisRegion value="255, 255, 255, 255" />
-<NetMapLiveRegion value="204, 204, 204, 255" />
-<NetMapDeadRegion value="255, 128, 128, 255" />
-<NetMapFrustum value="255, 255, 255, 20" />
-<NetMapFrustumRotating value="255, 255, 255, 51" />
-
-  <!-- INVENTORY -->
-<InventoryBackgroundColor value="255, 255, 255, 80"/>           <!-- Inventory floater background -->
-<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/>  <!-- "loading..." -->
-<InventoryItemSuffixColor value="120, 70, 55, 255"/>            <!-- "worn", "no modify", etc -->
-<FilterBackgroundColor value="75, 75, 150, 180" />              <!-- Inventory search background -->
-<FilterTextColor value="255, 200, 70, 255" />                   <!-- Inventory search text -->
-<InventorySearchStatusColor value="0, 0, 0, 255" />             <!-- "Searching..." -->
- 
-<!-- MISC -->
-<AvatarNameColor value="251, 175, 93, 255" />           <!-- Text color of avatar nametags -->
-<FocusColor value="239, 156, 0, 255" />                 <!-- Color of the glow around UI controls with keyboard focus -->
-<FloaterButtonImageColor value="255, 255, 255, 255" />  <!-- The floater buttons (like the close box) are white images that receive this color. -->
-<ButtonCautionImageColor value="255, 255,  255, 255" /> <!-- Match the caution dialog buttons to the default -->
-<MapAutopilotColor value="255, 128, 0, 255" />
-<ContextSilhouetteColor value="239, 156, 0, 255" />     <!-- For "context" highlighting, i.e. pie menu -->
-<GroupOverTierColor value="110, 15, 15, 255" />         <!-- Warning text in Group Info window -->
-<ConsoleBackground value="0, 0, 0, 255" />              <!-- Background for inworld chat -->
-
-</settings>
-- 
cgit v1.1


From 2a17af96e5ce9fa58e0fa29dd706fabef64f21c7 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Tue, 28 Feb 2012 01:02:00 +1000
Subject: Fixes http://redmine.kokuaviewer.org/issues/1000 and remove some
 related left over cruft.

---
 linden/indra/newview/llfloatermediabrowser.cpp                      | 3 ++-
 linden/indra/newview/skins/default/xui/da/floater_html.xml          | 6 ------
 linden/indra/newview/skins/default/xui/de/floater_html.xml          | 6 ------
 linden/indra/newview/skins/default/xui/en-us/floater_html.xml       | 6 ------
 .../indra/newview/skins/default/xui/en-us/floater_media_browser.xml | 6 ------
 linden/indra/newview/skins/default/xui/es/floater_html.xml          | 6 ------
 linden/indra/newview/skins/default/xui/fr/floater_html.xml          | 6 ------
 linden/indra/newview/skins/default/xui/hu/floater_html.xml          | 3 ---
 linden/indra/newview/skins/default/xui/it/floater_html.xml          | 6 ------
 linden/indra/newview/skins/default/xui/ja/floater_html.xml          | 6 ------
 linden/indra/newview/skins/default/xui/nl/floater_html.xml          | 6 ------
 linden/indra/newview/skins/default/xui/pl/floater_html.xml          | 6 ------
 linden/indra/newview/skins/default/xui/pt/floater_html.xml          | 6 ------
 linden/indra/newview/skins/default/xui/ru/floater_html.xml          | 3 ---
 linden/indra/newview/skins/default/xui/uk/floater_html.xml          | 3 ---
 15 files changed, 2 insertions(+), 76 deletions(-)

diff --git a/linden/indra/newview/llfloatermediabrowser.cpp b/linden/indra/newview/llfloatermediabrowser.cpp
index 54ffc0f..ed1ec42 100644
--- a/linden/indra/newview/llfloatermediabrowser.cpp
+++ b/linden/indra/newview/llfloatermediabrowser.cpp
@@ -54,6 +54,7 @@
 #include "llviewerparcelmedia.h"
 #include "llcombobox.h"
 
+#include "hippogridmanager.h"
 
 // TEMP
 #include "llsdutil.h"
@@ -157,7 +158,7 @@ void LLFloaterMediaBrowser::buildURLHistory()
 
 std::string LLFloaterMediaBrowser::getSupportURL()
 {
-	return getString("support_page_url");
+	return gHippoGridManager->getConnectedGrid()->getSupportURL();
 }
 void LLFloaterMediaBrowser::onClose(bool app_quitting)
 {
diff --git a/linden/indra/newview/skins/default/xui/da/floater_html.xml b/linden/indra/newview/skins/default/xui/da/floater_html.xml
index 28480f8..5961a0d 100644
--- a/linden/indra/newview/skins/default/xui/da/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/da/floater_html.xml
@@ -4,10 +4,4 @@
 	<button label="Retur" name="back_btn" />
 	<button label="Frem" name="forward_btn" />
 	<button label="start" name="go_btn" />
-	<string name="home_page_url">
-		http://www.secondlife.com
-	</string>
-	<string name="support_page_url">
-		http://support.secondlife.com
-	</string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/de/floater_html.xml b/linden/indra/newview/skins/default/xui/de/floater_html.xml
index 7bf1bad..55a9580 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_html.xml
@@ -4,10 +4,4 @@
 	<button label="Zurück" name="back_btn" />
 	<button label="Weiter" name="forward_btn" />
 	<button label="Los" name="go_btn" />
-	<string name="home_page_url">
-		http://de.secondlife.com
-	</string>
-	<string name="support_page_url">
-	  	http://de.secondlife.com/support
-	</string>	
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_html.xml b/linden/indra/newview/skins/default/xui/en-us/floater_html.xml
index d107454..76283c3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_html.xml
@@ -16,10 +16,4 @@
 	     select_all_on_focus_received="true" width="435" />
 	<button bottom_delta="0" follows="top|right" font="SansSerifSmall" height="20"
 	     label="Go" left_delta="440" name="go_btn" width="70" />
-	<string name="home_page_url">
-	  	http://www.secondlife.com
-	</string>
-	<string name="support_page_url">
-	  	http://support.secondlife.com
-	</string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
index 76eee6f..12fe153 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_media_browser.xml
@@ -48,10 +48,4 @@
 			     left="-110" name="set_home" width="104" />
 		</layout_panel>
 	</layout_stack>
-  <string name="home_page_url">
-    http://www.secondlife.com
-  </string>
-  <string name="support_page_url">
-    http://support.secondlife.com
-  </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/es/floater_html.xml b/linden/indra/newview/skins/default/xui/es/floater_html.xml
index 5977fff..8f469b1 100644
--- a/linden/indra/newview/skins/default/xui/es/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/es/floater_html.xml
@@ -4,10 +4,4 @@
 	<button label="Atrás" name="back_btn"/>
 	<button label="Adelante" name="forward_btn"/>
 	<button label="Ir" name="go_btn"/>
-	<string name="home_page_url">
-		http://www.secondlife.com
-	</string>
-	<string name="support_page_url">
-		http://support.secondlife.com
-	</string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/fr/floater_html.xml b/linden/indra/newview/skins/default/xui/fr/floater_html.xml
index 1538189..f335617 100644
--- a/linden/indra/newview/skins/default/xui/fr/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/fr/floater_html.xml
@@ -7,10 +7,4 @@
 	<button label="Arrêter" name="stop_btn" />
 	<button label="Domicile" name="home_btn" />
 	<button label="Aller" name="go_btn" />
-	<string name="home_page_url">
-		http://www.secondlife.com
-	</string>
-	<string name="support_page_url">
-		http://support.secondlife.com
-	</string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/hu/floater_html.xml b/linden/indra/newview/skins/default/xui/hu/floater_html.xml
index 21b6a21..5923c52 100644
--- a/linden/indra/newview/skins/default/xui/hu/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/hu/floater_html.xml
@@ -5,9 +5,6 @@
 	<button label="Kezdő helyszín" name="home_btn" />
 	<button label="Előre" name="forward_btn" />
 	<button label="Menj" name="go_btn" />
-	<text name="home_page_url">
-		http://www.google.com
-	</text>
 	<text name="in-world_help_title">
 		In-World segítség
 	</text>
diff --git a/linden/indra/newview/skins/default/xui/it/floater_html.xml b/linden/indra/newview/skins/default/xui/it/floater_html.xml
index 4080f80..b2d1951 100644
--- a/linden/indra/newview/skins/default/xui/it/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/it/floater_html.xml
@@ -4,10 +4,4 @@
 	<button label="Indietro" name="back_btn"/>
 	<button label="Avanti" name="forward_btn"/>
 	<button label="Vai" name="go_btn"/>
-	<string name="home_page_url">
-		http://www.secondlife.com
-	</string>
-	<string name="support_page_url">
-		http://support.secondlife.com
-	</string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ja/floater_html.xml b/linden/indra/newview/skins/default/xui/ja/floater_html.xml
index 62aac82..1cb5384 100644
--- a/linden/indra/newview/skins/default/xui/ja/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/ja/floater_html.xml
@@ -5,10 +5,4 @@
 	<button label="ホーム" name="home_btn" />
 	<button label="進む" name="forward_btn" />
 	<button label="移動" name="go_btn" />
-	<string name="home_page_url">
-		http://jp.secondlife.com
-	</string>
-	<string name="support_page_url">
-		http://wiki.secondlife.com/wiki/Knowledge_Base/ja
-	</string>	
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/nl/floater_html.xml b/linden/indra/newview/skins/default/xui/nl/floater_html.xml
index 1604248..0147319 100644
--- a/linden/indra/newview/skins/default/xui/nl/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/nl/floater_html.xml
@@ -4,10 +4,4 @@
 	<button label="Terug" name="back_btn"/>
 	<button label="Vooruit" name="forward_btn"/>
 	<button label="Ga" name="go_btn"/>
-	<string name="home_page_url">
-		http://www.secondlife.com
-	</string>
-	<string name="support_page_url">
-		http://support.secondlife.com
-	</string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pl/floater_html.xml b/linden/indra/newview/skins/default/xui/pl/floater_html.xml
index 90d29e1..645fe80 100755
--- a/linden/indra/newview/skins/default/xui/pl/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/pl/floater_html.xml
@@ -5,10 +5,4 @@
 	<button label="Prześlij dalej" name="forward_btn" width="85"/>
 	<line_editor left_delta="100" name="url_edit" width="420" />
 	<button label="Idź" name="go_btn" left_delta="425" />
-	<string name="home_page_url">
-		http://www.secondlife.com
-	</string>
-	<string name="support_page_url">
-		http://support.secondlife.com
-	</string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/pt/floater_html.xml b/linden/indra/newview/skins/default/xui/pt/floater_html.xml
index 3d500dd..aaa49c8 100644
--- a/linden/indra/newview/skins/default/xui/pt/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/pt/floater_html.xml
@@ -4,10 +4,4 @@
 	<button label="Voltar" name="back_btn"/>
 	<button label="Adiantar" name="forward_btn"/>
 	<button label="Ir" name="go_btn"/>
-	<string name="home_page_url">
-		http://www.secondlife.com
-	</string>
-	<string name="support_page_url">
-		http://support.secondlife.com
-	</string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/ru/floater_html.xml b/linden/indra/newview/skins/default/xui/ru/floater_html.xml
index 4a5942b..6492440 100644
--- a/linden/indra/newview/skins/default/xui/ru/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/ru/floater_html.xml
@@ -4,7 +4,4 @@
 	<button label="Назад" name="back_btn" />
 	<button label="Вперед" name="forward_btn" />
 	<button label="Перейти" name="go_btn" />
-	<string name="home_page_url">
-		http://www.secondlife.com
-	</string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/uk/floater_html.xml b/linden/indra/newview/skins/default/xui/uk/floater_html.xml
index 8bde260..11a10cf 100644
--- a/linden/indra/newview/skins/default/xui/uk/floater_html.xml
+++ b/linden/indra/newview/skins/default/xui/uk/floater_html.xml
@@ -4,7 +4,4 @@
 	<button label="Назад" name="back_btn" />
 	<button label="Вперед" name="forward_btn" />
 	<button label="Перейти" name="go_btn" />
-	<string name="home_page_url">
-		http://www.secondlife.com
-	</string>
 </floater>
-- 
cgit v1.1


From c7720a774ccb2fc992a1ef35530153c8fdf92743 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Thu, 1 Mar 2012 21:31:50 +1000
Subject: Merge the artwork and font "prebuilt" packages into the source repo,
 as discussed on IRC and the mailing list, and remove some SL logos.

I know, there are two slightly different LICENSE-logos.txt files.
One that was originally in the source repo, one that was from the artwork package.
I'm a coder, not a lawyer, and not the owner of those copyrights, so left them as is.
---
 .gitignore                                         |  32 +-
 linden/LICENSES/LICENSE-logos.txt                  |  31 ++
 linden/indra/cmake/CMakeLists.txt                  |   1 -
 linden/indra/cmake/ViewerArtwork.cmake             |  16 -
 linden/indra/newview/CMakeLists.txt                |   1 -
 linden/indra/newview/app_settings/static_data.db2  | Bin 0 -> 832578 bytes
 linden/indra/newview/app_settings/static_index.db2 | Bin 0 -> 18020 bytes
 .../newview/app_settings/windlight/clouds2.tga     | Bin 0 -> 262935 bytes
 .../app_settings/windlight/days/Default.xml        |  36 ++
 .../app_settings/windlight/postprocesseffects.xml  |   2 +
 .../app_settings/windlight/skies/A%2D12AM.xml      | 141 ++++++++
 .../app_settings/windlight/skies/A%2D12PM.xml      | 141 ++++++++
 .../app_settings/windlight/skies/A%2D3AM.xml       | 141 ++++++++
 .../app_settings/windlight/skies/A%2D3PM.xml       | 141 ++++++++
 .../app_settings/windlight/skies/A%2D6AM.xml       | 141 ++++++++
 .../app_settings/windlight/skies/A%2D6PM.xml       | 142 ++++++++
 .../app_settings/windlight/skies/A%2D9AM.xml       | 141 ++++++++
 .../app_settings/windlight/skies/A%2D9PM.xml       | 141 ++++++++
 .../app_settings/windlight/skies/Barcelona.xml     | 141 ++++++++
 .../app_settings/windlight/skies/Blizzard.xml      | 141 ++++++++
 .../app_settings/windlight/skies/Blue%20Midday.xml | 141 ++++++++
 .../windlight/skies/Coastal%20Afternoon.xml        | 141 ++++++++
 .../windlight/skies/Coastal%20Sunset.xml           | 141 ++++++++
 .../app_settings/windlight/skies/Default.xml       | 141 ++++++++
 .../windlight/skies/Desert%20Sunset.xml            | 141 ++++++++
 .../app_settings/windlight/skies/Fine%20Day.xml    | 141 ++++++++
 .../windlight/skies/Fluffy%20Big%20Clouds.xml      | 141 ++++++++
 .../newview/app_settings/windlight/skies/Foggy.xml | 141 ++++++++
 .../windlight/skies/Funky%20Funky%20Funky.xml      | 141 ++++++++
 .../app_settings/windlight/skies/Funky%20Funky.xml | 141 ++++++++
 .../app_settings/windlight/skies/Gelatto.xml       | 141 ++++++++
 .../newview/app_settings/windlight/skies/Ghost.xml | 141 ++++++++
 .../windlight/skies/Incongruent%20Truths.xml       | 141 ++++++++
 .../app_settings/windlight/skies/Midday%201.xml    | 141 ++++++++
 .../app_settings/windlight/skies/Midday%202.xml    | 141 ++++++++
 .../app_settings/windlight/skies/Midday%203.xml    | 141 ++++++++
 .../app_settings/windlight/skies/Midday%204.xml    | 141 ++++++++
 .../newview/app_settings/windlight/skies/Night.xml | 141 ++++++++
 .../app_settings/windlight/skies/Pirate.xml        | 141 ++++++++
 .../app_settings/windlight/skies/Purple.xml        | 141 ++++++++
 .../windlight/skies/Sailor%27s%20Delight.xml       | 141 ++++++++
 .../windlight/skies/Sheer%20Surreality.xml         | 141 ++++++++
 .../app_settings/windlight/water/Default.xml       |  43 +++
 .../app_settings/windlight/water/Glassy.xml        |  43 +++
 .../newview/app_settings/windlight/water/Murky.xml |  43 +++
 .../newview/app_settings/windlight/water/Pond.xml  |  43 +++
 .../windlight/water/SNAKE%21%21%21.xml             |  43 +++
 .../windlight/water/Second%20Plague.xml            |  43 +++
 .../app_settings/windlight/water/Valdez.xml        |  43 +++
 .../indra/newview/cursors_mac/UI_CURSOR_ARROW.tif  | Bin 0 -> 14336 bytes
 .../newview/cursors_mac/UI_CURSOR_ARROWDRAG.tif    | Bin 0 -> 14368 bytes
 .../newview/cursors_mac/UI_CURSOR_ARROWLOCKED.tif  | Bin 0 -> 14376 bytes
 .../newview/cursors_mac/UI_CURSOR_GRABLOCKED.tif   | Bin 0 -> 14392 bytes
 linden/indra/newview/cursors_mac/UI_CURSOR_NO.tif  | Bin 0 -> 14380 bytes
 .../newview/cursors_mac/UI_CURSOR_NOLOCKED.tif     | Bin 0 -> 14416 bytes
 .../newview/cursors_mac/UI_CURSOR_SIZENESW.tif     | Bin 0 -> 14336 bytes
 .../indra/newview/cursors_mac/UI_CURSOR_SIZENS.tif | Bin 0 -> 14344 bytes
 .../newview/cursors_mac/UI_CURSOR_SIZENWSE.tif     | Bin 0 -> 14340 bytes
 .../indra/newview/cursors_mac/UI_CURSOR_SIZEWE.tif | Bin 0 -> 14328 bytes
 .../newview/cursors_mac/UI_CURSOR_TOOLBUY.tif      | Bin 0 -> 14776 bytes
 .../newview/cursors_mac/UI_CURSOR_TOOLCAMERA.tif   | Bin 0 -> 14356 bytes
 .../newview/cursors_mac/UI_CURSOR_TOOLCREATE.tif   | Bin 0 -> 14368 bytes
 .../newview/cursors_mac/UI_CURSOR_TOOLFOCUS.tif    | Bin 0 -> 14348 bytes
 .../newview/cursors_mac/UI_CURSOR_TOOLGRAB.tif     | Bin 0 -> 14364 bytes
 .../newview/cursors_mac/UI_CURSOR_TOOLLAND.tif     | Bin 0 -> 14348 bytes
 .../cursors_mac/UI_CURSOR_TOOLMEDIAOPEN.tif        | Bin 0 -> 41228 bytes
 .../newview/cursors_mac/UI_CURSOR_TOOLOPEN.tif     | Bin 0 -> 15144 bytes
 .../newview/cursors_mac/UI_CURSOR_TOOLPAN.tif      | Bin 0 -> 14368 bytes
 .../newview/cursors_mac/UI_CURSOR_TOOLPAUSE.tif    | Bin 0 -> 41224 bytes
 .../newview/cursors_mac/UI_CURSOR_TOOLPAY.tif      | Bin 0 -> 15464 bytes
 .../cursors_mac/UI_CURSOR_TOOLPICKOBJECT3.tif      | Bin 0 -> 14392 bytes
 .../newview/cursors_mac/UI_CURSOR_TOOLPLAY.tif     | Bin 0 -> 41224 bytes
 .../newview/cursors_mac/UI_CURSOR_TOOLROTATE.tif   | Bin 0 -> 14380 bytes
 .../newview/cursors_mac/UI_CURSOR_TOOLSCALE.tif    | Bin 0 -> 14384 bytes
 .../newview/cursors_mac/UI_CURSOR_TOOLSIT.tif      | Bin 0 -> 15176 bytes
 .../cursors_mac/UI_CURSOR_TOOLTRANSLATE.tif        | Bin 0 -> 14388 bytes
 .../newview/cursors_mac/UI_CURSOR_TOOLZOOMIN.tif   | Bin 0 -> 14364 bytes
 .../newview/cursors_mac/UI_CURSOR_WORKING.tif      | Bin 0 -> 14392 bytes
 linden/indra/newview/fonts/DejaVu-License.txt      |  97 ++++++
 .../newview/fonts/DejaVuSansCondensed-Bold.ttf     | Bin 0 -> 595416 bytes
 .../fonts/DejaVuSansCondensed-BoldOblique.ttf      | Bin 0 -> 543704 bytes
 .../newview/fonts/DejaVuSansCondensed-Oblique.ttf  | Bin 0 -> 539024 bytes
 linden/indra/newview/fonts/DejaVuSansCondensed.ttf | Bin 0 -> 605792 bytes
 linden/indra/newview/fonts/Delicious-Bold.otf      | Bin 0 -> 24648 bytes
 .../indra/newview/fonts/Delicious-BoldItalic.otf   | Bin 0 -> 25424 bytes
 linden/indra/newview/fonts/Delicious-Italic.otf    | Bin 0 -> 25036 bytes
 linden/indra/newview/fonts/Delicious-License.txt   |  26 ++
 linden/indra/newview/fonts/Delicious-Roman.otf     | Bin 0 -> 24700 bytes
 linden/indra/newview/fonts/Droid-License.txt       | 190 ++++++++++
 linden/indra/newview/fonts/DroidSans-Bold.ttf      | Bin 0 -> 150804 bytes
 linden/indra/newview/fonts/DroidSans.ttf           | Bin 0 -> 149076 bytes
 .../installers/windows/vcredist_x86_VS2005.exe     | Bin 0 -> 2686232 bytes
 linden/indra/newview/res-sdl/arrow.BMP             | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/arrowcop.BMP          | Bin 0 -> 3126 bytes
 linden/indra/newview/res-sdl/arrowcopmulti.BMP     | Bin 0 -> 3126 bytes
 linden/indra/newview/res-sdl/arrowdrag.BMP         | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/circleandline.BMP     | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/cross.BMP             | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/hand.BMP              | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/ibeam.BMP             | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/imprudence_icon.BMP   | Bin 0 -> 4662 bytes
 linden/indra/newview/res-sdl/llarrow.BMP           | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/llarrowdrag.BMP       | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/llarrowdragmulti.BMP  | Bin 0 -> 3126 bytes
 linden/indra/newview/res-sdl/llarrowlocked.BMP     | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/llgrablocked.BMP      | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/llno.BMP              | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/llnolocked.BMP        | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/lltoolcamera.BMP      | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/lltoolcreate.BMP      | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/lltoolfocus.BMP       | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/lltoolgrab.BMP        | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/lltoolland.BMP        | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/lltoolpan.BMP         | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/lltoolpipette.BMP     | Bin 0 -> 3126 bytes
 linden/indra/newview/res-sdl/lltoolrotate.BMP      | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/lltoolscale.BMP       | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/lltooltranslate.BMP   | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/lltoolzoomin.BMP      | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/lltoolzoomout.BMP     | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/sizenesw.BMP          | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/sizens.BMP            | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/sizenwse.BMP          | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/sizewe.BMP            | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/toolbuy.BMP           | Bin 0 -> 3126 bytes
 linden/indra/newview/res-sdl/toolmediaopen.BMP     | Bin 0 -> 3128 bytes
 linden/indra/newview/res-sdl/toolopen.BMP          | Bin 0 -> 3126 bytes
 linden/indra/newview/res-sdl/toolpause.BMP         | Bin 0 -> 3128 bytes
 linden/indra/newview/res-sdl/toolpay.BMP           | Bin 0 -> 3128 bytes
 linden/indra/newview/res-sdl/toolpickobject.BMP    | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/toolpickobject2.BMP   | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/toolpickobject3.BMP   | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/toolplay.BMP          | Bin 0 -> 3128 bytes
 linden/indra/newview/res-sdl/toolsit.BMP           | Bin 0 -> 3126 bytes
 linden/indra/newview/res-sdl/wait.BMP              | Bin 0 -> 2102 bytes
 linden/indra/newview/res-sdl/working.BMP           | Bin 0 -> 2102 bytes
 linden/indra/newview/res/arrow.cur                 | Bin 0 -> 326 bytes
 linden/indra/newview/res/arrowcop.cur              | Bin 0 -> 326 bytes
 linden/indra/newview/res/arrowcopmulti.cur         | Bin 0 -> 326 bytes
 linden/indra/newview/res/arrowdrag.cur             | Bin 0 -> 326 bytes
 linden/indra/newview/res/circleandline.cur         | Bin 0 -> 326 bytes
 linden/indra/newview/res/imp_icon.ico              | Bin 0 -> 533678 bytes
 linden/indra/newview/res/imprudence_icon.png       | Bin 0 -> 32529 bytes
 linden/indra/newview/res/llarrow.cur               | Bin 0 -> 326 bytes
 linden/indra/newview/res/llarrowdrag.cur           | Bin 0 -> 326 bytes
 linden/indra/newview/res/llarrowdragmulti.cur      | Bin 0 -> 326 bytes
 linden/indra/newview/res/llarrowlocked.cur         | Bin 0 -> 326 bytes
 linden/indra/newview/res/llgrablocked.cur          | Bin 0 -> 326 bytes
 linden/indra/newview/res/llno.cur                  | Bin 0 -> 326 bytes
 linden/indra/newview/res/llnolocked.cur            | Bin 0 -> 326 bytes
 linden/indra/newview/res/lltoolcamera.cur          | Bin 0 -> 326 bytes
 linden/indra/newview/res/lltoolcreate.cur          | Bin 0 -> 326 bytes
 linden/indra/newview/res/lltoolfocus.cur           | Bin 0 -> 326 bytes
 linden/indra/newview/res/lltoolgrab.cur            | Bin 0 -> 326 bytes
 linden/indra/newview/res/lltoolland.cur            | Bin 0 -> 326 bytes
 linden/indra/newview/res/lltoolpan.cur             | Bin 0 -> 326 bytes
 linden/indra/newview/res/lltoolpipette.cur         | Bin 0 -> 326 bytes
 linden/indra/newview/res/lltoolrotate.cur          | Bin 0 -> 326 bytes
 linden/indra/newview/res/lltoolscale.cur           | Bin 0 -> 326 bytes
 linden/indra/newview/res/lltooltranslate.cur       | Bin 0 -> 326 bytes
 linden/indra/newview/res/lltoolzoomin.cur          | Bin 0 -> 326 bytes
 linden/indra/newview/res/lltoolzoomout.cur         | Bin 0 -> 326 bytes
 linden/indra/newview/res/toolbuy.cur               | Bin 0 -> 2238 bytes
 linden/indra/newview/res/toolmediaopen.cur         | Bin 0 -> 2238 bytes
 linden/indra/newview/res/toolopen.cur              | Bin 0 -> 2238 bytes
 linden/indra/newview/res/toolpause.cur             | Bin 0 -> 2238 bytes
 linden/indra/newview/res/toolpay.cur               | Bin 0 -> 2238 bytes
 linden/indra/newview/res/toolpickobject.cur        | Bin 0 -> 326 bytes
 linden/indra/newview/res/toolpickobject2.cur       | Bin 0 -> 326 bytes
 linden/indra/newview/res/toolpickobject3.cur       | Bin 0 -> 326 bytes
 linden/indra/newview/res/toolpipette.cur           | Bin 0 -> 326 bytes
 linden/indra/newview/res/toolplay.cur              | Bin 0 -> 2238 bytes
 linden/indra/newview/res/toolsit.cur               | Bin 0 -> 2238 bytes
 linden/indra/newview/skins/dark/colors_base.xml    | 206 +++++++++++
 .../0098b015-3daf-4cfe-a72f-915369ea97c2.tga       | Bin 0 -> 2870 bytes
 .../3c18c87e-5f50-14e2-e744-f44734aa365f.tga       | Bin 0 -> 804 bytes
 .../5748decc-f629-461c-9a36-a35a221fe21f.tga       | Bin 0 -> 3116 bytes
 .../7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga       | Bin 0 -> 2694 bytes
 .../7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga       | Bin 0 -> 1068 bytes
 .../89e9fc7c-0b16-457d-be4f-136270759c4d.tga       | Bin 0 -> 4140 bytes
 .../9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga       | Bin 0 -> 1068 bytes
 .../skins/dark/textures/active_speakers.tga        | Bin 0 -> 1137 bytes
 .../skins/dark/textures/active_voice_tab.tga       | Bin 0 -> 556 bytes
 .../newview/skins/dark/textures/arrow_down.tga     | Bin 0 -> 1068 bytes
 .../indra/newview/skins/dark/textures/arrow_up.tga | Bin 0 -> 418 bytes
 .../b4870163-6208-42a9-9801-93133bf9a6cd.tga       | Bin 0 -> 2957 bytes
 linden/indra/newview/skins/dark/textures/black.tga | Bin 0 -> 3116 bytes
 .../newview/skins/dark/textures/btn_chatbar.tga    | Bin 0 -> 820 bytes
 .../skins/dark/textures/btn_chatbar_selected.tga   | Bin 0 -> 1900 bytes
 .../skins/dark/textures/button_anim_pause.tga      | Bin 0 -> 940 bytes
 .../dark/textures/button_anim_pause_selected.tga   | Bin 0 -> 744 bytes
 .../skins/dark/textures/button_anim_play.tga       | Bin 0 -> 937 bytes
 .../dark/textures/button_anim_play_selected.tga    | Bin 0 -> 761 bytes
 .../skins/dark/textures/button_anim_stop.tga       | Bin 0 -> 864 bytes
 .../dark/textures/button_anim_stop_selected.tga    | Bin 0 -> 680 bytes
 .../skins/dark/textures/button_disabled_32x128.tga | Bin 0 -> 10284 bytes
 .../skins/dark/textures/button_enabled_32x128.tga  | Bin 0 -> 7081 bytes
 .../textures/button_enabled_selected_32x128.tga    | Bin 0 -> 5468 bytes
 .../c1e21504-f136-451d-b8e9-929037812f1d.tga       | Bin 0 -> 2949 bytes
 .../c63f124c-6340-4fbf-b59e-0869a44adb64.tga       | Bin 0 -> 2713 bytes
 .../newview/skins/dark/textures/cam_rotate_in.tga  | Bin 0 -> 814 bytes
 .../newview/skins/dark/textures/cam_rotate_out.tga | Bin 0 -> 5224 bytes
 .../skins/dark/textures/cam_tracking_in.tga        | Bin 0 -> 946 bytes
 .../skins/dark/textures/cam_tracking_out.tga       | Bin 0 -> 4816 bytes
 .../skins/dark/textures/cam_zoom_minus_in.tga      | Bin 0 -> 1462 bytes
 .../newview/skins/dark/textures/cam_zoom_out.tga   | Bin 0 -> 1434 bytes
 .../skins/dark/textures/cam_zoom_plus_in.tga       | Bin 0 -> 1522 bytes
 .../ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga       | Bin 0 -> 2755 bytes
 .../dark/textures/checkbox_disabled_false.tga      | Bin 0 -> 1068 bytes
 .../skins/dark/textures/checkbox_disabled_true.tga | Bin 0 -> 1068 bytes
 .../skins/dark/textures/checkbox_enabled_false.tga | Bin 0 -> 711 bytes
 .../skins/dark/textures/checkbox_enabled_true.tga  | Bin 0 -> 634 bytes
 .../indra/newview/skins/dark/textures/circle.tga   | Bin 0 -> 1068 bytes
 .../newview/skins/dark/textures/close_in_blue.tga  | Bin 0 -> 668 bytes
 .../newview/skins/dark/textures/close_inactive.tga | Bin 0 -> 254 bytes
 .../skins/dark/textures/close_inactive_blue.tga    | Bin 0 -> 254 bytes
 .../indra/newview/skins/dark/textures/closebox.tga | Bin 0 -> 748 bytes
 .../newview/skins/dark/textures/combobox_arrow.tga | Bin 0 -> 202 bytes
 .../indra/newview/skins/dark/textures/darkgray.tga | Bin 0 -> 3116 bytes
 .../skins/dark/textures/eye_button_active.tga      | Bin 0 -> 2552 bytes
 .../skins/dark/textures/eye_button_inactive.tga    | Bin 0 -> 2889 bytes
 .../ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga       | Bin 0 -> 804 bytes
 .../skins/dark/textures/ff_edit_mine_button.tga    | Bin 0 -> 998 bytes
 .../skins/dark/textures/ff_edit_theirs_button.tga  | Bin 0 -> 1081 bytes
 .../dark/textures/ff_online_status_button.tga      | Bin 0 -> 1076 bytes
 .../skins/dark/textures/ff_visible_map_button.tga  | Bin 0 -> 853 bytes
 .../dark/textures/ff_visible_online_button.tga     | Bin 0 -> 1040 bytes
 .../skins/dark/textures/flyout_btn_left.tga        | Bin 0 -> 504 bytes
 .../dark/textures/flyout_btn_left_disabled.tga     | Bin 0 -> 370 bytes
 .../dark/textures/flyout_btn_left_selected.tga     | Bin 0 -> 1561 bytes
 .../skins/dark/textures/flyout_btn_right.tga       | Bin 0 -> 504 bytes
 .../dark/textures/flyout_btn_right_disabled.tga    | Bin 0 -> 370 bytes
 .../dark/textures/flyout_btn_right_selected.tga    | Bin 0 -> 1407 bytes
 .../newview/skins/dark/textures/folder_arrow.tga   | Bin 0 -> 4140 bytes
 .../dark/textures/icn_active-speakers-dot-lvl0.tga | Bin 0 -> 1068 bytes
 .../dark/textures/icn_active-speakers-dot-lvl1.tga | Bin 0 -> 1068 bytes
 .../dark/textures/icn_active-speakers-dot-lvl2.tga | Bin 0 -> 1068 bytes
 .../dark/textures/icn_active-speakers-typing1.tga  | Bin 0 -> 1068 bytes
 .../dark/textures/icn_active-speakers-typing2.tga  | Bin 0 -> 1068 bytes
 .../dark/textures/icn_active-speakers-typing3.tga  | Bin 0 -> 1068 bytes
 .../newview/skins/dark/textures/icn_chatbar.tga    | Bin 0 -> 1075 bytes
 .../skins/dark/textures/icn_clear_lineeditor.tga   | Bin 0 -> 1068 bytes
 .../skins/dark/textures/icn_media-pause_active.tga | Bin 0 -> 3168 bytes
 .../dark/textures/icn_media-pause_disabled.tga     | Bin 0 -> 2287 bytes
 .../dark/textures/icn_media-pause_enabled.tga      | Bin 0 -> 2705 bytes
 .../skins/dark/textures/icn_media-play_enabled.tga | Bin 0 -> 2540 bytes
 .../skins/dark/textures/icn_media-stop_enabled.tga | Bin 0 -> 2295 bytes
 .../newview/skins/dark/textures/icn_media.tga      | Bin 0 -> 1811 bytes
 .../newview/skins/dark/textures/icn_music.tga      | Bin 0 -> 2185 bytes
 .../newview/skins/dark/textures/icn_scrollbar.tga  | Bin 0 -> 1068 bytes
 .../skins/dark/textures/icn_scrollbar_bg.tga       | Bin 0 -> 380 bytes
 .../skins/dark/textures/icn_scrollbar_thumb.tga    | Bin 0 -> 490 bytes
 .../skins/dark/textures/icn_slide-groove_dark.tga  | Bin 0 -> 170 bytes
 .../skins/dark/textures/icn_slide-highlight.tga    | Bin 0 -> 261 bytes
 .../skins/dark/textures/icn_slide-thumb_dark.tga   | Bin 0 -> 604 bytes
 .../skins/dark/textures/icn_speaker-muted_dark.tga | Bin 0 -> 710 bytes
 .../skins/dark/textures/icn_speaker_dark.tga       | Bin 0 -> 752 bytes
 .../skins/dark/textures/icn_toolbar_build.tga      | Bin 0 -> 949 bytes
 .../skins/dark/textures/icn_toolbar_fly.tga        | Bin 0 -> 912 bytes
 .../skins/dark/textures/icn_toolbar_inventory.tga  | Bin 0 -> 1209 bytes
 .../skins/dark/textures/icn_toolbar_map.tga        | Bin 0 -> 904 bytes
 .../skins/dark/textures/icn_toolbar_minimap.tga    | Bin 0 -> 1215 bytes
 .../skins/dark/textures/icn_toolbar_radar.tga      | Bin 0 -> 2348 bytes
 .../skins/dark/textures/icn_toolbar_search.tga     | Bin 0 -> 792 bytes
 .../skins/dark/textures/icn_toolbar_snapshot.tga   | Bin 0 -> 988 bytes
 .../newview/skins/dark/textures/icon_top_pick.tga  | Bin 0 -> 1068 bytes
 .../newview/skins/dark/textures/lightgray.tga      | Bin 0 -> 3116 bytes
 .../indra/newview/skins/dark/textures/minimize.tga | Bin 0 -> 476 bytes
 .../skins/dark/textures/minimize_inactive.tga      | Bin 0 -> 194 bytes
 .../skins/dark/textures/minimize_pressed.tga       | Bin 0 -> 380 bytes
 .../skins/dark/textures/move_backward_in.tga       | Bin 0 -> 651 bytes
 .../skins/dark/textures/move_backward_out.tga      | Bin 0 -> 769 bytes
 .../newview/skins/dark/textures/move_down_in.tga   | Bin 0 -> 703 bytes
 .../newview/skins/dark/textures/move_down_out.tga  | Bin 0 -> 843 bytes
 .../skins/dark/textures/move_forward_in.tga        | Bin 0 -> 693 bytes
 .../skins/dark/textures/move_forward_out.tga       | Bin 0 -> 869 bytes
 .../newview/skins/dark/textures/move_left_in.tga   | Bin 0 -> 580 bytes
 .../newview/skins/dark/textures/move_left_out.tga  | Bin 0 -> 660 bytes
 .../newview/skins/dark/textures/move_right_in.tga  | Bin 0 -> 598 bytes
 .../newview/skins/dark/textures/move_right_out.tga | Bin 0 -> 674 bytes
 .../skins/dark/textures/move_turn_left_in.tga      | Bin 0 -> 1032 bytes
 .../skins/dark/textures/move_turn_left_out.tga     | Bin 0 -> 1166 bytes
 .../skins/dark/textures/move_turn_right_in.tga     | Bin 0 -> 975 bytes
 .../skins/dark/textures/move_turn_right_out.tga    | Bin 0 -> 1127 bytes
 .../newview/skins/dark/textures/move_up_in.tga     | Bin 0 -> 703 bytes
 .../newview/skins/dark/textures/move_up_out.tga    | Bin 0 -> 843 bytes
 .../newview/skins/dark/textures/mute_icon.tga      | Bin 0 -> 1042 bytes
 .../newview/skins/dark/textures/notify_next.png    | Bin 0 -> 3360 bytes
 .../indra/newview/skins/dark/textures/preview.png  | Bin 0 -> 16592 bytes
 .../newview/skins/dark/textures/progress_fill.tga  | Bin 0 -> 896 bytes
 .../skins/dark/textures/progressbar_fill.tga       | Bin 0 -> 773 bytes
 .../skins/dark/textures/progressbar_track.tga      | Bin 0 -> 486 bytes
 .../newview/skins/dark/textures/ptt_lock_off.tga   | Bin 0 -> 670 bytes
 .../newview/skins/dark/textures/ptt_lock_on.tga    | Bin 0 -> 1068 bytes
 .../skins/dark/textures/radio_active_false.tga     | Bin 0 -> 683 bytes
 .../skins/dark/textures/radio_active_true.tga      | Bin 0 -> 700 bytes
 .../skins/dark/textures/radio_inactive_false.tga   | Bin 0 -> 1068 bytes
 .../skins/dark/textures/radio_inactive_true.tga    | Bin 0 -> 1068 bytes
 .../textures/resize_handle_bottom_right_blue.tga   | Bin 0 -> 305 bytes
 .../indra/newview/skins/dark/textures/restore.tga  | Bin 0 -> 636 bytes
 .../skins/dark/textures/restore_inactive.tga       | Bin 0 -> 194 bytes
 .../skins/dark/textures/restore_pressed.tga        | Bin 0 -> 564 bytes
 .../newview/skins/dark/textures/rounded_square.tga | Bin 0 -> 16428 bytes
 .../skins/dark/textures/rounded_square_soft.tga    | Bin 0 -> 16428 bytes
 .../dark/textures/scrollbutton_down_in_blue.tga    | Bin 0 -> 672 bytes
 .../dark/textures/scrollbutton_down_out_blue.tga   | Bin 0 -> 919 bytes
 .../dark/textures/scrollbutton_left_in_blue.tga    | Bin 0 -> 745 bytes
 .../dark/textures/scrollbutton_left_out_blue.tga   | Bin 0 -> 951 bytes
 .../dark/textures/scrollbutton_right_in_blue.tga   | Bin 0 -> 751 bytes
 .../dark/textures/scrollbutton_right_out_blue.tga  | Bin 0 -> 956 bytes
 .../dark/textures/scrollbutton_up_in_blue.tga      | Bin 0 -> 694 bytes
 .../indra/newview/skins/dark/textures/spacer24.tga | Bin 0 -> 2348 bytes
 .../indra/newview/skins/dark/textures/spacer35.tga | Bin 0 -> 3404 bytes
 .../skins/dark/textures/spin_down_in_blue.tga      | Bin 0 -> 340 bytes
 .../skins/dark/textures/spin_down_out_blue.tga     | Bin 0 -> 365 bytes
 .../skins/dark/textures/spin_up_in_blue.tga        | Bin 0 -> 336 bytes
 .../skins/dark/textures/spin_up_out_blue.tga       | Bin 0 -> 387 bytes
 .../skins/dark/textures/square_btn_32x128.tga      | Bin 0 -> 5488 bytes
 .../dark/textures/square_btn_selected_32x128.tga   | Bin 0 -> 4446 bytes
 .../skins/dark/textures/status_buy_currency.tga    | Bin 0 -> 777 bytes
 .../dark/textures/status_buy_currency_pressed.tga  | Bin 0 -> 708 bytes
 .../skins/dark/textures/status_buy_land.tga        | Bin 0 -> 762 bytes
 .../skins/dark/textures/tab_bottom_blue.tga        | Bin 0 -> 653 bytes
 .../dark/textures/tab_bottom_selected_blue.tga     | Bin 0 -> 500 bytes
 .../indra/newview/skins/dark/textures/tab_left.tga | Bin 0 -> 5826 bytes
 .../skins/dark/textures/tab_left_selected.tga      | Bin 0 -> 5801 bytes
 .../newview/skins/dark/textures/tab_top_blue.tga   | Bin 0 -> 654 bytes
 .../skins/dark/textures/tab_top_selected_blue.tga  | Bin 0 -> 500 bytes
 .../indra/newview/skins/dark/textures/tabarea.tga  | Bin 0 -> 1340 bytes
 .../indra/newview/skins/dark/textures/textures.xml | 386 +++++++++++++++++++++
 .../newview/skins/dark/textures/tool_dozer.tga     | Bin 0 -> 3193 bytes
 .../skins/dark/textures/tool_dozer_active.tga      | Bin 0 -> 3279 bytes
 .../newview/skins/dark/textures/tool_zoom.tga      | Bin 0 -> 2626 bytes
 .../skins/dark/textures/tool_zoom_active.tga       | Bin 0 -> 2869 bytes
 .../skins/dark/textures/toolbar_btn_disabled.tga   | Bin 0 -> 12332 bytes
 .../skins/dark/textures/toolbar_btn_enabled.tga    | Bin 0 -> 644 bytes
 .../skins/dark/textures/toolbar_btn_selected.tga   | Bin 0 -> 2608 bytes
 .../newview/skins/dark/textures/toolbar_tab.tga    | Bin 0 -> 18211 bytes
 linden/indra/newview/skins/dark/textures/white.tga | Bin 0 -> 3116 bytes
 .../skins/default/html/btn_purplepill_bg.png       | Bin 0 -> 3564 bytes
 .../html/en-us/loading/imprudence_loading.png      | Bin 0 -> 10714 bytes
 .../newview/skins/default/html/unabletoconnect.png | Bin 0 -> 10714 bytes
 .../0098b015-3daf-4cfe-a72f-915369ea97c2.tga       | Bin 0 -> 4140 bytes
 .../0187babf-6c0d-5891-ebed-4ecab1426683.j2c       | Bin 0 -> 130977 bytes
 .../041ee5a0-cb6a-9ac5-6e49-41e9320507d5.j2c       | Bin 0 -> 499 bytes
 .../0498c309-5306-43cd-82a2-ae31d096cdef.tga       | Bin 0 -> 1068 bytes
 .../058c75c0-a0d5-f2f8-43f3-e9699a89c2fc.j2c       | Bin 0 -> 32420 bytes
 .../073c9723-540c-5449-cdd4-0e87fdc159e3.j2c       | Bin 0 -> 28776 bytes
 .../07d0ea4c-af0c-aad1-dbbf-c24020ff2b80.tga       | Bin 0 -> 1068 bytes
 .../09a324a8-acc1-d9cd-2cbd-7465d90d3a98.tga       | Bin 0 -> 4140 bytes
 .../0a94b42f-ec84-5f9c-14b7-1ef8505ceead.j2c       | Bin 0 -> 169 bytes
 .../0b444c3a-75c2-4891-9d1e-ac35c8d13d62.j2c       | Bin 0 -> 1073 bytes
 .../0bc58228-74a0-7e83-89bc-5c23464bcec5.j2c       | Bin 0 -> 97838 bytes
 .../0e82d24e-ed45-41bc-b090-94c97c1caab2.tga       | Bin 0 -> 1068 bytes
 .../0ff70ead-4562-45f9-9e8a-52b1a3286868.j2c       | Bin 0 -> 1186 bytes
 .../10d2a01a-0818-84b9-4b96-c2eb63256519.j2c       | Bin 0 -> 131060 bytes
 .../111b39de-8928-4690-b7b2-e17d5c960277.tga       | Bin 0 -> 1068 bytes
 .../11ee27f5-43c0-414e-afd5-d7f5688c351f.j2c       | Bin 0 -> 184 bytes
 .../13dd1d96-6836-461e-8a4c-36003065c59b.tga       | Bin 0 -> 1068 bytes
 .../179cdabd-398a-9b6b-1391-4dc333ba321f.j2c       | Bin 0 -> 6077 bytes
 .../18fb888b-e8f1-dce7-7da7-321d651ea6b0.j2c       | Bin 0 -> 130888 bytes
 .../19c76b49-c5f4-aeca-7cd8-17010f2969c3.j2c       | Bin 0 -> 16298 bytes
 .../1e63e323-5fe0-452e-92f8-b98bd0f764e3.j2c       | Bin 0 -> 8072 bytes
 .../2660b114-1d66-3cde-e148-ebc2d1f963d5.j2c       | Bin 0 -> 24492 bytes
 .../28f0f9ca-0423-4d1b-9e76-616ffce99544.j2c       | Bin 0 -> 6103 bytes
 .../29de489d-0491-fb00-7dab-f9e686d31e83.j2c       | Bin 0 -> 2518 bytes
 .../2a4880b6-b7a3-690a-2049-bfbe38eafb9f.j2c       | Bin 0 -> 45583 bytes
 .../2caf1179-7861-6ff3-4b7d-46e17780bdfa.j2c       | Bin 0 -> 60248 bytes
 .../2d784476-d0db-9979-0cff-9408745a7cf3.j2c       | Bin 0 -> 130949 bytes
 .../30047cec-269d-408e-0c30-b2603b887268.j2c       | Bin 0 -> 130834 bytes
 .../303cd381-8560-7579-23f1-f0a880799740.j2c       | Bin 0 -> 98199 bytes
 .../335f8f14-f2db-db7c-1c04-734dc7657439.j2c       | Bin 0 -> 24560 bytes
 .../34c9398d-bb78-4643-9633-46a2fa3e9637.tga       | Bin 0 -> 1068 bytes
 .../35f217a3-f618-49cf-bbca-c86d486551a9.j2c       | Bin 0 -> 1600 bytes
 .../37c8e000-6aa2-41ef-8f86-e0c2e60bfa42.tga       | Bin 0 -> 1042 bytes
 .../39801651-26cb-4926-af57-7af9352c273c.tga       | Bin 0 -> 1068 bytes
 .../3c18c87e-5f50-14e2-e744-f44734aa365f.tga       | Bin 0 -> 812 bytes
 .../3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3bef.j2c       | Bin 0 -> 2113 bytes
 .../3cddf591-a726-4702-87b3-70c1daf88f90.j2c       | Bin 0 -> 5927 bytes
 .../402f8b24-5f9d-4905-b5f8-37baff603e88.j2c       | Bin 0 -> 1226 bytes
 .../43f0a590-f3d3-48b5-b460-f5b3e6e03626.tga       | Bin 0 -> 1042 bytes
 .../4726f13e-bd07-f2fb-feb0-bfa2ac58ab61.j2c       | Bin 0 -> 32567 bytes
 .../47a8c844-cd2a-4b1a-be01-df8b1612fe5d.tga       | Bin 0 -> 1068 bytes
 .../48766d75-6e58-de84-68fe-1980c64feaee.j2c       | Bin 0 -> 1535 bytes
 .../53a2f406-4895-1d13-d541-d2e3b86bc19c.j2c       | Bin 0 -> 98264 bytes
 .../5748decc-f629-461c-9a36-a35a221fe21f.tga       | Bin 0 -> 3116 bytes
 .../5894e2e7-ab8d-edfa-e61c-18cf16854ba3.j2c       | Bin 0 -> 106851 bytes
 .../5ab48dd5-05d0-4f1a-ace6-efd4e2fb3508.j2c       | Bin 0 -> 1222 bytes
 .../5abfabc2-5d6d-4912-acd8-d7e38ae93d02.j2c       | Bin 0 -> 172 bytes
 .../5bc11cd6-2f40-071e-a8da-0903394204f9.j2c       | Bin 0 -> 131031 bytes
 .../6002a571-549c-472c-9443-9ab35b1a55ed.tga       | Bin 0 -> 6162 bytes
 .../63338ede-0037-c4fd-855b-015d77112fc8.j2c       | Bin 0 -> 97904 bytes
 .../64367bd1-697e-b3e6-0b65-3f862a577366.j2c       | Bin 0 -> 131044 bytes
 .../64eed6af-f575-35c7-baa4-b140bdcdb00f.j2c       | Bin 0 -> 172 bytes
 .../6522e74d-1660-4e7f-b601-6f48c1659a77.j2c       | Bin 0 -> 5373 bytes
 .../67931331-0c02-4876-1255-28770896c6a2.j2c       | Bin 0 -> 131051 bytes
 .../6c4727b8-ac79-ba44-3b81-f9aa887b47eb.j2c       | Bin 0 -> 131049 bytes
 .../6c9fa78a-1c69-2168-325b-3e03ffa348ce.j2c       | Bin 0 -> 32742 bytes
 .../6de37e4e-7029-61f5-54b8-f5e63f983f58.j2c       | Bin 0 -> 131026 bytes
 .../735198cf-6ea0-2550-e222-21d3c6a341ae.j2c       | Bin 0 -> 27371 bytes
 .../73577b7b-19c3-4050-a19d-36bc2408aa79.tga       | Bin 0 -> 1068 bytes
 .../74e1a96f-4833-a24d-a1bb-1bce1468b0e7.tga       | Bin 0 -> 1068 bytes
 .../7581f2f4-d0d2-481a-bc75-69a13d9caeaa.j2c       | Bin 0 -> 4095 bytes
 .../78af921a-3c49-47a1-9c4e-2608951164ae.j2c       | Bin 0 -> 6009 bytes
 .../79504bf5-c3ec-0763-6563-d843de66d0a1.j2c       | Bin 0 -> 131065 bytes
 .../7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga       | Bin 0 -> 4140 bytes
 .../7a2b3a4a-53c2-53ac-5716-aac7d743c020.j2c       | Bin 0 -> 130928 bytes
 .../7c0cf89b-44b1-1ce2-dd74-07102a98ac2a.j2c       | Bin 0 -> 131027 bytes
 .../7ca39b4c-bd19-4699-aff7-f93fd03d3e7b.j2c       | Bin 0 -> 131038 bytes
 .../7cb070bc-fc00-4527-9c4d-7f7e0c4191be.j2c       | Bin 0 -> 6131 bytes
 .../7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga       | Bin 0 -> 812 bytes
 .../822ded49-9a6c-f61c-cb89-6df54f42cdf4.j2c       | Bin 0 -> 23911 bytes
 .../827ff765-8c1d-a8b1-23f7-fdcba560effc.j2c       | Bin 0 -> 212 bytes
 .../83b77fc6-10b4-63ec-4de7-f40629f238c5.j2c       | Bin 0 -> 22709 bytes
 .../8872f2b8-31db-42d8-580a-b3e4a91262de.j2c       | Bin 0 -> 130977 bytes
 .../89e9fc7c-0b16-457d-be4f-136270759c4d.tga       | Bin 0 -> 4140 bytes
 .../8a515889-eac9-fb55-8eba-d2dc09eb32c8.j2c       | Bin 0 -> 130810 bytes
 .../8dcd4a48-2d37-4909-9f78-f7a9eb4ef903.j2c       | Bin 0 -> 172 bytes
 .../8f458549-173b-23ff-d4ff-bfaa5ea2371b.j2c       | Bin 0 -> 131038 bytes
 .../8f761ce3-5939-4d3a-8991-00064fdfacf9.tga       | Bin 0 -> 1068 bytes
 .../92e66e00-f56f-598a-7997-048aa64cde18.j2c       | Bin 0 -> 32708 bytes
 .../95281d5c-d27a-ee13-e067-08295b67b58a.j2c       | Bin 0 -> 169 bytes
 .../96b4de31-f4fa-337d-ec78-451e3609769e.j2c       | Bin 0 -> 85238 bytes
 .../978380f0-aaf7-c459-14e3-9808833fd372.j2c       | Bin 0 -> 172 bytes
 .../988dd995-1769-bdc9-8842-51f8f2b03884.j2c       | Bin 0 -> 169 bytes
 .../99bd60a2-3250-efc9-2e39-2fbcadefbecc.j2c       | Bin 0 -> 131032 bytes
 .../9beb8cdd-3dce-53c2-b28e-e1f3bc2ec0a4.tga       | Bin 0 -> 1068 bytes
 .../9c88539c-fd04-46b8-bea2-ddf1bcffe3bd.j2c       | Bin 0 -> 1227 bytes
 .../9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga       | Bin 0 -> 812 bytes
 .../9deab416-9c63-78d6-d558-9a156f12044c.j2c       | Bin 0 -> 32390 bytes
 .../skins/default/textures/Inv_WaterLight.png      | Bin 0 -> 3221 bytes
 .../skins/default/textures/Inv_WindLight.png       | Bin 0 -> 763 bytes
 .../a6162133-724b-54df-a12f-51cd070ad6f3.j2c       | Bin 0 -> 131029 bytes
 .../a85ac674-cb75-4af6-9499-df7c5aaf7a28.j2c       | Bin 0 -> 3313 bytes
 .../abb783e6-3e93-26c0-248a-247666855da3.j2c       | Bin 0 -> 6139 bytes
 .../skins/default/textures/account_id_green.tga    | Bin 0 -> 1068 bytes
 .../skins/default/textures/account_id_orange.tga   | Bin 0 -> 1068 bytes
 .../skins/default/textures/active_speakers.tga     | Bin 0 -> 1479 bytes
 .../skins/default/textures/active_voice_tab.tga    | Bin 0 -> 1042 bytes
 .../ae874d1a-93ef-54fb-5fd3-eb0cb156afc0.j2c       | Bin 0 -> 32456 bytes
 .../skins/default/textures/alpha_gradient.tga      | Bin 0 -> 300 bytes
 .../skins/default/textures/alpha_gradient_2d.j2c   | Bin 0 -> 4325 bytes
 .../newview/skins/default/textures/arrow_down.tga  | Bin 0 -> 1068 bytes
 .../newview/skins/default/textures/arrow_left.tga  | Bin 0 -> 510 bytes
 .../newview/skins/default/textures/arrow_right.tga | Bin 0 -> 510 bytes
 .../newview/skins/default/textures/arrow_up.tga    | Bin 0 -> 1068 bytes
 .../skins/default/textures/avatar_thumb_bkgrnd.j2c | Bin 0 -> 1508 bytes
 .../b4870163-6208-42a9-9801-93133bf9a6cd.tga       | Bin 0 -> 4140 bytes
 .../b4ba225c-373f-446d-9f7e-6cb7b5cf9b3d.j2c       | Bin 0 -> 10313 bytes
 .../b8d3965a-ad78-bf43-699b-bff8eca6c975.j2c       | Bin 0 -> 6004 bytes
 .../b8eed5f0-64b7-6e12-b67f-43fa8e773440.j2c       | Bin 0 -> 32583 bytes
 .../b9e1cf8a-9660-c020-0c69-18f1ea27268a.j2c       | Bin 0 -> 24464 bytes
 .../b9f1a3b8-933e-b7c8-e6f5-dba1bc666bed.j2c       | Bin 0 -> 1523 bytes
 .../newview/skins/default/textures/badge_error.j2c | Bin 0 -> 2048 bytes
 .../newview/skins/default/textures/badge_note.j2c  | Bin 0 -> 2040 bytes
 .../newview/skins/default/textures/badge_ok.j2c    | Bin 0 -> 2043 bytes
 .../newview/skins/default/textures/badge_warn.j2c  | Bin 0 -> 2043 bytes
 .../beb169c7-11ea-fff2-efe5-0f24dc881df2.j2c       | Bin 0 -> 6140 bytes
 .../indra/newview/skins/default/textures/black.tga | Bin 0 -> 3116 bytes
 .../newview/skins/default/textures/btn_chatbar.tga | Bin 0 -> 3947 bytes
 .../default/textures/btn_chatbar_selected.tga      | Bin 0 -> 4495 bytes
 .../skins/default/textures/button_anim_pause.tga   | Bin 0 -> 4140 bytes
 .../textures/button_anim_pause_disabled.tga        | Bin 0 -> 4140 bytes
 .../textures/button_anim_pause_selected.tga        | Bin 0 -> 4140 bytes
 .../skins/default/textures/button_anim_play.tga    | Bin 0 -> 4140 bytes
 .../default/textures/button_anim_play_disabled.tga | Bin 0 -> 4140 bytes
 .../default/textures/button_anim_play_selected.tga | Bin 0 -> 4140 bytes
 .../skins/default/textures/button_anim_stop.tga    | Bin 0 -> 4140 bytes
 .../default/textures/button_anim_stop_disabled.tga | Bin 0 -> 4140 bytes
 .../default/textures/button_anim_stop_selected.tga | Bin 0 -> 4140 bytes
 .../default/textures/button_disabled_32x128.tga    | Bin 0 -> 7801 bytes
 .../default/textures/button_enabled_32x128.tga     | Bin 0 -> 9770 bytes
 .../textures/button_enabled_selected_32x128.tga    | Bin 0 -> 10306 bytes
 .../c1e21504-f136-451d-b8e9-929037812f1d.tga       | Bin 0 -> 4140 bytes
 .../c63f124c-6340-4fbf-b59e-0869a44adb64.tga       | Bin 0 -> 4140 bytes
 .../c7d8bbf3-21ee-4f6e-9b20-3cf18425af1d.j2c       | Bin 0 -> 1073 bytes
 .../ca4e8c27-473c-eb1c-2f5d-50ee3f07d85c.j2c       | Bin 0 -> 131063 bytes
 .../ca7609c6-6ec6-32d9-332e-0d8f437ef644.tga       | Bin 0 -> 1068 bytes
 .../newview/skins/default/textures/cakeisalie.png  | Bin 0 -> 124929 bytes
 .../skins/default/textures/cam_rotate_in.tga       | Bin 0 -> 16428 bytes
 .../skins/default/textures/cam_rotate_out.tga      | Bin 0 -> 16428 bytes
 .../skins/default/textures/cam_tracking_in.tga     | Bin 0 -> 16428 bytes
 .../skins/default/textures/cam_tracking_out.tga    | Bin 0 -> 16428 bytes
 .../skins/default/textures/cam_zoom_minus_in.tga   | Bin 0 -> 4140 bytes
 .../skins/default/textures/cam_zoom_out.tga        | Bin 0 -> 4140 bytes
 .../skins/default/textures/cam_zoom_plus_in.tga    | Bin 0 -> 4140 bytes
 .../cce0f112-878f-4586-a2e2-a8f104bba271.j2c       | Bin 0 -> 9226 bytes
 .../cdd9a9fc-6d0b-f90d-8416-c72b6019bca8.j2c       | Bin 0 -> 129703 bytes
 .../ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga       | Bin 0 -> 4140 bytes
 .../newview/skins/default/textures/ceilingcat.png  | Bin 0 -> 139515 bytes
 .../default/textures/checkbox_disabled_false.tga   | Bin 0 -> 1068 bytes
 .../default/textures/checkbox_disabled_true.tga    | Bin 0 -> 1068 bytes
 .../default/textures/checkbox_enabled_false.tga    | Bin 0 -> 1068 bytes
 .../default/textures/checkbox_enabled_true.tga     | Bin 0 -> 1068 bytes
 .../textures/checkerboard_transparency_bg.png      | Bin 0 -> 1110 bytes
 .../newview/skins/default/textures/circle.tga      | Bin 0 -> 1068 bytes
 .../skins/default/textures/close_in_blue.tga       | Bin 0 -> 358 bytes
 .../skins/default/textures/close_inactive_blue.tga | Bin 0 -> 1068 bytes
 .../newview/skins/default/textures/closebox.tga    | Bin 0 -> 248 bytes
 .../skins/default/textures/cloud-particle.j2c      | Bin 0 -> 4049 bytes
 .../skins/default/textures/color_swatch_alpha.tga  | Bin 0 -> 16428 bytes
 .../skins/default/textures/combobox_arrow.tga      | Bin 0 -> 1068 bytes
 .../newview/skins/default/textures/crosshairs.tga  | Bin 0 -> 300 bytes
 .../d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c       | Bin 0 -> 32686 bytes
 .../d21e44ca-ff1c-a96e-b2ef-c0753426b7d9.j2c       | Bin 0 -> 21410 bytes
 .../d319ce44-0821-932a-cd18-cd1afb9d3ead.j2c       | Bin 0 -> 15845 bytes
 .../d691a01c-13b7-578d-57c0-5caef0b4e7e1.j2c       | Bin 0 -> 130950 bytes
 .../d7d99e40-10e2-5739-d063-91dcbdefc492.j2c       | Bin 0 -> 10704 bytes
 .../d9258671-868f-7511-c321-7baef9e948a4.j2c       | Bin 0 -> 32763 bytes
 .../newview/skins/default/textures/darkgray.tga    | Bin 0 -> 178 bytes
 .../db9d39ec-a896-c287-1ced-64566217021e.j2c       | Bin 0 -> 32754 bytes
 .../de651394-f926-48db-b666-e49d83af1bbc.j2c       | Bin 0 -> 1063 bytes
 .../default/textures/default_land_picture.j2c      | Bin 0 -> 24492 bytes
 .../default/textures/default_profile_picture.j2c   | Bin 0 -> 6128 bytes
 .../skins/default/textures/direction_arrow.tga     | Bin 0 -> 1068 bytes
 .../newview/skins/default/textures/down_arrow.png  | Bin 0 -> 2936 bytes
 .../e121e2fc-7573-740f-edfd-0d45a9ba486e.j2c       | Bin 0 -> 8114 bytes
 .../e3369e02-93e1-43dc-b9c0-4533db0963d0.tga       | Bin 0 -> 1068 bytes
 .../e38248f9-f2ee-2c9f-aa49-4860857e3b08.j2c       | Bin 0 -> 6129 bytes
 .../e569711a-27c2-aad4-9246-0c910239a179.j2c       | Bin 0 -> 32475 bytes
 .../e674ca0c-a387-4dae-a0b4-db6bd073faa5.j2c       | Bin 0 -> 524 bytes
 .../e97cf410-8e61-7005-ec06-629eba4cd1fb.tga       | Bin 0 -> 300 bytes
 .../newview/skins/default/textures/easteregg.png   | Bin 0 -> 395345 bytes
 .../ebf2aa19-6c34-c5d8-4f14-853da1241f91.j2c       | Bin 0 -> 339 bytes
 .../skins/default/textures/eye_button_active.tga   | Bin 0 -> 3116 bytes
 .../skins/default/textures/eye_button_inactive.tga | Bin 0 -> 3116 bytes
 .../f2d7b6f6-4200-1e9a-fd5b-96459e950f94.j2c       | Bin 0 -> 32394 bytes
 .../f4b6b161-6530-6679-1a84-adfcb71a8b12.j2c       | Bin 0 -> 24238 bytes
 .../f54a0c32-3cd1-d49a-5b4f-7b792bebc204.j2c       | Bin 0 -> 169 bytes
 .../f9bbb2fe-584b-4c01-86fc-599c69534c1b.tga       | Bin 0 -> 1068 bytes
 .../fb1fecba-9585-415b-ad15-6e6e3d6c5479.j2c       | Bin 0 -> 25053 bytes
 .../fb2ae204-3fd1-df33-594f-c9f882830e66.j2c       | Bin 0 -> 130740 bytes
 .../fc987bf9-b8cb-f8e5-45f2-d664ca6bd3eb.j2c       | Bin 0 -> 24358 bytes
 .../ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga       | Bin 0 -> 812 bytes
 .../skins/default/textures/ff_edit_mine.tga        | Bin 0 -> 1068 bytes
 .../skins/default/textures/ff_edit_mine_button.tga | Bin 0 -> 4140 bytes
 .../skins/default/textures/ff_edit_theirs.tga      | Bin 0 -> 1068 bytes
 .../default/textures/ff_edit_theirs_button.tga     | Bin 0 -> 4140 bytes
 .../default/textures/ff_online_status_button.tga   | Bin 0 -> 4140 bytes
 .../skins/default/textures/ff_visible_map.tga      | Bin 0 -> 812 bytes
 .../default/textures/ff_visible_map_button.tga     | Bin 0 -> 4140 bytes
 .../skins/default/textures/ff_visible_online.tga   | Bin 0 -> 1068 bytes
 .../default/textures/ff_visible_online_button.tga  | Bin 0 -> 4140 bytes
 .../skins/default/textures/flyout_btn_left.tga     | Bin 0 -> 3000 bytes
 .../default/textures/flyout_btn_left_disabled.tga  | Bin 0 -> 4762 bytes
 .../default/textures/flyout_btn_left_selected.tga  | Bin 0 -> 3616 bytes
 .../skins/default/textures/flyout_btn_right.tga    | Bin 0 -> 2598 bytes
 .../default/textures/flyout_btn_right_disabled.tga | Bin 0 -> 1571 bytes
 .../default/textures/flyout_btn_right_selected.tga | Bin 0 -> 3074 bytes
 .../skins/default/textures/folder_arrow.tga        | Bin 0 -> 4140 bytes
 .../newview/skins/default/textures/foot_shadow.j2c | Bin 0 -> 1647 bytes
 .../newview/skins/default/textures/go-home-4.png   | Bin 0 -> 485 bytes
 .../newview/skins/default/textures/go-next-4.png   | Bin 0 -> 508 bytes
 .../skins/default/textures/go-previous-4.png       | Bin 0 -> 467 bytes
 .../indra/newview/skins/default/textures/hugs.png  | Bin 0 -> 204219 bytes
 .../textures/icn_active-speakers-dot-lvl0.tga      | Bin 0 -> 1068 bytes
 .../textures/icn_active-speakers-dot-lvl1.tga      | Bin 0 -> 1068 bytes
 .../textures/icn_active-speakers-dot-lvl2.tga      | Bin 0 -> 1068 bytes
 .../textures/icn_active-speakers-typing1.tga       | Bin 0 -> 1068 bytes
 .../textures/icn_active-speakers-typing2.tga       | Bin 0 -> 1068 bytes
 .../textures/icn_active-speakers-typing3.tga       | Bin 0 -> 1068 bytes
 .../newview/skins/default/textures/icn_chatbar.tga | Bin 0 -> 2092 bytes
 .../default/textures/icn_clear_lineeditor.tga      | Bin 0 -> 1068 bytes
 .../skins/default/textures/icn_label_media.tga     | Bin 0 -> 4140 bytes
 .../skins/default/textures/icn_label_music.tga     | Bin 0 -> 4140 bytes
 .../skins/default/textures/icn_label_web.tga       | Bin 0 -> 4140 bytes
 .../skins/default/textures/icn_media-pause.tga     | Bin 0 -> 2092 bytes
 .../default/textures/icn_media-pause_active.tga    | Bin 0 -> 4140 bytes
 .../default/textures/icn_media-pause_disabled.tga  | Bin 0 -> 4140 bytes
 .../default/textures/icn_media-pause_enabled.tga   | Bin 0 -> 4140 bytes
 .../skins/default/textures/icn_media-play.tga      | Bin 0 -> 2092 bytes
 .../default/textures/icn_media-play_active.tga     | Bin 0 -> 4140 bytes
 .../default/textures/icn_media-play_disabled.tga   | Bin 0 -> 4140 bytes
 .../default/textures/icn_media-play_enabled.tga    | Bin 0 -> 4140 bytes
 .../default/textures/icn_media-stop_active.tga     | Bin 0 -> 4140 bytes
 .../default/textures/icn_media-stop_disabled.tga   | Bin 0 -> 4140 bytes
 .../default/textures/icn_media-stop_enabled.tga    | Bin 0 -> 4140 bytes
 .../newview/skins/default/textures/icn_media.tga   | Bin 0 -> 4140 bytes
 .../skins/default/textures/icn_media_movie.tga     | Bin 0 -> 4140 bytes
 .../skins/default/textures/icn_media_web.tga       | Bin 0 -> 4140 bytes
 .../skins/default/textures/icn_music-pause.tga     | Bin 0 -> 2092 bytes
 .../skins/default/textures/icn_music-play.tga      | Bin 0 -> 2092 bytes
 .../newview/skins/default/textures/icn_music.tga   | Bin 0 -> 4140 bytes
 .../newview/skins/default/textures/icn_pause.tga   | Bin 0 -> 1068 bytes
 .../newview/skins/default/textures/icn_play.tga    | Bin 0 -> 1068 bytes
 .../default/textures/icn_rounded-text-field.tga    | Bin 0 -> 16402 bytes
 .../skins/default/textures/icn_scrollbar.tga       | Bin 0 -> 1068 bytes
 .../skins/default/textures/icn_scrollbar_bg.tga    | Bin 0 -> 1068 bytes
 .../skins/default/textures/icn_scrollbar_thumb.tga | Bin 0 -> 1068 bytes
 .../default/textures/icn_slide-groove_dark.tga     | Bin 0 -> 214 bytes
 .../skins/default/textures/icn_slide-highlight.tga | Bin 0 -> 128 bytes
 .../default/textures/icn_slide-thumb_dark.tga      | Bin 0 -> 1042 bytes
 .../default/textures/icn_speaker-muted_dark.tga    | Bin 0 -> 2066 bytes
 .../skins/default/textures/icn_speaker_dark.tga    | Bin 0 -> 2066 bytes
 .../newview/skins/default/textures/icn_stop.tga    | Bin 0 -> 1068 bytes
 .../default/textures/icn_textfield_enabled.tga     | Bin 0 -> 1068 bytes
 .../skins/default/textures/icn_toolbar_build.tga   | Bin 0 -> 138 bytes
 .../skins/default/textures/icn_toolbar_fly.tga     | Bin 0 -> 138 bytes
 .../default/textures/icn_toolbar_inventory.tga     | Bin 0 -> 138 bytes
 .../skins/default/textures/icn_toolbar_map.tga     | Bin 0 -> 138 bytes
 .../skins/default/textures/icn_toolbar_minimap.tga | Bin 0 -> 138 bytes
 .../skins/default/textures/icn_toolbar_search.tga  | Bin 0 -> 138 bytes
 .../default/textures/icn_toolbar_snapshot.tga      | Bin 0 -> 138 bytes
 .../skins/default/textures/icn_voice-call-end.tga  | Bin 0 -> 1068 bytes
 .../default/textures/icn_voice-call-start.tga      | Bin 0 -> 1068 bytes
 .../default/textures/icn_voice-groupfocus.tga      | Bin 0 -> 1068 bytes
 .../skins/default/textures/icn_voice-localchat.tga | Bin 0 -> 1068 bytes
 .../skins/default/textures/icn_voice-pvtfocus.tga  | Bin 0 -> 1068 bytes
 .../skins/default/textures/icn_voice_ptt-off.tga   | Bin 0 -> 1042 bytes
 .../default/textures/icn_voice_ptt-on-lvl1.tga     | Bin 0 -> 1042 bytes
 .../default/textures/icn_voice_ptt-on-lvl2.tga     | Bin 0 -> 1042 bytes
 .../default/textures/icn_voice_ptt-on-lvl3.tga     | Bin 0 -> 1042 bytes
 .../skins/default/textures/icn_voice_ptt-on.tga    | Bin 0 -> 1042 bytes
 .../skins/default/textures/icon_auction.tga        | Bin 0 -> 1068 bytes
 .../skins/default/textures/icon_avatar_offline.tga | Bin 0 -> 1068 bytes
 .../skins/default/textures/icon_avatar_online.tga  | Bin 0 -> 1068 bytes
 .../skins/default/textures/icon_day_cycle.tga      | Bin 0 -> 25682 bytes
 .../skins/default/textures/icon_diurnal.tga        | Bin 0 -> 6162 bytes
 .../newview/skins/default/textures/icon_event.tga  | Bin 0 -> 1068 bytes
 .../skins/default/textures/icon_event_adult.tga    | Bin 0 -> 648 bytes
 .../skins/default/textures/icon_event_mature.tga   | Bin 0 -> 1068 bytes
 .../skins/default/textures/icon_for_sale.tga       | Bin 0 -> 1068 bytes
 .../skins/default/textures/icon_for_sale_adult.tga | Bin 0 -> 743 bytes
 .../newview/skins/default/textures/icon_group.tga  | Bin 0 -> 612 bytes
 .../skins/default/textures/icon_groupnotice.tga    | Bin 0 -> 16021 bytes
 .../default/textures/icon_groupnoticeinventory.tga | Bin 0 -> 16172 bytes
 .../newview/skins/default/textures/icon_lock.tga   | Bin 0 -> 1030 bytes
 .../newview/skins/default/textures/icon_place.tga  | Bin 0 -> 1068 bytes
 .../skins/default/textures/icon_popular.tga        | Bin 0 -> 1068 bytes
 .../skins/default/textures/icon_top_pick.tga       | Bin 0 -> 1068 bytes
 .../default/textures/inv_folder_animation.tga      | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_folder_bodypart.tga | Bin 0 -> 1068 bytes
 .../default/textures/inv_folder_callingcard.tga    | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_folder_clothing.tga | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_folder_gesture.tga  | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_folder_landmark.tga | Bin 0 -> 1068 bytes
 .../default/textures/inv_folder_lostandfound.tga   | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_folder_notecard.tga | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_folder_object.tga   | Bin 0 -> 1068 bytes
 .../default/textures/inv_folder_plain_closed.tga   | Bin 0 -> 1068 bytes
 .../default/textures/inv_folder_plain_open.tga     | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_folder_script.tga   | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_folder_snapshot.tga | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_folder_sound.tga    | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_folder_texture.tga  | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_folder_trash.tga    | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_item_alpha.tga      | Bin 0 -> 657 bytes
 .../skins/default/textures/inv_item_animation.tga  | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_item_attach.tga     | Bin 0 -> 1068 bytes
 .../textures/inv_item_callingcard_offline.tga      | Bin 0 -> 1068 bytes
 .../textures/inv_item_callingcard_online.tga       | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_item_clothing.tga   | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_item_eyes.tga       | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_item_gesture.tga    | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_item_gloves.tga     | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_item_hair.tga       | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_item_jacket.tga     | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_item_landmark.tga   | Bin 0 -> 1068 bytes
 .../default/textures/inv_item_landmark_visited.tga | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_item_notecard.tga   | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_item_object.tga     | Bin 0 -> 1068 bytes
 .../default/textures/inv_item_object_multi.tga     | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_item_pants.tga      | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_item_script.tga     | Bin 0 -> 1068 bytes
 .../default/textures/inv_item_script_dangerous.tga | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_item_shape.tga      | Bin 0 -> 812 bytes
 .../skins/default/textures/inv_item_shirt.tga      | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_item_shoes.tga      | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_item_skin.tga       | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_item_skirt.tga      | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_item_snapshot.tga   | Bin 0 -> 812 bytes
 .../skins/default/textures/inv_item_socks.tga      | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_item_sound.tga      | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_item_tattoo.tga     | Bin 0 -> 819 bytes
 .../skins/default/textures/inv_item_texture.tga    | Bin 0 -> 812 bytes
 .../skins/default/textures/inv_item_underpants.tga | Bin 0 -> 1068 bytes
 .../skins/default/textures/inv_item_undershirt.tga | Bin 0 -> 1068 bytes
 .../skins/default/textures/lag_status_critical.tga | Bin 0 -> 4140 bytes
 .../skins/default/textures/lag_status_good.tga     | Bin 0 -> 658 bytes
 .../skins/default/textures/lag_status_warning.tga  | Bin 0 -> 658 bytes
 .../newview/skins/default/textures/legend.tga      | Bin 0 -> 1068 bytes
 .../newview/skins/default/textures/lightgray.tga   | Bin 0 -> 178 bytes
 .../skins/default/textures/locked_image.j2c        | Bin 0 -> 6140 bytes
 .../skins/default/textures/map_avatar_16.tga       | Bin 0 -> 1068 bytes
 .../skins/default/textures/map_avatar_32.tga       | Bin 0 -> 2894 bytes
 .../skins/default/textures/map_avatar_8.tga        | Bin 0 -> 300 bytes
 .../skins/default/textures/map_avatar_above_32.tga | Bin 0 -> 2909 bytes
 .../skins/default/textures/map_avatar_above_8.tga  | Bin 0 -> 300 bytes
 .../skins/default/textures/map_avatar_below_32.tga | Bin 0 -> 3037 bytes
 .../skins/default/textures/map_avatar_below_8.tga  | Bin 0 -> 300 bytes
 .../skins/default/textures/map_avatar_you_32.tga   | Bin 0 -> 3395 bytes
 .../skins/default/textures/map_avatar_you_8.tga    | Bin 0 -> 300 bytes
 .../newview/skins/default/textures/map_event.tga   | Bin 0 -> 1068 bytes
 .../skins/default/textures/map_event_adult.tga     | Bin 0 -> 648 bytes
 .../skins/default/textures/map_event_mature.tga    | Bin 0 -> 1068 bytes
 .../newview/skins/default/textures/map_home.tga    | Bin 0 -> 1068 bytes
 .../newview/skins/default/textures/map_infohub.tga | Bin 0 -> 1068 bytes
 .../newview/skins/default/textures/map_telehub.tga | Bin 0 -> 1068 bytes
 .../skins/default/textures/map_track_16.tga        | Bin 0 -> 1068 bytes
 .../newview/skins/default/textures/map_track_8.tga | Bin 0 -> 300 bytes
 .../skins/default/textures/media_btn_back.png      | Bin 0 -> 538 bytes
 .../skins/default/textures/media_btn_done.png      | Bin 0 -> 591 bytes
 .../skins/default/textures/media_btn_forward.png   | Bin 0 -> 474 bytes
 .../skins/default/textures/media_btn_home.png      | Bin 0 -> 409 bytes
 .../skins/default/textures/media_btn_newwindow.png | Bin 0 -> 308 bytes
 .../default/textures/media_btn_optimalzoom.png     | Bin 0 -> 741 bytes
 .../skins/default/textures/media_btn_reload.png    | Bin 0 -> 875 bytes
 .../default/textures/media_btn_scrolldown.png      | Bin 0 -> 244 bytes
 .../default/textures/media_btn_scrollleft.png      | Bin 0 -> 248 bytes
 .../default/textures/media_btn_scrollright.png     | Bin 0 -> 262 bytes
 .../skins/default/textures/media_btn_scrollup.png  | Bin 0 -> 255 bytes
 .../default/textures/media_btn_stoploading.png     | Bin 0 -> 390 bytes
 .../newview/skins/default/textures/media_icon.tga  | Bin 0 -> 1068 bytes
 .../skins/default/textures/media_panel_bg.png      | Bin 0 -> 646 bytes
 .../skins/default/textures/media_panel_divider.png | Bin 0 -> 154 bytes
 .../textures/media_panel_hoverrectangle.png        | Bin 0 -> 716 bytes
 .../default/textures/media_panel_scrollbg.png      | Bin 0 -> 929 bytes
 .../newview/skins/default/textures/minimize.tga    | Bin 0 -> 118 bytes
 .../skins/default/textures/minimize_inactive.tga   | Bin 0 -> 1068 bytes
 .../skins/default/textures/minimize_pressed.tga    | Bin 0 -> 228 bytes
 .../skins/default/textures/missing_asset.tga       | Bin 0 -> 2511 bytes
 .../skins/default/textures/move_backward_in.tga    | Bin 0 -> 4140 bytes
 .../skins/default/textures/move_backward_out.tga   | Bin 0 -> 4140 bytes
 .../skins/default/textures/move_down_in.tga        | Bin 0 -> 4140 bytes
 .../skins/default/textures/move_down_out.tga       | Bin 0 -> 4140 bytes
 .../skins/default/textures/move_forward_in.tga     | Bin 0 -> 4140 bytes
 .../skins/default/textures/move_forward_out.tga    | Bin 0 -> 4140 bytes
 .../skins/default/textures/move_left_in.tga        | Bin 0 -> 4140 bytes
 .../skins/default/textures/move_left_out.tga       | Bin 0 -> 4140 bytes
 .../skins/default/textures/move_right_in.tga       | Bin 0 -> 4140 bytes
 .../skins/default/textures/move_right_out.tga      | Bin 0 -> 4140 bytes
 .../skins/default/textures/move_turn_left_in.tga   | Bin 0 -> 4140 bytes
 .../skins/default/textures/move_turn_left_out.tga  | Bin 0 -> 4140 bytes
 .../skins/default/textures/move_turn_right_in.tga  | Bin 0 -> 4140 bytes
 .../skins/default/textures/move_turn_right_out.tga | Bin 0 -> 4140 bytes
 .../newview/skins/default/textures/move_up_in.tga  | Bin 0 -> 4140 bytes
 .../newview/skins/default/textures/move_up_out.tga | Bin 0 -> 4140 bytes
 .../newview/skins/default/textures/music_icon.tga  | Bin 0 -> 1068 bytes
 .../newview/skins/default/textures/mute_icon.tga   | Bin 0 -> 1042 bytes
 .../skins/default/textures/noentrylines.j2c        | Bin 0 -> 3926 bytes
 .../skins/default/textures/noentrypasslines.j2c    | Bin 0 -> 3815 bytes
 .../newview/skins/default/textures/nomnom.png      | Bin 0 -> 380325 bytes
 .../skins/default/textures/notify_box_icon.tga     | Bin 0 -> 4140 bytes
 .../skins/default/textures/notify_caution_icon.tga | Bin 0 -> 4140 bytes
 .../newview/skins/default/textures/notify_next.png | Bin 0 -> 372 bytes
 .../skins/default/textures/notify_tip_icon.tga     | Bin 0 -> 4140 bytes
 .../newview/skins/default/textures/object_cone.tga | Bin 0 -> 3116 bytes
 .../skins/default/textures/object_cone_active.tga  | Bin 0 -> 3116 bytes
 .../newview/skins/default/textures/object_cube.tga | Bin 0 -> 3116 bytes
 .../skins/default/textures/object_cube_active.tga  | Bin 0 -> 3116 bytes
 .../skins/default/textures/object_cylinder.tga     | Bin 0 -> 3116 bytes
 .../default/textures/object_cylinder_active.tga    | Bin 0 -> 3116 bytes
 .../skins/default/textures/object_grass.tga        | Bin 0 -> 3116 bytes
 .../skins/default/textures/object_grass_active.tga | Bin 0 -> 3116 bytes
 .../skins/default/textures/object_hemi_cone.tga    | Bin 0 -> 3116 bytes
 .../default/textures/object_hemi_cone_active.tga   | Bin 0 -> 3116 bytes
 .../default/textures/object_hemi_cylinder.tga      | Bin 0 -> 3116 bytes
 .../textures/object_hemi_cylinder_active.tga       | Bin 0 -> 3116 bytes
 .../skins/default/textures/object_hemi_sphere.tga  | Bin 0 -> 3116 bytes
 .../default/textures/object_hemi_sphere_active.tga | Bin 0 -> 3116 bytes
 .../skins/default/textures/object_prism.tga        | Bin 0 -> 3116 bytes
 .../skins/default/textures/object_prism_active.tga | Bin 0 -> 3116 bytes
 .../skins/default/textures/object_pyramid.tga      | Bin 0 -> 3116 bytes
 .../default/textures/object_pyramid_active.tga     | Bin 0 -> 3116 bytes
 .../newview/skins/default/textures/object_ring.tga | Bin 0 -> 4140 bytes
 .../skins/default/textures/object_ring_active.tga  | Bin 0 -> 4140 bytes
 .../skins/default/textures/object_sphere.tga       | Bin 0 -> 3116 bytes
 .../default/textures/object_sphere_active.tga      | Bin 0 -> 3116 bytes
 .../skins/default/textures/object_tetrahedron.tga  | Bin 0 -> 3116 bytes
 .../default/textures/object_tetrahedron_active.tga | Bin 0 -> 3116 bytes
 .../skins/default/textures/object_torus.tga        | Bin 0 -> 3116 bytes
 .../skins/default/textures/object_torus_active.tga | Bin 0 -> 3116 bytes
 .../newview/skins/default/textures/object_tree.tga | Bin 0 -> 3116 bytes
 .../skins/default/textures/object_tree_active.tga  | Bin 0 -> 3116 bytes
 .../newview/skins/default/textures/object_tube.tga | Bin 0 -> 3116 bytes
 .../skins/default/textures/object_tube_active.tga  | Bin 0 -> 3116 bytes
 .../newview/skins/default/textures/octopus.png     | Bin 0 -> 442610 bytes
 .../newview/skins/default/textures/pixiesmall.j2c  | Bin 0 -> 2845 bytes
 .../skins/default/textures/progress_fill.tga       | Bin 0 -> 5548 bytes
 .../skins/default/textures/progressbar_fill.tga    | Bin 0 -> 456 bytes
 .../skins/default/textures/progressbar_track.tga   | Bin 0 -> 700 bytes
 .../skins/default/textures/propertyline.tga        | Bin 0 -> 2092 bytes
 .../skins/default/textures/ptt_lock_off.tga        | Bin 0 -> 2085 bytes
 .../newview/skins/default/textures/ptt_lock_on.tga | Bin 0 -> 2085 bytes
 .../skins/default/textures/radio_active_false.tga  | Bin 0 -> 1068 bytes
 .../skins/default/textures/radio_active_true.tga   | Bin 0 -> 1068 bytes
 .../default/textures/radio_inactive_false.tga      | Bin 0 -> 1068 bytes
 .../skins/default/textures/radio_inactive_true.tga | Bin 0 -> 1068 bytes
 .../textures/resize_handle_bottom_right_blue.tga   | Bin 0 -> 1068 bytes
 .../newview/skins/default/textures/restore.tga     | Bin 0 -> 276 bytes
 .../skins/default/textures/restore_inactive.tga    | Bin 0 -> 168 bytes
 .../skins/default/textures/restore_pressed.tga     | Bin 0 -> 341 bytes
 .../skins/default/textures/rounded_square.j2c      | Bin 0 -> 1074 bytes
 .../skins/default/textures/rounded_square_soft.j2c | Bin 0 -> 636 bytes
 .../skins/default/textures/script_error.j2c        | Bin 0 -> 8132 bytes
 .../default/textures/scrollbutton_down_in_blue.tga | Bin 0 -> 812 bytes
 .../textures/scrollbutton_down_out_blue.tga        | Bin 0 -> 812 bytes
 .../default/textures/scrollbutton_left_in_blue.tga | Bin 0 -> 812 bytes
 .../textures/scrollbutton_left_out_blue.tga        | Bin 0 -> 812 bytes
 .../textures/scrollbutton_right_in_blue.tga        | Bin 0 -> 812 bytes
 .../textures/scrollbutton_right_out_blue.tga       | Bin 0 -> 812 bytes
 .../default/textures/scrollbutton_up_in_blue.tga   | Bin 0 -> 812 bytes
 .../default/textures/scrollbutton_up_out_blue.tga  | Bin 0 -> 812 bytes
 .../newview/skins/default/textures/silhouette.j2c  | Bin 0 -> 1460 bytes
 .../skins/default/textures/skin_thumbnail_dark.png | Bin 0 -> 16592 bytes
 .../default/textures/skin_thumbnail_default.png    | Bin 0 -> 24343 bytes
 .../default/textures/skin_thumbnail_emerald.png    | Bin 0 -> 26862 bytes
 .../default/textures/skin_thumbnail_gemini.png     | Bin 0 -> 14108 bytes
 .../skins/default/textures/skin_thumbnail_gred.png | Bin 0 -> 20882 bytes
 .../default/textures/skin_thumbnail_pslgreen.png   | Bin 0 -> 17623 bytes
 .../default/textures/skin_thumbnail_pslpurple.png  | Bin 0 -> 19646 bytes
 .../skins/default/textures/skin_thumbnail_ruby.png | Bin 0 -> 24221 bytes
 .../default/textures/skin_thumbnail_saphire.png    | Bin 0 -> 26729 bytes
 .../default/textures/skin_thumbnail_silver.png     | Bin 0 -> 19100 bytes
 .../skins/default/textures/slim_icon_16_viewer.tga | Bin 0 -> 1032 bytes
 .../default/textures/sm_rounded_corners_simple.tga | Bin 0 -> 812 bytes
 .../newview/skins/default/textures/smicon_warn.tga | Bin 0 -> 1068 bytes
 .../newview/skins/default/textures/spacer24.tga    | Bin 0 -> 2348 bytes
 .../newview/skins/default/textures/spacer35.tga    | Bin 0 -> 3404 bytes
 .../skins/default/textures/spin_down_in_blue.tga   | Bin 0 -> 428 bytes
 .../skins/default/textures/spin_down_out_blue.tga  | Bin 0 -> 428 bytes
 .../skins/default/textures/spin_up_in_blue.tga     | Bin 0 -> 428 bytes
 .../skins/default/textures/spin_up_out_blue.tga    | Bin 0 -> 428 bytes
 .../skins/default/textures/square_btn_32x128.tga   | Bin 0 -> 6292 bytes
 .../textures/square_btn_selected_32x128.tga        | Bin 0 -> 6983 bytes
 .../skins/default/textures/startup_logo.j2c        | Bin 0 -> 69118 bytes
 .../newview/skins/default/textures/status_busy.tga | Bin 0 -> 4140 bytes
 .../skins/default/textures/status_buy_currency.tga | Bin 0 -> 3609 bytes
 .../textures/status_buy_currency_pressed.tga       | Bin 0 -> 3973 bytes
 .../skins/default/textures/status_buy_land.tga     | Bin 0 -> 3644 bytes
 .../default/textures/status_buy_land_pressed.tga   | Bin 0 -> 3891 bytes
 .../skins/default/textures/status_health.tga       | Bin 0 -> 2092 bytes
 .../skins/default/textures/status_money.tga        | Bin 0 -> 1068 bytes
 .../skins/default/textures/status_no_build.tga     | Bin 0 -> 2066 bytes
 .../skins/default/textures/status_no_fly.tga       | Bin 0 -> 2092 bytes
 .../skins/default/textures/status_no_push.tga      | Bin 0 -> 2092 bytes
 .../skins/default/textures/status_no_scripts.tga   | Bin 0 -> 2092 bytes
 .../skins/default/textures/status_no_voice.tga     | Bin 0 -> 2092 bytes
 .../skins/default/textures/status_script_debug.tga | Bin 0 -> 1068 bytes
 .../skins/default/textures/status_search.tga       | Bin 0 -> 812 bytes
 .../skins/default/textures/status_search_btn.png   | Bin 0 -> 3012 bytes
 .../default/textures/status_search_btn_pressed.png | Bin 0 -> 3361 bytes
 .../skins/default/textures/status_voice.tga        | Bin 0 -> 2092 bytes
 .../default/textures/tab_background_darkpurple.tga | Bin 0 -> 56 bytes
 .../default/textures/tab_background_lightgrey.tga  | Bin 0 -> 56 bytes
 .../default/textures/tab_background_purple.tga     | Bin 0 -> 56 bytes
 .../skins/default/textures/tab_bottom_blue.tga     | Bin 0 -> 7365 bytes
 .../default/textures/tab_bottom_selected_blue.tga  | Bin 0 -> 8498 bytes
 .../newview/skins/default/textures/tab_left.tga    | Bin 0 -> 7849 bytes
 .../skins/default/textures/tab_left_selected.tga   | Bin 0 -> 8867 bytes
 .../skins/default/textures/tab_top_blue.tga        | Bin 0 -> 7642 bytes
 .../default/textures/tab_top_selected_blue.tga     | Bin 0 -> 8907 bytes
 .../newview/skins/default/textures/tabarea.tga     | Bin 0 -> 1340 bytes
 .../skins/default/textures/tearoff_pressed.tga     | Bin 0 -> 513 bytes
 .../newview/skins/default/textures/tearoffbox.tga  | Bin 0 -> 408 bytes
 .../newview/skins/default/textures/tool_dozer.tga  | Bin 0 -> 4140 bytes
 .../skins/default/textures/tool_dozer_active.tga   | Bin 0 -> 4140 bytes
 .../newview/skins/default/textures/tool_zoom.tga   | Bin 0 -> 4140 bytes
 .../skins/default/textures/tool_zoom_active.tga    | Bin 0 -> 4140 bytes
 .../newview/skins/default/textures/toolbar_bg.tga  | Bin 0 -> 308 bytes
 .../default/textures/toolbar_btn_disabled.tga      | Bin 0 -> 4572 bytes
 .../skins/default/textures/toolbar_btn_enabled.tga | Bin 0 -> 5943 bytes
 .../default/textures/toolbar_btn_selected.tga      | Bin 0 -> 6564 bytes
 .../newview/skins/default/textures/toolbar_tab.tga | Bin 0 -> 1416 bytes
 .../newview/skins/default/textures/up_arrow.png    | Bin 0 -> 2930 bytes
 .../newview/skins/default/textures/up_arrow.tga    | Bin 0 -> 1068 bytes
 .../newview/skins/default/textures/uv_test1.bmp    | Bin 0 -> 196662 bytes
 .../newview/skins/default/textures/uv_test1.j2c    | Bin 0 -> 1206 bytes
 .../newview/skins/default/textures/uv_test2.tga    | Bin 0 -> 1308 bytes
 .../skins/default/textures/view-refresh-5.png      | Bin 0 -> 786 bytes
 .../indra/newview/skins/default/textures/white.tga | Bin 0 -> 178 bytes
 .../newview/skins/default/textures/zombiecat.png   | Bin 0 -> 334660 bytes
 linden/indra/newview/skins/gemini/colors.xml       |   3 +
 linden/indra/newview/skins/gemini/colors_base.xml  | 208 +++++++++++
 .../0098b015-3daf-4cfe-a72f-915369ea97c2.tga       | Bin 0 -> 4140 bytes
 .../0498c309-5306-43cd-82a2-ae31d096cdef.tga       | Bin 0 -> 1068 bytes
 .../07d0ea4c-af0c-aad1-dbbf-c24020ff2b80.tga       | Bin 0 -> 1068 bytes
 .../09a324a8-acc1-d9cd-2cbd-7465d90d3a98.tga       | Bin 0 -> 4140 bytes
 .../0e82d24e-ed45-41bc-b090-94c97c1caab2.tga       | Bin 0 -> 1068 bytes
 .../111b39de-8928-4690-b7b2-e17d5c960277.tga       | Bin 0 -> 1068 bytes
 .../13dd1d96-6836-461e-8a4c-36003065c59b.tga       | Bin 0 -> 1068 bytes
 .../34c9398d-bb78-4643-9633-46a2fa3e9637.tga       | Bin 0 -> 1068 bytes
 .../37c8e000-6aa2-41ef-8f86-e0c2e60bfa42.tga       | Bin 0 -> 1042 bytes
 .../39801651-26cb-4926-af57-7af9352c273c.tga       | Bin 0 -> 1068 bytes
 .../3c18c87e-5f50-14e2-e744-f44734aa365f.tga       | Bin 0 -> 812 bytes
 .../43f0a590-f3d3-48b5-b460-f5b3e6e03626.tga       | Bin 0 -> 1042 bytes
 .../47a8c844-cd2a-4b1a-be01-df8b1612fe5d.tga       | Bin 0 -> 1068 bytes
 .../5748decc-f629-461c-9a36-a35a221fe21f.tga       | Bin 0 -> 3116 bytes
 .../6002a571-549c-472c-9443-9ab35b1a55ed.tga       | Bin 0 -> 6162 bytes
 .../73577b7b-19c3-4050-a19d-36bc2408aa79.tga       | Bin 0 -> 1068 bytes
 .../74e1a96f-4833-a24d-a1bb-1bce1468b0e7.tga       | Bin 0 -> 1068 bytes
 .../7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga       | Bin 0 -> 4140 bytes
 .../7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga       | Bin 0 -> 812 bytes
 .../89e9fc7c-0b16-457d-be4f-136270759c4d.tga       | Bin 0 -> 4140 bytes
 .../8f761ce3-5939-4d3a-8991-00064fdfacf9.tga       | Bin 0 -> 1068 bytes
 .../9beb8cdd-3dce-53c2-b28e-e1f3bc2ec0a4.tga       | Bin 0 -> 1068 bytes
 .../9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga       | Bin 0 -> 812 bytes
 .../skins/gemini/textures/account_id_green.tga     | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/account_id_orange.tga    | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/active_speakers.tga      | Bin 0 -> 1479 bytes
 .../skins/gemini/textures/active_voice_tab.tga     | Bin 0 -> 1042 bytes
 .../skins/gemini/textures/alpha_gradient.tga       | Bin 0 -> 300 bytes
 .../newview/skins/gemini/textures/arrow_down.tga   | Bin 0 -> 1068 bytes
 .../newview/skins/gemini/textures/arrow_up.tga     | Bin 0 -> 1068 bytes
 .../newview/skins/gemini/textures/avatar_gone.tga  | Bin 0 -> 1042 bytes
 .../newview/skins/gemini/textures/avatar_new.tga   | Bin 0 -> 1042 bytes
 .../newview/skins/gemini/textures/avatar_sound.tga | Bin 0 -> 1042 bytes
 .../skins/gemini/textures/avatar_typing.tga        | Bin 0 -> 1042 bytes
 .../b4870163-6208-42a9-9801-93133bf9a6cd.tga       | Bin 0 -> 4140 bytes
 .../indra/newview/skins/gemini/textures/black.tga  | Bin 0 -> 3116 bytes
 .../newview/skins/gemini/textures/btn_chatbar.tga  | Bin 0 -> 6188 bytes
 .../skins/gemini/textures/btn_chatbar_selected.tga | Bin 0 -> 6188 bytes
 .../skins/gemini/textures/button_anim_pause.tga    | Bin 0 -> 4140 bytes
 .../gemini/textures/button_anim_pause_disabled.tga | Bin 0 -> 4140 bytes
 .../gemini/textures/button_anim_pause_selected.tga | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/button_anim_play.tga     | Bin 0 -> 4140 bytes
 .../gemini/textures/button_anim_play_disabled.tga  | Bin 0 -> 4140 bytes
 .../gemini/textures/button_anim_play_selected.tga  | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/button_anim_stop.tga     | Bin 0 -> 4140 bytes
 .../gemini/textures/button_anim_stop_disabled.tga  | Bin 0 -> 4140 bytes
 .../gemini/textures/button_anim_stop_selected.tga  | Bin 0 -> 4140 bytes
 .../gemini/textures/button_disabled_32x128.tga     | Bin 0 -> 16428 bytes
 .../gemini/textures/button_enabled_32x128.tga      | Bin 0 -> 16428 bytes
 .../textures/button_enabled_selected_32x128.tga    | Bin 0 -> 16428 bytes
 .../c1e21504-f136-451d-b8e9-929037812f1d.tga       | Bin 0 -> 4140 bytes
 .../c63f124c-6340-4fbf-b59e-0869a44adb64.tga       | Bin 0 -> 4140 bytes
 .../ca7609c6-6ec6-32d9-332e-0d8f437ef644.tga       | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/cam_rotate_in.tga        | Bin 0 -> 16428 bytes
 .../skins/gemini/textures/cam_rotate_out.tga       | Bin 0 -> 16428 bytes
 .../skins/gemini/textures/cam_tracking_in.tga      | Bin 0 -> 16428 bytes
 .../skins/gemini/textures/cam_tracking_out.tga     | Bin 0 -> 16428 bytes
 .../skins/gemini/textures/cam_zoom_minus_in.tga    | Bin 0 -> 4140 bytes
 .../newview/skins/gemini/textures/cam_zoom_out.tga | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/cam_zoom_plus_in.tga     | Bin 0 -> 4140 bytes
 .../ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga       | Bin 0 -> 4140 bytes
 .../gemini/textures/checkbox_disabled_false.tga    | Bin 0 -> 1068 bytes
 .../gemini/textures/checkbox_disabled_true.tga     | Bin 0 -> 1068 bytes
 .../gemini/textures/checkbox_enabled_false.tga     | Bin 0 -> 1068 bytes
 .../gemini/textures/checkbox_enabled_true.tga      | Bin 0 -> 1068 bytes
 .../textures/checkerboard_transparency_bg.png      | Bin 0 -> 1110 bytes
 .../indra/newview/skins/gemini/textures/circle.tga | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/close_in_blue.tga        | Bin 0 -> 358 bytes
 .../skins/gemini/textures/close_inactive_blue.tga  | Bin 0 -> 1068 bytes
 .../newview/skins/gemini/textures/closebox.tga     | Bin 0 -> 248 bytes
 .../skins/gemini/textures/color_swatch_alpha.tga   | Bin 0 -> 16428 bytes
 .../skins/gemini/textures/combobox_arrow.tga       | Bin 0 -> 1068 bytes
 .../newview/skins/gemini/textures/crosshairs.tga   | Bin 0 -> 300 bytes
 .../newview/skins/gemini/textures/darkgray.tga     | Bin 0 -> 178 bytes
 .../skins/gemini/textures/direction_arrow.tga      | Bin 0 -> 1068 bytes
 .../newview/skins/gemini/textures/down_arrow.png   | Bin 0 -> 2936 bytes
 .../e3369e02-93e1-43dc-b9c0-4533db0963d0.tga       | Bin 0 -> 1068 bytes
 .../e97cf410-8e61-7005-ec06-629eba4cd1fb.tga       | Bin 0 -> 300 bytes
 .../skins/gemini/textures/eye_button_active.tga    | Bin 0 -> 3116 bytes
 .../skins/gemini/textures/eye_button_inactive.tga  | Bin 0 -> 3116 bytes
 .../f9bbb2fe-584b-4c01-86fc-599c69534c1b.tga       | Bin 0 -> 1068 bytes
 .../ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga       | Bin 0 -> 812 bytes
 .../newview/skins/gemini/textures/ff_edit_mine.tga | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/ff_edit_mine_button.tga  | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/ff_edit_theirs.tga       | Bin 0 -> 1068 bytes
 .../gemini/textures/ff_edit_theirs_button.tga      | Bin 0 -> 4140 bytes
 .../gemini/textures/ff_online_status_button.tga    | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/ff_visible_map.tga       | Bin 0 -> 812 bytes
 .../gemini/textures/ff_visible_map_button.tga      | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/ff_visible_online.tga    | Bin 0 -> 1068 bytes
 .../gemini/textures/ff_visible_online_button.tga   | Bin 0 -> 4140 bytes
 .../newview/skins/gemini/textures/flag_blue.tga    | Bin 0 -> 1042 bytes
 .../newview/skins/gemini/textures/flag_green.tga   | Bin 0 -> 1042 bytes
 .../newview/skins/gemini/textures/flag_orange.tga  | Bin 0 -> 1042 bytes
 .../newview/skins/gemini/textures/flag_pink.tga    | Bin 0 -> 1042 bytes
 .../newview/skins/gemini/textures/flag_purple.tga  | Bin 0 -> 1042 bytes
 .../newview/skins/gemini/textures/flag_red.tga     | Bin 0 -> 1042 bytes
 .../newview/skins/gemini/textures/flag_yellow.tga  | Bin 0 -> 1042 bytes
 .../skins/gemini/textures/flyout_btn_left.tga      | Bin 0 -> 15404 bytes
 .../gemini/textures/flyout_btn_left_disabled.tga   | Bin 0 -> 15404 bytes
 .../gemini/textures/flyout_btn_left_selected.tga   | Bin 0 -> 15404 bytes
 .../skins/gemini/textures/flyout_btn_right.tga     | Bin 0 -> 3884 bytes
 .../gemini/textures/flyout_btn_right_disabled.tga  | Bin 0 -> 3884 bytes
 .../gemini/textures/flyout_btn_right_selected.tga  | Bin 0 -> 3884 bytes
 .../newview/skins/gemini/textures/folder_arrow.tga | Bin 0 -> 4140 bytes
 .../textures/icn_active-speakers-dot-lvl0.tga      | Bin 0 -> 1068 bytes
 .../textures/icn_active-speakers-dot-lvl1.tga      | Bin 0 -> 1068 bytes
 .../textures/icn_active-speakers-dot-lvl2.tga      | Bin 0 -> 1068 bytes
 .../textures/icn_active-speakers-typing1.tga       | Bin 0 -> 1068 bytes
 .../textures/icn_active-speakers-typing2.tga       | Bin 0 -> 1068 bytes
 .../textures/icn_active-speakers-typing3.tga       | Bin 0 -> 1068 bytes
 .../newview/skins/gemini/textures/icn_chatbar.tga  | Bin 0 -> 2092 bytes
 .../skins/gemini/textures/icn_clear_lineeditor.tga | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/icn_label_media.tga      | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/icn_label_music.tga      | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/icn_label_web.tga        | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/icn_media-pause.tga      | Bin 0 -> 2092 bytes
 .../gemini/textures/icn_media-pause_active.tga     | Bin 0 -> 4140 bytes
 .../gemini/textures/icn_media-pause_disabled.tga   | Bin 0 -> 4140 bytes
 .../gemini/textures/icn_media-pause_enabled.tga    | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/icn_media-play.tga       | Bin 0 -> 2092 bytes
 .../gemini/textures/icn_media-play_active.tga      | Bin 0 -> 4140 bytes
 .../gemini/textures/icn_media-play_disabled.tga    | Bin 0 -> 4140 bytes
 .../gemini/textures/icn_media-play_enabled.tga     | Bin 0 -> 4140 bytes
 .../gemini/textures/icn_media-stop_active.tga      | Bin 0 -> 4140 bytes
 .../gemini/textures/icn_media-stop_disabled.tga    | Bin 0 -> 4140 bytes
 .../gemini/textures/icn_media-stop_enabled.tga     | Bin 0 -> 4140 bytes
 .../newview/skins/gemini/textures/icn_media.tga    | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/icn_media_movie.tga      | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/icn_media_web.tga        | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/icn_music-pause.tga      | Bin 0 -> 2092 bytes
 .../skins/gemini/textures/icn_music-play.tga       | Bin 0 -> 2092 bytes
 .../newview/skins/gemini/textures/icn_music.tga    | Bin 0 -> 4140 bytes
 .../newview/skins/gemini/textures/icn_pause.tga    | Bin 0 -> 1068 bytes
 .../newview/skins/gemini/textures/icn_play.tga     | Bin 0 -> 1068 bytes
 .../gemini/textures/icn_rounded-text-field.tga     | Bin 0 -> 16402 bytes
 .../skins/gemini/textures/icn_scrollbar.tga        | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/icn_scrollbar_bg.tga     | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/icn_scrollbar_thumb.tga  | Bin 0 -> 1068 bytes
 .../gemini/textures/icn_slide-groove_dark.tga      | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/icn_slide-highlight.tga  | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/icn_slide-thumb_dark.tga | Bin 0 -> 1068 bytes
 .../gemini/textures/icn_speaker-muted_dark.tga     | Bin 0 -> 2066 bytes
 .../skins/gemini/textures/icn_speaker_dark.tga     | Bin 0 -> 2092 bytes
 .../newview/skins/gemini/textures/icn_stop.tga     | Bin 0 -> 1068 bytes
 .../gemini/textures/icn_textfield_enabled.tga      | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/icn_toolbar_build.tga    | Bin 0 -> 138 bytes
 .../skins/gemini/textures/icn_toolbar_fly.tga      | Bin 0 -> 138 bytes
 .../gemini/textures/icn_toolbar_inventory.tga      | Bin 0 -> 138 bytes
 .../skins/gemini/textures/icn_toolbar_map.tga      | Bin 0 -> 138 bytes
 .../skins/gemini/textures/icn_toolbar_minimap.tga  | Bin 0 -> 138 bytes
 .../skins/gemini/textures/icn_toolbar_search.tga   | Bin 0 -> 138 bytes
 .../skins/gemini/textures/icn_toolbar_snapshot.tga | Bin 0 -> 138 bytes
 .../skins/gemini/textures/icn_voice-call-end.tga   | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/icn_voice-call-start.tga | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/icn_voice-groupfocus.tga | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/icn_voice-localchat.tga  | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/icn_voice-pvtfocus.tga   | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/icn_voice_ptt-off.tga    | Bin 0 -> 1042 bytes
 .../gemini/textures/icn_voice_ptt-on-lvl1.tga      | Bin 0 -> 1042 bytes
 .../gemini/textures/icn_voice_ptt-on-lvl2.tga      | Bin 0 -> 1042 bytes
 .../gemini/textures/icn_voice_ptt-on-lvl3.tga      | Bin 0 -> 1042 bytes
 .../skins/gemini/textures/icn_voice_ptt-on.tga     | Bin 0 -> 1042 bytes
 .../newview/skins/gemini/textures/icon_auction.tga | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/icon_avatar_expand.png   | Bin 0 -> 393 bytes
 .../skins/gemini/textures/icon_avatar_offline.tga  | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/icon_avatar_online.tga   | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/icon_day_cycle.tga       | Bin 0 -> 25682 bytes
 .../newview/skins/gemini/textures/icon_diurnal.tga | Bin 0 -> 6162 bytes
 .../newview/skins/gemini/textures/icon_event.tga   | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/icon_event_mature.tga    | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/icon_for_sale.tga        | Bin 0 -> 1068 bytes
 .../newview/skins/gemini/textures/icon_group.tga   | Bin 0 -> 612 bytes
 .../skins/gemini/textures/icon_groupnotice.tga     | Bin 0 -> 16021 bytes
 .../gemini/textures/icon_groupnoticeinventory.tga  | Bin 0 -> 16172 bytes
 .../newview/skins/gemini/textures/icon_lock.tga    | Bin 0 -> 1030 bytes
 .../newview/skins/gemini/textures/icon_place.tga   | Bin 0 -> 1068 bytes
 .../newview/skins/gemini/textures/icon_popular.tga | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/icon_top_pick.tga        | Bin 0 -> 1068 bytes
 .../newview/skins/gemini/textures/info_error.tga   | Bin 0 -> 1042 bytes
 .../skins/gemini/textures/info_fetching.tga        | Bin 0 -> 1042 bytes
 .../newview/skins/gemini/textures/info_unknown.tga | Bin 0 -> 1042 bytes
 .../skins/gemini/textures/inv_folder_animation.tga | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_folder_bodypart.tga  | Bin 0 -> 1068 bytes
 .../gemini/textures/inv_folder_callingcard.tga     | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_folder_clothing.tga  | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_folder_gesture.tga   | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_folder_landmark.tga  | Bin 0 -> 1068 bytes
 .../gemini/textures/inv_folder_lostandfound.tga    | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_folder_notecard.tga  | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_folder_object.tga    | Bin 0 -> 1068 bytes
 .../gemini/textures/inv_folder_plain_closed.tga    | Bin 0 -> 1068 bytes
 .../gemini/textures/inv_folder_plain_open.tga      | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_folder_script.tga    | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_folder_snapshot.tga  | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_folder_sound.tga     | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_folder_texture.tga   | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_folder_trash.tga     | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_item_animation.tga   | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_item_attach.tga      | Bin 0 -> 1068 bytes
 .../textures/inv_item_callingcard_offline.tga      | Bin 0 -> 1068 bytes
 .../textures/inv_item_callingcard_online.tga       | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_item_clothing.tga    | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_item_eyes.tga        | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_item_gesture.tga     | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_item_gloves.tga      | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_item_hair.tga        | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_item_jacket.tga      | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_item_landmark.tga    | Bin 0 -> 1068 bytes
 .../gemini/textures/inv_item_landmark_visited.tga  | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_item_notecard.tga    | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_item_object.tga      | Bin 0 -> 1068 bytes
 .../gemini/textures/inv_item_object_multi.tga      | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_item_pants.tga       | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_item_script.tga      | Bin 0 -> 1068 bytes
 .../gemini/textures/inv_item_script_dangerous.tga  | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_item_shape.tga       | Bin 0 -> 812 bytes
 .../skins/gemini/textures/inv_item_shirt.tga       | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_item_shoes.tga       | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_item_skin.tga        | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_item_skirt.tga       | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_item_snapshot.tga    | Bin 0 -> 812 bytes
 .../skins/gemini/textures/inv_item_socks.tga       | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_item_sound.tga       | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_item_texture.tga     | Bin 0 -> 812 bytes
 .../skins/gemini/textures/inv_item_underpants.tga  | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/inv_item_undershirt.tga  | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/lag_status_critical.tga  | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/lag_status_good.tga      | Bin 0 -> 658 bytes
 .../skins/gemini/textures/lag_status_warning.tga   | Bin 0 -> 658 bytes
 .../indra/newview/skins/gemini/textures/legend.tga | Bin 0 -> 1068 bytes
 .../newview/skins/gemini/textures/lightgray.tga    | Bin 0 -> 178 bytes
 .../skins/gemini/textures/map_avatar_16.tga        | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/map_avatar_32.tga        | Bin 0 -> 2894 bytes
 .../newview/skins/gemini/textures/map_avatar_8.tga | Bin 0 -> 300 bytes
 .../skins/gemini/textures/map_avatar_above_32.tga  | Bin 0 -> 2909 bytes
 .../skins/gemini/textures/map_avatar_above_8.tga   | Bin 0 -> 300 bytes
 .../skins/gemini/textures/map_avatar_below_32.tga  | Bin 0 -> 3037 bytes
 .../skins/gemini/textures/map_avatar_below_8.tga   | Bin 0 -> 300 bytes
 .../skins/gemini/textures/map_avatar_you_32.tga    | Bin 0 -> 3395 bytes
 .../skins/gemini/textures/map_avatar_you_8.tga     | Bin 0 -> 300 bytes
 .../newview/skins/gemini/textures/map_event.tga    | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/map_event_mature.tga     | Bin 0 -> 1068 bytes
 .../newview/skins/gemini/textures/map_home.tga     | Bin 0 -> 1068 bytes
 .../newview/skins/gemini/textures/map_infohub.tga  | Bin 0 -> 1068 bytes
 .../newview/skins/gemini/textures/map_telehub.tga  | Bin 0 -> 1068 bytes
 .../newview/skins/gemini/textures/map_track_16.tga | Bin 0 -> 1068 bytes
 .../newview/skins/gemini/textures/map_track_8.tga  | Bin 0 -> 300 bytes
 .../newview/skins/gemini/textures/media_icon.tga   | Bin 0 -> 1068 bytes
 .../newview/skins/gemini/textures/minimize.tga     | Bin 0 -> 118 bytes
 .../skins/gemini/textures/minimize_inactive.tga    | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/minimize_pressed.tga     | Bin 0 -> 228 bytes
 .../skins/gemini/textures/missing_asset.tga        | Bin 0 -> 2511 bytes
 .../skins/gemini/textures/move_backward_in.tga     | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/move_backward_out.tga    | Bin 0 -> 4140 bytes
 .../newview/skins/gemini/textures/move_down_in.tga | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/move_down_out.tga        | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/move_forward_in.tga      | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/move_forward_out.tga     | Bin 0 -> 4140 bytes
 .../newview/skins/gemini/textures/move_left_in.tga | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/move_left_out.tga        | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/move_right_in.tga        | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/move_right_out.tga       | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/move_turn_left_in.tga    | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/move_turn_left_out.tga   | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/move_turn_right_in.tga   | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/move_turn_right_out.tga  | Bin 0 -> 4140 bytes
 .../newview/skins/gemini/textures/move_up_in.tga   | Bin 0 -> 4140 bytes
 .../newview/skins/gemini/textures/move_up_out.tga  | Bin 0 -> 4140 bytes
 .../newview/skins/gemini/textures/music_icon.tga   | Bin 0 -> 1068 bytes
 .../newview/skins/gemini/textures/mute_icon.tga    | Bin 0 -> 1042 bytes
 .../skins/gemini/textures/notify_box_icon.tga      | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/notify_caution_icon.tga  | Bin 0 -> 4140 bytes
 .../newview/skins/gemini/textures/notify_next.png  | Bin 0 -> 3103 bytes
 .../skins/gemini/textures/notify_tip_icon.tga      | Bin 0 -> 4140 bytes
 .../newview/skins/gemini/textures/object_cone.tga  | Bin 0 -> 3116 bytes
 .../skins/gemini/textures/object_cone_active.tga   | Bin 0 -> 3116 bytes
 .../newview/skins/gemini/textures/object_cube.tga  | Bin 0 -> 3116 bytes
 .../skins/gemini/textures/object_cube_active.tga   | Bin 0 -> 3116 bytes
 .../skins/gemini/textures/object_cylinder.tga      | Bin 0 -> 3116 bytes
 .../gemini/textures/object_cylinder_active.tga     | Bin 0 -> 3116 bytes
 .../newview/skins/gemini/textures/object_grass.tga | Bin 0 -> 3116 bytes
 .../skins/gemini/textures/object_grass_active.tga  | Bin 0 -> 3116 bytes
 .../skins/gemini/textures/object_hemi_cone.tga     | Bin 0 -> 3116 bytes
 .../gemini/textures/object_hemi_cone_active.tga    | Bin 0 -> 3116 bytes
 .../skins/gemini/textures/object_hemi_cylinder.tga | Bin 0 -> 3116 bytes
 .../textures/object_hemi_cylinder_active.tga       | Bin 0 -> 3116 bytes
 .../skins/gemini/textures/object_hemi_sphere.tga   | Bin 0 -> 3116 bytes
 .../gemini/textures/object_hemi_sphere_active.tga  | Bin 0 -> 3116 bytes
 .../newview/skins/gemini/textures/object_prism.tga | Bin 0 -> 3116 bytes
 .../skins/gemini/textures/object_prism_active.tga  | Bin 0 -> 3116 bytes
 .../skins/gemini/textures/object_pyramid.tga       | Bin 0 -> 3116 bytes
 .../gemini/textures/object_pyramid_active.tga      | Bin 0 -> 3116 bytes
 .../newview/skins/gemini/textures/object_ring.tga  | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/object_ring_active.tga   | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/object_sphere.tga        | Bin 0 -> 3116 bytes
 .../skins/gemini/textures/object_sphere_active.tga | Bin 0 -> 3116 bytes
 .../skins/gemini/textures/object_tetrahedron.tga   | Bin 0 -> 3116 bytes
 .../gemini/textures/object_tetrahedron_active.tga  | Bin 0 -> 3116 bytes
 .../newview/skins/gemini/textures/object_torus.tga | Bin 0 -> 3116 bytes
 .../skins/gemini/textures/object_torus_active.tga  | Bin 0 -> 3116 bytes
 .../newview/skins/gemini/textures/object_tree.tga  | Bin 0 -> 3116 bytes
 .../skins/gemini/textures/object_tree_active.tga   | Bin 0 -> 3116 bytes
 .../newview/skins/gemini/textures/object_tube.tga  | Bin 0 -> 3116 bytes
 .../skins/gemini/textures/object_tube_active.tga   | Bin 0 -> 3116 bytes
 .../skins/gemini/textures/payment_info_charter.tga | Bin 0 -> 1042 bytes
 .../skins/gemini/textures/payment_info_filled.tga  | Bin 0 -> 1042 bytes
 .../skins/gemini/textures/payment_info_used.tga    | Bin 0 -> 1042 bytes
 .../newview/skins/gemini/textures/preview.png      | Bin 0 -> 14108 bytes
 .../skins/gemini/textures/progress_fill.tga        | Bin 0 -> 5548 bytes
 .../skins/gemini/textures/progressbar_fill.tga     | Bin 0 -> 4244 bytes
 .../skins/gemini/textures/progressbar_track.tga    | Bin 0 -> 5084 bytes
 .../newview/skins/gemini/textures/propertyline.tga | Bin 0 -> 2092 bytes
 .../newview/skins/gemini/textures/ptt_lock_off.tga | Bin 0 -> 2085 bytes
 .../newview/skins/gemini/textures/ptt_lock_on.tga  | Bin 0 -> 2085 bytes
 .../skins/gemini/textures/radio_active_false.tga   | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/radio_active_true.tga    | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/radio_inactive_false.tga | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/radio_inactive_true.tga  | Bin 0 -> 1068 bytes
 .../textures/resize_handle_bottom_right_blue.tga   | Bin 0 -> 1068 bytes
 .../newview/skins/gemini/textures/restore.tga      | Bin 0 -> 276 bytes
 .../skins/gemini/textures/restore_inactive.tga     | Bin 0 -> 168 bytes
 .../skins/gemini/textures/restore_pressed.tga      | Bin 0 -> 341 bytes
 .../gemini/textures/scrollbutton_down_in_blue.tga  | Bin 0 -> 812 bytes
 .../gemini/textures/scrollbutton_down_out_blue.tga | Bin 0 -> 812 bytes
 .../gemini/textures/scrollbutton_left_in_blue.tga  | Bin 0 -> 812 bytes
 .../gemini/textures/scrollbutton_left_out_blue.tga | Bin 0 -> 812 bytes
 .../gemini/textures/scrollbutton_right_in_blue.tga | Bin 0 -> 812 bytes
 .../textures/scrollbutton_right_out_blue.tga       | Bin 0 -> 812 bytes
 .../gemini/textures/scrollbutton_up_in_blue.tga    | Bin 0 -> 812 bytes
 .../gemini/textures/scrollbutton_up_out_blue.tga   | Bin 0 -> 812 bytes
 .../skins/gemini/textures/slim_icon_16_viewer.tga  | Bin 0 -> 1032 bytes
 .../gemini/textures/sm_rounded_corners_simple.tga  | Bin 0 -> 812 bytes
 .../newview/skins/gemini/textures/smicon_warn.tga  | Bin 0 -> 1068 bytes
 .../newview/skins/gemini/textures/spacer24.tga     | Bin 0 -> 2348 bytes
 .../newview/skins/gemini/textures/spacer35.tga     | Bin 0 -> 3404 bytes
 .../skins/gemini/textures/spin_down_in_blue.tga    | Bin 0 -> 428 bytes
 .../skins/gemini/textures/spin_down_out_blue.tga   | Bin 0 -> 428 bytes
 .../skins/gemini/textures/spin_up_in_blue.tga      | Bin 0 -> 428 bytes
 .../skins/gemini/textures/spin_up_out_blue.tga     | Bin 0 -> 428 bytes
 .../skins/gemini/textures/square_btn_32x128.tga    | Bin 0 -> 12332 bytes
 .../gemini/textures/square_btn_selected_32x128.tga | Bin 0 -> 12332 bytes
 .../newview/skins/gemini/textures/startup_logo.j2c | Bin 0 -> 32379 bytes
 .../newview/skins/gemini/textures/status_busy.tga  | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/status_buy_currency.tga  | Bin 0 -> 4140 bytes
 .../textures/status_buy_currency_pressed.tga       | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/status_buy_land.tga      | Bin 0 -> 4140 bytes
 .../gemini/textures/status_buy_land_pressed.tga    | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/status_health.tga        | Bin 0 -> 2092 bytes
 .../newview/skins/gemini/textures/status_money.tga | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/status_no_build.tga      | Bin 0 -> 2066 bytes
 .../skins/gemini/textures/status_no_fly.tga        | Bin 0 -> 2092 bytes
 .../skins/gemini/textures/status_no_push.tga       | Bin 0 -> 2092 bytes
 .../skins/gemini/textures/status_no_scripts.tga    | Bin 0 -> 2092 bytes
 .../skins/gemini/textures/status_no_voice.tga      | Bin 0 -> 2092 bytes
 .../skins/gemini/textures/status_script_debug.tga  | Bin 0 -> 1068 bytes
 .../skins/gemini/textures/status_search.tga        | Bin 0 -> 812 bytes
 .../skins/gemini/textures/status_search_btn.png    | Bin 0 -> 3012 bytes
 .../gemini/textures/status_search_btn_pressed.png  | Bin 0 -> 3361 bytes
 .../newview/skins/gemini/textures/status_voice.tga | Bin 0 -> 2092 bytes
 .../gemini/textures/tab_background_darkpurple.tga  | Bin 0 -> 56 bytes
 .../gemini/textures/tab_background_lightgrey.tga   | Bin 0 -> 56 bytes
 .../gemini/textures/tab_background_purple.tga      | Bin 0 -> 56 bytes
 .../skins/gemini/textures/tab_bottom_blue.tga      | Bin 0 -> 16428 bytes
 .../gemini/textures/tab_bottom_selected_blue.tga   | Bin 0 -> 16428 bytes
 .../newview/skins/gemini/textures/tab_left.tga     | Bin 0 -> 16428 bytes
 .../skins/gemini/textures/tab_left_selected.tga    | Bin 0 -> 16428 bytes
 .../newview/skins/gemini/textures/tab_top_blue.tga | Bin 0 -> 16428 bytes
 .../gemini/textures/tab_top_selected_blue.tga      | Bin 0 -> 16428 bytes
 .../newview/skins/gemini/textures/tabarea.tga      | Bin 0 -> 1340 bytes
 .../skins/gemini/textures/tearoff_pressed.tga      | Bin 0 -> 513 bytes
 .../newview/skins/gemini/textures/tearoffbox.tga   | Bin 0 -> 408 bytes
 .../newview/skins/gemini/textures/textures.xml     | 382 ++++++++++++++++++++
 .../newview/skins/gemini/textures/tool_dozer.tga   | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/tool_dozer_active.tga    | Bin 0 -> 4140 bytes
 .../newview/skins/gemini/textures/tool_zoom.tga    | Bin 0 -> 4140 bytes
 .../skins/gemini/textures/tool_zoom_active.tga     | Bin 0 -> 4140 bytes
 .../newview/skins/gemini/textures/toolbar_bg.tga   | Bin 0 -> 308 bytes
 .../skins/gemini/textures/toolbar_btn_disabled.tga | Bin 0 -> 16428 bytes
 .../skins/gemini/textures/toolbar_btn_enabled.tga  | Bin 0 -> 16428 bytes
 .../skins/gemini/textures/toolbar_btn_selected.tga | Bin 0 -> 16428 bytes
 .../newview/skins/gemini/textures/toolbar_tab.tga  | Bin 0 -> 1416 bytes
 .../newview/skins/gemini/textures/up_arrow.png     | Bin 0 -> 2930 bytes
 .../newview/skins/gemini/textures/up_arrow.tga     | Bin 0 -> 1068 bytes
 .../newview/skins/gemini/textures/uv_test2.tga     | Bin 0 -> 1308 bytes
 .../indra/newview/skins/gemini/textures/white.tga  | Bin 0 -> 178 bytes
 .../0098b015-3daf-4cfe-a72f-915369ea97c2.tga       | Bin 0 -> 4140 bytes
 .../3c18c87e-5f50-14e2-e744-f44734aa365f.tga       | Bin 0 -> 1068 bytes
 .../7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga       | Bin 0 -> 4140 bytes
 .../7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga       | Bin 0 -> 1068 bytes
 .../9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga       | Bin 0 -> 1068 bytes
 .../skins/silver/textures/active_speakers.tga      | Bin 0 -> 2092 bytes
 .../skins/silver/textures/active_voice_tab.tga     | Bin 0 -> 556 bytes
 .../newview/skins/silver/textures/arrow_down.tga   | Bin 0 -> 1068 bytes
 .../newview/skins/silver/textures/arrow_left.tga   | Bin 0 -> 424 bytes
 .../newview/skins/silver/textures/arrow_right.tga  | Bin 0 -> 424 bytes
 .../newview/skins/silver/textures/arrow_up.tga     | Bin 0 -> 1068 bytes
 .../b4870163-6208-42a9-9801-93133bf9a6cd.tga       | Bin 0 -> 4140 bytes
 .../indra/newview/skins/silver/textures/black.tga  | Bin 0 -> 3116 bytes
 .../newview/skins/silver/textures/btn_chatbar.tga  | Bin 0 -> 6188 bytes
 .../skins/silver/textures/btn_chatbar_selected.tga | Bin 0 -> 6188 bytes
 .../skins/silver/textures/button_anim_pause.tga    | Bin 0 -> 1068 bytes
 .../silver/textures/button_anim_pause_selected.tga | Bin 0 -> 1068 bytes
 .../skins/silver/textures/button_anim_play.tga     | Bin 0 -> 1068 bytes
 .../silver/textures/button_anim_play_selected.tga  | Bin 0 -> 1068 bytes
 .../skins/silver/textures/button_anim_stop.tga     | Bin 0 -> 1068 bytes
 .../silver/textures/button_anim_stop_selected.tga  | Bin 0 -> 1068 bytes
 .../silver/textures/button_disabled_32x128.tga     | Bin 0 -> 12332 bytes
 .../silver/textures/button_enabled_32x128.tga      | Bin 0 -> 10284 bytes
 .../textures/button_enabled_selected_32x128.tga    | Bin 0 -> 10284 bytes
 .../c1e21504-f136-451d-b8e9-929037812f1d.tga       | Bin 0 -> 4140 bytes
 .../c63f124c-6340-4fbf-b59e-0869a44adb64.tga       | Bin 0 -> 4140 bytes
 .../ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga       | Bin 0 -> 4140 bytes
 .../silver/textures/checkbox_disabled_false.tga    | Bin 0 -> 1068 bytes
 .../silver/textures/checkbox_disabled_true.tga     | Bin 0 -> 1068 bytes
 .../silver/textures/checkbox_enabled_false.tga     | Bin 0 -> 1068 bytes
 .../silver/textures/checkbox_enabled_true.tga      | Bin 0 -> 1068 bytes
 .../skins/silver/textures/close_in_blue.tga        | Bin 0 -> 1068 bytes
 .../skins/silver/textures/close_inactive_blue.tga  | Bin 0 -> 1068 bytes
 .../newview/skins/silver/textures/closebox.tga     | Bin 0 -> 1068 bytes
 .../skins/silver/textures/combobox_arrow.tga       | Bin 0 -> 1068 bytes
 .../newview/skins/silver/textures/darkgray.tga     | Bin 0 -> 3116 bytes
 .../newview/skins/silver/textures/down_arrow.png   | Bin 0 -> 2866 bytes
 .../skins/silver/textures/eye_button_active.tga    | Bin 0 -> 4140 bytes
 .../skins/silver/textures/eye_button_inactive.tga  | Bin 0 -> 4140 bytes
 .../ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga       | Bin 0 -> 1068 bytes
 .../skins/silver/textures/ff_edit_mine_button.tga  | Bin 0 -> 1644 bytes
 .../silver/textures/ff_edit_theirs_button.tga      | Bin 0 -> 1644 bytes
 .../silver/textures/ff_online_status_button.tga    | Bin 0 -> 1644 bytes
 .../silver/textures/ff_visible_map_button.tga      | Bin 0 -> 1644 bytes
 .../silver/textures/ff_visible_online_button.tga   | Bin 0 -> 1644 bytes
 .../skins/silver/textures/flyout_btn_left.tga      | Bin 0 -> 12332 bytes
 .../silver/textures/flyout_btn_left_disabled.tga   | Bin 0 -> 10284 bytes
 .../silver/textures/flyout_btn_left_selected.tga   | Bin 0 -> 12332 bytes
 .../skins/silver/textures/flyout_btn_right.tga     | Bin 0 -> 2348 bytes
 .../silver/textures/flyout_btn_right_disabled.tga  | Bin 0 -> 10284 bytes
 .../silver/textures/flyout_btn_right_selected.tga  | Bin 0 -> 2348 bytes
 .../newview/skins/silver/textures/icn_chatbar.tga  | Bin 0 -> 2348 bytes
 .../skins/silver/textures/icn_label_media.tga      | Bin 0 -> 996 bytes
 .../skins/silver/textures/icn_label_music.tga      | Bin 0 -> 828 bytes
 .../skins/silver/textures/icn_label_web.tga        | Bin 0 -> 828 bytes
 .../skins/silver/textures/icn_media-pause.tga      | Bin 0 -> 2092 bytes
 .../skins/silver/textures/icn_media-play.tga       | Bin 0 -> 2092 bytes
 .../skins/silver/textures/icn_media_movie.tga      | Bin 0 -> 996 bytes
 .../skins/silver/textures/icn_media_web.tga        | Bin 0 -> 996 bytes
 .../skins/silver/textures/icn_music-pause.tga      | Bin 0 -> 2092 bytes
 .../skins/silver/textures/icn_music-play.tga       | Bin 0 -> 2092 bytes
 .../newview/skins/silver/textures/icn_pause.tga    | Bin 0 -> 444 bytes
 .../newview/skins/silver/textures/icn_play.tga     | Bin 0 -> 444 bytes
 .../silver/textures/icn_rounded-text-field.tga     | Bin 0 -> 16428 bytes
 .../silver/textures/icn_slide-groove_dark.tga      | Bin 0 -> 1068 bytes
 .../skins/silver/textures/icn_slide-highlight.tga  | Bin 0 -> 1068 bytes
 .../skins/silver/textures/icn_slide-thumb_dark.tga | Bin 0 -> 1068 bytes
 .../silver/textures/icn_speaker-muted_dark.tga     | Bin 0 -> 1068 bytes
 .../skins/silver/textures/icn_speaker_dark.tga     | Bin 0 -> 1068 bytes
 .../newview/skins/silver/textures/icn_stop.tga     | Bin 0 -> 444 bytes
 .../skins/silver/textures/icn_toolbar_build.tga    | Bin 0 -> 2348 bytes
 .../skins/silver/textures/icn_toolbar_fly.tga      | Bin 0 -> 2348 bytes
 .../silver/textures/icn_toolbar_inventory.tga      | Bin 0 -> 2348 bytes
 .../skins/silver/textures/icn_toolbar_map.tga      | Bin 0 -> 2348 bytes
 .../skins/silver/textures/icn_toolbar_minimap.tga  | Bin 0 -> 2348 bytes
 .../skins/silver/textures/icn_toolbar_search.tga   | Bin 0 -> 2348 bytes
 .../skins/silver/textures/icn_toolbar_snapshot.tga | Bin 0 -> 2348 bytes
 .../skins/silver/textures/icn_voice-call-end.tga   | Bin 0 -> 1068 bytes
 .../skins/silver/textures/icn_voice-call-start.tga | Bin 0 -> 1068 bytes
 .../skins/silver/textures/icn_voice-groupfocus.tga | Bin 0 -> 1068 bytes
 .../skins/silver/textures/icn_voice-localchat.tga  | Bin 0 -> 1068 bytes
 .../skins/silver/textures/icn_voice-pvtfocus.tga   | Bin 0 -> 1068 bytes
 .../skins/silver/textures/icn_voice_ptt-off.tga    | Bin 0 -> 828 bytes
 .../silver/textures/icn_voice_ptt-on-lvl1.tga      | Bin 0 -> 828 bytes
 .../silver/textures/icn_voice_ptt-on-lvl2.tga      | Bin 0 -> 828 bytes
 .../silver/textures/icn_voice_ptt-on-lvl3.tga      | Bin 0 -> 828 bytes
 .../skins/silver/textures/icn_voice_ptt-on.tga     | Bin 0 -> 828 bytes
 .../newview/skins/silver/textures/icon_auction.tga | Bin 0 -> 1068 bytes
 .../skins/silver/textures/icon_avatar_offline.tga  | Bin 0 -> 1068 bytes
 .../skins/silver/textures/icon_avatar_online.tga   | Bin 0 -> 1068 bytes
 .../skins/silver/textures/icon_day_cycle.tga       | Bin 0 -> 24594 bytes
 .../newview/skins/silver/textures/icon_event.tga   | Bin 0 -> 1068 bytes
 .../skins/silver/textures/icon_event_mature.tga    | Bin 0 -> 1068 bytes
 .../skins/silver/textures/icon_for_sale.tga        | Bin 0 -> 1068 bytes
 .../newview/skins/silver/textures/icon_group.tga   | Bin 0 -> 1068 bytes
 .../skins/silver/textures/icon_groupnotice.tga     | Bin 0 -> 16428 bytes
 .../silver/textures/icon_groupnoticeinventory.tga  | Bin 0 -> 16428 bytes
 .../newview/skins/silver/textures/icon_lock.tga    | Bin 0 -> 1068 bytes
 .../skins/silver/textures/icon_top_pick.tga        | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_folder_animation.tga | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_folder_bodypart.tga  | Bin 0 -> 1068 bytes
 .../silver/textures/inv_folder_callingcard.tga     | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_folder_clothing.tga  | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_folder_gesture.tga   | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_folder_landmark.tga  | Bin 0 -> 1068 bytes
 .../silver/textures/inv_folder_lostandfound.tga    | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_folder_notecard.tga  | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_folder_object.tga    | Bin 0 -> 1068 bytes
 .../silver/textures/inv_folder_plain_closed.tga    | Bin 0 -> 1068 bytes
 .../silver/textures/inv_folder_plain_open.tga      | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_folder_script.tga    | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_folder_snapshot.tga  | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_folder_sound.tga     | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_folder_texture.tga   | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_folder_trash.tga     | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_item_animation.tga   | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_item_attach.tga      | Bin 0 -> 1068 bytes
 .../textures/inv_item_callingcard_offline.tga      | Bin 0 -> 1068 bytes
 .../textures/inv_item_callingcard_online.tga       | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_item_clothing.tga    | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_item_eyes.tga        | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_item_gesture.tga     | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_item_gloves.tga      | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_item_hair.tga        | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_item_jacket.tga      | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_item_landmark.tga    | Bin 0 -> 1068 bytes
 .../silver/textures/inv_item_landmark_visited.tga  | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_item_notecard.tga    | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_item_object.tga      | Bin 0 -> 1068 bytes
 .../silver/textures/inv_item_object_multi.tga      | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_item_pants.tga       | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_item_script.tga      | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_item_shape.tga       | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_item_shirt.tga       | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_item_shoes.tga       | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_item_skin.tga        | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_item_skirt.tga       | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_item_snapshot.tga    | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_item_socks.tga       | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_item_sound.tga       | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_item_texture.tga     | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_item_underpants.tga  | Bin 0 -> 1068 bytes
 .../skins/silver/textures/inv_item_undershirt.tga  | Bin 0 -> 1068 bytes
 .../newview/skins/silver/textures/lightgray.tga    | Bin 0 -> 3116 bytes
 .../skins/silver/textures/map_avatar_16.tga        | Bin 0 -> 1068 bytes
 .../skins/silver/textures/map_avatar_you_8.tga     | Bin 0 -> 300 bytes
 .../newview/skins/silver/textures/map_event.tga    | Bin 0 -> 1068 bytes
 .../skins/silver/textures/map_event_adult.tga      | Bin 0 -> 1006 bytes
 .../skins/silver/textures/map_event_mature.tga     | Bin 0 -> 1068 bytes
 .../newview/skins/silver/textures/map_home.tga     | Bin 0 -> 1068 bytes
 .../newview/skins/silver/textures/map_infohub.tga  | Bin 0 -> 1068 bytes
 .../newview/skins/silver/textures/map_telehub.tga  | Bin 0 -> 1068 bytes
 .../newview/skins/silver/textures/minimize.tga     | Bin 0 -> 1068 bytes
 .../skins/silver/textures/minimize_inactive.tga    | Bin 0 -> 1068 bytes
 .../skins/silver/textures/minimize_pressed.tga     | Bin 0 -> 1068 bytes
 .../newview/skins/silver/textures/notify_next.png  | Bin 0 -> 3306 bytes
 .../newview/skins/silver/textures/object_cone.tga  | Bin 0 -> 4140 bytes
 .../skins/silver/textures/object_cone_active.tga   | Bin 0 -> 4140 bytes
 .../newview/skins/silver/textures/object_cube.tga  | Bin 0 -> 4140 bytes
 .../skins/silver/textures/object_cube_active.tga   | Bin 0 -> 4140 bytes
 .../skins/silver/textures/object_cylinder.tga      | Bin 0 -> 4140 bytes
 .../silver/textures/object_cylinder_active.tga     | Bin 0 -> 4140 bytes
 .../newview/skins/silver/textures/object_grass.tga | Bin 0 -> 4140 bytes
 .../skins/silver/textures/object_grass_active.tga  | Bin 0 -> 4140 bytes
 .../skins/silver/textures/object_hemi_cone.tga     | Bin 0 -> 4140 bytes
 .../silver/textures/object_hemi_cone_active.tga    | Bin 0 -> 4140 bytes
 .../skins/silver/textures/object_hemi_cylinder.tga | Bin 0 -> 4140 bytes
 .../textures/object_hemi_cylinder_active.tga       | Bin 0 -> 4140 bytes
 .../skins/silver/textures/object_hemi_sphere.tga   | Bin 0 -> 4140 bytes
 .../silver/textures/object_hemi_sphere_active.tga  | Bin 0 -> 4140 bytes
 .../newview/skins/silver/textures/object_prism.tga | Bin 0 -> 4140 bytes
 .../skins/silver/textures/object_prism_active.tga  | Bin 0 -> 4140 bytes
 .../skins/silver/textures/object_pyramid.tga       | Bin 0 -> 4140 bytes
 .../silver/textures/object_pyramid_active.tga      | Bin 0 -> 4140 bytes
 .../newview/skins/silver/textures/object_ring.tga  | Bin 0 -> 4140 bytes
 .../skins/silver/textures/object_ring_active.tga   | Bin 0 -> 4140 bytes
 .../skins/silver/textures/object_sphere.tga        | Bin 0 -> 4140 bytes
 .../skins/silver/textures/object_sphere_active.tga | Bin 0 -> 4140 bytes
 .../skins/silver/textures/object_tetrahedron.tga   | Bin 0 -> 4140 bytes
 .../silver/textures/object_tetrahedron_active.tga  | Bin 0 -> 4140 bytes
 .../newview/skins/silver/textures/object_torus.tga | Bin 0 -> 4140 bytes
 .../skins/silver/textures/object_torus_active.tga  | Bin 0 -> 4140 bytes
 .../newview/skins/silver/textures/object_tree.tga  | Bin 0 -> 4140 bytes
 .../skins/silver/textures/object_tree_active.tga   | Bin 0 -> 4140 bytes
 .../newview/skins/silver/textures/object_tube.tga  | Bin 0 -> 4140 bytes
 .../skins/silver/textures/object_tube_active.tga   | Bin 0 -> 4140 bytes
 .../skins/silver/textures/progressbar_fill.tga     | Bin 0 -> 4244 bytes
 .../skins/silver/textures/progressbar_track.tga    | Bin 0 -> 5084 bytes
 .../newview/skins/silver/textures/ptt_lock_off.tga | Bin 0 -> 1068 bytes
 .../newview/skins/silver/textures/ptt_lock_on.tga  | Bin 0 -> 1068 bytes
 .../skins/silver/textures/radio_active_false.tga   | Bin 0 -> 1068 bytes
 .../skins/silver/textures/radio_active_true.tga    | Bin 0 -> 1068 bytes
 .../skins/silver/textures/radio_inactive_false.tga | Bin 0 -> 1068 bytes
 .../skins/silver/textures/radio_inactive_true.tga  | Bin 0 -> 1068 bytes
 .../textures/resize_handle_bottom_right_blue.tga   | Bin 0 -> 1068 bytes
 .../newview/skins/silver/textures/restore.tga      | Bin 0 -> 1068 bytes
 .../skins/silver/textures/restore_inactive.tga     | Bin 0 -> 1068 bytes
 .../skins/silver/textures/restore_pressed.tga      | Bin 0 -> 1068 bytes
 .../skins/silver/textures/rounded_square.tga       | Bin 0 -> 16428 bytes
 .../skins/silver/textures/rounded_square_soft.tga  | Bin 0 -> 16428 bytes
 .../silver/textures/scrollbutton_down_in_blue.tga  | Bin 0 -> 1068 bytes
 .../silver/textures/scrollbutton_down_out_blue.tga | Bin 0 -> 1068 bytes
 .../silver/textures/scrollbutton_left_in_blue.tga  | Bin 0 -> 1068 bytes
 .../silver/textures/scrollbutton_left_out_blue.tga | Bin 0 -> 1068 bytes
 .../silver/textures/scrollbutton_right_in_blue.tga | Bin 0 -> 1068 bytes
 .../textures/scrollbutton_right_out_blue.tga       | Bin 0 -> 1068 bytes
 .../silver/textures/scrollbutton_up_in_blue.tga    | Bin 0 -> 1068 bytes
 .../silver/textures/scrollbutton_up_out_blue.tga   | Bin 0 -> 1068 bytes
 .../silver/textures/sm_rounded_corners_simple.tga  | Bin 0 -> 1068 bytes
 .../skins/silver/textures/spin_down_in_blue.tga    | Bin 0 -> 556 bytes
 .../skins/silver/textures/spin_down_out_blue.tga   | Bin 0 -> 556 bytes
 .../skins/silver/textures/spin_up_in_blue.tga      | Bin 0 -> 556 bytes
 .../skins/silver/textures/spin_up_out_blue.tga     | Bin 0 -> 556 bytes
 .../skins/silver/textures/square_btn_32x128.tga    | Bin 0 -> 10284 bytes
 .../silver/textures/square_btn_selected_32x128.tga | Bin 0 -> 10284 bytes
 .../newview/skins/silver/textures/startup_logo.j2c | Bin 0 -> 12629 bytes
 .../skins/silver/textures/status_buy_currency.tga  | Bin 0 -> 1068 bytes
 .../textures/status_buy_currency_pressed.tga       | Bin 0 -> 1068 bytes
 .../skins/silver/textures/status_buy_land.tga      | Bin 0 -> 1068 bytes
 .../silver/textures/status_buy_land_pressed.tga    | Bin 0 -> 1068 bytes
 .../skins/silver/textures/status_health.tga        | Bin 0 -> 2092 bytes
 .../skins/silver/textures/status_no_build.tga      | Bin 0 -> 2092 bytes
 .../skins/silver/textures/status_no_fly.tga        | Bin 0 -> 2092 bytes
 .../skins/silver/textures/status_no_push.tga       | Bin 0 -> 2092 bytes
 .../skins/silver/textures/status_no_scripts.tga    | Bin 0 -> 2092 bytes
 .../skins/silver/textures/status_no_voice.tga      | Bin 0 -> 2092 bytes
 .../skins/silver/textures/status_search.tga        | Bin 0 -> 620 bytes
 .../newview/skins/silver/textures/status_voice.tga | Bin 0 -> 2092 bytes
 .../skins/silver/textures/tab_bottom_blue.tga      | Bin 0 -> 8748 bytes
 .../silver/textures/tab_bottom_selected_blue.tga   | Bin 0 -> 8748 bytes
 .../newview/skins/silver/textures/tab_left.tga     | Bin 0 -> 10284 bytes
 .../skins/silver/textures/tab_left_selected.tga    | Bin 0 -> 10284 bytes
 .../newview/skins/silver/textures/tab_top_blue.tga | Bin 0 -> 8748 bytes
 .../silver/textures/tab_top_selected_blue.tga      | Bin 0 -> 8748 bytes
 .../skins/silver/textures/tearoff_pressed.tga      | Bin 0 -> 1068 bytes
 .../newview/skins/silver/textures/tearoffbox.tga   | Bin 0 -> 1068 bytes
 .../newview/skins/silver/textures/tool_dozer.tga   | Bin 0 -> 4140 bytes
 .../skins/silver/textures/tool_dozer_active.tga    | Bin 0 -> 4140 bytes
 .../newview/skins/silver/textures/tool_zoom.tga    | Bin 0 -> 4140 bytes
 .../skins/silver/textures/tool_zoom_active.tga     | Bin 0 -> 4140 bytes
 .../newview/skins/silver/textures/toolbar_bg.tga   | Bin 0 -> 25564 bytes
 .../skins/silver/textures/toolbar_btn_disabled.tga | Bin 0 -> 12332 bytes
 .../skins/silver/textures/toolbar_btn_enabled.tga  | Bin 0 -> 12332 bytes
 .../skins/silver/textures/toolbar_btn_selected.tga | Bin 0 -> 12332 bytes
 .../newview/skins/silver/textures/toolbar_tab.tga  | Bin 0 -> 25564 bytes
 .../newview/skins/silver/textures/up_arrow.png     | Bin 0 -> 2852 bytes
 .../indra/newview/skins/silver/textures/white.tga  | Bin 0 -> 3116 bytes
 linden/indra/newview/viewer.icns                   | Bin 0 -> 151593 bytes
 linden/install.xml                                 |  59 ----
 1509 files changed, 6391 insertions(+), 99 deletions(-)
 create mode 100644 linden/LICENSES/LICENSE-logos.txt
 delete mode 100644 linden/indra/cmake/ViewerArtwork.cmake
 create mode 100644 linden/indra/newview/app_settings/static_data.db2
 create mode 100644 linden/indra/newview/app_settings/static_index.db2
 create mode 100644 linden/indra/newview/app_settings/windlight/clouds2.tga
 create mode 100644 linden/indra/newview/app_settings/windlight/days/Default.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/postprocesseffects.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/A%2D12AM.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/A%2D12PM.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/A%2D3AM.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/A%2D3PM.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/A%2D6AM.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/A%2D6PM.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/A%2D9AM.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/A%2D9PM.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/Barcelona.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/Blizzard.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/Blue%20Midday.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/Coastal%20Afternoon.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/Coastal%20Sunset.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/Default.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/Desert%20Sunset.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/Fine%20Day.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/Fluffy%20Big%20Clouds.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/Foggy.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/Funky%20Funky%20Funky.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/Funky%20Funky.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/Gelatto.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/Ghost.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/Incongruent%20Truths.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/Midday%201.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/Midday%202.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/Midday%203.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/Midday%204.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/Night.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/Pirate.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/Purple.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/Sailor%27s%20Delight.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/skies/Sheer%20Surreality.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/water/Default.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/water/Glassy.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/water/Murky.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/water/Pond.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/water/SNAKE%21%21%21.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/water/Second%20Plague.xml
 create mode 100644 linden/indra/newview/app_settings/windlight/water/Valdez.xml
 create mode 100644 linden/indra/newview/cursors_mac/UI_CURSOR_ARROW.tif
 create mode 100644 linden/indra/newview/cursors_mac/UI_CURSOR_ARROWDRAG.tif
 create mode 100644 linden/indra/newview/cursors_mac/UI_CURSOR_ARROWLOCKED.tif
 create mode 100644 linden/indra/newview/cursors_mac/UI_CURSOR_GRABLOCKED.tif
 create mode 100644 linden/indra/newview/cursors_mac/UI_CURSOR_NO.tif
 create mode 100644 linden/indra/newview/cursors_mac/UI_CURSOR_NOLOCKED.tif
 create mode 100644 linden/indra/newview/cursors_mac/UI_CURSOR_SIZENESW.tif
 create mode 100644 linden/indra/newview/cursors_mac/UI_CURSOR_SIZENS.tif
 create mode 100644 linden/indra/newview/cursors_mac/UI_CURSOR_SIZENWSE.tif
 create mode 100644 linden/indra/newview/cursors_mac/UI_CURSOR_SIZEWE.tif
 create mode 100644 linden/indra/newview/cursors_mac/UI_CURSOR_TOOLBUY.tif
 create mode 100644 linden/indra/newview/cursors_mac/UI_CURSOR_TOOLCAMERA.tif
 create mode 100644 linden/indra/newview/cursors_mac/UI_CURSOR_TOOLCREATE.tif
 create mode 100644 linden/indra/newview/cursors_mac/UI_CURSOR_TOOLFOCUS.tif
 create mode 100644 linden/indra/newview/cursors_mac/UI_CURSOR_TOOLGRAB.tif
 create mode 100644 linden/indra/newview/cursors_mac/UI_CURSOR_TOOLLAND.tif
 create mode 100644 linden/indra/newview/cursors_mac/UI_CURSOR_TOOLMEDIAOPEN.tif
 create mode 100644 linden/indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN.tif
 create mode 100644 linden/indra/newview/cursors_mac/UI_CURSOR_TOOLPAN.tif
 create mode 100644 linden/indra/newview/cursors_mac/UI_CURSOR_TOOLPAUSE.tif
 create mode 100644 linden/indra/newview/cursors_mac/UI_CURSOR_TOOLPAY.tif
 create mode 100644 linden/indra/newview/cursors_mac/UI_CURSOR_TOOLPICKOBJECT3.tif
 create mode 100644 linden/indra/newview/cursors_mac/UI_CURSOR_TOOLPLAY.tif
 create mode 100644 linden/indra/newview/cursors_mac/UI_CURSOR_TOOLROTATE.tif
 create mode 100644 linden/indra/newview/cursors_mac/UI_CURSOR_TOOLSCALE.tif
 create mode 100644 linden/indra/newview/cursors_mac/UI_CURSOR_TOOLSIT.tif
 create mode 100644 linden/indra/newview/cursors_mac/UI_CURSOR_TOOLTRANSLATE.tif
 create mode 100644 linden/indra/newview/cursors_mac/UI_CURSOR_TOOLZOOMIN.tif
 create mode 100644 linden/indra/newview/cursors_mac/UI_CURSOR_WORKING.tif
 create mode 100644 linden/indra/newview/fonts/DejaVu-License.txt
 create mode 100644 linden/indra/newview/fonts/DejaVuSansCondensed-Bold.ttf
 create mode 100644 linden/indra/newview/fonts/DejaVuSansCondensed-BoldOblique.ttf
 create mode 100644 linden/indra/newview/fonts/DejaVuSansCondensed-Oblique.ttf
 create mode 100644 linden/indra/newview/fonts/DejaVuSansCondensed.ttf
 create mode 100644 linden/indra/newview/fonts/Delicious-Bold.otf
 create mode 100644 linden/indra/newview/fonts/Delicious-BoldItalic.otf
 create mode 100644 linden/indra/newview/fonts/Delicious-Italic.otf
 create mode 100644 linden/indra/newview/fonts/Delicious-License.txt
 create mode 100644 linden/indra/newview/fonts/Delicious-Roman.otf
 create mode 100644 linden/indra/newview/fonts/Droid-License.txt
 create mode 100644 linden/indra/newview/fonts/DroidSans-Bold.ttf
 create mode 100644 linden/indra/newview/fonts/DroidSans.ttf
 create mode 100755 linden/indra/newview/installers/windows/vcredist_x86_VS2005.exe
 create mode 100644 linden/indra/newview/res-sdl/arrow.BMP
 create mode 100644 linden/indra/newview/res-sdl/arrowcop.BMP
 create mode 100644 linden/indra/newview/res-sdl/arrowcopmulti.BMP
 create mode 100644 linden/indra/newview/res-sdl/arrowdrag.BMP
 create mode 100644 linden/indra/newview/res-sdl/circleandline.BMP
 create mode 100644 linden/indra/newview/res-sdl/cross.BMP
 create mode 100644 linden/indra/newview/res-sdl/hand.BMP
 create mode 100644 linden/indra/newview/res-sdl/ibeam.BMP
 create mode 100644 linden/indra/newview/res-sdl/imprudence_icon.BMP
 create mode 100644 linden/indra/newview/res-sdl/llarrow.BMP
 create mode 100644 linden/indra/newview/res-sdl/llarrowdrag.BMP
 create mode 100644 linden/indra/newview/res-sdl/llarrowdragmulti.BMP
 create mode 100644 linden/indra/newview/res-sdl/llarrowlocked.BMP
 create mode 100644 linden/indra/newview/res-sdl/llgrablocked.BMP
 create mode 100644 linden/indra/newview/res-sdl/llno.BMP
 create mode 100644 linden/indra/newview/res-sdl/llnolocked.BMP
 create mode 100644 linden/indra/newview/res-sdl/lltoolcamera.BMP
 create mode 100644 linden/indra/newview/res-sdl/lltoolcreate.BMP
 create mode 100644 linden/indra/newview/res-sdl/lltoolfocus.BMP
 create mode 100644 linden/indra/newview/res-sdl/lltoolgrab.BMP
 create mode 100644 linden/indra/newview/res-sdl/lltoolland.BMP
 create mode 100644 linden/indra/newview/res-sdl/lltoolpan.BMP
 create mode 100644 linden/indra/newview/res-sdl/lltoolpipette.BMP
 create mode 100644 linden/indra/newview/res-sdl/lltoolrotate.BMP
 create mode 100644 linden/indra/newview/res-sdl/lltoolscale.BMP
 create mode 100644 linden/indra/newview/res-sdl/lltooltranslate.BMP
 create mode 100644 linden/indra/newview/res-sdl/lltoolzoomin.BMP
 create mode 100644 linden/indra/newview/res-sdl/lltoolzoomout.BMP
 create mode 100644 linden/indra/newview/res-sdl/sizenesw.BMP
 create mode 100644 linden/indra/newview/res-sdl/sizens.BMP
 create mode 100644 linden/indra/newview/res-sdl/sizenwse.BMP
 create mode 100644 linden/indra/newview/res-sdl/sizewe.BMP
 create mode 100644 linden/indra/newview/res-sdl/toolbuy.BMP
 create mode 100644 linden/indra/newview/res-sdl/toolmediaopen.BMP
 create mode 100644 linden/indra/newview/res-sdl/toolopen.BMP
 create mode 100644 linden/indra/newview/res-sdl/toolpause.BMP
 create mode 100644 linden/indra/newview/res-sdl/toolpay.BMP
 create mode 100644 linden/indra/newview/res-sdl/toolpickobject.BMP
 create mode 100644 linden/indra/newview/res-sdl/toolpickobject2.BMP
 create mode 100644 linden/indra/newview/res-sdl/toolpickobject3.BMP
 create mode 100644 linden/indra/newview/res-sdl/toolplay.BMP
 create mode 100644 linden/indra/newview/res-sdl/toolsit.BMP
 create mode 100644 linden/indra/newview/res-sdl/wait.BMP
 create mode 100644 linden/indra/newview/res-sdl/working.BMP
 create mode 100644 linden/indra/newview/res/arrow.cur
 create mode 100644 linden/indra/newview/res/arrowcop.cur
 create mode 100644 linden/indra/newview/res/arrowcopmulti.cur
 create mode 100644 linden/indra/newview/res/arrowdrag.cur
 create mode 100644 linden/indra/newview/res/circleandline.cur
 create mode 100644 linden/indra/newview/res/imp_icon.ico
 create mode 100644 linden/indra/newview/res/imprudence_icon.png
 create mode 100644 linden/indra/newview/res/llarrow.cur
 create mode 100644 linden/indra/newview/res/llarrowdrag.cur
 create mode 100644 linden/indra/newview/res/llarrowdragmulti.cur
 create mode 100644 linden/indra/newview/res/llarrowlocked.cur
 create mode 100644 linden/indra/newview/res/llgrablocked.cur
 create mode 100644 linden/indra/newview/res/llno.cur
 create mode 100644 linden/indra/newview/res/llnolocked.cur
 create mode 100644 linden/indra/newview/res/lltoolcamera.cur
 create mode 100644 linden/indra/newview/res/lltoolcreate.cur
 create mode 100644 linden/indra/newview/res/lltoolfocus.cur
 create mode 100644 linden/indra/newview/res/lltoolgrab.cur
 create mode 100644 linden/indra/newview/res/lltoolland.cur
 create mode 100644 linden/indra/newview/res/lltoolpan.cur
 create mode 100644 linden/indra/newview/res/lltoolpipette.cur
 create mode 100644 linden/indra/newview/res/lltoolrotate.cur
 create mode 100644 linden/indra/newview/res/lltoolscale.cur
 create mode 100644 linden/indra/newview/res/lltooltranslate.cur
 create mode 100644 linden/indra/newview/res/lltoolzoomin.cur
 create mode 100644 linden/indra/newview/res/lltoolzoomout.cur
 create mode 100644 linden/indra/newview/res/toolbuy.cur
 create mode 100644 linden/indra/newview/res/toolmediaopen.cur
 create mode 100644 linden/indra/newview/res/toolopen.cur
 create mode 100644 linden/indra/newview/res/toolpause.cur
 create mode 100644 linden/indra/newview/res/toolpay.cur
 create mode 100644 linden/indra/newview/res/toolpickobject.cur
 create mode 100644 linden/indra/newview/res/toolpickobject2.cur
 create mode 100644 linden/indra/newview/res/toolpickobject3.cur
 create mode 100644 linden/indra/newview/res/toolpipette.cur
 create mode 100644 linden/indra/newview/res/toolplay.cur
 create mode 100644 linden/indra/newview/res/toolsit.cur
 create mode 100644 linden/indra/newview/skins/dark/colors_base.xml
 create mode 100644 linden/indra/newview/skins/dark/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/5748decc-f629-461c-9a36-a35a221fe21f.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/89e9fc7c-0b16-457d-be4f-136270759c4d.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/active_speakers.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/active_voice_tab.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/arrow_down.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/arrow_up.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/black.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/btn_chatbar.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/btn_chatbar_selected.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/button_anim_pause.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/button_anim_pause_selected.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/button_anim_play.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/button_anim_play_selected.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/button_anim_stop.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/button_anim_stop_selected.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/button_disabled_32x128.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/button_enabled_32x128.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/button_enabled_selected_32x128.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/cam_rotate_in.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/cam_rotate_out.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/cam_tracking_in.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/cam_tracking_out.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/cam_zoom_minus_in.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/cam_zoom_out.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/cam_zoom_plus_in.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/checkbox_disabled_false.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/checkbox_disabled_true.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/checkbox_enabled_false.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/checkbox_enabled_true.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/circle.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/close_in_blue.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/close_inactive.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/close_inactive_blue.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/closebox.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/combobox_arrow.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/darkgray.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/eye_button_active.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/eye_button_inactive.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/ff_edit_mine_button.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/ff_edit_theirs_button.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/ff_online_status_button.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/ff_visible_map_button.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/ff_visible_online_button.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/flyout_btn_left.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/flyout_btn_left_disabled.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/flyout_btn_left_selected.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/flyout_btn_right.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/flyout_btn_right_disabled.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/flyout_btn_right_selected.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/folder_arrow.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_active-speakers-dot-lvl0.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_active-speakers-dot-lvl1.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_active-speakers-dot-lvl2.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_active-speakers-typing1.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_active-speakers-typing2.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_active-speakers-typing3.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_chatbar.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_clear_lineeditor.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_media-pause_active.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_media-pause_disabled.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_media-pause_enabled.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_media-play_enabled.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_media-stop_enabled.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_media.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_music.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_scrollbar.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_scrollbar_bg.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_scrollbar_thumb.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_slide-groove_dark.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_slide-highlight.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_slide-thumb_dark.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_speaker-muted_dark.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_speaker_dark.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_toolbar_build.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_toolbar_fly.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_toolbar_inventory.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_toolbar_map.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_toolbar_minimap.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_toolbar_radar.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_toolbar_search.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icn_toolbar_snapshot.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/icon_top_pick.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/lightgray.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/minimize.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/minimize_inactive.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/minimize_pressed.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/move_backward_in.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/move_backward_out.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/move_down_in.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/move_down_out.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/move_forward_in.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/move_forward_out.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/move_left_in.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/move_left_out.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/move_right_in.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/move_right_out.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/move_turn_left_in.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/move_turn_left_out.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/move_turn_right_in.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/move_turn_right_out.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/move_up_in.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/move_up_out.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/mute_icon.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/notify_next.png
 create mode 100644 linden/indra/newview/skins/dark/textures/preview.png
 create mode 100644 linden/indra/newview/skins/dark/textures/progress_fill.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/progressbar_fill.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/progressbar_track.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/ptt_lock_off.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/ptt_lock_on.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/radio_active_false.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/radio_active_true.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/radio_inactive_false.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/radio_inactive_true.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/resize_handle_bottom_right_blue.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/restore.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/restore_inactive.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/restore_pressed.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/rounded_square.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/rounded_square_soft.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/scrollbutton_down_in_blue.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/scrollbutton_down_out_blue.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/scrollbutton_left_in_blue.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/scrollbutton_left_out_blue.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/scrollbutton_right_in_blue.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/scrollbutton_right_out_blue.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/scrollbutton_up_in_blue.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/spacer24.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/spacer35.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/spin_down_in_blue.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/spin_down_out_blue.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/spin_up_in_blue.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/spin_up_out_blue.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/square_btn_32x128.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/square_btn_selected_32x128.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/status_buy_currency.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/status_buy_currency_pressed.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/status_buy_land.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/tab_bottom_blue.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/tab_bottom_selected_blue.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/tab_left.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/tab_left_selected.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/tab_top_blue.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/tab_top_selected_blue.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/tabarea.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/textures.xml
 create mode 100644 linden/indra/newview/skins/dark/textures/tool_dozer.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/tool_dozer_active.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/tool_zoom.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/tool_zoom_active.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/toolbar_btn_disabled.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/toolbar_btn_enabled.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/toolbar_btn_selected.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/toolbar_tab.tga
 create mode 100644 linden/indra/newview/skins/dark/textures/white.tga
 create mode 100644 linden/indra/newview/skins/default/html/btn_purplepill_bg.png
 create mode 100644 linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png
 create mode 100644 linden/indra/newview/skins/default/html/unabletoconnect.png
 create mode 100644 linden/indra/newview/skins/default/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga
 create mode 100644 linden/indra/newview/skins/default/textures/0187babf-6c0d-5891-ebed-4ecab1426683.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/041ee5a0-cb6a-9ac5-6e49-41e9320507d5.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/0498c309-5306-43cd-82a2-ae31d096cdef.tga
 create mode 100644 linden/indra/newview/skins/default/textures/058c75c0-a0d5-f2f8-43f3-e9699a89c2fc.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/073c9723-540c-5449-cdd4-0e87fdc159e3.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/07d0ea4c-af0c-aad1-dbbf-c24020ff2b80.tga
 create mode 100644 linden/indra/newview/skins/default/textures/09a324a8-acc1-d9cd-2cbd-7465d90d3a98.tga
 create mode 100644 linden/indra/newview/skins/default/textures/0a94b42f-ec84-5f9c-14b7-1ef8505ceead.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/0b444c3a-75c2-4891-9d1e-ac35c8d13d62.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/0bc58228-74a0-7e83-89bc-5c23464bcec5.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/0e82d24e-ed45-41bc-b090-94c97c1caab2.tga
 create mode 100644 linden/indra/newview/skins/default/textures/0ff70ead-4562-45f9-9e8a-52b1a3286868.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/10d2a01a-0818-84b9-4b96-c2eb63256519.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/111b39de-8928-4690-b7b2-e17d5c960277.tga
 create mode 100644 linden/indra/newview/skins/default/textures/11ee27f5-43c0-414e-afd5-d7f5688c351f.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/13dd1d96-6836-461e-8a4c-36003065c59b.tga
 create mode 100644 linden/indra/newview/skins/default/textures/179cdabd-398a-9b6b-1391-4dc333ba321f.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/18fb888b-e8f1-dce7-7da7-321d651ea6b0.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/19c76b49-c5f4-aeca-7cd8-17010f2969c3.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/1e63e323-5fe0-452e-92f8-b98bd0f764e3.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/2660b114-1d66-3cde-e148-ebc2d1f963d5.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/28f0f9ca-0423-4d1b-9e76-616ffce99544.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/29de489d-0491-fb00-7dab-f9e686d31e83.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/2a4880b6-b7a3-690a-2049-bfbe38eafb9f.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/2caf1179-7861-6ff3-4b7d-46e17780bdfa.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/2d784476-d0db-9979-0cff-9408745a7cf3.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/30047cec-269d-408e-0c30-b2603b887268.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/303cd381-8560-7579-23f1-f0a880799740.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/335f8f14-f2db-db7c-1c04-734dc7657439.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/34c9398d-bb78-4643-9633-46a2fa3e9637.tga
 create mode 100644 linden/indra/newview/skins/default/textures/35f217a3-f618-49cf-bbca-c86d486551a9.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/37c8e000-6aa2-41ef-8f86-e0c2e60bfa42.tga
 create mode 100644 linden/indra/newview/skins/default/textures/39801651-26cb-4926-af57-7af9352c273c.tga
 create mode 100644 linden/indra/newview/skins/default/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga
 create mode 100644 linden/indra/newview/skins/default/textures/3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3bef.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/3cddf591-a726-4702-87b3-70c1daf88f90.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/402f8b24-5f9d-4905-b5f8-37baff603e88.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/43f0a590-f3d3-48b5-b460-f5b3e6e03626.tga
 create mode 100644 linden/indra/newview/skins/default/textures/4726f13e-bd07-f2fb-feb0-bfa2ac58ab61.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/47a8c844-cd2a-4b1a-be01-df8b1612fe5d.tga
 create mode 100644 linden/indra/newview/skins/default/textures/48766d75-6e58-de84-68fe-1980c64feaee.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/53a2f406-4895-1d13-d541-d2e3b86bc19c.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/5748decc-f629-461c-9a36-a35a221fe21f.tga
 create mode 100644 linden/indra/newview/skins/default/textures/5894e2e7-ab8d-edfa-e61c-18cf16854ba3.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/5ab48dd5-05d0-4f1a-ace6-efd4e2fb3508.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/5abfabc2-5d6d-4912-acd8-d7e38ae93d02.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/5bc11cd6-2f40-071e-a8da-0903394204f9.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/6002a571-549c-472c-9443-9ab35b1a55ed.tga
 create mode 100644 linden/indra/newview/skins/default/textures/63338ede-0037-c4fd-855b-015d77112fc8.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/64367bd1-697e-b3e6-0b65-3f862a577366.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/64eed6af-f575-35c7-baa4-b140bdcdb00f.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/6522e74d-1660-4e7f-b601-6f48c1659a77.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/67931331-0c02-4876-1255-28770896c6a2.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/6c4727b8-ac79-ba44-3b81-f9aa887b47eb.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/6c9fa78a-1c69-2168-325b-3e03ffa348ce.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/6de37e4e-7029-61f5-54b8-f5e63f983f58.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/735198cf-6ea0-2550-e222-21d3c6a341ae.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/73577b7b-19c3-4050-a19d-36bc2408aa79.tga
 create mode 100644 linden/indra/newview/skins/default/textures/74e1a96f-4833-a24d-a1bb-1bce1468b0e7.tga
 create mode 100644 linden/indra/newview/skins/default/textures/7581f2f4-d0d2-481a-bc75-69a13d9caeaa.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/78af921a-3c49-47a1-9c4e-2608951164ae.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/79504bf5-c3ec-0763-6563-d843de66d0a1.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga
 create mode 100644 linden/indra/newview/skins/default/textures/7a2b3a4a-53c2-53ac-5716-aac7d743c020.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/7c0cf89b-44b1-1ce2-dd74-07102a98ac2a.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/7ca39b4c-bd19-4699-aff7-f93fd03d3e7b.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/7cb070bc-fc00-4527-9c4d-7f7e0c4191be.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga
 create mode 100644 linden/indra/newview/skins/default/textures/822ded49-9a6c-f61c-cb89-6df54f42cdf4.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/827ff765-8c1d-a8b1-23f7-fdcba560effc.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/83b77fc6-10b4-63ec-4de7-f40629f238c5.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/8872f2b8-31db-42d8-580a-b3e4a91262de.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/89e9fc7c-0b16-457d-be4f-136270759c4d.tga
 create mode 100644 linden/indra/newview/skins/default/textures/8a515889-eac9-fb55-8eba-d2dc09eb32c8.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/8dcd4a48-2d37-4909-9f78-f7a9eb4ef903.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/8f458549-173b-23ff-d4ff-bfaa5ea2371b.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/8f761ce3-5939-4d3a-8991-00064fdfacf9.tga
 create mode 100644 linden/indra/newview/skins/default/textures/92e66e00-f56f-598a-7997-048aa64cde18.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/95281d5c-d27a-ee13-e067-08295b67b58a.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/96b4de31-f4fa-337d-ec78-451e3609769e.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/978380f0-aaf7-c459-14e3-9808833fd372.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/988dd995-1769-bdc9-8842-51f8f2b03884.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/99bd60a2-3250-efc9-2e39-2fbcadefbecc.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/9beb8cdd-3dce-53c2-b28e-e1f3bc2ec0a4.tga
 create mode 100644 linden/indra/newview/skins/default/textures/9c88539c-fd04-46b8-bea2-ddf1bcffe3bd.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga
 create mode 100644 linden/indra/newview/skins/default/textures/9deab416-9c63-78d6-d558-9a156f12044c.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/Inv_WaterLight.png
 create mode 100644 linden/indra/newview/skins/default/textures/Inv_WindLight.png
 create mode 100644 linden/indra/newview/skins/default/textures/a6162133-724b-54df-a12f-51cd070ad6f3.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/a85ac674-cb75-4af6-9499-df7c5aaf7a28.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/abb783e6-3e93-26c0-248a-247666855da3.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/account_id_green.tga
 create mode 100644 linden/indra/newview/skins/default/textures/account_id_orange.tga
 create mode 100644 linden/indra/newview/skins/default/textures/active_speakers.tga
 create mode 100644 linden/indra/newview/skins/default/textures/active_voice_tab.tga
 create mode 100644 linden/indra/newview/skins/default/textures/ae874d1a-93ef-54fb-5fd3-eb0cb156afc0.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/alpha_gradient.tga
 create mode 100644 linden/indra/newview/skins/default/textures/alpha_gradient_2d.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/arrow_down.tga
 create mode 100644 linden/indra/newview/skins/default/textures/arrow_left.tga
 create mode 100644 linden/indra/newview/skins/default/textures/arrow_right.tga
 create mode 100644 linden/indra/newview/skins/default/textures/arrow_up.tga
 create mode 100644 linden/indra/newview/skins/default/textures/avatar_thumb_bkgrnd.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga
 create mode 100644 linden/indra/newview/skins/default/textures/b4ba225c-373f-446d-9f7e-6cb7b5cf9b3d.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/b8d3965a-ad78-bf43-699b-bff8eca6c975.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/b8eed5f0-64b7-6e12-b67f-43fa8e773440.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/b9e1cf8a-9660-c020-0c69-18f1ea27268a.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/b9f1a3b8-933e-b7c8-e6f5-dba1bc666bed.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/badge_error.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/badge_note.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/badge_ok.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/badge_warn.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/beb169c7-11ea-fff2-efe5-0f24dc881df2.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/black.tga
 create mode 100644 linden/indra/newview/skins/default/textures/btn_chatbar.tga
 create mode 100644 linden/indra/newview/skins/default/textures/btn_chatbar_selected.tga
 create mode 100644 linden/indra/newview/skins/default/textures/button_anim_pause.tga
 create mode 100644 linden/indra/newview/skins/default/textures/button_anim_pause_disabled.tga
 create mode 100644 linden/indra/newview/skins/default/textures/button_anim_pause_selected.tga
 create mode 100644 linden/indra/newview/skins/default/textures/button_anim_play.tga
 create mode 100644 linden/indra/newview/skins/default/textures/button_anim_play_disabled.tga
 create mode 100644 linden/indra/newview/skins/default/textures/button_anim_play_selected.tga
 create mode 100644 linden/indra/newview/skins/default/textures/button_anim_stop.tga
 create mode 100644 linden/indra/newview/skins/default/textures/button_anim_stop_disabled.tga
 create mode 100644 linden/indra/newview/skins/default/textures/button_anim_stop_selected.tga
 create mode 100644 linden/indra/newview/skins/default/textures/button_disabled_32x128.tga
 create mode 100644 linden/indra/newview/skins/default/textures/button_enabled_32x128.tga
 create mode 100644 linden/indra/newview/skins/default/textures/button_enabled_selected_32x128.tga
 create mode 100644 linden/indra/newview/skins/default/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga
 create mode 100644 linden/indra/newview/skins/default/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga
 create mode 100644 linden/indra/newview/skins/default/textures/c7d8bbf3-21ee-4f6e-9b20-3cf18425af1d.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/ca4e8c27-473c-eb1c-2f5d-50ee3f07d85c.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/ca7609c6-6ec6-32d9-332e-0d8f437ef644.tga
 create mode 100644 linden/indra/newview/skins/default/textures/cakeisalie.png
 create mode 100644 linden/indra/newview/skins/default/textures/cam_rotate_in.tga
 create mode 100644 linden/indra/newview/skins/default/textures/cam_rotate_out.tga
 create mode 100644 linden/indra/newview/skins/default/textures/cam_tracking_in.tga
 create mode 100644 linden/indra/newview/skins/default/textures/cam_tracking_out.tga
 create mode 100644 linden/indra/newview/skins/default/textures/cam_zoom_minus_in.tga
 create mode 100644 linden/indra/newview/skins/default/textures/cam_zoom_out.tga
 create mode 100644 linden/indra/newview/skins/default/textures/cam_zoom_plus_in.tga
 create mode 100644 linden/indra/newview/skins/default/textures/cce0f112-878f-4586-a2e2-a8f104bba271.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/cdd9a9fc-6d0b-f90d-8416-c72b6019bca8.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga
 create mode 100644 linden/indra/newview/skins/default/textures/ceilingcat.png
 create mode 100644 linden/indra/newview/skins/default/textures/checkbox_disabled_false.tga
 create mode 100644 linden/indra/newview/skins/default/textures/checkbox_disabled_true.tga
 create mode 100644 linden/indra/newview/skins/default/textures/checkbox_enabled_false.tga
 create mode 100644 linden/indra/newview/skins/default/textures/checkbox_enabled_true.tga
 create mode 100644 linden/indra/newview/skins/default/textures/checkerboard_transparency_bg.png
 create mode 100644 linden/indra/newview/skins/default/textures/circle.tga
 create mode 100644 linden/indra/newview/skins/default/textures/close_in_blue.tga
 create mode 100644 linden/indra/newview/skins/default/textures/close_inactive_blue.tga
 create mode 100644 linden/indra/newview/skins/default/textures/closebox.tga
 create mode 100644 linden/indra/newview/skins/default/textures/cloud-particle.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/color_swatch_alpha.tga
 create mode 100644 linden/indra/newview/skins/default/textures/combobox_arrow.tga
 create mode 100644 linden/indra/newview/skins/default/textures/crosshairs.tga
 create mode 100644 linden/indra/newview/skins/default/textures/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/d21e44ca-ff1c-a96e-b2ef-c0753426b7d9.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/d319ce44-0821-932a-cd18-cd1afb9d3ead.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/d691a01c-13b7-578d-57c0-5caef0b4e7e1.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/d7d99e40-10e2-5739-d063-91dcbdefc492.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/d9258671-868f-7511-c321-7baef9e948a4.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/darkgray.tga
 create mode 100644 linden/indra/newview/skins/default/textures/db9d39ec-a896-c287-1ced-64566217021e.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/de651394-f926-48db-b666-e49d83af1bbc.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/default_land_picture.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/default_profile_picture.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/direction_arrow.tga
 create mode 100644 linden/indra/newview/skins/default/textures/down_arrow.png
 create mode 100644 linden/indra/newview/skins/default/textures/e121e2fc-7573-740f-edfd-0d45a9ba486e.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/e3369e02-93e1-43dc-b9c0-4533db0963d0.tga
 create mode 100644 linden/indra/newview/skins/default/textures/e38248f9-f2ee-2c9f-aa49-4860857e3b08.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/e569711a-27c2-aad4-9246-0c910239a179.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/e674ca0c-a387-4dae-a0b4-db6bd073faa5.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/e97cf410-8e61-7005-ec06-629eba4cd1fb.tga
 create mode 100644 linden/indra/newview/skins/default/textures/easteregg.png
 create mode 100644 linden/indra/newview/skins/default/textures/ebf2aa19-6c34-c5d8-4f14-853da1241f91.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/eye_button_active.tga
 create mode 100644 linden/indra/newview/skins/default/textures/eye_button_inactive.tga
 create mode 100644 linden/indra/newview/skins/default/textures/f2d7b6f6-4200-1e9a-fd5b-96459e950f94.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/f4b6b161-6530-6679-1a84-adfcb71a8b12.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/f54a0c32-3cd1-d49a-5b4f-7b792bebc204.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/f9bbb2fe-584b-4c01-86fc-599c69534c1b.tga
 create mode 100644 linden/indra/newview/skins/default/textures/fb1fecba-9585-415b-ad15-6e6e3d6c5479.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/fb2ae204-3fd1-df33-594f-c9f882830e66.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/fc987bf9-b8cb-f8e5-45f2-d664ca6bd3eb.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga
 create mode 100644 linden/indra/newview/skins/default/textures/ff_edit_mine.tga
 create mode 100644 linden/indra/newview/skins/default/textures/ff_edit_mine_button.tga
 create mode 100644 linden/indra/newview/skins/default/textures/ff_edit_theirs.tga
 create mode 100644 linden/indra/newview/skins/default/textures/ff_edit_theirs_button.tga
 create mode 100644 linden/indra/newview/skins/default/textures/ff_online_status_button.tga
 create mode 100644 linden/indra/newview/skins/default/textures/ff_visible_map.tga
 create mode 100644 linden/indra/newview/skins/default/textures/ff_visible_map_button.tga
 create mode 100644 linden/indra/newview/skins/default/textures/ff_visible_online.tga
 create mode 100644 linden/indra/newview/skins/default/textures/ff_visible_online_button.tga
 create mode 100644 linden/indra/newview/skins/default/textures/flyout_btn_left.tga
 create mode 100644 linden/indra/newview/skins/default/textures/flyout_btn_left_disabled.tga
 create mode 100644 linden/indra/newview/skins/default/textures/flyout_btn_left_selected.tga
 create mode 100644 linden/indra/newview/skins/default/textures/flyout_btn_right.tga
 create mode 100644 linden/indra/newview/skins/default/textures/flyout_btn_right_disabled.tga
 create mode 100644 linden/indra/newview/skins/default/textures/flyout_btn_right_selected.tga
 create mode 100644 linden/indra/newview/skins/default/textures/folder_arrow.tga
 create mode 100644 linden/indra/newview/skins/default/textures/foot_shadow.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/go-home-4.png
 create mode 100644 linden/indra/newview/skins/default/textures/go-next-4.png
 create mode 100644 linden/indra/newview/skins/default/textures/go-previous-4.png
 create mode 100644 linden/indra/newview/skins/default/textures/hugs.png
 create mode 100644 linden/indra/newview/skins/default/textures/icn_active-speakers-dot-lvl0.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_active-speakers-dot-lvl1.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_active-speakers-dot-lvl2.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_active-speakers-typing1.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_active-speakers-typing2.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_active-speakers-typing3.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_chatbar.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_clear_lineeditor.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_label_media.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_label_music.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_label_web.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_media-pause.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_media-pause_active.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_media-pause_disabled.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_media-pause_enabled.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_media-play.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_media-play_active.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_media-play_disabled.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_media-play_enabled.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_media-stop_active.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_media-stop_disabled.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_media-stop_enabled.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_media.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_media_movie.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_media_web.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_music-pause.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_music-play.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_music.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_pause.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_play.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_rounded-text-field.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_scrollbar.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_scrollbar_bg.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_scrollbar_thumb.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_slide-groove_dark.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_slide-highlight.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_slide-thumb_dark.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_speaker-muted_dark.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_speaker_dark.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_stop.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_textfield_enabled.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_toolbar_build.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_toolbar_fly.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_toolbar_inventory.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_toolbar_map.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_toolbar_minimap.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_toolbar_search.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_toolbar_snapshot.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_voice-call-end.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_voice-call-start.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_voice-groupfocus.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_voice-localchat.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_voice-pvtfocus.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_voice_ptt-off.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_voice_ptt-on-lvl1.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_voice_ptt-on-lvl2.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_voice_ptt-on-lvl3.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icn_voice_ptt-on.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icon_auction.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icon_avatar_offline.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icon_avatar_online.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icon_day_cycle.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icon_diurnal.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icon_event.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icon_event_adult.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icon_event_mature.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icon_for_sale.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icon_for_sale_adult.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icon_group.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icon_groupnotice.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icon_groupnoticeinventory.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icon_lock.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icon_place.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icon_popular.tga
 create mode 100644 linden/indra/newview/skins/default/textures/icon_top_pick.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_folder_animation.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_folder_bodypart.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_folder_callingcard.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_folder_clothing.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_folder_gesture.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_folder_landmark.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_folder_lostandfound.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_folder_notecard.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_folder_object.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_folder_plain_closed.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_folder_plain_open.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_folder_script.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_folder_snapshot.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_folder_sound.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_folder_texture.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_folder_trash.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_alpha.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_animation.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_attach.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_callingcard_offline.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_callingcard_online.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_clothing.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_eyes.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_gesture.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_gloves.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_hair.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_jacket.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_landmark.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_landmark_visited.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_notecard.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_object.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_object_multi.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_pants.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_script.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_script_dangerous.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_shape.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_shirt.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_shoes.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_skin.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_skirt.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_snapshot.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_socks.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_sound.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_tattoo.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_texture.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_underpants.tga
 create mode 100644 linden/indra/newview/skins/default/textures/inv_item_undershirt.tga
 create mode 100644 linden/indra/newview/skins/default/textures/lag_status_critical.tga
 create mode 100644 linden/indra/newview/skins/default/textures/lag_status_good.tga
 create mode 100644 linden/indra/newview/skins/default/textures/lag_status_warning.tga
 create mode 100644 linden/indra/newview/skins/default/textures/legend.tga
 create mode 100644 linden/indra/newview/skins/default/textures/lightgray.tga
 create mode 100644 linden/indra/newview/skins/default/textures/locked_image.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/map_avatar_16.tga
 create mode 100644 linden/indra/newview/skins/default/textures/map_avatar_32.tga
 create mode 100644 linden/indra/newview/skins/default/textures/map_avatar_8.tga
 create mode 100644 linden/indra/newview/skins/default/textures/map_avatar_above_32.tga
 create mode 100644 linden/indra/newview/skins/default/textures/map_avatar_above_8.tga
 create mode 100644 linden/indra/newview/skins/default/textures/map_avatar_below_32.tga
 create mode 100644 linden/indra/newview/skins/default/textures/map_avatar_below_8.tga
 create mode 100644 linden/indra/newview/skins/default/textures/map_avatar_you_32.tga
 create mode 100644 linden/indra/newview/skins/default/textures/map_avatar_you_8.tga
 create mode 100644 linden/indra/newview/skins/default/textures/map_event.tga
 create mode 100644 linden/indra/newview/skins/default/textures/map_event_adult.tga
 create mode 100644 linden/indra/newview/skins/default/textures/map_event_mature.tga
 create mode 100644 linden/indra/newview/skins/default/textures/map_home.tga
 create mode 100644 linden/indra/newview/skins/default/textures/map_infohub.tga
 create mode 100644 linden/indra/newview/skins/default/textures/map_telehub.tga
 create mode 100644 linden/indra/newview/skins/default/textures/map_track_16.tga
 create mode 100644 linden/indra/newview/skins/default/textures/map_track_8.tga
 create mode 100644 linden/indra/newview/skins/default/textures/media_btn_back.png
 create mode 100644 linden/indra/newview/skins/default/textures/media_btn_done.png
 create mode 100644 linden/indra/newview/skins/default/textures/media_btn_forward.png
 create mode 100644 linden/indra/newview/skins/default/textures/media_btn_home.png
 create mode 100644 linden/indra/newview/skins/default/textures/media_btn_newwindow.png
 create mode 100644 linden/indra/newview/skins/default/textures/media_btn_optimalzoom.png
 create mode 100644 linden/indra/newview/skins/default/textures/media_btn_reload.png
 create mode 100644 linden/indra/newview/skins/default/textures/media_btn_scrolldown.png
 create mode 100644 linden/indra/newview/skins/default/textures/media_btn_scrollleft.png
 create mode 100644 linden/indra/newview/skins/default/textures/media_btn_scrollright.png
 create mode 100644 linden/indra/newview/skins/default/textures/media_btn_scrollup.png
 create mode 100644 linden/indra/newview/skins/default/textures/media_btn_stoploading.png
 create mode 100644 linden/indra/newview/skins/default/textures/media_icon.tga
 create mode 100644 linden/indra/newview/skins/default/textures/media_panel_bg.png
 create mode 100644 linden/indra/newview/skins/default/textures/media_panel_divider.png
 create mode 100644 linden/indra/newview/skins/default/textures/media_panel_hoverrectangle.png
 create mode 100644 linden/indra/newview/skins/default/textures/media_panel_scrollbg.png
 create mode 100644 linden/indra/newview/skins/default/textures/minimize.tga
 create mode 100644 linden/indra/newview/skins/default/textures/minimize_inactive.tga
 create mode 100644 linden/indra/newview/skins/default/textures/minimize_pressed.tga
 create mode 100644 linden/indra/newview/skins/default/textures/missing_asset.tga
 create mode 100644 linden/indra/newview/skins/default/textures/move_backward_in.tga
 create mode 100644 linden/indra/newview/skins/default/textures/move_backward_out.tga
 create mode 100644 linden/indra/newview/skins/default/textures/move_down_in.tga
 create mode 100644 linden/indra/newview/skins/default/textures/move_down_out.tga
 create mode 100644 linden/indra/newview/skins/default/textures/move_forward_in.tga
 create mode 100644 linden/indra/newview/skins/default/textures/move_forward_out.tga
 create mode 100644 linden/indra/newview/skins/default/textures/move_left_in.tga
 create mode 100644 linden/indra/newview/skins/default/textures/move_left_out.tga
 create mode 100644 linden/indra/newview/skins/default/textures/move_right_in.tga
 create mode 100644 linden/indra/newview/skins/default/textures/move_right_out.tga
 create mode 100644 linden/indra/newview/skins/default/textures/move_turn_left_in.tga
 create mode 100644 linden/indra/newview/skins/default/textures/move_turn_left_out.tga
 create mode 100644 linden/indra/newview/skins/default/textures/move_turn_right_in.tga
 create mode 100644 linden/indra/newview/skins/default/textures/move_turn_right_out.tga
 create mode 100644 linden/indra/newview/skins/default/textures/move_up_in.tga
 create mode 100644 linden/indra/newview/skins/default/textures/move_up_out.tga
 create mode 100644 linden/indra/newview/skins/default/textures/music_icon.tga
 create mode 100644 linden/indra/newview/skins/default/textures/mute_icon.tga
 create mode 100644 linden/indra/newview/skins/default/textures/noentrylines.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/noentrypasslines.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/nomnom.png
 create mode 100644 linden/indra/newview/skins/default/textures/notify_box_icon.tga
 create mode 100644 linden/indra/newview/skins/default/textures/notify_caution_icon.tga
 create mode 100644 linden/indra/newview/skins/default/textures/notify_next.png
 create mode 100644 linden/indra/newview/skins/default/textures/notify_tip_icon.tga
 create mode 100644 linden/indra/newview/skins/default/textures/object_cone.tga
 create mode 100644 linden/indra/newview/skins/default/textures/object_cone_active.tga
 create mode 100644 linden/indra/newview/skins/default/textures/object_cube.tga
 create mode 100644 linden/indra/newview/skins/default/textures/object_cube_active.tga
 create mode 100644 linden/indra/newview/skins/default/textures/object_cylinder.tga
 create mode 100644 linden/indra/newview/skins/default/textures/object_cylinder_active.tga
 create mode 100644 linden/indra/newview/skins/default/textures/object_grass.tga
 create mode 100644 linden/indra/newview/skins/default/textures/object_grass_active.tga
 create mode 100644 linden/indra/newview/skins/default/textures/object_hemi_cone.tga
 create mode 100644 linden/indra/newview/skins/default/textures/object_hemi_cone_active.tga
 create mode 100644 linden/indra/newview/skins/default/textures/object_hemi_cylinder.tga
 create mode 100644 linden/indra/newview/skins/default/textures/object_hemi_cylinder_active.tga
 create mode 100644 linden/indra/newview/skins/default/textures/object_hemi_sphere.tga
 create mode 100644 linden/indra/newview/skins/default/textures/object_hemi_sphere_active.tga
 create mode 100644 linden/indra/newview/skins/default/textures/object_prism.tga
 create mode 100644 linden/indra/newview/skins/default/textures/object_prism_active.tga
 create mode 100644 linden/indra/newview/skins/default/textures/object_pyramid.tga
 create mode 100644 linden/indra/newview/skins/default/textures/object_pyramid_active.tga
 create mode 100644 linden/indra/newview/skins/default/textures/object_ring.tga
 create mode 100644 linden/indra/newview/skins/default/textures/object_ring_active.tga
 create mode 100644 linden/indra/newview/skins/default/textures/object_sphere.tga
 create mode 100644 linden/indra/newview/skins/default/textures/object_sphere_active.tga
 create mode 100644 linden/indra/newview/skins/default/textures/object_tetrahedron.tga
 create mode 100644 linden/indra/newview/skins/default/textures/object_tetrahedron_active.tga
 create mode 100644 linden/indra/newview/skins/default/textures/object_torus.tga
 create mode 100644 linden/indra/newview/skins/default/textures/object_torus_active.tga
 create mode 100644 linden/indra/newview/skins/default/textures/object_tree.tga
 create mode 100644 linden/indra/newview/skins/default/textures/object_tree_active.tga
 create mode 100644 linden/indra/newview/skins/default/textures/object_tube.tga
 create mode 100644 linden/indra/newview/skins/default/textures/object_tube_active.tga
 create mode 100644 linden/indra/newview/skins/default/textures/octopus.png
 create mode 100644 linden/indra/newview/skins/default/textures/pixiesmall.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/progress_fill.tga
 create mode 100644 linden/indra/newview/skins/default/textures/progressbar_fill.tga
 create mode 100644 linden/indra/newview/skins/default/textures/progressbar_track.tga
 create mode 100644 linden/indra/newview/skins/default/textures/propertyline.tga
 create mode 100644 linden/indra/newview/skins/default/textures/ptt_lock_off.tga
 create mode 100644 linden/indra/newview/skins/default/textures/ptt_lock_on.tga
 create mode 100644 linden/indra/newview/skins/default/textures/radio_active_false.tga
 create mode 100644 linden/indra/newview/skins/default/textures/radio_active_true.tga
 create mode 100644 linden/indra/newview/skins/default/textures/radio_inactive_false.tga
 create mode 100644 linden/indra/newview/skins/default/textures/radio_inactive_true.tga
 create mode 100644 linden/indra/newview/skins/default/textures/resize_handle_bottom_right_blue.tga
 create mode 100644 linden/indra/newview/skins/default/textures/restore.tga
 create mode 100644 linden/indra/newview/skins/default/textures/restore_inactive.tga
 create mode 100644 linden/indra/newview/skins/default/textures/restore_pressed.tga
 create mode 100644 linden/indra/newview/skins/default/textures/rounded_square.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/rounded_square_soft.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/script_error.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/scrollbutton_down_in_blue.tga
 create mode 100644 linden/indra/newview/skins/default/textures/scrollbutton_down_out_blue.tga
 create mode 100644 linden/indra/newview/skins/default/textures/scrollbutton_left_in_blue.tga
 create mode 100644 linden/indra/newview/skins/default/textures/scrollbutton_left_out_blue.tga
 create mode 100644 linden/indra/newview/skins/default/textures/scrollbutton_right_in_blue.tga
 create mode 100644 linden/indra/newview/skins/default/textures/scrollbutton_right_out_blue.tga
 create mode 100644 linden/indra/newview/skins/default/textures/scrollbutton_up_in_blue.tga
 create mode 100644 linden/indra/newview/skins/default/textures/scrollbutton_up_out_blue.tga
 create mode 100644 linden/indra/newview/skins/default/textures/silhouette.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/skin_thumbnail_dark.png
 create mode 100644 linden/indra/newview/skins/default/textures/skin_thumbnail_default.png
 create mode 100644 linden/indra/newview/skins/default/textures/skin_thumbnail_emerald.png
 create mode 100644 linden/indra/newview/skins/default/textures/skin_thumbnail_gemini.png
 create mode 100644 linden/indra/newview/skins/default/textures/skin_thumbnail_gred.png
 create mode 100644 linden/indra/newview/skins/default/textures/skin_thumbnail_pslgreen.png
 create mode 100644 linden/indra/newview/skins/default/textures/skin_thumbnail_pslpurple.png
 create mode 100644 linden/indra/newview/skins/default/textures/skin_thumbnail_ruby.png
 create mode 100644 linden/indra/newview/skins/default/textures/skin_thumbnail_saphire.png
 create mode 100644 linden/indra/newview/skins/default/textures/skin_thumbnail_silver.png
 create mode 100644 linden/indra/newview/skins/default/textures/slim_icon_16_viewer.tga
 create mode 100644 linden/indra/newview/skins/default/textures/sm_rounded_corners_simple.tga
 create mode 100644 linden/indra/newview/skins/default/textures/smicon_warn.tga
 create mode 100644 linden/indra/newview/skins/default/textures/spacer24.tga
 create mode 100644 linden/indra/newview/skins/default/textures/spacer35.tga
 create mode 100644 linden/indra/newview/skins/default/textures/spin_down_in_blue.tga
 create mode 100644 linden/indra/newview/skins/default/textures/spin_down_out_blue.tga
 create mode 100644 linden/indra/newview/skins/default/textures/spin_up_in_blue.tga
 create mode 100644 linden/indra/newview/skins/default/textures/spin_up_out_blue.tga
 create mode 100644 linden/indra/newview/skins/default/textures/square_btn_32x128.tga
 create mode 100644 linden/indra/newview/skins/default/textures/square_btn_selected_32x128.tga
 create mode 100644 linden/indra/newview/skins/default/textures/startup_logo.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/status_busy.tga
 create mode 100644 linden/indra/newview/skins/default/textures/status_buy_currency.tga
 create mode 100644 linden/indra/newview/skins/default/textures/status_buy_currency_pressed.tga
 create mode 100644 linden/indra/newview/skins/default/textures/status_buy_land.tga
 create mode 100644 linden/indra/newview/skins/default/textures/status_buy_land_pressed.tga
 create mode 100644 linden/indra/newview/skins/default/textures/status_health.tga
 create mode 100644 linden/indra/newview/skins/default/textures/status_money.tga
 create mode 100644 linden/indra/newview/skins/default/textures/status_no_build.tga
 create mode 100644 linden/indra/newview/skins/default/textures/status_no_fly.tga
 create mode 100644 linden/indra/newview/skins/default/textures/status_no_push.tga
 create mode 100644 linden/indra/newview/skins/default/textures/status_no_scripts.tga
 create mode 100644 linden/indra/newview/skins/default/textures/status_no_voice.tga
 create mode 100644 linden/indra/newview/skins/default/textures/status_script_debug.tga
 create mode 100644 linden/indra/newview/skins/default/textures/status_search.tga
 create mode 100644 linden/indra/newview/skins/default/textures/status_search_btn.png
 create mode 100644 linden/indra/newview/skins/default/textures/status_search_btn_pressed.png
 create mode 100644 linden/indra/newview/skins/default/textures/status_voice.tga
 create mode 100644 linden/indra/newview/skins/default/textures/tab_background_darkpurple.tga
 create mode 100644 linden/indra/newview/skins/default/textures/tab_background_lightgrey.tga
 create mode 100644 linden/indra/newview/skins/default/textures/tab_background_purple.tga
 create mode 100644 linden/indra/newview/skins/default/textures/tab_bottom_blue.tga
 create mode 100644 linden/indra/newview/skins/default/textures/tab_bottom_selected_blue.tga
 create mode 100644 linden/indra/newview/skins/default/textures/tab_left.tga
 create mode 100644 linden/indra/newview/skins/default/textures/tab_left_selected.tga
 create mode 100644 linden/indra/newview/skins/default/textures/tab_top_blue.tga
 create mode 100644 linden/indra/newview/skins/default/textures/tab_top_selected_blue.tga
 create mode 100644 linden/indra/newview/skins/default/textures/tabarea.tga
 create mode 100644 linden/indra/newview/skins/default/textures/tearoff_pressed.tga
 create mode 100644 linden/indra/newview/skins/default/textures/tearoffbox.tga
 create mode 100644 linden/indra/newview/skins/default/textures/tool_dozer.tga
 create mode 100644 linden/indra/newview/skins/default/textures/tool_dozer_active.tga
 create mode 100644 linden/indra/newview/skins/default/textures/tool_zoom.tga
 create mode 100644 linden/indra/newview/skins/default/textures/tool_zoom_active.tga
 create mode 100644 linden/indra/newview/skins/default/textures/toolbar_bg.tga
 create mode 100644 linden/indra/newview/skins/default/textures/toolbar_btn_disabled.tga
 create mode 100644 linden/indra/newview/skins/default/textures/toolbar_btn_enabled.tga
 create mode 100644 linden/indra/newview/skins/default/textures/toolbar_btn_selected.tga
 create mode 100644 linden/indra/newview/skins/default/textures/toolbar_tab.tga
 create mode 100644 linden/indra/newview/skins/default/textures/up_arrow.png
 create mode 100644 linden/indra/newview/skins/default/textures/up_arrow.tga
 create mode 100644 linden/indra/newview/skins/default/textures/uv_test1.bmp
 create mode 100644 linden/indra/newview/skins/default/textures/uv_test1.j2c
 create mode 100644 linden/indra/newview/skins/default/textures/uv_test2.tga
 create mode 100644 linden/indra/newview/skins/default/textures/view-refresh-5.png
 create mode 100644 linden/indra/newview/skins/default/textures/white.tga
 create mode 100644 linden/indra/newview/skins/default/textures/zombiecat.png
 create mode 100644 linden/indra/newview/skins/gemini/colors.xml
 create mode 100644 linden/indra/newview/skins/gemini/colors_base.xml
 create mode 100644 linden/indra/newview/skins/gemini/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/0498c309-5306-43cd-82a2-ae31d096cdef.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/07d0ea4c-af0c-aad1-dbbf-c24020ff2b80.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/09a324a8-acc1-d9cd-2cbd-7465d90d3a98.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/0e82d24e-ed45-41bc-b090-94c97c1caab2.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/111b39de-8928-4690-b7b2-e17d5c960277.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/13dd1d96-6836-461e-8a4c-36003065c59b.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/34c9398d-bb78-4643-9633-46a2fa3e9637.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/37c8e000-6aa2-41ef-8f86-e0c2e60bfa42.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/39801651-26cb-4926-af57-7af9352c273c.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/43f0a590-f3d3-48b5-b460-f5b3e6e03626.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/47a8c844-cd2a-4b1a-be01-df8b1612fe5d.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/5748decc-f629-461c-9a36-a35a221fe21f.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/6002a571-549c-472c-9443-9ab35b1a55ed.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/73577b7b-19c3-4050-a19d-36bc2408aa79.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/74e1a96f-4833-a24d-a1bb-1bce1468b0e7.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/89e9fc7c-0b16-457d-be4f-136270759c4d.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/8f761ce3-5939-4d3a-8991-00064fdfacf9.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/9beb8cdd-3dce-53c2-b28e-e1f3bc2ec0a4.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/account_id_green.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/account_id_orange.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/active_speakers.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/active_voice_tab.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/alpha_gradient.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/arrow_down.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/arrow_up.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/avatar_gone.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/avatar_new.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/avatar_sound.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/avatar_typing.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/black.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/btn_chatbar.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/btn_chatbar_selected.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/button_anim_pause.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/button_anim_pause_disabled.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/button_anim_pause_selected.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/button_anim_play.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/button_anim_play_disabled.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/button_anim_play_selected.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/button_anim_stop.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/button_anim_stop_disabled.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/button_anim_stop_selected.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/button_disabled_32x128.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/button_enabled_32x128.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/button_enabled_selected_32x128.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/ca7609c6-6ec6-32d9-332e-0d8f437ef644.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/cam_rotate_in.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/cam_rotate_out.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/cam_tracking_in.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/cam_tracking_out.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/cam_zoom_minus_in.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/cam_zoom_out.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/cam_zoom_plus_in.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/checkbox_disabled_false.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/checkbox_disabled_true.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/checkbox_enabled_false.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/checkbox_enabled_true.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/checkerboard_transparency_bg.png
 create mode 100644 linden/indra/newview/skins/gemini/textures/circle.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/close_in_blue.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/close_inactive_blue.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/closebox.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/color_swatch_alpha.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/combobox_arrow.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/crosshairs.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/darkgray.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/direction_arrow.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/down_arrow.png
 create mode 100644 linden/indra/newview/skins/gemini/textures/e3369e02-93e1-43dc-b9c0-4533db0963d0.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/e97cf410-8e61-7005-ec06-629eba4cd1fb.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/eye_button_active.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/eye_button_inactive.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/f9bbb2fe-584b-4c01-86fc-599c69534c1b.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/ff_edit_mine.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/ff_edit_mine_button.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/ff_edit_theirs.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/ff_edit_theirs_button.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/ff_online_status_button.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/ff_visible_map.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/ff_visible_map_button.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/ff_visible_online.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/ff_visible_online_button.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/flag_blue.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/flag_green.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/flag_orange.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/flag_pink.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/flag_purple.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/flag_red.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/flag_yellow.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/flyout_btn_left.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/flyout_btn_left_disabled.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/flyout_btn_left_selected.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/flyout_btn_right.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/flyout_btn_right_disabled.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/flyout_btn_right_selected.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/folder_arrow.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_active-speakers-dot-lvl0.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_active-speakers-dot-lvl1.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_active-speakers-dot-lvl2.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_active-speakers-typing1.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_active-speakers-typing2.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_active-speakers-typing3.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_chatbar.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_clear_lineeditor.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_label_media.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_label_music.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_label_web.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_media-pause.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_media-pause_active.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_media-pause_disabled.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_media-pause_enabled.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_media-play.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_media-play_active.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_media-play_disabled.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_media-play_enabled.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_media-stop_active.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_media-stop_disabled.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_media-stop_enabled.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_media.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_media_movie.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_media_web.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_music-pause.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_music-play.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_music.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_pause.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_play.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_rounded-text-field.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_scrollbar.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_scrollbar_bg.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_scrollbar_thumb.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_slide-groove_dark.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_slide-highlight.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_slide-thumb_dark.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_speaker-muted_dark.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_speaker_dark.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_stop.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_textfield_enabled.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_toolbar_build.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_toolbar_fly.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_toolbar_inventory.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_toolbar_map.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_toolbar_minimap.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_toolbar_search.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_toolbar_snapshot.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_voice-call-end.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_voice-call-start.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_voice-groupfocus.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_voice-localchat.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_voice-pvtfocus.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_voice_ptt-off.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_voice_ptt-on-lvl1.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_voice_ptt-on-lvl2.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_voice_ptt-on-lvl3.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icn_voice_ptt-on.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icon_auction.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icon_avatar_expand.png
 create mode 100644 linden/indra/newview/skins/gemini/textures/icon_avatar_offline.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icon_avatar_online.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icon_day_cycle.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icon_diurnal.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icon_event.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icon_event_mature.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icon_for_sale.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icon_group.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icon_groupnotice.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icon_groupnoticeinventory.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icon_lock.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icon_place.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icon_popular.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/icon_top_pick.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/info_error.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/info_fetching.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/info_unknown.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_folder_animation.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_folder_bodypart.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_folder_callingcard.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_folder_clothing.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_folder_gesture.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_folder_landmark.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_folder_lostandfound.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_folder_notecard.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_folder_object.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_folder_plain_closed.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_folder_plain_open.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_folder_script.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_folder_snapshot.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_folder_sound.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_folder_texture.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_folder_trash.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_item_animation.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_item_attach.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_item_callingcard_offline.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_item_callingcard_online.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_item_clothing.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_item_eyes.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_item_gesture.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_item_gloves.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_item_hair.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_item_jacket.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_item_landmark.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_item_landmark_visited.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_item_notecard.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_item_object.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_item_object_multi.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_item_pants.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_item_script.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_item_script_dangerous.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_item_shape.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_item_shirt.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_item_shoes.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_item_skin.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_item_skirt.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_item_snapshot.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_item_socks.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_item_sound.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_item_texture.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_item_underpants.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/inv_item_undershirt.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/lag_status_critical.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/lag_status_good.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/lag_status_warning.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/legend.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/lightgray.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/map_avatar_16.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/map_avatar_32.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/map_avatar_8.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/map_avatar_above_32.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/map_avatar_above_8.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/map_avatar_below_32.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/map_avatar_below_8.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/map_avatar_you_32.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/map_avatar_you_8.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/map_event.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/map_event_mature.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/map_home.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/map_infohub.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/map_telehub.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/map_track_16.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/map_track_8.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/media_icon.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/minimize.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/minimize_inactive.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/minimize_pressed.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/missing_asset.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/move_backward_in.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/move_backward_out.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/move_down_in.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/move_down_out.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/move_forward_in.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/move_forward_out.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/move_left_in.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/move_left_out.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/move_right_in.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/move_right_out.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/move_turn_left_in.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/move_turn_left_out.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/move_turn_right_in.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/move_turn_right_out.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/move_up_in.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/move_up_out.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/music_icon.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/mute_icon.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/notify_box_icon.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/notify_caution_icon.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/notify_next.png
 create mode 100644 linden/indra/newview/skins/gemini/textures/notify_tip_icon.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/object_cone.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/object_cone_active.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/object_cube.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/object_cube_active.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/object_cylinder.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/object_cylinder_active.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/object_grass.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/object_grass_active.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/object_hemi_cone.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/object_hemi_cone_active.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/object_hemi_cylinder.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/object_hemi_cylinder_active.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/object_hemi_sphere.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/object_hemi_sphere_active.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/object_prism.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/object_prism_active.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/object_pyramid.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/object_pyramid_active.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/object_ring.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/object_ring_active.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/object_sphere.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/object_sphere_active.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/object_tetrahedron.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/object_tetrahedron_active.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/object_torus.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/object_torus_active.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/object_tree.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/object_tree_active.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/object_tube.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/object_tube_active.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/payment_info_charter.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/payment_info_filled.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/payment_info_used.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/preview.png
 create mode 100644 linden/indra/newview/skins/gemini/textures/progress_fill.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/progressbar_fill.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/progressbar_track.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/propertyline.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/ptt_lock_off.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/ptt_lock_on.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/radio_active_false.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/radio_active_true.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/radio_inactive_false.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/radio_inactive_true.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/resize_handle_bottom_right_blue.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/restore.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/restore_inactive.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/restore_pressed.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/scrollbutton_down_in_blue.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/scrollbutton_down_out_blue.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/scrollbutton_left_in_blue.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/scrollbutton_left_out_blue.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/scrollbutton_right_in_blue.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/scrollbutton_right_out_blue.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/scrollbutton_up_in_blue.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/scrollbutton_up_out_blue.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/slim_icon_16_viewer.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/sm_rounded_corners_simple.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/smicon_warn.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/spacer24.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/spacer35.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/spin_down_in_blue.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/spin_down_out_blue.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/spin_up_in_blue.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/spin_up_out_blue.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/square_btn_32x128.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/square_btn_selected_32x128.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/startup_logo.j2c
 create mode 100644 linden/indra/newview/skins/gemini/textures/status_busy.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/status_buy_currency.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/status_buy_currency_pressed.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/status_buy_land.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/status_buy_land_pressed.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/status_health.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/status_money.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/status_no_build.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/status_no_fly.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/status_no_push.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/status_no_scripts.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/status_no_voice.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/status_script_debug.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/status_search.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/status_search_btn.png
 create mode 100644 linden/indra/newview/skins/gemini/textures/status_search_btn_pressed.png
 create mode 100644 linden/indra/newview/skins/gemini/textures/status_voice.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/tab_background_darkpurple.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/tab_background_lightgrey.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/tab_background_purple.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/tab_bottom_blue.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/tab_bottom_selected_blue.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/tab_left.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/tab_left_selected.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/tab_top_blue.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/tab_top_selected_blue.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/tabarea.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/tearoff_pressed.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/tearoffbox.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/textures.xml
 create mode 100644 linden/indra/newview/skins/gemini/textures/tool_dozer.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/tool_dozer_active.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/tool_zoom.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/tool_zoom_active.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/toolbar_bg.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/toolbar_btn_disabled.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/toolbar_btn_enabled.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/toolbar_btn_selected.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/toolbar_tab.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/up_arrow.png
 create mode 100644 linden/indra/newview/skins/gemini/textures/up_arrow.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/uv_test2.tga
 create mode 100644 linden/indra/newview/skins/gemini/textures/white.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/active_speakers.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/active_voice_tab.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/arrow_down.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/arrow_left.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/arrow_right.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/arrow_up.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/black.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/btn_chatbar.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/btn_chatbar_selected.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/button_anim_pause.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/button_anim_pause_selected.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/button_anim_play.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/button_anim_play_selected.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/button_anim_stop.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/button_anim_stop_selected.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/button_disabled_32x128.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/button_enabled_32x128.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/button_enabled_selected_32x128.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/checkbox_disabled_false.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/checkbox_disabled_true.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/checkbox_enabled_false.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/checkbox_enabled_true.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/close_in_blue.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/close_inactive_blue.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/closebox.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/combobox_arrow.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/darkgray.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/down_arrow.png
 create mode 100644 linden/indra/newview/skins/silver/textures/eye_button_active.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/eye_button_inactive.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/ff_edit_mine_button.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/ff_edit_theirs_button.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/ff_online_status_button.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/ff_visible_map_button.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/ff_visible_online_button.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/flyout_btn_left.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/flyout_btn_left_disabled.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/flyout_btn_left_selected.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/flyout_btn_right.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/flyout_btn_right_disabled.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/flyout_btn_right_selected.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_chatbar.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_label_media.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_label_music.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_label_web.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_media-pause.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_media-play.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_media_movie.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_media_web.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_music-pause.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_music-play.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_pause.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_play.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_rounded-text-field.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_slide-groove_dark.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_slide-highlight.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_slide-thumb_dark.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_speaker-muted_dark.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_speaker_dark.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_stop.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_toolbar_build.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_toolbar_fly.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_toolbar_inventory.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_toolbar_map.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_toolbar_minimap.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_toolbar_search.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_toolbar_snapshot.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_voice-call-end.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_voice-call-start.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_voice-groupfocus.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_voice-localchat.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_voice-pvtfocus.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_voice_ptt-off.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_voice_ptt-on-lvl1.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_voice_ptt-on-lvl2.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_voice_ptt-on-lvl3.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icn_voice_ptt-on.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icon_auction.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icon_avatar_offline.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icon_avatar_online.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icon_day_cycle.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icon_event.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icon_event_mature.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icon_for_sale.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icon_group.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icon_groupnotice.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icon_groupnoticeinventory.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icon_lock.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/icon_top_pick.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_folder_animation.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_folder_bodypart.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_folder_callingcard.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_folder_clothing.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_folder_gesture.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_folder_landmark.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_folder_lostandfound.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_folder_notecard.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_folder_object.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_folder_plain_closed.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_folder_plain_open.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_folder_script.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_folder_snapshot.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_folder_sound.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_folder_texture.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_folder_trash.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_item_animation.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_item_attach.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_item_callingcard_offline.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_item_callingcard_online.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_item_clothing.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_item_eyes.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_item_gesture.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_item_gloves.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_item_hair.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_item_jacket.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_item_landmark.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_item_landmark_visited.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_item_notecard.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_item_object.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_item_object_multi.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_item_pants.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_item_script.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_item_shape.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_item_shirt.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_item_shoes.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_item_skin.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_item_skirt.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_item_snapshot.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_item_socks.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_item_sound.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_item_texture.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_item_underpants.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/inv_item_undershirt.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/lightgray.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/map_avatar_16.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/map_avatar_you_8.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/map_event.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/map_event_adult.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/map_event_mature.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/map_home.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/map_infohub.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/map_telehub.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/minimize.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/minimize_inactive.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/minimize_pressed.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/notify_next.png
 create mode 100644 linden/indra/newview/skins/silver/textures/object_cone.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/object_cone_active.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/object_cube.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/object_cube_active.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/object_cylinder.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/object_cylinder_active.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/object_grass.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/object_grass_active.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/object_hemi_cone.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/object_hemi_cone_active.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/object_hemi_cylinder.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/object_hemi_cylinder_active.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/object_hemi_sphere.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/object_hemi_sphere_active.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/object_prism.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/object_prism_active.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/object_pyramid.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/object_pyramid_active.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/object_ring.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/object_ring_active.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/object_sphere.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/object_sphere_active.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/object_tetrahedron.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/object_tetrahedron_active.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/object_torus.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/object_torus_active.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/object_tree.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/object_tree_active.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/object_tube.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/object_tube_active.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/progressbar_fill.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/progressbar_track.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/ptt_lock_off.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/ptt_lock_on.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/radio_active_false.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/radio_active_true.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/radio_inactive_false.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/radio_inactive_true.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/resize_handle_bottom_right_blue.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/restore.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/restore_inactive.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/restore_pressed.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/rounded_square.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/rounded_square_soft.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/scrollbutton_down_in_blue.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/scrollbutton_down_out_blue.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/scrollbutton_left_in_blue.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/scrollbutton_left_out_blue.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/scrollbutton_right_in_blue.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/scrollbutton_right_out_blue.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/scrollbutton_up_in_blue.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/scrollbutton_up_out_blue.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/sm_rounded_corners_simple.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/spin_down_in_blue.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/spin_down_out_blue.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/spin_up_in_blue.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/spin_up_out_blue.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/square_btn_32x128.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/square_btn_selected_32x128.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/startup_logo.j2c
 create mode 100644 linden/indra/newview/skins/silver/textures/status_buy_currency.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/status_buy_currency_pressed.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/status_buy_land.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/status_buy_land_pressed.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/status_health.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/status_no_build.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/status_no_fly.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/status_no_push.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/status_no_scripts.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/status_no_voice.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/status_search.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/status_voice.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/tab_bottom_blue.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/tab_bottom_selected_blue.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/tab_left.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/tab_left_selected.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/tab_top_blue.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/tab_top_selected_blue.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/tearoff_pressed.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/tearoffbox.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/tool_dozer.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/tool_dozer_active.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/tool_zoom.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/tool_zoom_active.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/toolbar_bg.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/toolbar_btn_disabled.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/toolbar_btn_enabled.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/toolbar_btn_selected.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/toolbar_tab.tga
 create mode 100644 linden/indra/newview/skins/silver/textures/up_arrow.png
 create mode 100644 linden/indra/newview/skins/silver/textures/white.tga
 create mode 100644 linden/indra/newview/viewer.icns

diff --git a/.gitignore b/.gitignore
index 18d7665..30ee132 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,35 +3,22 @@
 # Git should ignore.
 # 
 # Since we only care about the actual source code files,
-# all the artwork and libraries are ignored, as are the
-# files that are created when you compile.
+# all the libraries are ignored, as are the files that 
+# are created when you compile.
 # 
 
-# ARTWORK
-
-linden/LICENSE-logos.txt
-linden/indra/newview/skins/*/textures/
-linden/indra/newview/skins/dark/
-linden/indra/newview/skins/gemini
-linden/indra/newview/skins/default/html/btn_purplepill_bg.png
-linden/indra/newview/skins/default/html/en-us/loading/sl_logo_rotate_black.gif
-linden/indra/newview/skins/default/html/en-us/loading/Thumbs.db
-linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png
-linden/indra/newview/skins/default/html/unabletoconnect.png
-linden/indra/newview/res/
-linden/indra/newview/res-sdl/
-linden/indra/newview/app_settings/*.db2
-linden/indra/newview/app_settings/windlight/
-linden/indra/newview/cursors_mac/
-linden/indra/newview/viewer.icns
-
 # LIBRARIES
 
-linden/LICENSES/
+# Thees two lines are a bit tricky.
+# The ! syntax negates a pattern,
+# but it needs a pattern, not just a directory.
+# So turn the first line into a pattern for ! to negate.
+linden/LICENSES/*
+!linden/LICENSES/LICENSE-logos.txt
+
 linden/LICENSE-libraries-*.txt
 linden/libraries/
 linden/indra/newview/app_settings/mozilla*/
-linden/indra/newview/fonts/
 linden/indra/newview/lib/
 linden/indra/newview/dbghelp.dll
 linden/indra/newview/linux_tools/client-readme-voice.txt
@@ -62,3 +49,4 @@ ChangeLog.txt
 .DS_Store
 *.zip
 linden/indra/newview/mozilla-universal-darwin.tgz
+
diff --git a/linden/LICENSES/LICENSE-logos.txt b/linden/LICENSES/LICENSE-logos.txt
new file mode 100644
index 0000000..aa475b6
--- /dev/null
+++ b/linden/LICENSES/LICENSE-logos.txt
@@ -0,0 +1,31 @@
+COPYRIGHT AND PERMISSION NOTICE
+
+Second Life(TM) Viewer Artwork.  Copyright (C) 2008 Linden Research, Inc.
+
+Linden Research, Inc. ("Linden Lab") licenses the Second Life viewer
+artwork and other works in the files distributed with this Notice under
+the Creative Commons Attribution-Share Alike 3.0 License, available at 
+http://creativecommons.org/licenses/by-sa/3.0/legalcode.  For the license
+summary, see http://creativecommons.org/licenses/by-sa/3.0/.
+
+Notwithstanding the foregoing, all of Linden Lab's trademarks, including
+but not limited to the Second Life brand name and Second Life Eye-in-Hand
+logo, are subject to our trademark policy at
+http://secondlife.com/corporate/trademark/.
+
+If you distribute any copies or adaptations of the Second Life viewer
+artwork or any other works in these files, you must include this Notice
+and clearly identify any changes made to the original works.  Include
+this Notice and information where copyright notices are usually included,
+for example, after your own copyright notice acknowledging your use of
+the Second Life viewer artwork, in a text file distributed with your
+program, in your application's About window, or on a credits page for
+your work.
+
+The following files included with the viewer artwork are licensed 
+under the MIT license http://www.opensource.org/licenses/mit-license.php:
+
+go-previous-4.png
+go-next-4.png
+view-refresh-5.png
+go-home-4.png
diff --git a/linden/indra/cmake/CMakeLists.txt b/linden/indra/cmake/CMakeLists.txt
index 4a7d633..aca7b5a 100644
--- a/linden/indra/cmake/CMakeLists.txt
+++ b/linden/indra/cmake/CMakeLists.txt
@@ -93,7 +93,6 @@ set(cmake_SOURCE_FILES
 	UI.cmake
 	UnixInstall.cmake
 	Variables.cmake
-	ViewerArtwork.cmake
 	ViewerMiscLibs.cmake
 	WebKitLibPlugin.cmake
 	XmlRpcEpi.cmake
diff --git a/linden/indra/cmake/ViewerArtwork.cmake b/linden/indra/cmake/ViewerArtwork.cmake
deleted file mode 100644
index 20210fc..0000000
--- a/linden/indra/cmake/ViewerArtwork.cmake
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- cmake -*-
-#
-# Download viewer artwork even when using standalone
-
-include(Variables)
-include(Prebuilt)
-
-if (NOT STANDALONE)
-  use_prebuilt_binary(artwork)
-  use_prebuilt_binary(fonts)
-else (NOT STANDALONE)
-  set(STANDALONE OFF)
-    use_prebuilt_binary(artwork)
-    use_prebuilt_binary(fonts)
-  set(STANDALONE ON)
-endif (NOT STANDALONE)
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 0871d16..2a976ff 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -37,7 +37,6 @@ include(GooglePerfTools)
 include(TemplateCheck)
 include(UI)
 include(UnixInstall)
-include(ViewerArtwork)
 include(ViewerMiscLibs)
 
 if (WINDOWS)
diff --git a/linden/indra/newview/app_settings/static_data.db2 b/linden/indra/newview/app_settings/static_data.db2
new file mode 100644
index 0000000..052ff9f
Binary files /dev/null and b/linden/indra/newview/app_settings/static_data.db2 differ
diff --git a/linden/indra/newview/app_settings/static_index.db2 b/linden/indra/newview/app_settings/static_index.db2
new file mode 100644
index 0000000..e0b7375
Binary files /dev/null and b/linden/indra/newview/app_settings/static_index.db2 differ
diff --git a/linden/indra/newview/app_settings/windlight/clouds2.tga b/linden/indra/newview/app_settings/windlight/clouds2.tga
new file mode 100644
index 0000000..c95ce7f
Binary files /dev/null and b/linden/indra/newview/app_settings/windlight/clouds2.tga differ
diff --git a/linden/indra/newview/app_settings/windlight/days/Default.xml b/linden/indra/newview/app_settings/windlight/days/Default.xml
new file mode 100644
index 0000000..d3d7ece
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/days/Default.xml
@@ -0,0 +1,36 @@
+<llsd>
+    <array>
+        <array>
+            <real>0</real>
+            <string>A-12AM</string>
+        </array>
+        <array>
+            <real>0.125</real>
+            <string>A-3AM</string>
+        </array>
+        <array>
+            <real>0.25</real>
+            <string>A-6AM</string>
+        </array>
+        <array>
+            <real>0.375</real>
+            <string>A-9AM</string>
+        </array>
+        <array>
+            <real>0.5</real>
+            <string>A-12PM</string>
+        </array>
+        <array>
+            <real>0.625</real>
+            <string>A-3PM</string>
+        </array>
+        <array>
+            <real>0.75</real>
+            <string>A-6PM</string>
+        </array>
+        <array>
+            <real>0.875</real>
+            <string>A-9PM</string>
+        </array>
+    </array>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/postprocesseffects.xml b/linden/indra/newview/app_settings/windlight/postprocesseffects.xml
new file mode 100644
index 0000000..2be9c72
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/postprocesseffects.xml
@@ -0,0 +1,2 @@
+<llsd><map><key>Asi Weird</key><map><key>bloom_strength</key><real>4.5799999237060547</real><key>bloom_width</key><real>12.539999961853027</real><key>brightness</key><real>0.89999997615814209</real><key>brightness_multiplier</key><real>3</real><key>contrast</key><real>0.22999998927116394</real><key>contrast_base</key><array><real>1</real><real>1</real><real>1</real><real>0.5</real></array><key>enable_bloom</key><integer>1</integer><key>enable_color_filter</key><integer>1</integer><key>enable_night_vision</key><boolean>0</boolean><key>extract_high</key><real>1</real><key>extract_low</key><real>0.47999998927116394</real><key>noise_size</key><real>25</real><key>noise_strength</key><real>0.40000000000000002</real><key>saturation</key><real>-1</real></map><key>NegativeSaturation</key><map><key>bloom_strength</key><real>1.5</real><key>bloom_width</key><real>2.25</real><key>brightness</key><real>1</real><key>brightness_multiplier</key><real>3</real><key>contrast</key><real>1</real><key>contrast_base</key><array><real>1</real><real>1</real><real>1</real><real>0.5</real></array><key>enable_bloom</key><boolean>0</boolean><key>enable_color_filter</key><integer>1</integer><key>enable_night_vision</key><boolean>0</boolean><key>extract_high</key><real>1</real><key>extract_low</key><real>0.94999999999999996</real><key>noise_size</key><real>25</real><key>noise_strength</key><real>0.40000000000000002</real><key>saturation</key><real>-1</real></map><key>NightVision</key><map><key>bloom_strength</key><real>1.5</real><key>bloom_width</key><real>2.25</real><key>brightness</key><real>1</real><key>brightness_multiplier</key><real>3</real><key>contrast</key><real>1</real><key>contrast_base</key><array><real>1</real><real>1</real><real>1</real><real>0.5</real></array><key>enable_bloom</key><boolean>0</boolean><key>enable_color_filter</key><boolean>0</boolean><key>enable_night_vision</key><integer>1</integer><key>extract_high</key><real>1</real><key>extract_low</key><real>0.94999999999999996</real><key>noise_size</key><real>25</real><key>noise_strength</key><real>0.40000000000000002</real><key>saturation</key><real>1</real></map><key>WGhost</key><map><key>bloom_strength</key><real>2.0399999618530273</real><key>bloom_width</key><real>2.25</real><key>brightness</key><real>1</real><key>brightness_multiplier</key><real>3</real><key>contrast</key><real>1</real><key>contrast_base</key><array><real>1</real><real>1</real><real>1</real><real>0.5</real></array><key>enable_bloom</key><integer>1</integer><key>enable_color_filter</key><boolean>0</boolean><key>enable_night_vision</key><boolean>0</boolean><key>extract_high</key><real>1</real><key>extract_low</key><real>0.22999998927116394</real><key>noise_size</key><real>25</real><key>noise_strength</key><real>0.40000000000000002</real><key>saturation</key><real>1</real></map><key>default</key><map><key>bloom_strength</key><real>1.5</real><key>bloom_width</key><real>2.25</real><key>brightness</key><real>1</real><key>brightness_multiplier</key><real>3</real><key>contrast</key><real>1</real><key>contrast_base</key><array><real>1</real><real>1</real><real>1</real><real>0.5</real></array><key>enable_bloom</key><boolean>0</boolean><key>enable_color_filter</key><boolean>0</boolean><key>enable_night_vision</key><boolean>0</boolean><key>extract_high</key><real>1</real><key>extract_low</key><real>0.94999999999999996</real><key>noise_size</key><real>25</real><key>noise_strength</key><real>0.40000000000000002</real><key>saturation</key><real>1</real></map></map></llsd>
+><map><key>bloom_strength</key><real>1.5</real><key>bloom_width</key><real>2.25</real><key>brightness</key><real>1</real><key>brightness_multiplier</key><real>3</real><key>contrast</key><real>1</real><key>contrast_base</key><array><real>1</real><real>1</real><real>1</real><real>0.5</real></array><key>enable_bloom</key><boolean>0</boolean><key>enable_color_filter</key><boolean>0</boolean><key>enable_night_vision</key><boolean>0</boolean><key>extract_high</key><real>1</real><key>extract_low</key><real>0.94999999999999996</real><key>noise_size</key><real>25</real><key>noise_strength</key><real>0.40000000000000002</real><key>saturation</key><real>1</real></map></map></llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/A%2D12AM.xml b/linden/indra/newview/app_settings/windlight/skies/A%2D12AM.xml
new file mode 100644
index 0000000..aa42de7
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/A%2D12AM.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.20405027270317078</real>
+            <real>0.24246673285961151</real>
+            <real>0.32999998331069946</real>
+            <real>0.10999999940395355</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.44999998807907104</real>
+            <real>0.44999998807907104</real>
+            <real>0.44999998807907104</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.23999999463558197</real>
+            <real>0.23999999463558197</real>
+            <real>0.23999999463558197</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.22615399956703186</real>
+            <real>0.22615399956703186</real>
+            <real>0.22615399956703186</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.87999999523162842</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.49940013885498</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00030000001424923539</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.47999998927116394</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>4</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>1</real>
+            <real>-4.8876205482883961e-007</real>
+            <real>1</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>906.20001220703125</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>2</real>
+    <key>sun_angle</key>
+        <real>4.7123894691467285</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.34876692295074463</real>
+            <real>0.35574248433113098</real>
+            <real>0.65999996662139893</real>
+            <real>0.2199999988079071</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/A%2D12PM.xml b/linden/indra/newview/app_settings/windlight/skies/A%2D12PM.xml
new file mode 100644
index 0000000..81291b1
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/A%2D12PM.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>1.0499999523162842</real>
+            <real>1.0499999523162842</real>
+            <real>1.0499999523162842</real>
+            <real>0.34999999403953552</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.24475815892219543</real>
+            <real>0.44872328639030457</real>
+            <real>0.75999999046325684</real>
+            <real>0.37999999523162842</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.49548381567001343</real>
+            <real>0.49548381567001343</real>
+            <real>0.63999998569488525</real>
+            <real>0.31999999284744263</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.40999999642372131</real>
+            <real>0.40999999642372131</real>
+            <real>0.40999999642372131</real>
+            <real>0.40999999642372131</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.199999809265137</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00017999998817685992</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>0.80000001192092896</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.47999998927116394</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.18999999761581421</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>1</real>
+            <real>-4.3711388286737929e-008</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1605</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>1.5707963705062866</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.7342105507850647</real>
+            <real>0.78157895803451538</real>
+            <real>0.89999997615814209</real>
+            <real>0.29999998211860657</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/A%2D3AM.xml b/linden/indra/newview/app_settings/windlight/skies/A%2D3AM.xml
new file mode 100644
index 0000000..29490cb
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/A%2D3AM.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.22259476780891418</real>
+            <real>0.26450252532958984</real>
+            <real>0.35999998450279236</real>
+            <real>0.11999999731779099</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.44999116536295314</real>
+            <real>0.44999854555993368</real>
+            <real>0.45001013284446073</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.23999616268583132</real>
+            <real>0.239999227803052</real>
+            <real>0.24000028550619668</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.22615400241566114</real>
+            <real>0.22615400241566114</real>
+            <real>0.22615400241566114</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.88000000953681223</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.499400354105791</real>
+            <real>10.011000104419489</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0003000046529240592</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>7.8213197608078763e-005</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5.0000000000023022</real>
+            <real>0.0010000000214220922</real>
+            <real>-0.47999999165507345</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>3.9999044060931555</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>4.6348559691012062e-006</real>
+            <real>0.19915600437461423</real>
+            <real>0.19915600437461423</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.70710653066635132</real>
+            <real>-0.70710700750350952</real>
+            <real>1</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>906.19008370909478</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>1.9999420642852783</real>
+    <key>sun_angle</key>
+        <real>5.4977874755859375</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.60242295265197754</real>
+            <real>0.61447036266326904</real>
+            <real>1.1399999856948853</real>
+            <real>0.37999999523162842</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/A%2D3PM.xml b/linden/indra/newview/app_settings/windlight/skies/A%2D3PM.xml
new file mode 100644
index 0000000..61ff9eb
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/A%2D3PM.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>1.0499999523162842</real>
+            <real>1.0499999523162842</real>
+            <real>1.0499999523162842</real>
+            <real>0.34999999403953552</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.2447581488182351</real>
+            <real>0.44872328639030457</real>
+            <real>0.75999999046325684</real>
+            <real>0.38000004053115788</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.49548382097675159</real>
+            <real>0.49548381382419748</real>
+            <real>0.63999999284744291</real>
+            <real>0.31999999642372146</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.40999999165535073</real>
+            <real>0.40999999165535073</real>
+            <real>0.40999999165535073</real>
+            <real>0.40999999165535073</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.99999999999999289</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.4199999868869746</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.199999809265137</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00017999998817685818</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>0.80000001192093606</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.47999998927116394</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.18999999761581243</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.70710659027099609</real>
+            <real>-0.70710694789886475</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1605</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>2.3561947345733643</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.73421055078505759</real>
+            <real>0.78157895803450828</real>
+            <real>0.89999997615813498</real>
+            <real>0.29999998211860301</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/A%2D6AM.xml b/linden/indra/newview/app_settings/windlight/skies/A%2D6AM.xml
new file mode 100644
index 0000000..3a7b619
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/A%2D6AM.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.80999994277954102</real>
+            <real>0.46289783716201782</real>
+            <real>0.62999993562698364</real>
+            <real>0.26999998092651367</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.15793180465698242</real>
+            <real>0.43499568104743958</real>
+            <real>0.87000000476837158</real>
+            <real>0.87000000476837158</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.20673196017742157</real>
+            <real>0.40988314151763916</real>
+            <real>0.47999998927116394</real>
+            <real>0.47999998927116394</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.22616604226328718</real>
+            <real>0.22616604226328718</real>
+            <real>0.22616604226328718</real>
+            <real>0.99997219085526012</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.88000025272481253</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.49940013883861</real>
+            <real>10.010999679576344</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00062000000616535544</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>2.6999279499073054</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5.0009990693069994</real>
+            <real>0.0010000000474963411</real>
+            <real>-0.48000101923815919</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.15999999642372131</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.094108223915100098</real>
+            <real>0.99556195735931396</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>563</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>0.094247691333293915</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.369999885559082</real>
+            <real>2.369999885559082</real>
+            <real>2.369999885559082</real>
+            <real>0.78999996185302734</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/A%2D6PM.xml b/linden/indra/newview/app_settings/windlight/skies/A%2D6PM.xml
new file mode 100644
index 0000000..796c6e1
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/A%2D6PM.xml
@@ -0,0 +1,142 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>1.0199999809265137</real>
+            <real>0.80999994277954102</real>
+            <real>0.80999994277954102</real>
+            <real>1.0199999809265137</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.14522500336170197</real>
+            <real>0.39999699592590332</real>
+            <real>0.80000197887420654</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.10767599940299988</real>
+            <real>0.21348699927330017</real>
+            <real>0.25</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.22615399956703186</real>
+            <real>0.22615399956703186</real>
+            <real>0.22615399956703186</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.87999999523162842</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.49940013885498</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00046000001020729542</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.47999998927116394</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.15999999642372131</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.07532646507024765</real>
+            <real>-0.99715894460678101</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>562.5</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>3.0661947727203369</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.8385701179504395</real>
+            <real>2.8385701179504395</real>
+            <real>2.8385701179504395</real>
+            <real>1</real>
+        </array>
+    </map>
+</llsd>
+
diff --git a/linden/indra/newview/app_settings/windlight/skies/A%2D9AM.xml b/linden/indra/newview/app_settings/windlight/skies/A%2D9AM.xml
new file mode 100644
index 0000000..84b61ac
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/A%2D9AM.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>1.0499999949065426</real>
+            <real>1.0499999988079054</real>
+            <real>1.0499999988079054</real>
+            <real>0.3500000095367426</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.15999999642372131</real>
+            <real>0.44872328639030457</real>
+            <real>0.75999999046325684</real>
+            <real>0.75999999046325684</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.47999998927116394</real>
+            <real>0.69999998807907104</real>
+            <real>0.34999999403953552</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.37000000476837158</real>
+            <real>0.37000000476837158</real>
+            <real>0.37000000476837158</real>
+            <real>0.37000000476837158</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.99999998569455784</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999997615814166</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.199999844956437</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.27333331108093262</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00017999998102430359</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>0.80000008344649842</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>4.9999999284740397</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.47999999046327346</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.70000003576435432</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.18999999284767277</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.70710676908493042</real>
+            <real>0.70710676908493042</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1605</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>0.78539818525314331</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.73421054104441197</real>
+            <real>0.7815789463510896</real>
+            <real>0.89999995470046912</real>
+            <real>0.29999997496605069</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/A%2D9PM.xml b/linden/indra/newview/app_settings/windlight/skies/A%2D9PM.xml
new file mode 100644
index 0000000..6a509d1
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/A%2D9PM.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.20404692765200849</real>
+            <real>0.24246276689169122</real>
+            <real>0.33000383615406292</real>
+            <real>0.1100123608103587</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.44999116536295314</real>
+            <real>0.44999854555993368</real>
+            <real>0.45001013284446073</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.23999616268583132</real>
+            <real>0.239999227803052</real>
+            <real>0.24000028550619668</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.22615400241566114</real>
+            <real>0.22615400241566114</real>
+            <real>0.22615400241566114</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.88000000953681223</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.499400354105791</real>
+            <real>10.011000104419489</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0003000046529240592</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>7.8213197608078763e-005</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5.0000000000023022</real>
+            <real>0.0010000000214220922</real>
+            <real>-0.47999999165507345</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>3.9999044060931555</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>4.6348559691012062e-006</real>
+            <real>0.19915600437461423</real>
+            <real>0.19915600437461423</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.70710688829421997</real>
+            <real>0.70710664987564087</real>
+            <real>1</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>906.19008370909478</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>1.9999420642852783</real>
+    <key>sun_angle</key>
+        <real>3.9269909858703613</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.34878980098432066</real>
+            <real>0.35576509414380553</real>
+            <real>0.66003586768772493</real>
+            <real>0.22001197576412324</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Barcelona.xml b/linden/indra/newview/app_settings/windlight/skies/Barcelona.xml
new file mode 100644
index 0000000..7b09fe2
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Barcelona.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.22260047495365143</real>
+            <real>0.26450866460800171</real>
+            <real>0.35999998450279236</real>
+            <real>0.11999999731779099</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.14522500336170197</real>
+            <real>0.39999699592590332</real>
+            <real>0.80000197887420654</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.15130999684333801</real>
+            <real>0.30000001192092896</real>
+            <real>0.35131001472473145</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.50999999046325684</real>
+            <real>0.50999999046325684</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.49940013885498</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.30000001192092896</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0003499999875202775</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>6</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.33000001311302185</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.062790460884571075</real>
+            <real>-0.99802672863006592</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>600</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>21</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>3.0787608623504639</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.1699999570846558</real>
+            <real>1.1699999570846558</real>
+            <real>1.1699999570846558</real>
+            <real>0.38999998569488525</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Blizzard.xml b/linden/indra/newview/app_settings/windlight/skies/Blizzard.xml
new file mode 100644
index 0000000..a4110a1
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Blizzard.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.4823022186756134</real>
+            <real>0.57310229539871216</real>
+            <real>0.77999997138977051</real>
+            <real>0.25999999046325684</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.14522500336170197</real>
+            <real>0.39999699592590332</real>
+            <real>0.80000197887420654</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.15130999684333801</real>
+            <real>0.30000001192092896</real>
+            <real>0.35131001472473145</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.12862999737262726</real>
+            <real>0.12862999737262726</real>
+            <real>0.12862999737262726</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.88419097661972046</real>
+            <real>0.53047597408294678</real>
+            <real>0.4270470142364502</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.38419300317764282</real>
+            <real>0.5</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10</real>
+            <real>10</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.61711597442626953</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0001250890054507181</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>11.40000057220459</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>6.4079799652099609</real>
+            <real>0.0012815999798476696</real>
+            <real>-0.42292699217796326</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>4</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.21744099259376526</real>
+            <real>0.21744099259376526</real>
+            <real>0.21744099259376526</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.15643447637557983</real>
+            <real>0.98768836259841919</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>4000</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>2</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>0.15707963705062866</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>3</real>
+            <real>3</real>
+            <real>3</real>
+            <real>1</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Blue%20Midday.xml b/linden/indra/newview/app_settings/windlight/skies/Blue%20Midday.xml
new file mode 100644
index 0000000..e7fdbe1
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Blue%20Midday.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.14999999105930328</real>
+            <real>0.14999999105930328</real>
+            <real>0.14999999105930328</real>
+            <real>0.049999997019767761</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.18153078854084015</real>
+            <real>0.49999505281448364</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.43070217967033386</real>
+            <real>0.85394656658172607</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.53962135314941406</real>
+            <real>0.53962135314941406</real>
+            <real>0.53962135314941406</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.69569224119186401</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.10999999195337296</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.49940013885498</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.3765256404876709</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0003499999875202775</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>2.9846153259277344</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>4.2061538696289062</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.44246155023574829</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>2.8830769062042236</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.49740666151046753</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.86074197292327881</real>
+            <real>-0.50904154777526855</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>600</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>10</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>2.1048672199249268</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.88526362180709839</real>
+            <real>1.2300000190734863</real>
+            <real>1.2300000190734863</real>
+            <real>0.40999999642372131</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Coastal%20Afternoon.xml b/linden/indra/newview/app_settings/windlight/skies/Coastal%20Afternoon.xml
new file mode 100644
index 0000000..1036e69
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Coastal%20Afternoon.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.89040267467498779</real>
+            <real>1.0580335855484009</real>
+            <real>1.4399999380111694</real>
+            <real>0.47999998927116394</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.14522500336170197</real>
+            <real>0.39999699592590332</real>
+            <real>0.80000197887420654</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.15130999684333801</real>
+            <real>0.30000001192092896</real>
+            <real>0.35131001472473145</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.21396400034427643</real>
+            <real>0.21396400034427643</real>
+            <real>0.21396400034427643</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.16495099663734436</real>
+            <real>0.09771379828453064</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.079754598438739777</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>9.644780158996582</real>
+            <real>10.423800468444824</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.30061298608779907</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00015800200344529003</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.33000001311302185</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.13210900127887726</real>
+            <real>0.13210900127887726</real>
+            <real>0.13210900127887726</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.031410444527864456</real>
+            <real>-0.99950659275054932</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>600</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>3</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>3.1101770401000977</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>3</real>
+            <real>3</real>
+            <real>3</real>
+            <real>1</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Coastal%20Sunset.xml b/linden/indra/newview/app_settings/windlight/skies/Coastal%20Sunset.xml
new file mode 100644
index 0000000..41f6aaf
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Coastal%20Sunset.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.31535112857818604</real>
+            <real>0.37471914291381836</real>
+            <real>0.50999999046325684</real>
+            <real>0.17000000178813934</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.11645399779081345</real>
+            <real>0.32075101137161255</real>
+            <real>0.64150899648666382</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.054176401346921921</real>
+            <real>0.10741499811410904</real>
+            <real>0.12578600645065308</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.21396400034427643</real>
+            <real>0.21396400034427643</real>
+            <real>0.21396400034427643</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.27044001221656799</real>
+            <real>1</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.10062900185585022</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>9.644780158996582</real>
+            <real>10.423800468444824</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.32704401016235352</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00015849100600462407</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>3.4000000953674316</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>6.867919921875</real>
+            <real>0.0013735899701714516</real>
+            <real>-0.45328301191329956</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.6792449951171875</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.13210900127887726</real>
+            <real>0.13210900127887726</real>
+            <real>0.13210900127887726</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.031410444527864456</real>
+            <real>-0.99950659275054932</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1308.1800537109375</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>5</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>3.1101770401000977</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>3</real>
+            <real>3</real>
+            <real>3</real>
+            <real>1</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Default.xml b/linden/indra/newview/app_settings/windlight/skies/Default.xml
new file mode 100644
index 0000000..d2d62e6
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Default.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>1.0499999523162842</real>
+            <real>1.0499999523162842</real>
+            <real>1.0499999523162842</real>
+            <real>0.34999999403953552</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.24475815892219543</real>
+            <real>0.44872328639030457</real>
+            <real>0.75999999046325684</real>
+            <real>0.37999999523162842</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.49548381567001343</real>
+            <real>0.49548381567001343</real>
+            <real>0.63999998569488525</real>
+            <real>0.31999999284744263</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.40999999642372131</real>
+            <real>0.40999999642372131</real>
+            <real>0.40999999642372131</real>
+            <real>0.40999999642372131</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.199999809265137</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00017999998817685992</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>0.80000001192092896</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.47999998927116394</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.18999999761581421</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.91269159317016602</real>
+            <real>-0.40864911675453186</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1605</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>1.9917697906494141</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.7342105507850647</real>
+            <real>0.78157895803451538</real>
+            <real>0.89999997615814209</real>
+            <real>0.29999998211860657</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Desert%20Sunset.xml b/linden/indra/newview/app_settings/windlight/skies/Desert%20Sunset.xml
new file mode 100644
index 0000000..89f8c36
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Desert%20Sunset.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.07420019805431366</real>
+            <real>0.088169597089290619</real>
+            <real>0.11999999731779099</real>
+            <real>1</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.14522500336170197</real>
+            <real>0.39999699592590332</real>
+            <real>0.80000197887420654</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.10767599940299988</real>
+            <real>0.21348699927330017</real>
+            <real>0.25</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.22615399956703186</real>
+            <real>0.22615399956703186</real>
+            <real>0.22615399956703186</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.199999809265137</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.37999999523162842</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00046000001020729542</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>2</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.6100000143051147</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.47999998927116394</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.15999999642372131</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.062790460884571075</real>
+            <real>-0.99802672863006592</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>562.5</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>3.0787608623504639</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.8385701179504395</real>
+            <real>2.8385701179504395</real>
+            <real>2.8385701179504395</real>
+            <real>1</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Fine%20Day.xml b/linden/indra/newview/app_settings/windlight/skies/Fine%20Day.xml
new file mode 100644
index 0000000..0d6d1db
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Fine%20Day.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.21194984018802643</real>
+            <real>0.25700280070304871</real>
+            <real>0.25999999046325684</real>
+            <real>0.25999999046325684</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.10031381994485855</real>
+            <real>0.2849995493888855</real>
+            <real>0.56999999284744263</real>
+            <real>0.56999999284744263</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.15806557238101959</real>
+            <real>0.31211116909980774</real>
+            <real>0.52999997138977051</real>
+            <real>0.52999997138977051</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.62000000476837158</real>
+            <real>0.72737622261047363</real>
+            <real>0.73626559972763062</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.89999997615814209</real>
+            <real>0.93999999761581421</real>
+            <real>0.74000000953674316</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.11999999731779099</real>
+            <real>0.20999999344348907</real>
+            <real>0.029999999329447746</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.25999999046325684</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>9.993240904292179</real>
+            <real>10.010000228881836</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00013000000035390258</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>10.100000381469727</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>3.8955750465393066</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.4699999094009399</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>11.200000762939453</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.64999997615814209</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.35999998450279236</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.11999999731779099</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.66304093599319458</real>
+            <real>0.24868990480899811</real>
+            <real>-0.70606660842895508</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>789</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>24</integer>
+    <key>star_brightness</key>
+        <real>0.18999999761581421</real>
+    <key>sun_angle</key>
+        <real>0.25132742524147034</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.25</real>
+            <real>1.2599999904632568</real>
+            <real>0.59999996423721313</real>
+            <real>2.25</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Fluffy%20Big%20Clouds.xml b/linden/indra/newview/app_settings/windlight/skies/Fluffy%20Big%20Clouds.xml
new file mode 100644
index 0000000..9b5ad5a
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Fluffy%20Big%20Clouds.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.029999999329447746</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0.029999999329447746</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.097999997437000275</real>
+            <real>0.2800000011920929</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.11999999731779099</real>
+            <real>0.35094299912452698</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.48999997973442078</real>
+            <real>0.79000002145767212</real>
+            <real>0.80000001192092896</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.5</real>
+            <real>0.75999999046325684</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.38999998569488525</real>
+            <real>0.5</real>
+            <real>0.039999999105930328</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.43999999761581421</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>11.809999465942383</real>
+            <real>12.799999237060547</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.32999998331069946</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00021999998716637492</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>4</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>3.2044246196746826</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.5399999618530273</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>3.8000010331979865</real>
+            <real>0.001000000059761974</real>
+            <real>-0.49999996688498527</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.20999999344348907</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.049999997019767761</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.056814663112163544</real>
+            <real>0.42577928304672241</real>
+            <real>-0.90304160118103027</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>676.10003662109375</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0.44999998807907104</real>
+    <key>sun_angle</key>
+        <real>0.4398229718208313</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.7999999523162842</real>
+            <real>1.4099999666213989</real>
+            <real>1.0199999809265137</real>
+            <real>1.7999999523162842</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Foggy.xml b/linden/indra/newview/app_settings/windlight/skies/Foggy.xml
new file mode 100644
index 0000000..88f55f6
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Foggy.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.32999998331069946</real>
+            <real>0.32999998331069946</real>
+            <real>0.32999998331069946</real>
+            <real>0.10999999940395355</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.14522500336170197</real>
+            <real>0.39999699592590332</real>
+            <real>0.80000197887420654</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.43070214986801147</real>
+            <real>0.85394668579101563</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0.69999998807907104</real>
+            <real>0.69999998807907104</real>
+            <real>0.69999998807907104</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.53999996185302734</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.49940013885498</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.39999997615814209</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0003499999875202775</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>4</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>3.7999999523162842</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.5</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>4</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.64999997615814209</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>1</real>
+            <real>-4.3711388286737929e-008</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>600</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>1.5707963705062866</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.53999996185302734</real>
+            <real>0.53999996185302734</real>
+            <real>0.17999999225139618</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Funky%20Funky%20Funky.xml b/linden/indra/newview/app_settings/windlight/skies/Funky%20Funky%20Funky.xml
new file mode 100644
index 0000000..aad702b
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Funky%20Funky%20Funky.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0.23511900007724762</real>
+            <real>0.31999999284744263</real>
+            <real>1</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.13977900147438049</real>
+            <real>0.38499599695205688</real>
+            <real>0.76999998092651367</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.18999999761581421</real>
+            <real>0.18999999761581421</real>
+            <real>0.18999999761581421</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.22615399956703186</real>
+            <real>0.22615399956703186</real>
+            <real>0.22615399956703186</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>5.3780298233032227</real>
+            <real>1.9675600528717041</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>5.3780298233032227</real>
+            <real>1.9675600528717041</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.739999771118164</real>
+            <real>10.600000381469727</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.31000000238418579</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00052000000141561031</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>3.4000000953674316</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>0.77999997138977051</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.47999998927116394</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>1.1000000238418579</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.12999999523162842</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.53582650423049927</real>
+            <real>-0.84432810544967651</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>656.20001220703125</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>28</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>2.5761063098907471</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.1299998760223389</real>
+            <real>1.5299999713897705</real>
+            <real>2.8385701179504395</real>
+            <real>1</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Funky%20Funky.xml b/linden/indra/newview/app_settings/windlight/skies/Funky%20Funky.xml
new file mode 100644
index 0000000..7b3c312
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Funky%20Funky.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.32999998331069946</real>
+            <real>0.32999998331069946</real>
+            <real>0.32999998331069946</real>
+            <real>0.10999999940395355</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.14522500336170197</real>
+            <real>0.39999699592590332</real>
+            <real>0.80000197887420654</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.15130999684333801</real>
+            <real>0.30000001192092896</real>
+            <real>0.35131001472473145</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.22615399956703186</real>
+            <real>0.22615399956703186</real>
+            <real>0.22615399956703186</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.65280699729919434</real>
+            <real>0.50335597991943359</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.65280699729919434</real>
+            <real>0.50335597991943359</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.49940013885498</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.33064401149749756</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0003499999875202775</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.33000001311302185</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.062790460884571075</real>
+            <real>-0.99802672863006592</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>600</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>11</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>3.0787608623504639</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.86811381578445435</real>
+            <real>2.2200000286102295</real>
+            <real>2.2200000286102295</real>
+            <real>0.74000000953674316</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Gelatto.xml b/linden/indra/newview/app_settings/windlight/skies/Gelatto.xml
new file mode 100644
index 0000000..92b4fd6
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Gelatto.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0</real>
+            <real>0.15999999642372131</real>
+            <real>0</real>
+            <real>0.15999999642372131</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.019999999552965164</real>
+            <real>0.22999770939350128</real>
+            <real>0.45999997854232788</real>
+            <real>0.55000001192092896</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.6319204568862915</real>
+            <real>0.74000000953674316</real>
+            <real>0.84999996423721313</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.53999996185302734</real>
+            <real>0.50999999046325684</real>
+            <real>0.23999999463558197</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.059999998658895493</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.2800000011920929</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>20</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.32999998331069946</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00016999999934341758</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>8.1000003814697266</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>3.7699110507965088</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>0</boolean>
+            <boolean>0</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.5399999618530273</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>0.39999961853027344</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.49999997019767761</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>3.2599999904632568</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.4699999988079071</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.58749508857727051</real>
+            <real>-0.031410761177539825</real>
+            <real>-0.80861783027648926</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1267.5999755859375</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>-0.031415928155183792</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.75</real>
+            <real>0.71999996900558472</real>
+            <real>0.37800011038780212</real>
+            <real>0.80999994277954102</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Ghost.xml b/linden/indra/newview/app_settings/windlight/skies/Ghost.xml
new file mode 100644
index 0000000..065b9e5
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Ghost.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.23999999463558197</real>
+            <real>0.23999999463558197</real>
+            <real>0.23999999463558197</real>
+            <real>0.079999998211860657</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.16700799763202667</real>
+            <real>0.45999500155448914</real>
+            <real>0.92000001668930054</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.18089599907398224</real>
+            <real>0.35865798592567444</real>
+            <real>0.41999998688697815</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.40999999642372131</real>
+            <real>0.40999999642372131</real>
+            <real>0.40999999642372131</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>11.539999961853027</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.36000001430511475</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00042999998549930751</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>8.1000003814697266</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.51999998092651367</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.75</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.18000000715255737</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.89100658893585205</real>
+            <real>0.45399042963981628</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>718.70001220703125</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>23</integer>
+    <key>star_brightness</key>
+        <real>2</real>
+    <key>sun_angle</key>
+        <real>1.0995575189590454</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.33000001311302185</real>
+            <real>0.33000001311302185</real>
+            <real>0.33000001311302185</real>
+            <real>1</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Incongruent%20Truths.xml b/linden/indra/newview/app_settings/windlight/skies/Incongruent%20Truths.xml
new file mode 100644
index 0000000..191f6f4
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Incongruent%20Truths.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0.44999998807907104</real>
+            <real>0.44999998807907104</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.13997539444089213</real>
+            <real>0.38665792478461469</real>
+            <real>0.77332294252195766</real>
+            <real>0.95108884837904384</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0</real>
+            <real>0.22876684367656708</real>
+            <real>0.290018230676651</real>
+            <real>0.31999999284744263</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.25999999046325684</real>
+            <real>0.28883209824562073</real>
+            <real>0.28994369506835938</real>
+            <real>0.28999999165534973</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.17999999225139618</real>
+            <real>0.50999999046325684</real>
+            <real>0.91999995708465576</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.079999998211860657</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.25</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.436104517528292</real>
+            <real>10</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.34000000357627869</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0002899999963119626</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>1.3000000715255737</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>2.2619466781616211</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.5399999618530273</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>4.0000009536743164</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.74999994039535522</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.12999999523162842</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.14999999105930328</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0.74630612134933472</real>
+            <real>0.24868990480899811</real>
+            <real>-0.61739814281463623</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>394.39999389648437</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>0.44999998807907104</real>
+    <key>sun_angle</key>
+        <real>0.25132742524147034</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.25</real>
+            <real>1.957500696182251</real>
+            <real>1.170000433921814</real>
+            <real>0.75</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Midday%201.xml b/linden/indra/newview/app_settings/windlight/skies/Midday%201.xml
new file mode 100644
index 0000000..d2d62e6
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Midday%201.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>1.0499999523162842</real>
+            <real>1.0499999523162842</real>
+            <real>1.0499999523162842</real>
+            <real>0.34999999403953552</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.24475815892219543</real>
+            <real>0.44872328639030457</real>
+            <real>0.75999999046325684</real>
+            <real>0.37999999523162842</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.49548381567001343</real>
+            <real>0.49548381567001343</real>
+            <real>0.63999998569488525</real>
+            <real>0.31999999284744263</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.40999999642372131</real>
+            <real>0.40999999642372131</real>
+            <real>0.40999999642372131</real>
+            <real>0.40999999642372131</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.6884100437164307</real>
+            <real>0.52609699964523315</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.199999809265137</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00017999998817685992</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>0.80000001192092896</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.47999998927116394</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.18999999761581421</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.91269159317016602</real>
+            <real>-0.40864911675453186</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1605</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>22</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>1.9917697906494141</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.7342105507850647</real>
+            <real>0.78157895803451538</real>
+            <real>0.89999997615814209</real>
+            <real>0.29999998211860657</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Midday%202.xml b/linden/indra/newview/app_settings/windlight/skies/Midday%202.xml
new file mode 100644
index 0000000..3fb21f2
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Midday%202.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.14522500336170197</real>
+            <real>0.39999699592590332</real>
+            <real>0.80000197887420654</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.43070214986801147</real>
+            <real>0.85394668579101563</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0.69999998807907104</real>
+            <real>0.69999998807907104</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.53999996185302734</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.199999809265137</real>
+            <real>10.069999694824219</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.22999998927116394</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0003499999875202775</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.6100000143051147</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>3.7999999523162842</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.5</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>1</real>
+            <real>-4.3711388286737929e-008</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>600</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>-1163005939</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>1.5707963705062866</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.80999994277954102</real>
+            <real>0.80999994277954102</real>
+            <real>0.80999994277954102</real>
+            <real>0.26999998092651367</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Midday%203.xml b/linden/indra/newview/app_settings/windlight/skies/Midday%203.xml
new file mode 100644
index 0000000..c1dfa55
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Midday%203.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.33000001311302185</real>
+            <real>0.33000001311302185</real>
+            <real>0.33000001311302185</real>
+            <real>1</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.16449999809265137</real>
+            <real>0.4699999988079071</real>
+            <real>0.93999999761581421</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.17547200620174408</real>
+            <real>0.35094299912452698</real>
+            <real>0.62000000476837158</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.5899999737739563</real>
+            <real>0.79000002145767212</real>
+            <real>0.80000001192092896</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>2.8148899078369141</real>
+            <real>5.6909198760986328</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>5.9584097862243652</real>
+            <real>6.9909601211547852</real>
+            <real>0.070000000298023224</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>9.9300003051757813</real>
+            <real>10.199999809265137</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.25999999046325684</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00039000000106170774</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.6100000143051147</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000474974513</real>
+            <real>-1.1599999666213989</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.20999999344348907</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.11999999731779099</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>1</real>
+            <real>-4.3711388286737929e-008</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>2250</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>24</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>1.5707963705062866</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.2599999904632568</real>
+            <real>1.2599999904632568</real>
+            <real>1.2599999904632568</real>
+            <real>1</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Midday%204.xml b/linden/indra/newview/app_settings/windlight/skies/Midday%204.xml
new file mode 100644
index 0000000..d0b1425
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Midday%204.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.33000001311302185</real>
+            <real>0.33000001311302185</real>
+            <real>0.33000001311302185</real>
+            <real>1</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.097999997437000275</real>
+            <real>0.2800000011920929</real>
+            <real>0.56000000238418579</real>
+            <real>0.56000000238418579</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.17547200620174408</real>
+            <real>0.35094299912452698</real>
+            <real>0.61000001430511475</real>
+            <real>0.61000001430511475</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.5899999737739563</real>
+            <real>0.79000002145767212</real>
+            <real>0.80000001192092896</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>2.8148899078369141</real>
+            <real>5.6909198760986328</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>5.9584097862243652</real>
+            <real>6.9909601211547852</real>
+            <real>0.070000000298023224</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.32999998331069946</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>9.9300003051757813</real>
+            <real>10.199999809265137</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.22999998927116394</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00039000000106170774</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.6100000143051147</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>3.8000011444091797</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.49999997019767761</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.20999999344348907</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.19999998807907104</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>1</real>
+            <real>-4.3711388286737929e-008</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>1802.800048828125</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>24</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>1.5707963705062866</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.2599999904632568</real>
+            <real>1.2599999904632568</real>
+            <real>1.2599999904632568</real>
+            <real>0.41999998688697815</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Night.xml b/linden/indra/newview/app_settings/windlight/skies/Night.xml
new file mode 100644
index 0000000..319a06f
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Night.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.20405027105862608</real>
+            <real>0.24246673976617727</real>
+            <real>0.32999997392212316</real>
+            <real>0.11000000166951449</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.44999999369830818</real>
+            <real>0.44999999398335949</real>
+            <real>0.4499999944309046</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.23999999567946317</real>
+            <real>0.23999999579784967</real>
+            <real>0.23999999583870221</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.22615400241575034</real>
+            <real>0.22615400241575034</real>
+            <real>0.22615400241575034</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.88000000953711155</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.49940035411295</real>
+            <real>10.011000104431371</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.36000001430511475</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00030000001824737163</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>3.0208916693946743e-009</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000214212465</real>
+            <real>-0.47999999165502744</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>3.9999999963077992</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>1.7901579546794781e-010</real>
+            <real>0.19915600437467304</real>
+            <real>0.19915600437467304</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>1</real>
+            <real>3.0028815672267228e-005</real>
+            <real>1</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>906.20003957594895</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>26</integer>
+    <key>star_brightness</key>
+        <real>2</real>
+    <key>sun_angle</key>
+        <real>4.7123589515686035</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.34876692389196384</real>
+            <real>0.3557424864638451</real>
+            <real>0.65999994893325931</real>
+            <real>0.22000000284673543</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Pirate.xml b/linden/indra/newview/app_settings/windlight/skies/Pirate.xml
new file mode 100644
index 0000000..dc61fc6
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Pirate.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.27825063467025757</real>
+            <real>0.33063584566116333</real>
+            <real>0.44999998807907104</real>
+            <real>0.14999999105930328</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.14522500336170197</real>
+            <real>0.39999699592590332</real>
+            <real>0.80000197887420654</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.15130999684333801</real>
+            <real>0.30000001192092896</real>
+            <real>0.35131001472473145</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.22615399956703186</real>
+            <real>0.22615399956703186</real>
+            <real>0.22615399956703186</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>1.2046600580215454</real>
+            <real>0.51547497510910034</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>1.2046600580215454</real>
+            <real>0.51547497510910034</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.49940013885498</real>
+            <real>10.01099967956543</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.33064401149749756</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.0003499999875202775</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>3.4000000953674316</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.36000001430511475</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.69999998807907104</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.062790460884571075</real>
+            <real>-0.99802672863006592</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>600</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>27</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>3.0787608623504639</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>2.8385701179504395</real>
+            <real>2.8385701179504395</real>
+            <real>2.8385701179504395</real>
+            <real>1</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Purple.xml b/linden/indra/newview/app_settings/windlight/skies/Purple.xml
new file mode 100644
index 0000000..ffa2949
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Purple.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.1978670060634613</real>
+            <real>0.23511900007724762</real>
+            <real>0.31999999284744263</real>
+            <real>1</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.13977900147438049</real>
+            <real>0.38499599695205688</real>
+            <real>0.76999998092651367</real>
+            <real>1</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.18999999761581421</real>
+            <real>0.18999999761581421</real>
+            <real>0.18999999761581421</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.22615399956703186</real>
+            <real>0.22615399956703186</real>
+            <real>0.22615399956703186</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>5.3780298233032227</real>
+            <real>1.9675600528717041</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>5.3780298233032227</real>
+            <real>1.9675600528717041</real>
+            <real>0.125</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.41999998688697815</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>10.739999771118164</real>
+            <real>10.600000381469727</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.31000000238418579</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00052000000141561031</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>3.4000000953674316</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>0</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>5</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.47999998927116394</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>1.1000000238418579</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.12999999523162842</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0</real>
+            <real>0.094108030200004578</real>
+            <real>-0.99556201696395874</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>656.20001220703125</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>28</integer>
+    <key>star_brightness</key>
+        <real>0</real>
+    <key>sun_angle</key>
+        <real>3.0473451614379883</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.5</real>
+            <real>1.5299999713897705</real>
+            <real>2.8385701179504395</real>
+            <real>1</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Sailor%27s%20Delight.xml b/linden/indra/newview/app_settings/windlight/skies/Sailor%27s%20Delight.xml
new file mode 100644
index 0000000..9b4c441
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Sailor%27s%20Delight.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0.8399999737739563</real>
+            <real>0.090738050639629364</real>
+            <real>0.1234893873333931</real>
+            <real>0.8399999737739563</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0.93999999761581421</real>
+            <real>0.69999998807907104</real>
+            <real>0.25</real>
+            <real>0.93999999761581421</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>1</real>
+            <real>0.59999996423721313</real>
+            <real>0.25001853704452515</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.65999996662139893</real>
+            <real>0.38999998569488525</real>
+            <real>0.22618354856967926</real>
+            <real>0.65999996662139893</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.76999998092651367</real>
+            <real>0.50999999046325684</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.5</real>
+            <real>0.5899999737739563</real>
+            <real>0.019999999552965164</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.26999998092651367</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>9.4499998092651367</real>
+            <real>9.4399995803833008</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.5</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00019999999494757503</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>6.7000002861022949</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>3.7070791721343994</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.4800000190734863</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>0.79999923706054688</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.94999998807907104</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.89999997615814209</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.29999998211860657</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>0.53160154819488525</real>
+            <real>0.12533323466777802</real>
+            <real>-0.83767020702362061</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>281.70001220703125</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>18</integer>
+    <key>star_brightness</key>
+        <real>1.3799999952316284</real>
+    <key>sun_angle</key>
+        <real>0.12566371262073517</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>0.75</real>
+            <real>1.6800000667572021</real>
+            <real>1.0777359008789062</real>
+            <real>0.56000000238418579</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/skies/Sheer%20Surreality.xml b/linden/indra/newview/app_settings/windlight/skies/Sheer%20Surreality.xml
new file mode 100644
index 0000000..a36024c
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/skies/Sheer%20Surreality.xml
@@ -0,0 +1,141 @@
+<llsd>
+    <map>
+    <key>ambient</key>
+        <array>
+            <real>0</real>
+            <real>0.059999998658895493</real>
+            <real>0</real>
+            <real>0.059999998658895493</real>
+        </array>
+    <key>blue_density</key>
+        <array>
+            <real>0</real>
+            <real>0.099999994039535522</real>
+            <real>0.32999998331069946</real>
+            <real>0.32999998331069946</real>
+        </array>
+    <key>blue_horizon</key>
+        <array>
+            <real>0.029999999329447746</real>
+            <real>0</real>
+            <real>1</real>
+            <real>1</real>
+        </array>
+    <key>cloud_color</key>
+        <array>
+            <real>0.81999999284744263</real>
+            <real>0.18999999761581421</real>
+            <real>0.039999999105930328</real>
+            <real>0.81999999284744263</real>
+        </array>
+    <key>cloud_pos_density1</key>
+        <array>
+            <real>0.74000000953674316</real>
+            <real>0.93999999761581421</real>
+            <real>0.20999999344348907</real>
+            <real>1</real>
+        </array>
+    <key>cloud_pos_density2</key>
+        <array>
+            <real>0.65999996662139893</real>
+            <real>0.52999997138977051</real>
+            <real>0.0099999997764825821</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scale</key>
+        <array>
+            <real>0.14000000059604645</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>cloud_scroll_rate</key>
+        <array>
+            <real>18</real>
+            <real>20</real>
+        </array>
+    <key>cloud_shadow</key>
+        <array>
+            <real>0.37999999523162842</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>density_multiplier</key>
+        <array>
+            <real>0.00018000000272877514</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>distance_multiplier</key>
+        <array>
+            <real>6.7000002861022949</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>east_angle</key>
+        <real>2.3247785568237305</real>
+    <key>enable_cloud_scroll</key>
+        <array>
+            <boolean>1</boolean>
+            <boolean>1</boolean>
+        </array>
+    <key>gamma</key>
+        <array>
+            <real>1.9499999284744263</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>glow</key>
+        <array>
+            <real>17.399999618530273</real>
+            <real>0.0010000000474974513</real>
+            <real>-0.64999997615814209</real>
+            <real>1</real>
+        </array>
+    <key>haze_density</key>
+        <array>
+            <real>0.40999999642372131</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>haze_horizon</key>
+        <array>
+            <real>0.17000000178813934</real>
+            <real>0.19915600121021271</real>
+            <real>0.19915600121021271</real>
+            <real>1</real>
+        </array>
+    <key>lightnorm</key>
+        <array>
+            <real>-0.72322052717208862</real>
+            <real>0.12533323466777802</real>
+            <real>-0.67914927005767822</real>
+            <real>0</real>
+        </array>
+    <key>max_y</key>
+        <array>
+            <real>263</real>
+            <real>0</real>
+            <real>0</real>
+            <real>1</real>
+        </array>
+    <key>preset_num</key>
+        <integer>24</integer>
+    <key>star_brightness</key>
+        <real>1.0399999618530273</real>
+    <key>sun_angle</key>
+        <real>0.12566371262073517</real>
+    <key>sunlight_color</key>
+        <array>
+            <real>1.5899999141693115</real>
+            <real>1.5299999713897705</real>
+            <real>0.53999996185302734</real>
+            <real>1.5899999141693115</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/Default.xml b/linden/indra/newview/app_settings/windlight/water/Default.xml
new file mode 100644
index 0000000..1826753
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/Default.xml
@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.040000002831220627</real>
+    <key>fresnelOffset</key>
+        <real>0.5</real>
+    <key>fresnelScale</key>
+        <real>0.39999997615814209</real>
+    <key>normScale</key>
+        <array>
+            <integer>2</integer>
+            <integer>2</integer>
+            <integer>2</integer>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0.029999999329447746</real>
+    <key>scaleBelow</key>
+        <real>0.20000000298023224</real>
+    <key>underWaterFogMod</key>
+        <real>0.25</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.015686275437474251</real>
+            <real>0.14901961386203766</real>
+            <real>0.25098040699958801</real>
+            <real>1</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>16</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>1.0499997138977051</real>
+            <real>-0.42000007629394531</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>1.1099996566772461</real>
+            <real>-1.1600000858306885</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/Glassy.xml b/linden/indra/newview/app_settings/windlight/water/Glassy.xml
new file mode 100644
index 0000000..754e6de
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/Glassy.xml
@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.003000000026077032089233398</real>
+    <key>fresnelOffset</key>
+        <real>0.579999983310699462890625</real>
+    <key>fresnelScale</key>
+        <real>0.0999999940395355224609375</real>
+    <key>normScale</key>
+        <array>
+            <integer>2</integer>
+            <integer>2</integer>
+            <integer>2</integer>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0.07999999821186065673828125</real>
+    <key>scaleBelow</key>
+        <real>0.2000000029802322387695312</real>
+    <key>underWaterFogMod</key>
+        <real>0.25</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.04999999701976776123046875</real>
+            <real>0.37999999523162841796875</real>
+            <real>0.5299999713897705078125</real>
+            <real>0.5299999713897705078125</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>1</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>0.5</real>
+            <real>-0.1700000017881393432617188</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>0.579999983310699462890625</real>
+            <real>-0.670000016689300537109375</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/Murky.xml b/linden/indra/newview/app_settings/windlight/water/Murky.xml
new file mode 100644
index 0000000..65418fa
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/Murky.xml
@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.0030000000260770321</real>
+    <key>fresnelOffset</key>
+        <real>0.39999997615814209</real>
+    <key>fresnelScale</key>
+        <real>0.5</real>
+    <key>normScale</key>
+        <array>
+            <integer>2</integer>
+            <integer>2</integer>
+            <integer>2</integer>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0.079999998211860657</real>
+    <key>scaleBelow</key>
+        <real>0.20000000298023224</real>
+    <key>underWaterFogMod</key>
+        <real>0.76999998092651367</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.08999999612569809</real>
+            <real>0.17000000178813934</real>
+            <real>0.20999999344348907</real>
+            <real>0.20999999344348907</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>16</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>0.5</real>
+            <real>-0.17000000178813934</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>0.57999998331069946</real>
+            <real>-0.67000001668930054</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/Pond.xml b/linden/indra/newview/app_settings/windlight/water/Pond.xml
new file mode 100644
index 0000000..8a4d2c2
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/Pond.xml
@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.0030000000260770321</real>
+    <key>fresnelOffset</key>
+        <real>0.50999999046325684</real>
+    <key>fresnelScale</key>
+        <real>0.099999994039535522</real>
+    <key>normScale</key>
+        <array>
+            <integer>2</integer>
+            <integer>2</integer>
+            <integer>2</integer>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0.079999998211860657</real>
+    <key>scaleBelow</key>
+        <real>0.20000000298023224</real>
+    <key>underWaterFogMod</key>
+        <real>0.25</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.059999998658895493</real>
+            <real>0.37999999523162842</real>
+            <real>0.52999997138977051</real>
+            <real>0.52999997138977051</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>2.1000001430511475</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>0.5</real>
+            <real>-0.17000000178813934</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>0.57999998331069946</real>
+            <real>-0.67000001668930054</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/SNAKE%21%21%21.xml b/linden/indra/newview/app_settings/windlight/water/SNAKE%21%21%21.xml
new file mode 100644
index 0000000..77984a0
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/SNAKE%21%21%21.xml
@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.0030000000260770321</real>
+    <key>fresnelOffset</key>
+        <real>0.57999998331069946</real>
+    <key>fresnelScale</key>
+        <real>0.099999994039535522</real>
+    <key>normScale</key>
+        <array>
+            <real>10</real>
+            <real>10</real>
+            <real>10</real>
+        </array>
+    <key>normalMap</key>
+        <uuid>470626e3-ac38-8554-d49b-90311c0176a9</uuid>
+    <key>scaleAbove</key>
+        <real>0.91999995708465576</real>
+    <key>scaleBelow</key>
+        <real>0.93999999761581421</real>
+    <key>underWaterFogMod</key>
+        <real>0.25</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.049999997019767761</real>
+            <real>0.37999999523162842</real>
+            <real>0.52999997138977051</real>
+            <real>0.52999997138977051</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>3.2000000476837158</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>0.5</real>
+            <real>-0.17000000178813934</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>0.57999998331069946</real>
+            <real>-0.67000001668930054</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/Second%20Plague.xml b/linden/indra/newview/app_settings/windlight/water/Second%20Plague.xml
new file mode 100644
index 0000000..7db679d
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/Second%20Plague.xml
@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.017000000923871994</real>
+    <key>fresnelOffset</key>
+        <real>0.37000000476837158</real>
+    <key>fresnelScale</key>
+        <real>0</real>
+    <key>normScale</key>
+        <array>
+            <integer>2</integer>
+            <integer>2</integer>
+            <integer>2</integer>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0.079999998211860657</real>
+    <key>scaleBelow</key>
+        <real>0.20000000298023224</real>
+    <key>underWaterFogMod</key>
+        <real>0.85999995470046997</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0.48999997973442078</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0.48999997973442078</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>20</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>0.5</real>
+            <real>-0.17000000178813934</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>0.57999998331069946</real>
+            <real>-0.67000001668930054</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/app_settings/windlight/water/Valdez.xml b/linden/indra/newview/app_settings/windlight/water/Valdez.xml
new file mode 100644
index 0000000..bde298b
--- /dev/null
+++ b/linden/indra/newview/app_settings/windlight/water/Valdez.xml
@@ -0,0 +1,43 @@
+<llsd>
+    <map>
+    <key>blurMultiplier</key>
+        <real>0.0020000000949949026</real>
+    <key>fresnelOffset</key>
+        <real>0.28999999165534973</real>
+    <key>fresnelScale</key>
+        <real>0</real>
+    <key>normScale</key>
+        <array>
+            <integer>2</integer>
+            <integer>2</integer>
+            <integer>2</integer>
+        </array>
+    <key>normalMap</key>
+        <uuid>822ded49-9a6c-f61c-cb89-6df54f42cdf4</uuid>
+    <key>scaleAbove</key>
+        <real>0.079999998211860657</real>
+    <key>scaleBelow</key>
+        <real>0.20000000298023224</real>
+    <key>underWaterFogMod</key>
+        <real>1</real>
+    <key>waterFogColor</key>
+        <array>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+            <real>0</real>
+        </array>
+    <key>waterFogDensity</key>
+        <real>1024</real>
+    <key>wave1Dir</key>
+        <array>
+            <real>0.5</real>
+            <real>-0.17000000178813934</real>
+        </array>
+    <key>wave2Dir</key>
+        <array>
+            <real>0.57999998331069946</real>
+            <real>-0.67000001668930054</real>
+        </array>
+    </map>
+</llsd>
diff --git a/linden/indra/newview/cursors_mac/UI_CURSOR_ARROW.tif b/linden/indra/newview/cursors_mac/UI_CURSOR_ARROW.tif
new file mode 100644
index 0000000..a20893b
Binary files /dev/null and b/linden/indra/newview/cursors_mac/UI_CURSOR_ARROW.tif differ
diff --git a/linden/indra/newview/cursors_mac/UI_CURSOR_ARROWDRAG.tif b/linden/indra/newview/cursors_mac/UI_CURSOR_ARROWDRAG.tif
new file mode 100644
index 0000000..ab84bfb
Binary files /dev/null and b/linden/indra/newview/cursors_mac/UI_CURSOR_ARROWDRAG.tif differ
diff --git a/linden/indra/newview/cursors_mac/UI_CURSOR_ARROWLOCKED.tif b/linden/indra/newview/cursors_mac/UI_CURSOR_ARROWLOCKED.tif
new file mode 100644
index 0000000..400ae42
Binary files /dev/null and b/linden/indra/newview/cursors_mac/UI_CURSOR_ARROWLOCKED.tif differ
diff --git a/linden/indra/newview/cursors_mac/UI_CURSOR_GRABLOCKED.tif b/linden/indra/newview/cursors_mac/UI_CURSOR_GRABLOCKED.tif
new file mode 100644
index 0000000..1cae801
Binary files /dev/null and b/linden/indra/newview/cursors_mac/UI_CURSOR_GRABLOCKED.tif differ
diff --git a/linden/indra/newview/cursors_mac/UI_CURSOR_NO.tif b/linden/indra/newview/cursors_mac/UI_CURSOR_NO.tif
new file mode 100644
index 0000000..bc4a7a7
Binary files /dev/null and b/linden/indra/newview/cursors_mac/UI_CURSOR_NO.tif differ
diff --git a/linden/indra/newview/cursors_mac/UI_CURSOR_NOLOCKED.tif b/linden/indra/newview/cursors_mac/UI_CURSOR_NOLOCKED.tif
new file mode 100644
index 0000000..62332fc
Binary files /dev/null and b/linden/indra/newview/cursors_mac/UI_CURSOR_NOLOCKED.tif differ
diff --git a/linden/indra/newview/cursors_mac/UI_CURSOR_SIZENESW.tif b/linden/indra/newview/cursors_mac/UI_CURSOR_SIZENESW.tif
new file mode 100644
index 0000000..de2c28b
Binary files /dev/null and b/linden/indra/newview/cursors_mac/UI_CURSOR_SIZENESW.tif differ
diff --git a/linden/indra/newview/cursors_mac/UI_CURSOR_SIZENS.tif b/linden/indra/newview/cursors_mac/UI_CURSOR_SIZENS.tif
new file mode 100644
index 0000000..2676c78
Binary files /dev/null and b/linden/indra/newview/cursors_mac/UI_CURSOR_SIZENS.tif differ
diff --git a/linden/indra/newview/cursors_mac/UI_CURSOR_SIZENWSE.tif b/linden/indra/newview/cursors_mac/UI_CURSOR_SIZENWSE.tif
new file mode 100644
index 0000000..33df339
Binary files /dev/null and b/linden/indra/newview/cursors_mac/UI_CURSOR_SIZENWSE.tif differ
diff --git a/linden/indra/newview/cursors_mac/UI_CURSOR_SIZEWE.tif b/linden/indra/newview/cursors_mac/UI_CURSOR_SIZEWE.tif
new file mode 100644
index 0000000..8952054
Binary files /dev/null and b/linden/indra/newview/cursors_mac/UI_CURSOR_SIZEWE.tif differ
diff --git a/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLBUY.tif b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLBUY.tif
new file mode 100644
index 0000000..39d8998
Binary files /dev/null and b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLBUY.tif differ
diff --git a/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLCAMERA.tif b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLCAMERA.tif
new file mode 100644
index 0000000..bbf415a
Binary files /dev/null and b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLCAMERA.tif differ
diff --git a/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLCREATE.tif b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLCREATE.tif
new file mode 100644
index 0000000..2ab71c8
Binary files /dev/null and b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLCREATE.tif differ
diff --git a/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLFOCUS.tif b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLFOCUS.tif
new file mode 100644
index 0000000..db4ca17
Binary files /dev/null and b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLFOCUS.tif differ
diff --git a/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLGRAB.tif b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLGRAB.tif
new file mode 100644
index 0000000..366630d
Binary files /dev/null and b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLGRAB.tif differ
diff --git a/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLLAND.tif b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLLAND.tif
new file mode 100644
index 0000000..ad5a9ca
Binary files /dev/null and b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLLAND.tif differ
diff --git a/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLMEDIAOPEN.tif b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLMEDIAOPEN.tif
new file mode 100644
index 0000000..7c0bcfc
Binary files /dev/null and b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLMEDIAOPEN.tif differ
diff --git a/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN.tif b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN.tif
new file mode 100644
index 0000000..864c8de
Binary files /dev/null and b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLOPEN.tif differ
diff --git a/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLPAN.tif b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLPAN.tif
new file mode 100644
index 0000000..0a89f9b
Binary files /dev/null and b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLPAN.tif differ
diff --git a/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLPAUSE.tif b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLPAUSE.tif
new file mode 100644
index 0000000..3431887
Binary files /dev/null and b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLPAUSE.tif differ
diff --git a/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLPAY.tif b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLPAY.tif
new file mode 100644
index 0000000..2bbb3b3
Binary files /dev/null and b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLPAY.tif differ
diff --git a/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLPICKOBJECT3.tif b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLPICKOBJECT3.tif
new file mode 100644
index 0000000..55317f1
Binary files /dev/null and b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLPICKOBJECT3.tif differ
diff --git a/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLPLAY.tif b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLPLAY.tif
new file mode 100644
index 0000000..796bbb7
Binary files /dev/null and b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLPLAY.tif differ
diff --git a/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLROTATE.tif b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLROTATE.tif
new file mode 100644
index 0000000..9888156
Binary files /dev/null and b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLROTATE.tif differ
diff --git a/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLSCALE.tif b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLSCALE.tif
new file mode 100644
index 0000000..316dd38
Binary files /dev/null and b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLSCALE.tif differ
diff --git a/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLSIT.tif b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLSIT.tif
new file mode 100644
index 0000000..d6d835a
Binary files /dev/null and b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLSIT.tif differ
diff --git a/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLTRANSLATE.tif b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLTRANSLATE.tif
new file mode 100644
index 0000000..0cd0637
Binary files /dev/null and b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLTRANSLATE.tif differ
diff --git a/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLZOOMIN.tif b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLZOOMIN.tif
new file mode 100644
index 0000000..65f3b6d
Binary files /dev/null and b/linden/indra/newview/cursors_mac/UI_CURSOR_TOOLZOOMIN.tif differ
diff --git a/linden/indra/newview/cursors_mac/UI_CURSOR_WORKING.tif b/linden/indra/newview/cursors_mac/UI_CURSOR_WORKING.tif
new file mode 100644
index 0000000..c49f16a
Binary files /dev/null and b/linden/indra/newview/cursors_mac/UI_CURSOR_WORKING.tif differ
diff --git a/linden/indra/newview/fonts/DejaVu-License.txt b/linden/indra/newview/fonts/DejaVu-License.txt
new file mode 100644
index 0000000..3e91fed
--- /dev/null
+++ b/linden/indra/newview/fonts/DejaVu-License.txt
@@ -0,0 +1,97 @@
+Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
+Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below)
+
+Bitstream Vera Fonts Copyright
+------------------------------
+
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
+a trademark of Bitstream, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of the fonts accompanying this license ("Fonts") and associated
+documentation files (the "Font Software"), to reproduce and distribute the
+Font Software, including without limitation the rights to use, copy, merge,
+publish, distribute, and/or sell copies of the Font Software, and to permit
+persons to whom the Font Software is furnished to do so, subject to the
+following conditions:
+
+The above copyright and trademark notices and this permission notice shall
+be included in all copies of one or more of the Font Software typefaces.
+
+The Font Software may be modified, altered, or added to, and in particular
+the designs of glyphs or characters in the Fonts may be modified and
+additional glyphs or characters may be added to the Fonts, only if the fonts
+are renamed to names not containing either the words "Bitstream" or the word
+"Vera".
+
+This License becomes null and void to the extent applicable to Fonts or Font
+Software that has been modified and is distributed under the "Bitstream
+Vera" names.
+
+The Font Software may be sold as part of a larger software package but no
+copy of one or more of the Font Software typefaces may be sold by itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
+TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
+FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
+ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
+FONT SOFTWARE.
+
+Except as contained in this notice, the names of Gnome, the Gnome
+Foundation, and Bitstream Inc., shall not be used in advertising or
+otherwise to promote the sale, use or other dealings in this Font Software
+without prior written authorization from the Gnome Foundation or Bitstream
+Inc., respectively. For further information, contact: fonts at gnome dot
+org. 
+
+Arev Fonts Copyright
+------------------------------
+
+Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the fonts accompanying this license ("Fonts") and
+associated documentation files (the "Font Software"), to reproduce
+and distribute the modifications to the Bitstream Vera Font Software,
+including without limitation the rights to use, copy, merge, publish,
+distribute, and/or sell copies of the Font Software, and to permit
+persons to whom the Font Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright and trademark notices and this permission notice
+shall be included in all copies of one or more of the Font Software
+typefaces.
+
+The Font Software may be modified, altered, or added to, and in
+particular the designs of glyphs or characters in the Fonts may be
+modified and additional glyphs or characters may be added to the
+Fonts, only if the fonts are renamed to names not containing either
+the words "Tavmjong Bah" or the word "Arev".
+
+This License becomes null and void to the extent applicable to Fonts
+or Font Software that has been modified and is distributed under the 
+"Tavmjong Bah Arev" names.
+
+The Font Software may be sold as part of a larger software package but
+no copy of one or more of the Font Software typefaces may be sold by
+itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
+TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
+
+Except as contained in this notice, the name of Tavmjong Bah shall not
+be used in advertising or otherwise to promote the sale, use or other
+dealings in this Font Software without prior written authorization
+from Tavmjong Bah. For further information, contact: tavmjong @ free
+. fr.
diff --git a/linden/indra/newview/fonts/DejaVuSansCondensed-Bold.ttf b/linden/indra/newview/fonts/DejaVuSansCondensed-Bold.ttf
new file mode 100644
index 0000000..91ccf5c
Binary files /dev/null and b/linden/indra/newview/fonts/DejaVuSansCondensed-Bold.ttf differ
diff --git a/linden/indra/newview/fonts/DejaVuSansCondensed-BoldOblique.ttf b/linden/indra/newview/fonts/DejaVuSansCondensed-BoldOblique.ttf
new file mode 100644
index 0000000..9f82d61
Binary files /dev/null and b/linden/indra/newview/fonts/DejaVuSansCondensed-BoldOblique.ttf differ
diff --git a/linden/indra/newview/fonts/DejaVuSansCondensed-Oblique.ttf b/linden/indra/newview/fonts/DejaVuSansCondensed-Oblique.ttf
new file mode 100644
index 0000000..bb4872c
Binary files /dev/null and b/linden/indra/newview/fonts/DejaVuSansCondensed-Oblique.ttf differ
diff --git a/linden/indra/newview/fonts/DejaVuSansCondensed.ttf b/linden/indra/newview/fonts/DejaVuSansCondensed.ttf
new file mode 100644
index 0000000..2b79e64
Binary files /dev/null and b/linden/indra/newview/fonts/DejaVuSansCondensed.ttf differ
diff --git a/linden/indra/newview/fonts/Delicious-Bold.otf b/linden/indra/newview/fonts/Delicious-Bold.otf
new file mode 100644
index 0000000..e5b1e25
Binary files /dev/null and b/linden/indra/newview/fonts/Delicious-Bold.otf differ
diff --git a/linden/indra/newview/fonts/Delicious-BoldItalic.otf b/linden/indra/newview/fonts/Delicious-BoldItalic.otf
new file mode 100644
index 0000000..81bf13b
Binary files /dev/null and b/linden/indra/newview/fonts/Delicious-BoldItalic.otf differ
diff --git a/linden/indra/newview/fonts/Delicious-Italic.otf b/linden/indra/newview/fonts/Delicious-Italic.otf
new file mode 100644
index 0000000..d57df3b
Binary files /dev/null and b/linden/indra/newview/fonts/Delicious-Italic.otf differ
diff --git a/linden/indra/newview/fonts/Delicious-License.txt b/linden/indra/newview/fonts/Delicious-License.txt
new file mode 100644
index 0000000..a738b69
--- /dev/null
+++ b/linden/indra/newview/fonts/Delicious-License.txt
@@ -0,0 +1,26 @@
+Delicious by Jos Buivenga (exljbris)
+
+exljbris Font Foundry Free Font License Agreement
+
+* This font is free for personal and commercial use
+
+* The font file/software may be modified to suit design of system
+  requirements, but strictly for your own (personal or commercial)
+  use. You may not sell or distribute it
+
+* Embedding (in PDF's, Flash files and programs) is allowed
+
+* You may use this font for Font-Face embedding, but only if you put a
+  link to www.exljbris.nl on your page and/or put this notice /* A
+  font by Jos Buivenga (exljbris) -> www.exljbris.com */ in your CSS
+  file as near as possible to the piece of code that declares the
+  Font-Face embedding of this font.
+
+* This font may not be distributed or sold -not online nor on any
+  media- without my permission
+
+* This font is and remains (even when modified) the intellectual
+  property of Jos Buivenga
+
+* exljbris Font Foundry is not liable for any damage resulting from
+  the use of this font
diff --git a/linden/indra/newview/fonts/Delicious-Roman.otf b/linden/indra/newview/fonts/Delicious-Roman.otf
new file mode 100644
index 0000000..31ec11a
Binary files /dev/null and b/linden/indra/newview/fonts/Delicious-Roman.otf differ
diff --git a/linden/indra/newview/fonts/Droid-License.txt b/linden/indra/newview/fonts/Droid-License.txt
new file mode 100644
index 0000000..c5b1efa
--- /dev/null
+++ b/linden/indra/newview/fonts/Droid-License.txt
@@ -0,0 +1,190 @@
+
+   Copyright (c) 2005-2008, The Android Open Source Project
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
diff --git a/linden/indra/newview/fonts/DroidSans-Bold.ttf b/linden/indra/newview/fonts/DroidSans-Bold.ttf
new file mode 100644
index 0000000..fc60df4
Binary files /dev/null and b/linden/indra/newview/fonts/DroidSans-Bold.ttf differ
diff --git a/linden/indra/newview/fonts/DroidSans.ttf b/linden/indra/newview/fonts/DroidSans.ttf
new file mode 100644
index 0000000..458ba59
Binary files /dev/null and b/linden/indra/newview/fonts/DroidSans.ttf differ
diff --git a/linden/indra/newview/installers/windows/vcredist_x86_VS2005.exe b/linden/indra/newview/installers/windows/vcredist_x86_VS2005.exe
new file mode 100755
index 0000000..1421c29
Binary files /dev/null and b/linden/indra/newview/installers/windows/vcredist_x86_VS2005.exe differ
diff --git a/linden/indra/newview/res-sdl/arrow.BMP b/linden/indra/newview/res-sdl/arrow.BMP
new file mode 100644
index 0000000..a8f6da6
Binary files /dev/null and b/linden/indra/newview/res-sdl/arrow.BMP differ
diff --git a/linden/indra/newview/res-sdl/arrowcop.BMP b/linden/indra/newview/res-sdl/arrowcop.BMP
new file mode 100644
index 0000000..1a26a0d
Binary files /dev/null and b/linden/indra/newview/res-sdl/arrowcop.BMP differ
diff --git a/linden/indra/newview/res-sdl/arrowcopmulti.BMP b/linden/indra/newview/res-sdl/arrowcopmulti.BMP
new file mode 100644
index 0000000..48f153c
Binary files /dev/null and b/linden/indra/newview/res-sdl/arrowcopmulti.BMP differ
diff --git a/linden/indra/newview/res-sdl/arrowdrag.BMP b/linden/indra/newview/res-sdl/arrowdrag.BMP
new file mode 100644
index 0000000..cd868ee
Binary files /dev/null and b/linden/indra/newview/res-sdl/arrowdrag.BMP differ
diff --git a/linden/indra/newview/res-sdl/circleandline.BMP b/linden/indra/newview/res-sdl/circleandline.BMP
new file mode 100644
index 0000000..284ae8b
Binary files /dev/null and b/linden/indra/newview/res-sdl/circleandline.BMP differ
diff --git a/linden/indra/newview/res-sdl/cross.BMP b/linden/indra/newview/res-sdl/cross.BMP
new file mode 100644
index 0000000..0b4672d
Binary files /dev/null and b/linden/indra/newview/res-sdl/cross.BMP differ
diff --git a/linden/indra/newview/res-sdl/hand.BMP b/linden/indra/newview/res-sdl/hand.BMP
new file mode 100644
index 0000000..2a092fb
Binary files /dev/null and b/linden/indra/newview/res-sdl/hand.BMP differ
diff --git a/linden/indra/newview/res-sdl/ibeam.BMP b/linden/indra/newview/res-sdl/ibeam.BMP
new file mode 100644
index 0000000..820904a
Binary files /dev/null and b/linden/indra/newview/res-sdl/ibeam.BMP differ
diff --git a/linden/indra/newview/res-sdl/imprudence_icon.BMP b/linden/indra/newview/res-sdl/imprudence_icon.BMP
new file mode 100644
index 0000000..c3f4887
Binary files /dev/null and b/linden/indra/newview/res-sdl/imprudence_icon.BMP differ
diff --git a/linden/indra/newview/res-sdl/llarrow.BMP b/linden/indra/newview/res-sdl/llarrow.BMP
new file mode 100644
index 0000000..a8f6da6
Binary files /dev/null and b/linden/indra/newview/res-sdl/llarrow.BMP differ
diff --git a/linden/indra/newview/res-sdl/llarrowdrag.BMP b/linden/indra/newview/res-sdl/llarrowdrag.BMP
new file mode 100644
index 0000000..cd868ee
Binary files /dev/null and b/linden/indra/newview/res-sdl/llarrowdrag.BMP differ
diff --git a/linden/indra/newview/res-sdl/llarrowdragmulti.BMP b/linden/indra/newview/res-sdl/llarrowdragmulti.BMP
new file mode 100644
index 0000000..fb528bc
Binary files /dev/null and b/linden/indra/newview/res-sdl/llarrowdragmulti.BMP differ
diff --git a/linden/indra/newview/res-sdl/llarrowlocked.BMP b/linden/indra/newview/res-sdl/llarrowlocked.BMP
new file mode 100644
index 0000000..0aaa441
Binary files /dev/null and b/linden/indra/newview/res-sdl/llarrowlocked.BMP differ
diff --git a/linden/indra/newview/res-sdl/llgrablocked.BMP b/linden/indra/newview/res-sdl/llgrablocked.BMP
new file mode 100644
index 0000000..8474396
Binary files /dev/null and b/linden/indra/newview/res-sdl/llgrablocked.BMP differ
diff --git a/linden/indra/newview/res-sdl/llno.BMP b/linden/indra/newview/res-sdl/llno.BMP
new file mode 100644
index 0000000..284ae8b
Binary files /dev/null and b/linden/indra/newview/res-sdl/llno.BMP differ
diff --git a/linden/indra/newview/res-sdl/llnolocked.BMP b/linden/indra/newview/res-sdl/llnolocked.BMP
new file mode 100644
index 0000000..61f0170
Binary files /dev/null and b/linden/indra/newview/res-sdl/llnolocked.BMP differ
diff --git a/linden/indra/newview/res-sdl/lltoolcamera.BMP b/linden/indra/newview/res-sdl/lltoolcamera.BMP
new file mode 100644
index 0000000..c961d7a
Binary files /dev/null and b/linden/indra/newview/res-sdl/lltoolcamera.BMP differ
diff --git a/linden/indra/newview/res-sdl/lltoolcreate.BMP b/linden/indra/newview/res-sdl/lltoolcreate.BMP
new file mode 100644
index 0000000..08a4a93
Binary files /dev/null and b/linden/indra/newview/res-sdl/lltoolcreate.BMP differ
diff --git a/linden/indra/newview/res-sdl/lltoolfocus.BMP b/linden/indra/newview/res-sdl/lltoolfocus.BMP
new file mode 100644
index 0000000..afb90a9
Binary files /dev/null and b/linden/indra/newview/res-sdl/lltoolfocus.BMP differ
diff --git a/linden/indra/newview/res-sdl/lltoolgrab.BMP b/linden/indra/newview/res-sdl/lltoolgrab.BMP
new file mode 100644
index 0000000..f2ac68b
Binary files /dev/null and b/linden/indra/newview/res-sdl/lltoolgrab.BMP differ
diff --git a/linden/indra/newview/res-sdl/lltoolland.BMP b/linden/indra/newview/res-sdl/lltoolland.BMP
new file mode 100644
index 0000000..64e6365
Binary files /dev/null and b/linden/indra/newview/res-sdl/lltoolland.BMP differ
diff --git a/linden/indra/newview/res-sdl/lltoolpan.BMP b/linden/indra/newview/res-sdl/lltoolpan.BMP
new file mode 100644
index 0000000..ffbef21
Binary files /dev/null and b/linden/indra/newview/res-sdl/lltoolpan.BMP differ
diff --git a/linden/indra/newview/res-sdl/lltoolpipette.BMP b/linden/indra/newview/res-sdl/lltoolpipette.BMP
new file mode 100644
index 0000000..2d27118
Binary files /dev/null and b/linden/indra/newview/res-sdl/lltoolpipette.BMP differ
diff --git a/linden/indra/newview/res-sdl/lltoolrotate.BMP b/linden/indra/newview/res-sdl/lltoolrotate.BMP
new file mode 100644
index 0000000..dd84673
Binary files /dev/null and b/linden/indra/newview/res-sdl/lltoolrotate.BMP differ
diff --git a/linden/indra/newview/res-sdl/lltoolscale.BMP b/linden/indra/newview/res-sdl/lltoolscale.BMP
new file mode 100644
index 0000000..882515e
Binary files /dev/null and b/linden/indra/newview/res-sdl/lltoolscale.BMP differ
diff --git a/linden/indra/newview/res-sdl/lltooltranslate.BMP b/linden/indra/newview/res-sdl/lltooltranslate.BMP
new file mode 100644
index 0000000..d084f6a
Binary files /dev/null and b/linden/indra/newview/res-sdl/lltooltranslate.BMP differ
diff --git a/linden/indra/newview/res-sdl/lltoolzoomin.BMP b/linden/indra/newview/res-sdl/lltoolzoomin.BMP
new file mode 100644
index 0000000..e4e46cc
Binary files /dev/null and b/linden/indra/newview/res-sdl/lltoolzoomin.BMP differ
diff --git a/linden/indra/newview/res-sdl/lltoolzoomout.BMP b/linden/indra/newview/res-sdl/lltoolzoomout.BMP
new file mode 100644
index 0000000..7f95838
Binary files /dev/null and b/linden/indra/newview/res-sdl/lltoolzoomout.BMP differ
diff --git a/linden/indra/newview/res-sdl/sizenesw.BMP b/linden/indra/newview/res-sdl/sizenesw.BMP
new file mode 100644
index 0000000..559579f
Binary files /dev/null and b/linden/indra/newview/res-sdl/sizenesw.BMP differ
diff --git a/linden/indra/newview/res-sdl/sizens.BMP b/linden/indra/newview/res-sdl/sizens.BMP
new file mode 100644
index 0000000..8373077
Binary files /dev/null and b/linden/indra/newview/res-sdl/sizens.BMP differ
diff --git a/linden/indra/newview/res-sdl/sizenwse.BMP b/linden/indra/newview/res-sdl/sizenwse.BMP
new file mode 100644
index 0000000..6d069fa
Binary files /dev/null and b/linden/indra/newview/res-sdl/sizenwse.BMP differ
diff --git a/linden/indra/newview/res-sdl/sizewe.BMP b/linden/indra/newview/res-sdl/sizewe.BMP
new file mode 100644
index 0000000..878df45
Binary files /dev/null and b/linden/indra/newview/res-sdl/sizewe.BMP differ
diff --git a/linden/indra/newview/res-sdl/toolbuy.BMP b/linden/indra/newview/res-sdl/toolbuy.BMP
new file mode 100644
index 0000000..a00bdb2
Binary files /dev/null and b/linden/indra/newview/res-sdl/toolbuy.BMP differ
diff --git a/linden/indra/newview/res-sdl/toolmediaopen.BMP b/linden/indra/newview/res-sdl/toolmediaopen.BMP
new file mode 100644
index 0000000..ac4b231
Binary files /dev/null and b/linden/indra/newview/res-sdl/toolmediaopen.BMP differ
diff --git a/linden/indra/newview/res-sdl/toolopen.BMP b/linden/indra/newview/res-sdl/toolopen.BMP
new file mode 100644
index 0000000..93c7e44
Binary files /dev/null and b/linden/indra/newview/res-sdl/toolopen.BMP differ
diff --git a/linden/indra/newview/res-sdl/toolpause.BMP b/linden/indra/newview/res-sdl/toolpause.BMP
new file mode 100644
index 0000000..dd2c685
Binary files /dev/null and b/linden/indra/newview/res-sdl/toolpause.BMP differ
diff --git a/linden/indra/newview/res-sdl/toolpay.BMP b/linden/indra/newview/res-sdl/toolpay.BMP
new file mode 100644
index 0000000..819b620
Binary files /dev/null and b/linden/indra/newview/res-sdl/toolpay.BMP differ
diff --git a/linden/indra/newview/res-sdl/toolpickobject.BMP b/linden/indra/newview/res-sdl/toolpickobject.BMP
new file mode 100644
index 0000000..25469fc
Binary files /dev/null and b/linden/indra/newview/res-sdl/toolpickobject.BMP differ
diff --git a/linden/indra/newview/res-sdl/toolpickobject2.BMP b/linden/indra/newview/res-sdl/toolpickobject2.BMP
new file mode 100644
index 0000000..09df69e
Binary files /dev/null and b/linden/indra/newview/res-sdl/toolpickobject2.BMP differ
diff --git a/linden/indra/newview/res-sdl/toolpickobject3.BMP b/linden/indra/newview/res-sdl/toolpickobject3.BMP
new file mode 100644
index 0000000..fc28698
Binary files /dev/null and b/linden/indra/newview/res-sdl/toolpickobject3.BMP differ
diff --git a/linden/indra/newview/res-sdl/toolplay.BMP b/linden/indra/newview/res-sdl/toolplay.BMP
new file mode 100644
index 0000000..9c40d7d
Binary files /dev/null and b/linden/indra/newview/res-sdl/toolplay.BMP differ
diff --git a/linden/indra/newview/res-sdl/toolsit.BMP b/linden/indra/newview/res-sdl/toolsit.BMP
new file mode 100644
index 0000000..ca911ec
Binary files /dev/null and b/linden/indra/newview/res-sdl/toolsit.BMP differ
diff --git a/linden/indra/newview/res-sdl/wait.BMP b/linden/indra/newview/res-sdl/wait.BMP
new file mode 100644
index 0000000..26dec59
Binary files /dev/null and b/linden/indra/newview/res-sdl/wait.BMP differ
diff --git a/linden/indra/newview/res-sdl/working.BMP b/linden/indra/newview/res-sdl/working.BMP
new file mode 100644
index 0000000..26dec59
Binary files /dev/null and b/linden/indra/newview/res-sdl/working.BMP differ
diff --git a/linden/indra/newview/res/arrow.cur b/linden/indra/newview/res/arrow.cur
new file mode 100644
index 0000000..d11b688
Binary files /dev/null and b/linden/indra/newview/res/arrow.cur differ
diff --git a/linden/indra/newview/res/arrowcop.cur b/linden/indra/newview/res/arrowcop.cur
new file mode 100644
index 0000000..8b5902c
Binary files /dev/null and b/linden/indra/newview/res/arrowcop.cur differ
diff --git a/linden/indra/newview/res/arrowcopmulti.cur b/linden/indra/newview/res/arrowcopmulti.cur
new file mode 100644
index 0000000..2620522
Binary files /dev/null and b/linden/indra/newview/res/arrowcopmulti.cur differ
diff --git a/linden/indra/newview/res/arrowdrag.cur b/linden/indra/newview/res/arrowdrag.cur
new file mode 100644
index 0000000..77b2d1a
Binary files /dev/null and b/linden/indra/newview/res/arrowdrag.cur differ
diff --git a/linden/indra/newview/res/circleandline.cur b/linden/indra/newview/res/circleandline.cur
new file mode 100644
index 0000000..00050f5
Binary files /dev/null and b/linden/indra/newview/res/circleandline.cur differ
diff --git a/linden/indra/newview/res/imp_icon.ico b/linden/indra/newview/res/imp_icon.ico
new file mode 100644
index 0000000..3b1250a
Binary files /dev/null and b/linden/indra/newview/res/imp_icon.ico differ
diff --git a/linden/indra/newview/res/imprudence_icon.png b/linden/indra/newview/res/imprudence_icon.png
new file mode 100644
index 0000000..8795fa7
Binary files /dev/null and b/linden/indra/newview/res/imprudence_icon.png differ
diff --git a/linden/indra/newview/res/llarrow.cur b/linden/indra/newview/res/llarrow.cur
new file mode 100644
index 0000000..8a922d7
Binary files /dev/null and b/linden/indra/newview/res/llarrow.cur differ
diff --git a/linden/indra/newview/res/llarrowdrag.cur b/linden/indra/newview/res/llarrowdrag.cur
new file mode 100644
index 0000000..77b2d1a
Binary files /dev/null and b/linden/indra/newview/res/llarrowdrag.cur differ
diff --git a/linden/indra/newview/res/llarrowdragmulti.cur b/linden/indra/newview/res/llarrowdragmulti.cur
new file mode 100644
index 0000000..f0853b8
Binary files /dev/null and b/linden/indra/newview/res/llarrowdragmulti.cur differ
diff --git a/linden/indra/newview/res/llarrowlocked.cur b/linden/indra/newview/res/llarrowlocked.cur
new file mode 100644
index 0000000..5b81f14
Binary files /dev/null and b/linden/indra/newview/res/llarrowlocked.cur differ
diff --git a/linden/indra/newview/res/llgrablocked.cur b/linden/indra/newview/res/llgrablocked.cur
new file mode 100644
index 0000000..73dea15
Binary files /dev/null and b/linden/indra/newview/res/llgrablocked.cur differ
diff --git a/linden/indra/newview/res/llno.cur b/linden/indra/newview/res/llno.cur
new file mode 100644
index 0000000..00050f5
Binary files /dev/null and b/linden/indra/newview/res/llno.cur differ
diff --git a/linden/indra/newview/res/llnolocked.cur b/linden/indra/newview/res/llnolocked.cur
new file mode 100644
index 0000000..dfa4a05
Binary files /dev/null and b/linden/indra/newview/res/llnolocked.cur differ
diff --git a/linden/indra/newview/res/lltoolcamera.cur b/linden/indra/newview/res/lltoolcamera.cur
new file mode 100644
index 0000000..e0f1946
Binary files /dev/null and b/linden/indra/newview/res/lltoolcamera.cur differ
diff --git a/linden/indra/newview/res/lltoolcreate.cur b/linden/indra/newview/res/lltoolcreate.cur
new file mode 100644
index 0000000..716f328
Binary files /dev/null and b/linden/indra/newview/res/lltoolcreate.cur differ
diff --git a/linden/indra/newview/res/lltoolfocus.cur b/linden/indra/newview/res/lltoolfocus.cur
new file mode 100644
index 0000000..7b38ad3
Binary files /dev/null and b/linden/indra/newview/res/lltoolfocus.cur differ
diff --git a/linden/indra/newview/res/lltoolgrab.cur b/linden/indra/newview/res/lltoolgrab.cur
new file mode 100644
index 0000000..4484001
Binary files /dev/null and b/linden/indra/newview/res/lltoolgrab.cur differ
diff --git a/linden/indra/newview/res/lltoolland.cur b/linden/indra/newview/res/lltoolland.cur
new file mode 100644
index 0000000..e22ef6c
Binary files /dev/null and b/linden/indra/newview/res/lltoolland.cur differ
diff --git a/linden/indra/newview/res/lltoolpan.cur b/linden/indra/newview/res/lltoolpan.cur
new file mode 100644
index 0000000..0a34866
Binary files /dev/null and b/linden/indra/newview/res/lltoolpan.cur differ
diff --git a/linden/indra/newview/res/lltoolpipette.cur b/linden/indra/newview/res/lltoolpipette.cur
new file mode 100644
index 0000000..b478096
Binary files /dev/null and b/linden/indra/newview/res/lltoolpipette.cur differ
diff --git a/linden/indra/newview/res/lltoolrotate.cur b/linden/indra/newview/res/lltoolrotate.cur
new file mode 100644
index 0000000..adbadae
Binary files /dev/null and b/linden/indra/newview/res/lltoolrotate.cur differ
diff --git a/linden/indra/newview/res/lltoolscale.cur b/linden/indra/newview/res/lltoolscale.cur
new file mode 100644
index 0000000..4b6d20b
Binary files /dev/null and b/linden/indra/newview/res/lltoolscale.cur differ
diff --git a/linden/indra/newview/res/lltooltranslate.cur b/linden/indra/newview/res/lltooltranslate.cur
new file mode 100644
index 0000000..2df80de
Binary files /dev/null and b/linden/indra/newview/res/lltooltranslate.cur differ
diff --git a/linden/indra/newview/res/lltoolzoomin.cur b/linden/indra/newview/res/lltoolzoomin.cur
new file mode 100644
index 0000000..0b5d801
Binary files /dev/null and b/linden/indra/newview/res/lltoolzoomin.cur differ
diff --git a/linden/indra/newview/res/lltoolzoomout.cur b/linden/indra/newview/res/lltoolzoomout.cur
new file mode 100644
index 0000000..b33e68d
Binary files /dev/null and b/linden/indra/newview/res/lltoolzoomout.cur differ
diff --git a/linden/indra/newview/res/toolbuy.cur b/linden/indra/newview/res/toolbuy.cur
new file mode 100644
index 0000000..7132d46
Binary files /dev/null and b/linden/indra/newview/res/toolbuy.cur differ
diff --git a/linden/indra/newview/res/toolmediaopen.cur b/linden/indra/newview/res/toolmediaopen.cur
new file mode 100644
index 0000000..7609989
Binary files /dev/null and b/linden/indra/newview/res/toolmediaopen.cur differ
diff --git a/linden/indra/newview/res/toolopen.cur b/linden/indra/newview/res/toolopen.cur
new file mode 100644
index 0000000..8408f7c
Binary files /dev/null and b/linden/indra/newview/res/toolopen.cur differ
diff --git a/linden/indra/newview/res/toolpause.cur b/linden/indra/newview/res/toolpause.cur
new file mode 100644
index 0000000..7a6e855
Binary files /dev/null and b/linden/indra/newview/res/toolpause.cur differ
diff --git a/linden/indra/newview/res/toolpay.cur b/linden/indra/newview/res/toolpay.cur
new file mode 100644
index 0000000..93940e9
Binary files /dev/null and b/linden/indra/newview/res/toolpay.cur differ
diff --git a/linden/indra/newview/res/toolpickobject.cur b/linden/indra/newview/res/toolpickobject.cur
new file mode 100644
index 0000000..ba482b5
Binary files /dev/null and b/linden/indra/newview/res/toolpickobject.cur differ
diff --git a/linden/indra/newview/res/toolpickobject2.cur b/linden/indra/newview/res/toolpickobject2.cur
new file mode 100644
index 0000000..b168f8d
Binary files /dev/null and b/linden/indra/newview/res/toolpickobject2.cur differ
diff --git a/linden/indra/newview/res/toolpickobject3.cur b/linden/indra/newview/res/toolpickobject3.cur
new file mode 100644
index 0000000..457c3a6
Binary files /dev/null and b/linden/indra/newview/res/toolpickobject3.cur differ
diff --git a/linden/indra/newview/res/toolpipette.cur b/linden/indra/newview/res/toolpipette.cur
new file mode 100644
index 0000000..b478096
Binary files /dev/null and b/linden/indra/newview/res/toolpipette.cur differ
diff --git a/linden/indra/newview/res/toolplay.cur b/linden/indra/newview/res/toolplay.cur
new file mode 100644
index 0000000..0776a17
Binary files /dev/null and b/linden/indra/newview/res/toolplay.cur differ
diff --git a/linden/indra/newview/res/toolsit.cur b/linden/indra/newview/res/toolsit.cur
new file mode 100644
index 0000000..60b0e77
Binary files /dev/null and b/linden/indra/newview/res/toolsit.cur differ
diff --git a/linden/indra/newview/skins/dark/colors_base.xml b/linden/indra/newview/skins/dark/colors_base.xml
new file mode 100644
index 0000000..19a3b72
--- /dev/null
+++ b/linden/indra/newview/skins/dark/colors_base.xml
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<settings version = "101">
+
+<!-- WINDOWS -->
+<TitleBarFocusColor value="255, 255, 255, 30" />		<!-- Focused window title bar highlight, no equivalent for unfocused windows -->
+<FloaterFocusBorderColor value="0, 0, 0, 80"/>
+<FloaterUnfocusBorderColor value="0, 0, 0, 80"/>
+<FocusBackgroundColor value="62, 62, 62, 255"/>			<!-- Background color of focused floaters -->
+<DefaultBackgroundColor value="62, 62, 62, 140"/>		<!-- Background color for unfocused floaters -->
+<ColorDropShadow value="0, 0, 0, 200"/>					<!-- The drop shadow behind windows and menus -->
+<DefaultHighlightDark value="26, 26, 26, 255"/>
+<DefaultHighlightLight value="132, 132, 132, 255"/>
+<DefaultShadowDark value="26, 26, 26, 255"/>
+<DefaultShadowLight value="0, 0, 0, 255"/>
+
+<!-- LABELS -->
+<LabelDisabledColor value="147, 169, 213, 77"/>
+<LabelSelectedColor value="255, 255, 255, 255"/>
+<LabelSelectedDisabledColor value="116, 116, 116, 128"/>
+<LabelTextColor value="200, 200, 200, 255"/>
+
+<!-- LOGIN -->
+<LoginProgressBarBgColor value="255, 255, 255, 255" />
+<LoginProgressBarFgColor value="255, 255, 255, 255" />
+<LoginProgressBoxBorderColor value="0, 30, 60, 0" />
+<LoginProgressBoxCenterColor value="0, 0, 0, 200" />
+<LoginProgressBoxShadowColor value="0, 0, 0, 200" />
+<LoginProgressBoxTextColor value="255, 255, 255, 255"/>
+
+<!-- BUTTONS -->
+<ButtonLabelColor value="220, 220, 220, 255"/>			<!-- Text labels for buttons, like the "OK" text -->
+<ButtonLabelSelectedColor value="220, 220, 220, 255"/>
+<ButtonLabelDisabledColor value="147, 169, 213, 200"/>
+<ButtonLabelSelectedDisabledColor value="164, 190, 237, 200"/>
+<ButtonSelectedBgColor value="62, 62, 62, 255"/>
+<ButtonSelectedColor value="255, 255, 255, 255"/>
+<ButtonUnselectedBgColor value="62, 62, 62, 255"/>
+<ButtonUnselectedFgColor value="255, 255, 255, 255"/>
+<ButtonBorderColor value="238, 156, 0, 255"/>
+<ButtonFlashBgColor value="255, 190, 62, 127" />
+<ButtonColor value="255, 255, 255, 255"/>				<!-- Blended with button art, usually left as opaque white -->
+<ButtonImageColor value="255, 255, 255, 255"/>			<!-- Blended with button art, usually left as opaque white -->
+
+<!-- SLIDERS -->
+<SliderDisabledThumbColor value="0, 0, 0, 255" />
+<SliderThumbCenterColor value="200, 200, 200, 255"/>
+<SliderThumbOutlineColor value="255, 255, 255, 255"/>
+<SliderTrackColor value="255, 255, 255, 255"/>
+
+<!-- TEXTFIELDS -->
+<TextBgFocusColor value="200, 209, 204, 255"/>			<!-- Text field background when receiving input (focused) -->
+<TextBgReadOnlyColor value="62, 62, 62, 160"/>			<!-- Text field background when read-only -->
+<TextBgWriteableColor value="200, 209, 204, 230"/>		<!-- Text field background when not receiving input (unfocused) -->
+<TextCursorColor value="0, 0, 0, 255"/>
+<TextFgColor value="0, 0, 0, 255"/>
+<TextFgReadOnlyColor value="255, 255, 255, 200"/>
+<TextFgTentativeColor value="0, 0, 0, 128"/>
+<TextEmbeddedItemReadOnlyColor value="58, 147, 242, 255"/>	<!-- i.e. About Land name that you don't own -->
+<TextEmbeddedItemColor value="0, 0, 128, 255"/>
+<TextDefaultColor value="0, 20, 0, 255"/>
+
+<!-- LISTBOXES -->
+<ScrollBgReadOnlyColor value="200, 209, 204, 255"/>
+<ScrollBgWriteableColor value="200, 209, 204, 255"/>
+<ScrollBGStripeColor value="100, 100, 100, 40"/>
+<ScrollDisabledColor value="128, 128, 128, 204"/>
+<ScrollSelectedBGColor value="100, 100, 100, 150"/>
+<ScrollSelectedFGColor value="0, 0, 0, 204"/>			<!-- Text color -->
+<ScrollUnselectedColor value="0, 0, 0, 204"/>			<!-- Text color -->
+<ScrollHighlightedColor value="183, 184, 188, 128"/>	<!-- Hover color -->
+<ScrollbarThumbColor value="100, 100, 100, 255"/>
+<ScrollbarTrackColor value="153, 154, 158, 255"/>
+
+<!-- MENUS -->
+<MenuBarBgColor value="62, 62, 62, 255"/>
+<MenuBarGodBgColor value="62, 128, 62, 255"/>
+<MenuNonProductionBgColor value="128, 0, 0, 255"/>
+<MenuNonProductionGodBgColor value="0,128,0,255"/>
+<MenuDefaultBgColor value="0, 0, 0, 255"/>
+<MenuItemDisabledColor value="133, 133, 164, 128"/>		<!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
+<MenuItemEnabledColor value="255, 255, 255, 255"/>		<!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
+<MenuItemHighlightBgColor value="183, 184, 188, 100"/>
+<MenuItemHighlightFgColor value="255, 255, 255, 255"/>	<!-- Highlighted menu text color; also treeview node selection highlight -->
+<MenuPopupBgColor value="0, 0, 0, 255"/>
+
+<!--  PIE MENUS -->
+<PieMenuBgColor value="62, 62, 62, 150"/>
+<PieMenuLineColor value="0, 0, 0, 128"/>
+<PieMenuSelectedColor value="183, 184, 188, 77"/>
+
+<!-- TOOLTIPS -->
+<ToolTipBgColor value="183, 184, 188, 200"/>
+<ToolTipBorderColor value="171, 212, 245, 255"/>
+<ToolTipTextColor value="0, 0, 0, 255"/>
+
+<!-- NOTIFICATION POP-UPS -->
+<NotifyBoxColor value="66, 66, 66, 255"/>
+<NotifyTextColor value="200, 200, 200, 255"/>
+<NotifyCautionBoxColor value="254, 209, 118, 255"/>		<!-- the background color of caution permissions prompts -->
+<NotifyCautionWarnColor value="0, 0, 0, 255"/>			<!-- the foreground color of the special title text in caution permissions prompts -->
+<GroupNotifyBoxColor value="70, 170, 255, 255"/>
+<GroupNotifyTextColor value="0, 0, 0 255" />
+
+<!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
+<ChatHistoryBgColor value="30, 30, 30, 200" />
+<ChatHistoryTextColor value="255, 255, 255, 255" />
+<IMHistoryBgColor value="30, 30, 30, 200" />
+<IMHistoryTextColor value="255, 255, 255, 255" />
+
+<!-- IN-WORLD SELECTION -->
+<SilhouetteParentColor value="255, 255, 0, 255"/>
+<SilhouetteChildColor value="32, 106, 196, 255"/>
+<HighlightParentColor value="171, 212, 245, 255"/>
+<HighlightChildColor value="171, 212, 245, 255"/>
+<HighlightInspectColor value="255, 0, 255, 255"/>
+
+<!-- EDIT MODE GRID -->
+<GridFocusPointColor value="255, 255, 255, 128"/>
+<GridlineColor value="255, 255, 255, 255"/>
+<GridlineBGColor value="235, 235, 255, 200"/>
+<GridlineShadowColor value="0, 0, 0, 80"/>
+
+<!-- PROPERTY LINES -->
+<PropertyColorAvail value="0, 0, 0, 0"/>
+<PropertyColorGroup value="0, 184, 184, 102"/>
+<PropertyColorOther value="255, 0, 0, 102"/>
+<PropertyColorSelf value="0, 255, 0, 102"/>
+<PropertyColorForSale value="255, 128, 0, 102"/>
+<PropertyColorAuction value="128, 0, 255, 102"/>		<!-- Match the color on the world map -->
+
+<!-- Icon Enable/Disable -->
+<IconEnabledColor value="255, 255, 255, 255"/>
+<IconDisabledColor value="147, 169, 213, 200"/>
+
+<!-- MAP -->
+<MapAvatar value="0, 255, 0, 255" />
+<MapFriend value="255, 255, 0, 255" />
+<MapLinden value="0, 0, 255, 255" />
+<MapMuted value="110, 110, 110, 255" />
+
+<!-- MINI-MAP -->
+<NetMapBackgroundColor value="0, 0, 0, 77" />
+<NetMapYouOwnAboveWater value="0, 255, 255, 255" />
+<NetMapYouOwnBelowWater value="0, 200, 200, 255" />
+<NetMapGroupOwnAboveWater value="255, 0, 255, 255" />
+<NetMapGroupOwnBelowWater value="200, 0, 200, 255" />
+<NetMapOtherOwnAboveWater value="60, 60, 60, 255" />
+<NetMapOtherOwnBelowWater value="30, 30, 30, 255" />
+<NetMapThisRegion value="255, 255, 255, 255" />
+<NetMapLiveRegion value="204, 204, 204, 255" />
+<NetMapDeadRegion value="255, 128, 128, 255" />
+<NetMapFrustum value="255, 255, 255, 20" />
+<NetMapFrustumRotating value="255, 255, 255, 51" />
+
+<!-- HELP WINDOW -->
+<HelpBgColor value="200, 209, 204, 255"/>
+<HelpFgColor value="0, 0, 0, 255"/>
+<HelpScrollTrackColor value="183, 184, 188, 255"/>
+<HelpScrollThumbColor value="80, 96, 124, 255"/>
+<HelpScrollHighlightColor value="115, 132, 155, 255"/>
+<HelpScrollShadowColor value="0, 0, 0, 255"/>
+
+<!-- MISC -->
+<AvatarNameColor value="251, 175, 93, 255"/>			<!-- Text color of avatar nametags -->
+<FocusColor value="238, 156, 0, 255"/>					<!-- Color of the glow around UI controls with keyboard focus -->
+<FloaterButtonImageColor value="239, 156, 0, 255"/>		<!-- The floater buttons (like the close box) are white images that receive this color. -->
+<ButtonCautionImageColor value="255, 255,  255, 255"/>	<!-- Match the caution dialog buttons to the default -->
+<MapAutopilotColor value="255, 128, 0, 255"/>
+<ContextSilhouetteColor value="239, 156, 0, 255"/>		<!-- For "context" highlighting, i.e. pie menu -->
+<ScriptBgReadOnlyColor value="100, 100, 100, 255"/>
+<ParcelTextColor value="0, 200, 100, 200" />			<!-- Parcel name on menu bar, normal state -->
+<ParcelHoverColor value="0, 200, 100, 255" />			<!-- Parcel name on menu bar, hover state -->
+<TimeTextColor value="255, 255, 255, 255" />			<!-- SL Time on menu bar -->
+<BalanceTextColor value="0, 255, 0, 255"/>				<!-- Linden dollar balance on menu bar -->
+<HealthTextColor value="255, 255, 255, 255"/>			<!-- Damage meter text on menu bar -->
+<GroupOverTierColor value="110, 15, 15, 255" />			<!-- Warning text in Group Info window -->
+<FilterBackgroundColor value="0, 0, 20, 255"/>			<!-- Matching region of Inventory search text -->
+<FilterTextColor value="255, 200, 70, 255"/>
+<InventoryItemSuffixColor value="200, 200, 200, 255"/>
+<InventorySearchStatusColor value="0, 0, 0, 255" />
+<ConsoleBackground value="0, 0, 0, 255" />
+<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/>
+<InventoryBackgroundColor value="62, 62, 62, 80"/>
+<ComboBoxBg value="255, 255, 255, 255"/>
+<AvatarListTextDistNormalRange value="0, 0, 0, 255"/>
+<AvatarListTextDistShoutRange value="0, 0, 0, 128"/>
+<AvatarListTextDistOver value="128, 0, 0, 128"/>
+<AvatarListTextAgeYoung value="255, 0, 0, 255"/>
+<AvatarListTextAgeNormal value="0, 0, 0, 255"/>
+
+
+<!-- Alert box colors -->
+<AlertBoxColor value="62, 62, 62, 255"/>
+<AlertTextColor value="147, 169, 213, 255"/>
+<AlertCautionBoxColor value="142, 0, 157, 255"/>		<!-- Background color of caution alerts -->
+<AlertCautionTextColor value="0, 0, 0, 255"/>			<!-- Foreground color of the special title text in caution alerts -->
+
+<!--  Multi sliders, as in the sky animation setting -->
+<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/>
+<MultiSliderThumbCenterColor value="183, 184, 188, 255"/>
+<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/>
+<MultiSliderTrackColor value="30, 30, 30, 255"/>
+<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/>
+<MultiSliderTriangleColor value="255, 255, 50, 255"/>
+
+</settings>
diff --git a/linden/indra/newview/skins/dark/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga b/linden/indra/newview/skins/dark/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga
new file mode 100644
index 0000000..a563672
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga b/linden/indra/newview/skins/dark/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga
new file mode 100644
index 0000000..f784196
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/5748decc-f629-461c-9a36-a35a221fe21f.tga b/linden/indra/newview/skins/dark/textures/5748decc-f629-461c-9a36-a35a221fe21f.tga
new file mode 100644
index 0000000..55e3793
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/5748decc-f629-461c-9a36-a35a221fe21f.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga b/linden/indra/newview/skins/dark/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga
new file mode 100644
index 0000000..dd57c80
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga b/linden/indra/newview/skins/dark/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga
new file mode 100644
index 0000000..132b192
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/89e9fc7c-0b16-457d-be4f-136270759c4d.tga b/linden/indra/newview/skins/dark/textures/89e9fc7c-0b16-457d-be4f-136270759c4d.tga
new file mode 100644
index 0000000..6cc9ea1
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/89e9fc7c-0b16-457d-be4f-136270759c4d.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga b/linden/indra/newview/skins/dark/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga
new file mode 100644
index 0000000..ceaaaba
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/active_speakers.tga b/linden/indra/newview/skins/dark/textures/active_speakers.tga
new file mode 100644
index 0000000..37521d2
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/active_speakers.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/active_voice_tab.tga b/linden/indra/newview/skins/dark/textures/active_voice_tab.tga
new file mode 100644
index 0000000..1a68c98
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/active_voice_tab.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/arrow_down.tga b/linden/indra/newview/skins/dark/textures/arrow_down.tga
new file mode 100644
index 0000000..5b05df1
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/arrow_down.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/arrow_up.tga b/linden/indra/newview/skins/dark/textures/arrow_up.tga
new file mode 100644
index 0000000..abe5c20
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/arrow_up.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga b/linden/indra/newview/skins/dark/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga
new file mode 100644
index 0000000..66c9dc4
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/black.tga b/linden/indra/newview/skins/dark/textures/black.tga
new file mode 100644
index 0000000..e368ea4
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/black.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/btn_chatbar.tga b/linden/indra/newview/skins/dark/textures/btn_chatbar.tga
new file mode 100644
index 0000000..76008ae
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/btn_chatbar.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/btn_chatbar_selected.tga b/linden/indra/newview/skins/dark/textures/btn_chatbar_selected.tga
new file mode 100644
index 0000000..1698e72
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/btn_chatbar_selected.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/button_anim_pause.tga b/linden/indra/newview/skins/dark/textures/button_anim_pause.tga
new file mode 100644
index 0000000..2d9f2b5
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/button_anim_pause.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/button_anim_pause_selected.tga b/linden/indra/newview/skins/dark/textures/button_anim_pause_selected.tga
new file mode 100644
index 0000000..f75b97d
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/button_anim_pause_selected.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/button_anim_play.tga b/linden/indra/newview/skins/dark/textures/button_anim_play.tga
new file mode 100644
index 0000000..37e9c7e
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/button_anim_play.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/button_anim_play_selected.tga b/linden/indra/newview/skins/dark/textures/button_anim_play_selected.tga
new file mode 100644
index 0000000..21d1c6d
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/button_anim_play_selected.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/button_anim_stop.tga b/linden/indra/newview/skins/dark/textures/button_anim_stop.tga
new file mode 100644
index 0000000..0888969
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/button_anim_stop.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/button_anim_stop_selected.tga b/linden/indra/newview/skins/dark/textures/button_anim_stop_selected.tga
new file mode 100644
index 0000000..46cce99
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/button_anim_stop_selected.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/button_disabled_32x128.tga b/linden/indra/newview/skins/dark/textures/button_disabled_32x128.tga
new file mode 100644
index 0000000..c3f0ad7
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/button_disabled_32x128.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/button_enabled_32x128.tga b/linden/indra/newview/skins/dark/textures/button_enabled_32x128.tga
new file mode 100644
index 0000000..acfa33e
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/button_enabled_32x128.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/button_enabled_selected_32x128.tga b/linden/indra/newview/skins/dark/textures/button_enabled_selected_32x128.tga
new file mode 100644
index 0000000..3823bc1
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/button_enabled_selected_32x128.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga b/linden/indra/newview/skins/dark/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga
new file mode 100644
index 0000000..6430fce
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga b/linden/indra/newview/skins/dark/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga
new file mode 100644
index 0000000..8b74341
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/cam_rotate_in.tga b/linden/indra/newview/skins/dark/textures/cam_rotate_in.tga
new file mode 100644
index 0000000..d08f980
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/cam_rotate_in.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/cam_rotate_out.tga b/linden/indra/newview/skins/dark/textures/cam_rotate_out.tga
new file mode 100644
index 0000000..f8f64f1
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/cam_rotate_out.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/cam_tracking_in.tga b/linden/indra/newview/skins/dark/textures/cam_tracking_in.tga
new file mode 100644
index 0000000..562c951
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/cam_tracking_in.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/cam_tracking_out.tga b/linden/indra/newview/skins/dark/textures/cam_tracking_out.tga
new file mode 100644
index 0000000..7835704
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/cam_tracking_out.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/cam_zoom_minus_in.tga b/linden/indra/newview/skins/dark/textures/cam_zoom_minus_in.tga
new file mode 100644
index 0000000..a1da27b
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/cam_zoom_minus_in.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/cam_zoom_out.tga b/linden/indra/newview/skins/dark/textures/cam_zoom_out.tga
new file mode 100644
index 0000000..2e9519d
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/cam_zoom_out.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/cam_zoom_plus_in.tga b/linden/indra/newview/skins/dark/textures/cam_zoom_plus_in.tga
new file mode 100644
index 0000000..c17d607
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/cam_zoom_plus_in.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga b/linden/indra/newview/skins/dark/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga
new file mode 100644
index 0000000..046e696
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/checkbox_disabled_false.tga b/linden/indra/newview/skins/dark/textures/checkbox_disabled_false.tga
new file mode 100644
index 0000000..074ded7
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/checkbox_disabled_false.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/checkbox_disabled_true.tga b/linden/indra/newview/skins/dark/textures/checkbox_disabled_true.tga
new file mode 100644
index 0000000..79d2590
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/checkbox_disabled_true.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/checkbox_enabled_false.tga b/linden/indra/newview/skins/dark/textures/checkbox_enabled_false.tga
new file mode 100644
index 0000000..df55cf2
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/checkbox_enabled_false.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/checkbox_enabled_true.tga b/linden/indra/newview/skins/dark/textures/checkbox_enabled_true.tga
new file mode 100644
index 0000000..3344ee7
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/checkbox_enabled_true.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/circle.tga b/linden/indra/newview/skins/dark/textures/circle.tga
new file mode 100644
index 0000000..d7097e3
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/circle.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/close_in_blue.tga b/linden/indra/newview/skins/dark/textures/close_in_blue.tga
new file mode 100644
index 0000000..a1a421e
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/close_in_blue.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/close_inactive.tga b/linden/indra/newview/skins/dark/textures/close_inactive.tga
new file mode 100644
index 0000000..30f6e7b
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/close_inactive.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/close_inactive_blue.tga b/linden/indra/newview/skins/dark/textures/close_inactive_blue.tga
new file mode 100644
index 0000000..30f6e7b
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/close_inactive_blue.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/closebox.tga b/linden/indra/newview/skins/dark/textures/closebox.tga
new file mode 100644
index 0000000..96488b4
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/closebox.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/combobox_arrow.tga b/linden/indra/newview/skins/dark/textures/combobox_arrow.tga
new file mode 100644
index 0000000..d769d31
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/combobox_arrow.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/darkgray.tga b/linden/indra/newview/skins/dark/textures/darkgray.tga
new file mode 100644
index 0000000..e69be08
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/darkgray.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/eye_button_active.tga b/linden/indra/newview/skins/dark/textures/eye_button_active.tga
new file mode 100644
index 0000000..cac3de5
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/eye_button_active.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/eye_button_inactive.tga b/linden/indra/newview/skins/dark/textures/eye_button_inactive.tga
new file mode 100644
index 0000000..6ca8fee
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/eye_button_inactive.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga b/linden/indra/newview/skins/dark/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga
new file mode 100644
index 0000000..8b9d012
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/ff_edit_mine_button.tga b/linden/indra/newview/skins/dark/textures/ff_edit_mine_button.tga
new file mode 100644
index 0000000..01770a3
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/ff_edit_mine_button.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/ff_edit_theirs_button.tga b/linden/indra/newview/skins/dark/textures/ff_edit_theirs_button.tga
new file mode 100644
index 0000000..78a23b0
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/ff_edit_theirs_button.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/ff_online_status_button.tga b/linden/indra/newview/skins/dark/textures/ff_online_status_button.tga
new file mode 100644
index 0000000..79f2918
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/ff_online_status_button.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/ff_visible_map_button.tga b/linden/indra/newview/skins/dark/textures/ff_visible_map_button.tga
new file mode 100644
index 0000000..bce9a8c
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/ff_visible_map_button.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/ff_visible_online_button.tga b/linden/indra/newview/skins/dark/textures/ff_visible_online_button.tga
new file mode 100644
index 0000000..c888b08
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/ff_visible_online_button.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/flyout_btn_left.tga b/linden/indra/newview/skins/dark/textures/flyout_btn_left.tga
new file mode 100644
index 0000000..3060d80
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/flyout_btn_left.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/flyout_btn_left_disabled.tga b/linden/indra/newview/skins/dark/textures/flyout_btn_left_disabled.tga
new file mode 100644
index 0000000..060a56b
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/flyout_btn_left_disabled.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/flyout_btn_left_selected.tga b/linden/indra/newview/skins/dark/textures/flyout_btn_left_selected.tga
new file mode 100644
index 0000000..9965fb4
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/flyout_btn_left_selected.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/flyout_btn_right.tga b/linden/indra/newview/skins/dark/textures/flyout_btn_right.tga
new file mode 100644
index 0000000..0a2354e
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/flyout_btn_right.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/flyout_btn_right_disabled.tga b/linden/indra/newview/skins/dark/textures/flyout_btn_right_disabled.tga
new file mode 100644
index 0000000..9050e12
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/flyout_btn_right_disabled.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/flyout_btn_right_selected.tga b/linden/indra/newview/skins/dark/textures/flyout_btn_right_selected.tga
new file mode 100644
index 0000000..58594da
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/flyout_btn_right_selected.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/folder_arrow.tga b/linden/indra/newview/skins/dark/textures/folder_arrow.tga
new file mode 100644
index 0000000..77d4707
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/folder_arrow.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_active-speakers-dot-lvl0.tga b/linden/indra/newview/skins/dark/textures/icn_active-speakers-dot-lvl0.tga
new file mode 100644
index 0000000..35846ce
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_active-speakers-dot-lvl0.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_active-speakers-dot-lvl1.tga b/linden/indra/newview/skins/dark/textures/icn_active-speakers-dot-lvl1.tga
new file mode 100644
index 0000000..1f9f564
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_active-speakers-dot-lvl1.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_active-speakers-dot-lvl2.tga b/linden/indra/newview/skins/dark/textures/icn_active-speakers-dot-lvl2.tga
new file mode 100644
index 0000000..b2e5609
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_active-speakers-dot-lvl2.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_active-speakers-typing1.tga b/linden/indra/newview/skins/dark/textures/icn_active-speakers-typing1.tga
new file mode 100644
index 0000000..3706c96
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_active-speakers-typing1.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_active-speakers-typing2.tga b/linden/indra/newview/skins/dark/textures/icn_active-speakers-typing2.tga
new file mode 100644
index 0000000..0d127f9
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_active-speakers-typing2.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_active-speakers-typing3.tga b/linden/indra/newview/skins/dark/textures/icn_active-speakers-typing3.tga
new file mode 100644
index 0000000..031b3ad
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_active-speakers-typing3.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_chatbar.tga b/linden/indra/newview/skins/dark/textures/icn_chatbar.tga
new file mode 100644
index 0000000..94fd6dc
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_chatbar.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_clear_lineeditor.tga b/linden/indra/newview/skins/dark/textures/icn_clear_lineeditor.tga
new file mode 100644
index 0000000..8cd8310
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_clear_lineeditor.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_media-pause_active.tga b/linden/indra/newview/skins/dark/textures/icn_media-pause_active.tga
new file mode 100644
index 0000000..8988829
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_media-pause_active.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_media-pause_disabled.tga b/linden/indra/newview/skins/dark/textures/icn_media-pause_disabled.tga
new file mode 100644
index 0000000..4690f42
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_media-pause_disabled.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_media-pause_enabled.tga b/linden/indra/newview/skins/dark/textures/icn_media-pause_enabled.tga
new file mode 100644
index 0000000..c01399e
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_media-pause_enabled.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_media-play_enabled.tga b/linden/indra/newview/skins/dark/textures/icn_media-play_enabled.tga
new file mode 100644
index 0000000..accac38
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_media-play_enabled.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_media-stop_enabled.tga b/linden/indra/newview/skins/dark/textures/icn_media-stop_enabled.tga
new file mode 100644
index 0000000..d935fa3
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_media-stop_enabled.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_media.tga b/linden/indra/newview/skins/dark/textures/icn_media.tga
new file mode 100644
index 0000000..2a035ba
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_media.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_music.tga b/linden/indra/newview/skins/dark/textures/icn_music.tga
new file mode 100644
index 0000000..81da5ab
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_music.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_scrollbar.tga b/linden/indra/newview/skins/dark/textures/icn_scrollbar.tga
new file mode 100644
index 0000000..a19a8a5
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_scrollbar.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_scrollbar_bg.tga b/linden/indra/newview/skins/dark/textures/icn_scrollbar_bg.tga
new file mode 100644
index 0000000..cd484c6
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_scrollbar_bg.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_scrollbar_thumb.tga b/linden/indra/newview/skins/dark/textures/icn_scrollbar_thumb.tga
new file mode 100644
index 0000000..b11b1bd
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_scrollbar_thumb.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_slide-groove_dark.tga b/linden/indra/newview/skins/dark/textures/icn_slide-groove_dark.tga
new file mode 100644
index 0000000..1936143
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_slide-groove_dark.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_slide-highlight.tga b/linden/indra/newview/skins/dark/textures/icn_slide-highlight.tga
new file mode 100644
index 0000000..0747e3c
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_slide-highlight.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_slide-thumb_dark.tga b/linden/indra/newview/skins/dark/textures/icn_slide-thumb_dark.tga
new file mode 100644
index 0000000..7605b2c
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_slide-thumb_dark.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_speaker-muted_dark.tga b/linden/indra/newview/skins/dark/textures/icn_speaker-muted_dark.tga
new file mode 100644
index 0000000..f53e8cc
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_speaker-muted_dark.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_speaker_dark.tga b/linden/indra/newview/skins/dark/textures/icn_speaker_dark.tga
new file mode 100644
index 0000000..6b326cf
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_speaker_dark.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_toolbar_build.tga b/linden/indra/newview/skins/dark/textures/icn_toolbar_build.tga
new file mode 100644
index 0000000..46e84ef
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_toolbar_build.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_toolbar_fly.tga b/linden/indra/newview/skins/dark/textures/icn_toolbar_fly.tga
new file mode 100644
index 0000000..8bd422a
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_toolbar_fly.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_toolbar_inventory.tga b/linden/indra/newview/skins/dark/textures/icn_toolbar_inventory.tga
new file mode 100644
index 0000000..b832ebc
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_toolbar_inventory.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_toolbar_map.tga b/linden/indra/newview/skins/dark/textures/icn_toolbar_map.tga
new file mode 100644
index 0000000..a100f57
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_toolbar_map.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_toolbar_minimap.tga b/linden/indra/newview/skins/dark/textures/icn_toolbar_minimap.tga
new file mode 100644
index 0000000..21149f3
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_toolbar_minimap.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_toolbar_radar.tga b/linden/indra/newview/skins/dark/textures/icn_toolbar_radar.tga
new file mode 100644
index 0000000..d1a55ed
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_toolbar_radar.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_toolbar_search.tga b/linden/indra/newview/skins/dark/textures/icn_toolbar_search.tga
new file mode 100644
index 0000000..2da9704
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_toolbar_search.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icn_toolbar_snapshot.tga b/linden/indra/newview/skins/dark/textures/icn_toolbar_snapshot.tga
new file mode 100644
index 0000000..23b97c0
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icn_toolbar_snapshot.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/icon_top_pick.tga b/linden/indra/newview/skins/dark/textures/icon_top_pick.tga
new file mode 100644
index 0000000..0b34882
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/icon_top_pick.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/lightgray.tga b/linden/indra/newview/skins/dark/textures/lightgray.tga
new file mode 100644
index 0000000..e69be08
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/lightgray.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/minimize.tga b/linden/indra/newview/skins/dark/textures/minimize.tga
new file mode 100644
index 0000000..35d2e9a
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/minimize.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/minimize_inactive.tga b/linden/indra/newview/skins/dark/textures/minimize_inactive.tga
new file mode 100644
index 0000000..8f09acd
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/minimize_inactive.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/minimize_pressed.tga b/linden/indra/newview/skins/dark/textures/minimize_pressed.tga
new file mode 100644
index 0000000..bc03952
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/minimize_pressed.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/move_backward_in.tga b/linden/indra/newview/skins/dark/textures/move_backward_in.tga
new file mode 100644
index 0000000..b64204e
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/move_backward_in.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/move_backward_out.tga b/linden/indra/newview/skins/dark/textures/move_backward_out.tga
new file mode 100644
index 0000000..1acce4b
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/move_backward_out.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/move_down_in.tga b/linden/indra/newview/skins/dark/textures/move_down_in.tga
new file mode 100644
index 0000000..904e9a8
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/move_down_in.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/move_down_out.tga b/linden/indra/newview/skins/dark/textures/move_down_out.tga
new file mode 100644
index 0000000..39bcda4
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/move_down_out.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/move_forward_in.tga b/linden/indra/newview/skins/dark/textures/move_forward_in.tga
new file mode 100644
index 0000000..d41a1e1
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/move_forward_in.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/move_forward_out.tga b/linden/indra/newview/skins/dark/textures/move_forward_out.tga
new file mode 100644
index 0000000..643c260
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/move_forward_out.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/move_left_in.tga b/linden/indra/newview/skins/dark/textures/move_left_in.tga
new file mode 100644
index 0000000..f63ff2d
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/move_left_in.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/move_left_out.tga b/linden/indra/newview/skins/dark/textures/move_left_out.tga
new file mode 100644
index 0000000..775bc15
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/move_left_out.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/move_right_in.tga b/linden/indra/newview/skins/dark/textures/move_right_in.tga
new file mode 100644
index 0000000..c85c4c3
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/move_right_in.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/move_right_out.tga b/linden/indra/newview/skins/dark/textures/move_right_out.tga
new file mode 100644
index 0000000..729331d
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/move_right_out.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/move_turn_left_in.tga b/linden/indra/newview/skins/dark/textures/move_turn_left_in.tga
new file mode 100644
index 0000000..970b7f2
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/move_turn_left_in.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/move_turn_left_out.tga b/linden/indra/newview/skins/dark/textures/move_turn_left_out.tga
new file mode 100644
index 0000000..8c16775
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/move_turn_left_out.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/move_turn_right_in.tga b/linden/indra/newview/skins/dark/textures/move_turn_right_in.tga
new file mode 100644
index 0000000..367deae
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/move_turn_right_in.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/move_turn_right_out.tga b/linden/indra/newview/skins/dark/textures/move_turn_right_out.tga
new file mode 100644
index 0000000..3105adb
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/move_turn_right_out.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/move_up_in.tga b/linden/indra/newview/skins/dark/textures/move_up_in.tga
new file mode 100644
index 0000000..f62727d
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/move_up_in.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/move_up_out.tga b/linden/indra/newview/skins/dark/textures/move_up_out.tga
new file mode 100644
index 0000000..777b221
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/move_up_out.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/mute_icon.tga b/linden/indra/newview/skins/dark/textures/mute_icon.tga
new file mode 100644
index 0000000..879b9e6
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/mute_icon.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/notify_next.png b/linden/indra/newview/skins/dark/textures/notify_next.png
new file mode 100644
index 0000000..b57c26e
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/notify_next.png differ
diff --git a/linden/indra/newview/skins/dark/textures/preview.png b/linden/indra/newview/skins/dark/textures/preview.png
new file mode 100644
index 0000000..2cac829
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/preview.png differ
diff --git a/linden/indra/newview/skins/dark/textures/progress_fill.tga b/linden/indra/newview/skins/dark/textures/progress_fill.tga
new file mode 100644
index 0000000..bbdf5dd
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/progress_fill.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/progressbar_fill.tga b/linden/indra/newview/skins/dark/textures/progressbar_fill.tga
new file mode 100644
index 0000000..7070343
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/progressbar_fill.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/progressbar_track.tga b/linden/indra/newview/skins/dark/textures/progressbar_track.tga
new file mode 100644
index 0000000..3434330
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/progressbar_track.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/ptt_lock_off.tga b/linden/indra/newview/skins/dark/textures/ptt_lock_off.tga
new file mode 100644
index 0000000..cb68344
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/ptt_lock_off.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/ptt_lock_on.tga b/linden/indra/newview/skins/dark/textures/ptt_lock_on.tga
new file mode 100644
index 0000000..5a7413b
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/ptt_lock_on.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/radio_active_false.tga b/linden/indra/newview/skins/dark/textures/radio_active_false.tga
new file mode 100644
index 0000000..15d5e59
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/radio_active_false.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/radio_active_true.tga b/linden/indra/newview/skins/dark/textures/radio_active_true.tga
new file mode 100644
index 0000000..cbef889
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/radio_active_true.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/radio_inactive_false.tga b/linden/indra/newview/skins/dark/textures/radio_inactive_false.tga
new file mode 100644
index 0000000..48a9342
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/radio_inactive_false.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/radio_inactive_true.tga b/linden/indra/newview/skins/dark/textures/radio_inactive_true.tga
new file mode 100644
index 0000000..785b3fa
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/radio_inactive_true.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/resize_handle_bottom_right_blue.tga b/linden/indra/newview/skins/dark/textures/resize_handle_bottom_right_blue.tga
new file mode 100644
index 0000000..b40ef73
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/resize_handle_bottom_right_blue.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/restore.tga b/linden/indra/newview/skins/dark/textures/restore.tga
new file mode 100644
index 0000000..904797e
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/restore.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/restore_inactive.tga b/linden/indra/newview/skins/dark/textures/restore_inactive.tga
new file mode 100644
index 0000000..8f09acd
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/restore_inactive.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/restore_pressed.tga b/linden/indra/newview/skins/dark/textures/restore_pressed.tga
new file mode 100644
index 0000000..c8ce0f9
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/restore_pressed.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/rounded_square.tga b/linden/indra/newview/skins/dark/textures/rounded_square.tga
new file mode 100644
index 0000000..c8fc7b7
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/rounded_square.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/rounded_square_soft.tga b/linden/indra/newview/skins/dark/textures/rounded_square_soft.tga
new file mode 100644
index 0000000..0e5bc79
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/rounded_square_soft.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/scrollbutton_down_in_blue.tga b/linden/indra/newview/skins/dark/textures/scrollbutton_down_in_blue.tga
new file mode 100644
index 0000000..6a89d4a
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/scrollbutton_down_in_blue.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/scrollbutton_down_out_blue.tga b/linden/indra/newview/skins/dark/textures/scrollbutton_down_out_blue.tga
new file mode 100644
index 0000000..04e158e
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/scrollbutton_down_out_blue.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/scrollbutton_left_in_blue.tga b/linden/indra/newview/skins/dark/textures/scrollbutton_left_in_blue.tga
new file mode 100644
index 0000000..4efaa99
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/scrollbutton_left_in_blue.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/scrollbutton_left_out_blue.tga b/linden/indra/newview/skins/dark/textures/scrollbutton_left_out_blue.tga
new file mode 100644
index 0000000..4de4ca5
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/scrollbutton_left_out_blue.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/scrollbutton_right_in_blue.tga b/linden/indra/newview/skins/dark/textures/scrollbutton_right_in_blue.tga
new file mode 100644
index 0000000..484f046
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/scrollbutton_right_in_blue.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/scrollbutton_right_out_blue.tga b/linden/indra/newview/skins/dark/textures/scrollbutton_right_out_blue.tga
new file mode 100644
index 0000000..fca7918
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/scrollbutton_right_out_blue.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/scrollbutton_up_in_blue.tga b/linden/indra/newview/skins/dark/textures/scrollbutton_up_in_blue.tga
new file mode 100644
index 0000000..d8fd0a7
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/scrollbutton_up_in_blue.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/spacer24.tga b/linden/indra/newview/skins/dark/textures/spacer24.tga
new file mode 100644
index 0000000..c7cab6b
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/spacer24.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/spacer35.tga b/linden/indra/newview/skins/dark/textures/spacer35.tga
new file mode 100644
index 0000000..b88bc66
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/spacer35.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/spin_down_in_blue.tga b/linden/indra/newview/skins/dark/textures/spin_down_in_blue.tga
new file mode 100644
index 0000000..1f3dbfc
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/spin_down_in_blue.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/spin_down_out_blue.tga b/linden/indra/newview/skins/dark/textures/spin_down_out_blue.tga
new file mode 100644
index 0000000..6728a6d
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/spin_down_out_blue.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/spin_up_in_blue.tga b/linden/indra/newview/skins/dark/textures/spin_up_in_blue.tga
new file mode 100644
index 0000000..4bb545e
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/spin_up_in_blue.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/spin_up_out_blue.tga b/linden/indra/newview/skins/dark/textures/spin_up_out_blue.tga
new file mode 100644
index 0000000..4a5cbcb
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/spin_up_out_blue.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/square_btn_32x128.tga b/linden/indra/newview/skins/dark/textures/square_btn_32x128.tga
new file mode 100644
index 0000000..495b056
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/square_btn_32x128.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/square_btn_selected_32x128.tga b/linden/indra/newview/skins/dark/textures/square_btn_selected_32x128.tga
new file mode 100644
index 0000000..0abbf56
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/square_btn_selected_32x128.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/status_buy_currency.tga b/linden/indra/newview/skins/dark/textures/status_buy_currency.tga
new file mode 100644
index 0000000..3912653
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/status_buy_currency.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/status_buy_currency_pressed.tga b/linden/indra/newview/skins/dark/textures/status_buy_currency_pressed.tga
new file mode 100644
index 0000000..4ade0c0
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/status_buy_currency_pressed.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/status_buy_land.tga b/linden/indra/newview/skins/dark/textures/status_buy_land.tga
new file mode 100644
index 0000000..4c4e977
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/status_buy_land.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/tab_bottom_blue.tga b/linden/indra/newview/skins/dark/textures/tab_bottom_blue.tga
new file mode 100644
index 0000000..65c9228
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/tab_bottom_blue.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/tab_bottom_selected_blue.tga b/linden/indra/newview/skins/dark/textures/tab_bottom_selected_blue.tga
new file mode 100644
index 0000000..7507eda
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/tab_bottom_selected_blue.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/tab_left.tga b/linden/indra/newview/skins/dark/textures/tab_left.tga
new file mode 100644
index 0000000..36a48bf
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/tab_left.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/tab_left_selected.tga b/linden/indra/newview/skins/dark/textures/tab_left_selected.tga
new file mode 100644
index 0000000..2ed53bc
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/tab_left_selected.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/tab_top_blue.tga b/linden/indra/newview/skins/dark/textures/tab_top_blue.tga
new file mode 100644
index 0000000..8f2625e
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/tab_top_blue.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/tab_top_selected_blue.tga b/linden/indra/newview/skins/dark/textures/tab_top_selected_blue.tga
new file mode 100644
index 0000000..bab178a
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/tab_top_selected_blue.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/tabarea.tga b/linden/indra/newview/skins/dark/textures/tabarea.tga
new file mode 100644
index 0000000..5517aeb
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/tabarea.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/textures.xml b/linden/indra/newview/skins/dark/textures/textures.xml
new file mode 100644
index 0000000..4dbbdf0
--- /dev/null
+++ b/linden/indra/newview/skins/dark/textures/textures.xml
@@ -0,0 +1,386 @@
+<textures version="101">
+  <sm_rounded_corners_simple.tga>
+        <scale_rect left="4" top="4" bottom="4" right="4"/>
+  </sm_rounded_corners_simple.tga>
+  
+  <icn_textfield_enabled.tga>
+        <scale_rect left="5" top="5" bottom="5" right="5"/>
+  </icn_textfield_enabled.tga>
+  <button_disabled_32x128.tga	preload="true">
+    <scale_rect left="8" top="16" right="120" bottom="8"/>
+  </button_disabled_32x128.tga>
+  <button_enabled_32x128.tga	preload="true">
+    <scale_rect left="8" top="16" right="120" bottom="8"/>
+  </button_enabled_32x128.tga>
+  <toolbar_btn_enabled.tga>
+        <scale_rect left="26" top="24" right="102" bottom="0" />
+                </toolbar_btn_enabled.tga>
+
+  <progressbar_fill.tga	preload="true">
+    <scale_rect left="4" top="7" right="71" bottom="7"/>
+    </progressbar_fill.tga>
+  <progressbar_track.tga	preload="true">
+    <scale_rect left="3" top="7" right="87" bottom="7"/>
+    </progressbar_track.tga>
+
+
+  <toolbar_btn_disabled.tga>
+        <scale_rect left="26" top="24" right="102" bottom="0" />
+                </toolbar_btn_disabled.tga>
+  <toolbar_btn_selected.tga>
+        <scale_rect left="26" top="24" right="102" bottom="0" />
+                </toolbar_btn_selected.tga>
+  <button_enabled_selected_32x128.tga	preload="true">
+    <scale_rect left="12" top="12" right="118" bottom="14"/>
+  </button_enabled_selected_32x128.tga>
+  <checkbox_disabled_false.tga	preload="true"/>
+  <checkbox_disabled_true.tga	preload="true"/>
+  <checkbox_enabled_false.tga	preload="true"/>
+  <checkbox_enabled_true.tga	preload="true"/>
+  <close_in_blue.tga	preload="true"/>
+  <combobox_arrow.tga	preload="true"/>
+  <minimize.tga	preload="true"/>
+  <minimize_pressed.tga	preload="true"/>
+  <radio_active_false.tga	preload="true"/>
+  <radio_active_true.tga	preload="true"/>
+  <radio_inactive_false.tga	preload="true"/>
+  <radio_inactive_true.tga	preload="true"/>
+  <resize_handle_bottom_right_blue.tga preload="true"/>
+  <rounded_square.tga	preload="true">
+    <scale_rect left="8" top="16" right="120" bottom="8"/>
+  </rounded_square.tga>
+  <rounded_square_soft.tga	preload="true">
+    <scale_rect left="8" top="16" right="120" bottom="8"/>
+  </rounded_square_soft.tga>
+  <toolbar_tab.tga	preload="true">
+    <scale_rect left="6" top="42" right="104" bottom="8"/>
+  </toolbar_tab.tga>
+  <toolbar_bg.tga	preload="true">
+    <scale_rect left="6" top="42" right="96" bottom="16"/>
+  </toolbar_bg.tga>
+  <scrollbutton_down_in_blue.tga	preload="true"/>
+  <scrollbutton_down_out_blue.tga	preload="true"/>
+  <scrollbutton_left_in_blue.tga	preload="true"/>
+  <scrollbutton_left_out_blue.tga	preload="true"/>
+  <scrollbutton_right_in_blue.tga	preload="true"/>
+  <scrollbutton_right_out_blue.tga	preload="true"/>
+  <scrollbutton_up_in_blue.tga	preload="true"/>
+  <scrollbutton_up_out_blue.tga	preload="true"/>
+  <spin_down_in_blue.tga	preload="true"/>
+  <spin_down_out_blue.tga	preload="true"/>
+  <spin_up_in_blue.tga	preload="true"/>
+  <spin_up_out_blue.tga	preload="true"/>
+  <square_btn_32x128.tga	preload="true">
+    <scale_rect left="8" top="10" right="120" bottom="10"/>
+  </square_btn_32x128.tga>
+  <square_btn_selected_32x128.tga	preload="true">
+    <scale_rect left="2" top="10" right="126" bottom="10"/>
+  </square_btn_selected_32x128.tga>
+  <tab_bottom_blue.tga	preload="true">
+    <scale_rect left="8" top="8" right="120" bottom="9"/>
+  </tab_bottom_blue.tga>
+  <tab_bottom_selected_blue.tga	preload="true">
+    <scale_rect left="8" top="8" right="96" bottom="9"/>
+  </tab_bottom_selected_blue.tga>
+  <tab_left.tga	preload="true">
+    <scale_rect left="8" top="8" right="120" bottom="9"/>
+  </tab_left.tga>
+  <tab_left_selected.tga	preload="true">
+    <scale_rect left="8" top="8" right="96" bottom="9"/>
+  </tab_left_selected.tga>
+  <tab_top_blue.tga	preload="true">
+    <scale_rect left="8" top="8" right="120" bottom="9"/>
+  </tab_top_blue.tga>
+  <tab_top_selected_blue.tga preload="true">
+    <scale_rect left="8" top="8" right="96" bottom="9"/>
+  </tab_top_selected_blue.tga>
+  <startup_logo.j2c preload="true"/>
+  <color_swatch_alpha.tga preload="true"/>
+
+  <active_voice_tab.tga/>
+  <button_anim_pause.tga/>
+  <button_anim_pause_selected.tga/>
+  <button_anim_play.tga/>
+  <button_anim_play_selected.tga/>
+  <button_anim_stop.tga/>
+  <button_anim_stop_selected.tga/>
+  <crosshairs.tga/>
+  <direction_arrow.tga/>
+  <cloud-particle.j2c use_mips="true"/>
+  <foot_shadow.j2c use_mips="true"/>
+
+  <icon_auction.tga/>
+  <icon_avatar_offline.tga/>
+  <icon_avatar_online.tga/>
+  <icon_day_cycle.tga/>
+  <icon_diurnal.tga/>
+  <icon_event.tga/>
+  <icon_event_mature.tga/>
+  <icon_for_sale.tga/>
+  <icon_group.tga/>
+  <icon_groupnotice.tga/>
+  <icon_groupnoticeinventory.tga/>
+  <icon_lock.tga/>
+  <icon_place.tga/>
+  <icon_top_pick.tga/>
+
+  <inv_folder_animation.tga/>
+  <inv_folder_bodypart.tga/>
+  <inv_folder_callingcard.tga/>
+  <inv_folder_clothing.tga/>
+  <inv_folder_gesture.tga/>
+  <inv_folder_landmark.tga/>
+  <inv_folder_lostandfound.tga/>
+  <inv_folder_notecard.tga/>
+  <inv_folder_object.tga/>
+  <inv_folder_plain_closed.tga/>
+  <inv_folder_script.tga/>
+  <inv_folder_snapshot.tga/>
+  <inv_folder_sound.tga/>
+  <inv_folder_texture.tga/>
+  <inv_folder_trash.tga/>
+  <inv_item_animation.tga/>
+  <inv_item_skin.tga/>
+  <inv_item_callingcard_offline.tga/>
+  <inv_item_callingcard_online.tga/>
+  <inv_item_eyes.tga/>
+  <inv_item_gesture.tga/>
+  <inv_item_gloves.tga/>
+  <inv_item_hair.tga/>
+  <inv_item_jacket.tga/>
+  <inv_item_landmark.tga/>
+  <inv_item_landmark_visited.tga/>
+  <inv_item_notecard.tga/>
+  <inv_item_object.tga/>
+  <inv_item_object_multi.tga/>
+  <inv_item_pants.tga/>
+  <inv_item_script.tga/>
+  <inv_item_shape.tga/>
+  <inv_item_shirt.tga/>
+  <inv_item_shoes.tga/>
+  <inv_item_skirt.tga/>
+  <inv_item_snapshot.tga/>
+  <inv_item_socks.tga/>
+  <inv_item_sound.tga/>
+  <inv_item_texture.tga/>
+  <inv_item_underpants.tga/>
+  <inv_item_undershirt.tga/>
+  <lag_status_critical.tga/>
+  <lag_status_good.tga/>
+  <lag_status_warning.tga/>
+  <legend.tga/>
+  <map_avatar_16.tga/>
+  <map_avatar_8.tga/>
+  <map_avatar_you_8.tga/>
+  <map_event.tga/>
+  <map_event_mature.tga/>
+  <map_home.tga/>
+  <map_infohub.tga/>
+  <map_telehub.tga/>
+  <map_track_16.tga/>
+  <media_icon.tga file_name="icn_label_media.tga" />
+  <music_icon.tga file_name="icn_label_music.tga" />
+  <noentrylines.j2c use_mips="true"/>
+  <noentrypasslines.j2c use_mips="true"/>
+  <notify_tip_icon.tga/>
+  <notify_caution_icon.tga/>
+  <notify_box_icon.tga/>
+  <object_cone.tga/>
+  <object_cone_active.tga/>
+  <object_cube.tga/>
+  <object_cube_active.tga/>
+  <object_cylinder.tga/>
+  <object_cylinder_active.tga/>
+  <object_grass.tga/>
+  <object_grass_active.tga/>
+  <object_hemi_cone.tga/>
+  <object_hemi_cone_active.tga/>
+  <object_hemi_cylinder.tga/>
+  <object_hemi_cylinder_active.tga/>
+  <object_hemi_sphere.tga/>
+  <object_hemi_sphere_active.tga/>
+  <object_prism.tga/>
+  <object_prism_active.tga/>
+  <object_pyramid.tga/>
+  <object_pyramid_active.tga/>
+  <object_ring.tga/>
+  <object_ring_active.tga/>
+  <object_sphere.tga/>
+  <object_sphere_active.tga/>
+  <object_tetrahedron.tga/>
+  <object_tetrahedron_active.tga/>
+  <object_torus.tga/>
+  <object_torus_active.tga/>
+  <object_tree.tga/>
+  <object_tree_active.tga/>
+  <object_tube.tga/>
+  <object_tube_active.tga/>
+  <pixiesmall.j2c use_mips="true"/>
+  <script_error.j2c use_mips="true"/>
+  <silhouette.j2c use_mips="true"/>
+  <status_no_build.tga/>
+  <status_voice.tga/>
+  <status_buy_currency.tga/>
+  <status_buy_currency_pressed.tga/>
+  <status_buy_land.tga/>
+  <status_buy_land_pressed.tga/>
+  <status_no_fly.tga/>
+  <status_health.tga/>
+  <status_no_push.tga/>
+  <status_no_scripts.tga/>
+  <tool_dozer.tga/>
+  <tool_dozer_active.tga/>
+  <tool_zoom.tga/>
+  <tool_zoom_active.tga/>
+  <icn_active-speakers-dot-lvl0.tga/>
+  <icn_active-speakers-dot-lvl1.tga/>
+  <icn_active-speakers-dot-lvl2.tga/>
+  <icn_active-speakers-typing1.tga/>
+  <icn_active-speakers-typing2.tga/>
+  <icn_active-speakers-typing3.tga/>
+  <icn_voice_ptt-off.tga/>
+  <icn_voice_ptt-on.tga/>
+  <icn_voice_ptt-on-lvl1.tga/>
+  <icn_voice_ptt-on-lvl2.tga/>
+  <icn_voice_ptt-on-lvl3.tga/>
+  <icn_voice-call-end.tga/>
+  <icn_voice-call-start.tga/>
+  <mute_icon.tga/>
+  <icn_slide-groove_dark.tga>
+    <scale_rect left="2" top="5" right="29" bottom="4"/>
+  </icn_slide-groove_dark.tga>
+  <icn_slide-highlight.tga>
+    <scale_rect left="2" top="5" right="29" bottom="4"/>
+  </icn_slide-highlight.tga>
+  <icn_slide-thumb_dark.tga>
+    <scale_rect left="2" top="5" right="29" bottom="4"/>
+  </icn_slide-thumb_dark.tga>
+  <icn_speaker-muted_dark.tga/>
+  <icn_speaker_dark.tga/>
+  <icn_voice-localchat.tga/>
+  <icn_voice-groupfocus.tga/>
+  <icn_voice-pvtfocus.tga/>
+  <icn_media-pause.tga/>
+  <icn_media-play.tga/>
+  <icn_music-play.tga/>
+  <icn_music-pause.tga/>
+  <icn_media_web.tga preload="true"/>
+  <icn_media_movie.tga preload="true"/>
+  <icn_chatbar.tga/>
+  <btn_chatbar.tga>
+    <scale_rect left="16" top="24" right="48" bottom="0"/>
+  </btn_chatbar.tga>
+  <btn_chatbar_selected.tga>
+    <scale_rect left="16" top="24" right="48" bottom="0"/>
+  </btn_chatbar_selected.tga>
+  <icn_rounded-text-field.tga/>
+
+  <flyout_btn_right_selected.tga>
+    <scale_rect left="6" top="12" right="26" bottom="12"/>
+  </flyout_btn_right_selected.tga>
+  <flyout_btn_right.tga>
+    <scale_rect left="6" top="12" right="26" bottom="12"/>
+  </flyout_btn_right.tga>
+  <flyout_btn_right_disabled.tga>
+    <scale_rect left="6" top="12" right="122" bottom="12"/>
+  </flyout_btn_right_disabled.tga>  
+  <flyout_btn_left_selected.tga>
+    <scale_rect left="6" top="12" right="122" bottom="12"/>
+  </flyout_btn_left_selected.tga>
+  <flyout_btn_left.tga>
+    <scale_rect left="6" top="12" right="122" bottom="12"/>
+  </flyout_btn_left.tga>
+ <flyout_btn_left_disabled.tga>
+    <scale_rect left="6" top="12" right="122" bottom="12"/>
+  </flyout_btn_left_disabled.tga>
+
+  <UIImgResizeBottomRightUUID file_name="resize_handle_bottom_right_blue.tga"/>
+
+  <UIImgBtnForwardOutUUID file_name="move_forward_out.tga" preload="true"/>
+  <UIImgBtnForwardInUUID file_name="move_forward_in.tga" preload="true"/>
+  <UIImgBtnSlideLeftOutUUID file_name="move_left_out.tga" preload="true"/>
+  <UIImgBtnSlideLeftInUUID file_name="move_left_in.tga" preload="true"/>
+  <UIImgBtnLeftOutUUID 	file_name="move_turn_left_out.tga" preload="true"/>
+  <UIImgBtnLeftInUUID 	file_name="move_turn_left_in.tga" preload="true"/>
+  <UIImgBtnRightOutUUID file_name="move_turn_right_out.tga" preload="true"/>
+  <UIImgBtnRightInUUID 	file_name="move_turn_right_in.tga" preload="true"/>
+  <UIImgBtnSlideRightOutUUID file_name="move_right_out.tga" preload="true"/>
+  <UIImgBtnSlideRightInUUID file_name="move_right_in.tga" preload="true"/>
+  <UIImgBtnMoveUpInUUID file_name="move_up_in.tga" preload="true"/>
+  <UIImgBtnMoveUpOutUUID file_name="move_up_out.tga" preload="true"/>
+  <UIImgBtnMoveDownInUUID file_name="move_down_in.tga" preload="true"/>
+  <UIImgBtnMoveDownOutUUID file_name="move_down_out.tga" preload="true"/>
+
+  <UIImgBtnScrollUpOutUUID file_name="scrollbutton_up_out_blue.tga"/>
+  <UIImgBtnScrollUpInUUID file_name="scrollbutton_up_in_blue.tga"/>
+  <UIImgBtnScrollDownOutUUID file_name="scrollbutton_down_out_blue.tga"/>
+  <UIImgBtnScrollDownInUUID file_name="scrollbutton_down_in_blue.tga"/>
+  <UIImgBtnScrollLeftOutUUID file_name="scrollbutton_left_out_blue.tga"/>
+  <UIImgBtnScrollLeftInUUID file_name="scrollbutton_left_in_blue.tga"/>
+  <UIImgBtnScrollRightOutUUID file_name="scrollbutton_right_out_blue.tga"/>
+  <UIImgBtnScrollRightInUUID file_name="scrollbutton_right_in_blue.tga"/>
+
+  <UIImgBtnJumpLeftOutUUID    file_name="3c18c87e-5f50-14e2-e744-f44734aa365f.tga"/>
+    <UIImgBtnJumpLeftInUUID    file_name="9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga"/>
+  <UIImgBtnJumpRightOutUUID file_name="ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga"/>
+  <UIImgBtnJumpRightInUUID    file_name="7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga"/>
+
+  <UIImgBtnSpinUpOutUUID 	file_name="spin_up_out_blue.tga"/>
+  <UIImgBtnSpinUpInUUID 	file_name="spin_up_in_blue.tga"/>
+  <UIImgBtnSpinDownOutUUID 	file_name="spin_down_out_blue.tga"/>
+  <UIImgBtnSpinDownInUUID 	file_name="spin_down_in_blue.tga"/>
+
+  <UIImgRadioActiveUUID 	file_name="radio_active_false.tga"/>
+  <UIImgRadioActiveSelectedUUID file_name="radio_active_true.tga"/>
+  <UIImgRadioInactiveUUID 	file_name="radio_inactive_false.tga"/>
+  <UIImgRadioInactiveSelectedUUID file_name="radio_inactive_true.tga"/>
+
+  <UIImgCheckboxActiveUUID 	file_name="checkbox_enabled_false.tga"/>
+  <UIImgCheckboxActiveSelectedUUID file_name="checkbox_enabled_true.tga"/>
+  <UIImgCheckboxInactiveUUID file_name="checkbox_disabled_false.tga"/>
+  <UIImgCheckboxInactiveSelectedUUID file_name="checkbox_disabled_true.tga"/>
+
+  <UIImgBtnTabTopOutUUID 	file_name="tab_top_blue.tga"/>
+  <UIImgBtnTabTopInUUID 	file_name="tab_top_selected_blue.tga"/>
+  <UIImgBtnTabBottomOutUUID file_name="tab_bottom_blue.tga"/>
+  <UIImgBtnTabBottomInUUID 	file_name="tab_bottom_selected_blue.tga"/>
+
+  <UIImgGrabUUID 			file_name="c63f124c-6340-4fbf-b59e-0869a44adb64.tga"/>
+  <UIImgGrabSelectedUUID 	file_name="c1e21504-f136-451d-b8e9-929037812f1d.tga"/>
+
+  <!--<UIImgScaleUUID 			file_name="88a90fef-b448-4883-9344-ecf378a60433.tga"/>-->
+
+  <UIImgFaceUUID 			file_name="ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga"/>
+  <UIImgFaceSelectedUUID 	file_name="b4870163-6208-42a9-9801-93133bf9a6cd.tga"/>
+
+  <UIImgCreateUUID 			file_name="7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga"/>
+  <UIImgCreateSelectedUUID 	file_name="0098b015-3daf-4cfe-a72f-915369ea97c2.tga"/>
+  
+  <UIImgBtnCloseInactiveUUID file_name="close_inactive_blue.tga"/>
+  <UIImgBtnCloseActiveUUID	file_name="closebox.tga"/>
+  <UIImgBtnClosePressedUUID file_name="close_in_blue.tga"/>
+  <icn_clear_lineeditor.tga />
+  <icn_scrollbar_thumb.tga    preload="true">
+        <scale_rect top="7" left="4" bottom="8" right="4" />
+</icn_scrollbar_thumb.tga>
+  <icn_scrollbar_bg.tga    preload="true">
+        <scale_rect top="7" left="4" bottom="8
+        " right="4" />
+</icn_scrollbar_bg.tga>
+
+  <UIImgBtnMinimizeInactiveUUID file_name="minimize_inactive.tga"/>
+  <UIImgBtnMinimizeActiveUUID file_name="minimize.tga"/>
+  <UIImgBtnMinimizePressedUUID file_name="minimize_pressed.tga"/>
+
+  <UIImgBtnRestoreInactiveUUID file_name="restore_inactive.tga"/>
+  <UIImgBtnRestoreActiveUUID file_name="restore.tga"/>
+  <UIImgBtnRestorePressedUUID file_name="restore_pressed.tga"/>
+
+  <UIImgBtnTearOffInactiveUUID file_name="tearoffbox.tga"/>
+  <UIImgBtnTearOffActiveUUID file_name="tearoffbox.tga"/>
+  <UIImgBtnTearOffPressedUUID file_name="tearoff_pressed.tga"/>
+
+  <UIImgCrosshairsUUID file_name="crosshairs.tga"/>
+  <icn_label_music.tga/>
+  <icn_label_media.tga/>
+</textures>
diff --git a/linden/indra/newview/skins/dark/textures/tool_dozer.tga b/linden/indra/newview/skins/dark/textures/tool_dozer.tga
new file mode 100644
index 0000000..bc1cc7a
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/tool_dozer.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/tool_dozer_active.tga b/linden/indra/newview/skins/dark/textures/tool_dozer_active.tga
new file mode 100644
index 0000000..6099823
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/tool_dozer_active.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/tool_zoom.tga b/linden/indra/newview/skins/dark/textures/tool_zoom.tga
new file mode 100644
index 0000000..2f6a75e
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/tool_zoom.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/tool_zoom_active.tga b/linden/indra/newview/skins/dark/textures/tool_zoom_active.tga
new file mode 100644
index 0000000..e83ca1a
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/tool_zoom_active.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/toolbar_btn_disabled.tga b/linden/indra/newview/skins/dark/textures/toolbar_btn_disabled.tga
new file mode 100644
index 0000000..59c57fc
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/toolbar_btn_disabled.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/toolbar_btn_enabled.tga b/linden/indra/newview/skins/dark/textures/toolbar_btn_enabled.tga
new file mode 100644
index 0000000..f005949
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/toolbar_btn_enabled.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/toolbar_btn_selected.tga b/linden/indra/newview/skins/dark/textures/toolbar_btn_selected.tga
new file mode 100644
index 0000000..cfd577b
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/toolbar_btn_selected.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/toolbar_tab.tga b/linden/indra/newview/skins/dark/textures/toolbar_tab.tga
new file mode 100644
index 0000000..eda95f6
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/toolbar_tab.tga differ
diff --git a/linden/indra/newview/skins/dark/textures/white.tga b/linden/indra/newview/skins/dark/textures/white.tga
new file mode 100644
index 0000000..55e3793
Binary files /dev/null and b/linden/indra/newview/skins/dark/textures/white.tga differ
diff --git a/linden/indra/newview/skins/default/html/btn_purplepill_bg.png b/linden/indra/newview/skins/default/html/btn_purplepill_bg.png
new file mode 100644
index 0000000..b78127a
Binary files /dev/null and b/linden/indra/newview/skins/default/html/btn_purplepill_bg.png differ
diff --git a/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png b/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png
new file mode 100644
index 0000000..f9ea7a2
Binary files /dev/null and b/linden/indra/newview/skins/default/html/en-us/loading/imprudence_loading.png differ
diff --git a/linden/indra/newview/skins/default/html/unabletoconnect.png b/linden/indra/newview/skins/default/html/unabletoconnect.png
new file mode 100644
index 0000000..f9ea7a2
Binary files /dev/null and b/linden/indra/newview/skins/default/html/unabletoconnect.png differ
diff --git a/linden/indra/newview/skins/default/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga b/linden/indra/newview/skins/default/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga
new file mode 100644
index 0000000..1e8b078
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga differ
diff --git a/linden/indra/newview/skins/default/textures/0187babf-6c0d-5891-ebed-4ecab1426683.j2c b/linden/indra/newview/skins/default/textures/0187babf-6c0d-5891-ebed-4ecab1426683.j2c
new file mode 100644
index 0000000..0e63168
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/0187babf-6c0d-5891-ebed-4ecab1426683.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/041ee5a0-cb6a-9ac5-6e49-41e9320507d5.j2c b/linden/indra/newview/skins/default/textures/041ee5a0-cb6a-9ac5-6e49-41e9320507d5.j2c
new file mode 100644
index 0000000..e536c33
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/041ee5a0-cb6a-9ac5-6e49-41e9320507d5.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/0498c309-5306-43cd-82a2-ae31d096cdef.tga b/linden/indra/newview/skins/default/textures/0498c309-5306-43cd-82a2-ae31d096cdef.tga
new file mode 100644
index 0000000..d7097e3
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/0498c309-5306-43cd-82a2-ae31d096cdef.tga differ
diff --git a/linden/indra/newview/skins/default/textures/058c75c0-a0d5-f2f8-43f3-e9699a89c2fc.j2c b/linden/indra/newview/skins/default/textures/058c75c0-a0d5-f2f8-43f3-e9699a89c2fc.j2c
new file mode 100644
index 0000000..e351995
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/058c75c0-a0d5-f2f8-43f3-e9699a89c2fc.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/073c9723-540c-5449-cdd4-0e87fdc159e3.j2c b/linden/indra/newview/skins/default/textures/073c9723-540c-5449-cdd4-0e87fdc159e3.j2c
new file mode 100644
index 0000000..7cae5cb
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/073c9723-540c-5449-cdd4-0e87fdc159e3.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/07d0ea4c-af0c-aad1-dbbf-c24020ff2b80.tga b/linden/indra/newview/skins/default/textures/07d0ea4c-af0c-aad1-dbbf-c24020ff2b80.tga
new file mode 100644
index 0000000..2d78d07
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/07d0ea4c-af0c-aad1-dbbf-c24020ff2b80.tga differ
diff --git a/linden/indra/newview/skins/default/textures/09a324a8-acc1-d9cd-2cbd-7465d90d3a98.tga b/linden/indra/newview/skins/default/textures/09a324a8-acc1-d9cd-2cbd-7465d90d3a98.tga
new file mode 100644
index 0000000..77d4707
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/09a324a8-acc1-d9cd-2cbd-7465d90d3a98.tga differ
diff --git a/linden/indra/newview/skins/default/textures/0a94b42f-ec84-5f9c-14b7-1ef8505ceead.j2c b/linden/indra/newview/skins/default/textures/0a94b42f-ec84-5f9c-14b7-1ef8505ceead.j2c
new file mode 100644
index 0000000..03d4b1a
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/0a94b42f-ec84-5f9c-14b7-1ef8505ceead.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/0b444c3a-75c2-4891-9d1e-ac35c8d13d62.j2c b/linden/indra/newview/skins/default/textures/0b444c3a-75c2-4891-9d1e-ac35c8d13d62.j2c
new file mode 100644
index 0000000..0bca24d
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/0b444c3a-75c2-4891-9d1e-ac35c8d13d62.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/0bc58228-74a0-7e83-89bc-5c23464bcec5.j2c b/linden/indra/newview/skins/default/textures/0bc58228-74a0-7e83-89bc-5c23464bcec5.j2c
new file mode 100644
index 0000000..20cbd5b
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/0bc58228-74a0-7e83-89bc-5c23464bcec5.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/0e82d24e-ed45-41bc-b090-94c97c1caab2.tga b/linden/indra/newview/skins/default/textures/0e82d24e-ed45-41bc-b090-94c97c1caab2.tga
new file mode 100644
index 0000000..b2e5609
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/0e82d24e-ed45-41bc-b090-94c97c1caab2.tga differ
diff --git a/linden/indra/newview/skins/default/textures/0ff70ead-4562-45f9-9e8a-52b1a3286868.j2c b/linden/indra/newview/skins/default/textures/0ff70ead-4562-45f9-9e8a-52b1a3286868.j2c
new file mode 100644
index 0000000..d0f7e3a
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/0ff70ead-4562-45f9-9e8a-52b1a3286868.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/10d2a01a-0818-84b9-4b96-c2eb63256519.j2c b/linden/indra/newview/skins/default/textures/10d2a01a-0818-84b9-4b96-c2eb63256519.j2c
new file mode 100644
index 0000000..a6e213a
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/10d2a01a-0818-84b9-4b96-c2eb63256519.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/111b39de-8928-4690-b7b2-e17d5c960277.tga b/linden/indra/newview/skins/default/textures/111b39de-8928-4690-b7b2-e17d5c960277.tga
new file mode 100644
index 0000000..0febf4e
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/111b39de-8928-4690-b7b2-e17d5c960277.tga differ
diff --git a/linden/indra/newview/skins/default/textures/11ee27f5-43c0-414e-afd5-d7f5688c351f.j2c b/linden/indra/newview/skins/default/textures/11ee27f5-43c0-414e-afd5-d7f5688c351f.j2c
new file mode 100644
index 0000000..3fb9c95
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/11ee27f5-43c0-414e-afd5-d7f5688c351f.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/13dd1d96-6836-461e-8a4c-36003065c59b.tga b/linden/indra/newview/skins/default/textures/13dd1d96-6836-461e-8a4c-36003065c59b.tga
new file mode 100644
index 0000000..031b3ad
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/13dd1d96-6836-461e-8a4c-36003065c59b.tga differ
diff --git a/linden/indra/newview/skins/default/textures/179cdabd-398a-9b6b-1391-4dc333ba321f.j2c b/linden/indra/newview/skins/default/textures/179cdabd-398a-9b6b-1391-4dc333ba321f.j2c
new file mode 100644
index 0000000..8971ac3
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/179cdabd-398a-9b6b-1391-4dc333ba321f.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/18fb888b-e8f1-dce7-7da7-321d651ea6b0.j2c b/linden/indra/newview/skins/default/textures/18fb888b-e8f1-dce7-7da7-321d651ea6b0.j2c
new file mode 100644
index 0000000..a101530
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/18fb888b-e8f1-dce7-7da7-321d651ea6b0.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/19c76b49-c5f4-aeca-7cd8-17010f2969c3.j2c b/linden/indra/newview/skins/default/textures/19c76b49-c5f4-aeca-7cd8-17010f2969c3.j2c
new file mode 100644
index 0000000..ecab78e
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/19c76b49-c5f4-aeca-7cd8-17010f2969c3.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/1e63e323-5fe0-452e-92f8-b98bd0f764e3.j2c b/linden/indra/newview/skins/default/textures/1e63e323-5fe0-452e-92f8-b98bd0f764e3.j2c
new file mode 100644
index 0000000..995932a
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/1e63e323-5fe0-452e-92f8-b98bd0f764e3.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/2660b114-1d66-3cde-e148-ebc2d1f963d5.j2c b/linden/indra/newview/skins/default/textures/2660b114-1d66-3cde-e148-ebc2d1f963d5.j2c
new file mode 100644
index 0000000..947b600
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/2660b114-1d66-3cde-e148-ebc2d1f963d5.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/28f0f9ca-0423-4d1b-9e76-616ffce99544.j2c b/linden/indra/newview/skins/default/textures/28f0f9ca-0423-4d1b-9e76-616ffce99544.j2c
new file mode 100644
index 0000000..73d094a
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/28f0f9ca-0423-4d1b-9e76-616ffce99544.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/29de489d-0491-fb00-7dab-f9e686d31e83.j2c b/linden/indra/newview/skins/default/textures/29de489d-0491-fb00-7dab-f9e686d31e83.j2c
new file mode 100644
index 0000000..17e7c6c
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/29de489d-0491-fb00-7dab-f9e686d31e83.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/2a4880b6-b7a3-690a-2049-bfbe38eafb9f.j2c b/linden/indra/newview/skins/default/textures/2a4880b6-b7a3-690a-2049-bfbe38eafb9f.j2c
new file mode 100644
index 0000000..5361a56
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/2a4880b6-b7a3-690a-2049-bfbe38eafb9f.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/2caf1179-7861-6ff3-4b7d-46e17780bdfa.j2c b/linden/indra/newview/skins/default/textures/2caf1179-7861-6ff3-4b7d-46e17780bdfa.j2c
new file mode 100644
index 0000000..675bdb4
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/2caf1179-7861-6ff3-4b7d-46e17780bdfa.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/2d784476-d0db-9979-0cff-9408745a7cf3.j2c b/linden/indra/newview/skins/default/textures/2d784476-d0db-9979-0cff-9408745a7cf3.j2c
new file mode 100644
index 0000000..0bc1a4f
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/2d784476-d0db-9979-0cff-9408745a7cf3.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/30047cec-269d-408e-0c30-b2603b887268.j2c b/linden/indra/newview/skins/default/textures/30047cec-269d-408e-0c30-b2603b887268.j2c
new file mode 100644
index 0000000..3a32fcb
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/30047cec-269d-408e-0c30-b2603b887268.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/303cd381-8560-7579-23f1-f0a880799740.j2c b/linden/indra/newview/skins/default/textures/303cd381-8560-7579-23f1-f0a880799740.j2c
new file mode 100644
index 0000000..905bd1b
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/303cd381-8560-7579-23f1-f0a880799740.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/335f8f14-f2db-db7c-1c04-734dc7657439.j2c b/linden/indra/newview/skins/default/textures/335f8f14-f2db-db7c-1c04-734dc7657439.j2c
new file mode 100644
index 0000000..5b8ffe5
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/335f8f14-f2db-db7c-1c04-734dc7657439.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/34c9398d-bb78-4643-9633-46a2fa3e9637.tga b/linden/indra/newview/skins/default/textures/34c9398d-bb78-4643-9633-46a2fa3e9637.tga
new file mode 100644
index 0000000..58cd2cd
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/34c9398d-bb78-4643-9633-46a2fa3e9637.tga differ
diff --git a/linden/indra/newview/skins/default/textures/35f217a3-f618-49cf-bbca-c86d486551a9.j2c b/linden/indra/newview/skins/default/textures/35f217a3-f618-49cf-bbca-c86d486551a9.j2c
new file mode 100644
index 0000000..5c2c85e
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/35f217a3-f618-49cf-bbca-c86d486551a9.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/37c8e000-6aa2-41ef-8f86-e0c2e60bfa42.tga b/linden/indra/newview/skins/default/textures/37c8e000-6aa2-41ef-8f86-e0c2e60bfa42.tga
new file mode 100644
index 0000000..879b9e6
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/37c8e000-6aa2-41ef-8f86-e0c2e60bfa42.tga differ
diff --git a/linden/indra/newview/skins/default/textures/39801651-26cb-4926-af57-7af9352c273c.tga b/linden/indra/newview/skins/default/textures/39801651-26cb-4926-af57-7af9352c273c.tga
new file mode 100644
index 0000000..f2fdd07
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/39801651-26cb-4926-af57-7af9352c273c.tga differ
diff --git a/linden/indra/newview/skins/default/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga b/linden/indra/newview/skins/default/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga
new file mode 100644
index 0000000..fb6dac0
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga differ
diff --git a/linden/indra/newview/skins/default/textures/3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3bef.j2c b/linden/indra/newview/skins/default/textures/3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3bef.j2c
new file mode 100644
index 0000000..6c3319e
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/3c59f7fe-9dc8-47f9-8aaf-a9dd1fbc3bef.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/3cddf591-a726-4702-87b3-70c1daf88f90.j2c b/linden/indra/newview/skins/default/textures/3cddf591-a726-4702-87b3-70c1daf88f90.j2c
new file mode 100644
index 0000000..6535a98
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/3cddf591-a726-4702-87b3-70c1daf88f90.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/402f8b24-5f9d-4905-b5f8-37baff603e88.j2c b/linden/indra/newview/skins/default/textures/402f8b24-5f9d-4905-b5f8-37baff603e88.j2c
new file mode 100644
index 0000000..0a38dde
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/402f8b24-5f9d-4905-b5f8-37baff603e88.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/43f0a590-f3d3-48b5-b460-f5b3e6e03626.tga b/linden/indra/newview/skins/default/textures/43f0a590-f3d3-48b5-b460-f5b3e6e03626.tga
new file mode 100644
index 0000000..340f321
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/43f0a590-f3d3-48b5-b460-f5b3e6e03626.tga differ
diff --git a/linden/indra/newview/skins/default/textures/4726f13e-bd07-f2fb-feb0-bfa2ac58ab61.j2c b/linden/indra/newview/skins/default/textures/4726f13e-bd07-f2fb-feb0-bfa2ac58ab61.j2c
new file mode 100644
index 0000000..46eb2da
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/4726f13e-bd07-f2fb-feb0-bfa2ac58ab61.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/47a8c844-cd2a-4b1a-be01-df8b1612fe5d.tga b/linden/indra/newview/skins/default/textures/47a8c844-cd2a-4b1a-be01-df8b1612fe5d.tga
new file mode 100644
index 0000000..505f6ed
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/47a8c844-cd2a-4b1a-be01-df8b1612fe5d.tga differ
diff --git a/linden/indra/newview/skins/default/textures/48766d75-6e58-de84-68fe-1980c64feaee.j2c b/linden/indra/newview/skins/default/textures/48766d75-6e58-de84-68fe-1980c64feaee.j2c
new file mode 100644
index 0000000..ac98d6c
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/48766d75-6e58-de84-68fe-1980c64feaee.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/53a2f406-4895-1d13-d541-d2e3b86bc19c.j2c b/linden/indra/newview/skins/default/textures/53a2f406-4895-1d13-d541-d2e3b86bc19c.j2c
new file mode 100644
index 0000000..ecc76fa
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/53a2f406-4895-1d13-d541-d2e3b86bc19c.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/5748decc-f629-461c-9a36-a35a221fe21f.tga b/linden/indra/newview/skins/default/textures/5748decc-f629-461c-9a36-a35a221fe21f.tga
new file mode 100644
index 0000000..55e3793
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/5748decc-f629-461c-9a36-a35a221fe21f.tga differ
diff --git a/linden/indra/newview/skins/default/textures/5894e2e7-ab8d-edfa-e61c-18cf16854ba3.j2c b/linden/indra/newview/skins/default/textures/5894e2e7-ab8d-edfa-e61c-18cf16854ba3.j2c
new file mode 100644
index 0000000..34f69c2
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/5894e2e7-ab8d-edfa-e61c-18cf16854ba3.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/5ab48dd5-05d0-4f1a-ace6-efd4e2fb3508.j2c b/linden/indra/newview/skins/default/textures/5ab48dd5-05d0-4f1a-ace6-efd4e2fb3508.j2c
new file mode 100644
index 0000000..81ccfbc
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/5ab48dd5-05d0-4f1a-ace6-efd4e2fb3508.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/5abfabc2-5d6d-4912-acd8-d7e38ae93d02.j2c b/linden/indra/newview/skins/default/textures/5abfabc2-5d6d-4912-acd8-d7e38ae93d02.j2c
new file mode 100644
index 0000000..1068e94
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/5abfabc2-5d6d-4912-acd8-d7e38ae93d02.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/5bc11cd6-2f40-071e-a8da-0903394204f9.j2c b/linden/indra/newview/skins/default/textures/5bc11cd6-2f40-071e-a8da-0903394204f9.j2c
new file mode 100644
index 0000000..9ac7908
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/5bc11cd6-2f40-071e-a8da-0903394204f9.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/6002a571-549c-472c-9443-9ab35b1a55ed.tga b/linden/indra/newview/skins/default/textures/6002a571-549c-472c-9443-9ab35b1a55ed.tga
new file mode 100644
index 0000000..fc720c8
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/6002a571-549c-472c-9443-9ab35b1a55ed.tga differ
diff --git a/linden/indra/newview/skins/default/textures/63338ede-0037-c4fd-855b-015d77112fc8.j2c b/linden/indra/newview/skins/default/textures/63338ede-0037-c4fd-855b-015d77112fc8.j2c
new file mode 100644
index 0000000..458be1c
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/63338ede-0037-c4fd-855b-015d77112fc8.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/64367bd1-697e-b3e6-0b65-3f862a577366.j2c b/linden/indra/newview/skins/default/textures/64367bd1-697e-b3e6-0b65-3f862a577366.j2c
new file mode 100644
index 0000000..1650c78
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/64367bd1-697e-b3e6-0b65-3f862a577366.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/64eed6af-f575-35c7-baa4-b140bdcdb00f.j2c b/linden/indra/newview/skins/default/textures/64eed6af-f575-35c7-baa4-b140bdcdb00f.j2c
new file mode 100644
index 0000000..1068e94
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/64eed6af-f575-35c7-baa4-b140bdcdb00f.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/6522e74d-1660-4e7f-b601-6f48c1659a77.j2c b/linden/indra/newview/skins/default/textures/6522e74d-1660-4e7f-b601-6f48c1659a77.j2c
new file mode 100644
index 0000000..4e99f3e
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/6522e74d-1660-4e7f-b601-6f48c1659a77.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/67931331-0c02-4876-1255-28770896c6a2.j2c b/linden/indra/newview/skins/default/textures/67931331-0c02-4876-1255-28770896c6a2.j2c
new file mode 100644
index 0000000..3f63493
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/67931331-0c02-4876-1255-28770896c6a2.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/6c4727b8-ac79-ba44-3b81-f9aa887b47eb.j2c b/linden/indra/newview/skins/default/textures/6c4727b8-ac79-ba44-3b81-f9aa887b47eb.j2c
new file mode 100644
index 0000000..adff7dc
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/6c4727b8-ac79-ba44-3b81-f9aa887b47eb.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/6c9fa78a-1c69-2168-325b-3e03ffa348ce.j2c b/linden/indra/newview/skins/default/textures/6c9fa78a-1c69-2168-325b-3e03ffa348ce.j2c
new file mode 100644
index 0000000..e657b96
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/6c9fa78a-1c69-2168-325b-3e03ffa348ce.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/6de37e4e-7029-61f5-54b8-f5e63f983f58.j2c b/linden/indra/newview/skins/default/textures/6de37e4e-7029-61f5-54b8-f5e63f983f58.j2c
new file mode 100644
index 0000000..434ba49
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/6de37e4e-7029-61f5-54b8-f5e63f983f58.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/735198cf-6ea0-2550-e222-21d3c6a341ae.j2c b/linden/indra/newview/skins/default/textures/735198cf-6ea0-2550-e222-21d3c6a341ae.j2c
new file mode 100644
index 0000000..baedd89
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/735198cf-6ea0-2550-e222-21d3c6a341ae.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/73577b7b-19c3-4050-a19d-36bc2408aa79.tga b/linden/indra/newview/skins/default/textures/73577b7b-19c3-4050-a19d-36bc2408aa79.tga
new file mode 100644
index 0000000..35846ce
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/73577b7b-19c3-4050-a19d-36bc2408aa79.tga differ
diff --git a/linden/indra/newview/skins/default/textures/74e1a96f-4833-a24d-a1bb-1bce1468b0e7.tga b/linden/indra/newview/skins/default/textures/74e1a96f-4833-a24d-a1bb-1bce1468b0e7.tga
new file mode 100644
index 0000000..c359f2f
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/74e1a96f-4833-a24d-a1bb-1bce1468b0e7.tga differ
diff --git a/linden/indra/newview/skins/default/textures/7581f2f4-d0d2-481a-bc75-69a13d9caeaa.j2c b/linden/indra/newview/skins/default/textures/7581f2f4-d0d2-481a-bc75-69a13d9caeaa.j2c
new file mode 100644
index 0000000..47f7911
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/7581f2f4-d0d2-481a-bc75-69a13d9caeaa.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/78af921a-3c49-47a1-9c4e-2608951164ae.j2c b/linden/indra/newview/skins/default/textures/78af921a-3c49-47a1-9c4e-2608951164ae.j2c
new file mode 100644
index 0000000..16d3625
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/78af921a-3c49-47a1-9c4e-2608951164ae.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/79504bf5-c3ec-0763-6563-d843de66d0a1.j2c b/linden/indra/newview/skins/default/textures/79504bf5-c3ec-0763-6563-d843de66d0a1.j2c
new file mode 100644
index 0000000..134574e
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/79504bf5-c3ec-0763-6563-d843de66d0a1.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga b/linden/indra/newview/skins/default/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga
new file mode 100644
index 0000000..815d001
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga differ
diff --git a/linden/indra/newview/skins/default/textures/7a2b3a4a-53c2-53ac-5716-aac7d743c020.j2c b/linden/indra/newview/skins/default/textures/7a2b3a4a-53c2-53ac-5716-aac7d743c020.j2c
new file mode 100644
index 0000000..ca37c78
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/7a2b3a4a-53c2-53ac-5716-aac7d743c020.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/7c0cf89b-44b1-1ce2-dd74-07102a98ac2a.j2c b/linden/indra/newview/skins/default/textures/7c0cf89b-44b1-1ce2-dd74-07102a98ac2a.j2c
new file mode 100644
index 0000000..5d556d9
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/7c0cf89b-44b1-1ce2-dd74-07102a98ac2a.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/7ca39b4c-bd19-4699-aff7-f93fd03d3e7b.j2c b/linden/indra/newview/skins/default/textures/7ca39b4c-bd19-4699-aff7-f93fd03d3e7b.j2c
new file mode 100644
index 0000000..15a1f36
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/7ca39b4c-bd19-4699-aff7-f93fd03d3e7b.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/7cb070bc-fc00-4527-9c4d-7f7e0c4191be.j2c b/linden/indra/newview/skins/default/textures/7cb070bc-fc00-4527-9c4d-7f7e0c4191be.j2c
new file mode 100644
index 0000000..b3c70be
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/7cb070bc-fc00-4527-9c4d-7f7e0c4191be.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga b/linden/indra/newview/skins/default/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga
new file mode 100644
index 0000000..010c748
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga differ
diff --git a/linden/indra/newview/skins/default/textures/822ded49-9a6c-f61c-cb89-6df54f42cdf4.j2c b/linden/indra/newview/skins/default/textures/822ded49-9a6c-f61c-cb89-6df54f42cdf4.j2c
new file mode 100644
index 0000000..a650bcd
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/822ded49-9a6c-f61c-cb89-6df54f42cdf4.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/827ff765-8c1d-a8b1-23f7-fdcba560effc.j2c b/linden/indra/newview/skins/default/textures/827ff765-8c1d-a8b1-23f7-fdcba560effc.j2c
new file mode 100644
index 0000000..eb13fcc
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/827ff765-8c1d-a8b1-23f7-fdcba560effc.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/83b77fc6-10b4-63ec-4de7-f40629f238c5.j2c b/linden/indra/newview/skins/default/textures/83b77fc6-10b4-63ec-4de7-f40629f238c5.j2c
new file mode 100644
index 0000000..e7771e4
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/83b77fc6-10b4-63ec-4de7-f40629f238c5.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/8872f2b8-31db-42d8-580a-b3e4a91262de.j2c b/linden/indra/newview/skins/default/textures/8872f2b8-31db-42d8-580a-b3e4a91262de.j2c
new file mode 100644
index 0000000..350b638
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/8872f2b8-31db-42d8-580a-b3e4a91262de.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/89e9fc7c-0b16-457d-be4f-136270759c4d.tga b/linden/indra/newview/skins/default/textures/89e9fc7c-0b16-457d-be4f-136270759c4d.tga
new file mode 100644
index 0000000..6cc9ea1
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/89e9fc7c-0b16-457d-be4f-136270759c4d.tga differ
diff --git a/linden/indra/newview/skins/default/textures/8a515889-eac9-fb55-8eba-d2dc09eb32c8.j2c b/linden/indra/newview/skins/default/textures/8a515889-eac9-fb55-8eba-d2dc09eb32c8.j2c
new file mode 100644
index 0000000..70821f2
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/8a515889-eac9-fb55-8eba-d2dc09eb32c8.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/8dcd4a48-2d37-4909-9f78-f7a9eb4ef903.j2c b/linden/indra/newview/skins/default/textures/8dcd4a48-2d37-4909-9f78-f7a9eb4ef903.j2c
new file mode 100644
index 0000000..1068e94
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/8dcd4a48-2d37-4909-9f78-f7a9eb4ef903.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/8f458549-173b-23ff-d4ff-bfaa5ea2371b.j2c b/linden/indra/newview/skins/default/textures/8f458549-173b-23ff-d4ff-bfaa5ea2371b.j2c
new file mode 100644
index 0000000..8819294
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/8f458549-173b-23ff-d4ff-bfaa5ea2371b.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/8f761ce3-5939-4d3a-8991-00064fdfacf9.tga b/linden/indra/newview/skins/default/textures/8f761ce3-5939-4d3a-8991-00064fdfacf9.tga
new file mode 100644
index 0000000..1f9f564
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/8f761ce3-5939-4d3a-8991-00064fdfacf9.tga differ
diff --git a/linden/indra/newview/skins/default/textures/92e66e00-f56f-598a-7997-048aa64cde18.j2c b/linden/indra/newview/skins/default/textures/92e66e00-f56f-598a-7997-048aa64cde18.j2c
new file mode 100644
index 0000000..287555f
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/92e66e00-f56f-598a-7997-048aa64cde18.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/95281d5c-d27a-ee13-e067-08295b67b58a.j2c b/linden/indra/newview/skins/default/textures/95281d5c-d27a-ee13-e067-08295b67b58a.j2c
new file mode 100644
index 0000000..03d4b1a
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/95281d5c-d27a-ee13-e067-08295b67b58a.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/96b4de31-f4fa-337d-ec78-451e3609769e.j2c b/linden/indra/newview/skins/default/textures/96b4de31-f4fa-337d-ec78-451e3609769e.j2c
new file mode 100644
index 0000000..4453ecb
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/96b4de31-f4fa-337d-ec78-451e3609769e.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/978380f0-aaf7-c459-14e3-9808833fd372.j2c b/linden/indra/newview/skins/default/textures/978380f0-aaf7-c459-14e3-9808833fd372.j2c
new file mode 100644
index 0000000..38227ff
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/978380f0-aaf7-c459-14e3-9808833fd372.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/988dd995-1769-bdc9-8842-51f8f2b03884.j2c b/linden/indra/newview/skins/default/textures/988dd995-1769-bdc9-8842-51f8f2b03884.j2c
new file mode 100644
index 0000000..03d4b1a
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/988dd995-1769-bdc9-8842-51f8f2b03884.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/99bd60a2-3250-efc9-2e39-2fbcadefbecc.j2c b/linden/indra/newview/skins/default/textures/99bd60a2-3250-efc9-2e39-2fbcadefbecc.j2c
new file mode 100644
index 0000000..c965530
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/99bd60a2-3250-efc9-2e39-2fbcadefbecc.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/9beb8cdd-3dce-53c2-b28e-e1f3bc2ec0a4.tga b/linden/indra/newview/skins/default/textures/9beb8cdd-3dce-53c2-b28e-e1f3bc2ec0a4.tga
new file mode 100644
index 0000000..c8491a0
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/9beb8cdd-3dce-53c2-b28e-e1f3bc2ec0a4.tga differ
diff --git a/linden/indra/newview/skins/default/textures/9c88539c-fd04-46b8-bea2-ddf1bcffe3bd.j2c b/linden/indra/newview/skins/default/textures/9c88539c-fd04-46b8-bea2-ddf1bcffe3bd.j2c
new file mode 100644
index 0000000..a84aa77
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/9c88539c-fd04-46b8-bea2-ddf1bcffe3bd.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga b/linden/indra/newview/skins/default/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga
new file mode 100644
index 0000000..e0656c9
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga differ
diff --git a/linden/indra/newview/skins/default/textures/9deab416-9c63-78d6-d558-9a156f12044c.j2c b/linden/indra/newview/skins/default/textures/9deab416-9c63-78d6-d558-9a156f12044c.j2c
new file mode 100644
index 0000000..f4e4cba
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/9deab416-9c63-78d6-d558-9a156f12044c.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/Inv_WaterLight.png b/linden/indra/newview/skins/default/textures/Inv_WaterLight.png
new file mode 100644
index 0000000..a5bc5f5
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/Inv_WaterLight.png differ
diff --git a/linden/indra/newview/skins/default/textures/Inv_WindLight.png b/linden/indra/newview/skins/default/textures/Inv_WindLight.png
new file mode 100644
index 0000000..0e633a3
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/Inv_WindLight.png differ
diff --git a/linden/indra/newview/skins/default/textures/a6162133-724b-54df-a12f-51cd070ad6f3.j2c b/linden/indra/newview/skins/default/textures/a6162133-724b-54df-a12f-51cd070ad6f3.j2c
new file mode 100644
index 0000000..9d93153
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/a6162133-724b-54df-a12f-51cd070ad6f3.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/a85ac674-cb75-4af6-9499-df7c5aaf7a28.j2c b/linden/indra/newview/skins/default/textures/a85ac674-cb75-4af6-9499-df7c5aaf7a28.j2c
new file mode 100644
index 0000000..aa22257
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/a85ac674-cb75-4af6-9499-df7c5aaf7a28.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/abb783e6-3e93-26c0-248a-247666855da3.j2c b/linden/indra/newview/skins/default/textures/abb783e6-3e93-26c0-248a-247666855da3.j2c
new file mode 100644
index 0000000..13c43b4
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/abb783e6-3e93-26c0-248a-247666855da3.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/account_id_green.tga b/linden/indra/newview/skins/default/textures/account_id_green.tga
new file mode 100644
index 0000000..9be215e
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/account_id_green.tga differ
diff --git a/linden/indra/newview/skins/default/textures/account_id_orange.tga b/linden/indra/newview/skins/default/textures/account_id_orange.tga
new file mode 100644
index 0000000..6b41e86
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/account_id_orange.tga differ
diff --git a/linden/indra/newview/skins/default/textures/active_speakers.tga b/linden/indra/newview/skins/default/textures/active_speakers.tga
new file mode 100644
index 0000000..02d3643
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/active_speakers.tga differ
diff --git a/linden/indra/newview/skins/default/textures/active_voice_tab.tga b/linden/indra/newview/skins/default/textures/active_voice_tab.tga
new file mode 100644
index 0000000..2d0dfaa
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/active_voice_tab.tga differ
diff --git a/linden/indra/newview/skins/default/textures/ae874d1a-93ef-54fb-5fd3-eb0cb156afc0.j2c b/linden/indra/newview/skins/default/textures/ae874d1a-93ef-54fb-5fd3-eb0cb156afc0.j2c
new file mode 100644
index 0000000..61711d2
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/ae874d1a-93ef-54fb-5fd3-eb0cb156afc0.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/alpha_gradient.tga b/linden/indra/newview/skins/default/textures/alpha_gradient.tga
new file mode 100644
index 0000000..6fdba25
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/alpha_gradient.tga differ
diff --git a/linden/indra/newview/skins/default/textures/alpha_gradient_2d.j2c b/linden/indra/newview/skins/default/textures/alpha_gradient_2d.j2c
new file mode 100644
index 0000000..5de5a80
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/alpha_gradient_2d.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/arrow_down.tga b/linden/indra/newview/skins/default/textures/arrow_down.tga
new file mode 100644
index 0000000..81dc9d3
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/arrow_down.tga differ
diff --git a/linden/indra/newview/skins/default/textures/arrow_left.tga b/linden/indra/newview/skins/default/textures/arrow_left.tga
new file mode 100644
index 0000000..68e6280
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/arrow_left.tga differ
diff --git a/linden/indra/newview/skins/default/textures/arrow_right.tga b/linden/indra/newview/skins/default/textures/arrow_right.tga
new file mode 100644
index 0000000..7a5a30e
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/arrow_right.tga differ
diff --git a/linden/indra/newview/skins/default/textures/arrow_up.tga b/linden/indra/newview/skins/default/textures/arrow_up.tga
new file mode 100644
index 0000000..22195cf
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/arrow_up.tga differ
diff --git a/linden/indra/newview/skins/default/textures/avatar_thumb_bkgrnd.j2c b/linden/indra/newview/skins/default/textures/avatar_thumb_bkgrnd.j2c
new file mode 100644
index 0000000..555551b
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/avatar_thumb_bkgrnd.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga b/linden/indra/newview/skins/default/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga
new file mode 100644
index 0000000..1ed52b2
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga differ
diff --git a/linden/indra/newview/skins/default/textures/b4ba225c-373f-446d-9f7e-6cb7b5cf9b3d.j2c b/linden/indra/newview/skins/default/textures/b4ba225c-373f-446d-9f7e-6cb7b5cf9b3d.j2c
new file mode 100644
index 0000000..0e5279f
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/b4ba225c-373f-446d-9f7e-6cb7b5cf9b3d.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/b8d3965a-ad78-bf43-699b-bff8eca6c975.j2c b/linden/indra/newview/skins/default/textures/b8d3965a-ad78-bf43-699b-bff8eca6c975.j2c
new file mode 100644
index 0000000..44f31a0
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/b8d3965a-ad78-bf43-699b-bff8eca6c975.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/b8eed5f0-64b7-6e12-b67f-43fa8e773440.j2c b/linden/indra/newview/skins/default/textures/b8eed5f0-64b7-6e12-b67f-43fa8e773440.j2c
new file mode 100644
index 0000000..f1e7a96
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/b8eed5f0-64b7-6e12-b67f-43fa8e773440.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/b9e1cf8a-9660-c020-0c69-18f1ea27268a.j2c b/linden/indra/newview/skins/default/textures/b9e1cf8a-9660-c020-0c69-18f1ea27268a.j2c
new file mode 100644
index 0000000..2cd79e4
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/b9e1cf8a-9660-c020-0c69-18f1ea27268a.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/b9f1a3b8-933e-b7c8-e6f5-dba1bc666bed.j2c b/linden/indra/newview/skins/default/textures/b9f1a3b8-933e-b7c8-e6f5-dba1bc666bed.j2c
new file mode 100644
index 0000000..df28fa3
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/b9f1a3b8-933e-b7c8-e6f5-dba1bc666bed.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/badge_error.j2c b/linden/indra/newview/skins/default/textures/badge_error.j2c
new file mode 100644
index 0000000..e8f3da5
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/badge_error.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/badge_note.j2c b/linden/indra/newview/skins/default/textures/badge_note.j2c
new file mode 100644
index 0000000..1ab5233
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/badge_note.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/badge_ok.j2c b/linden/indra/newview/skins/default/textures/badge_ok.j2c
new file mode 100644
index 0000000..f85b880
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/badge_ok.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/badge_warn.j2c b/linden/indra/newview/skins/default/textures/badge_warn.j2c
new file mode 100644
index 0000000..26437ca
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/badge_warn.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/beb169c7-11ea-fff2-efe5-0f24dc881df2.j2c b/linden/indra/newview/skins/default/textures/beb169c7-11ea-fff2-efe5-0f24dc881df2.j2c
new file mode 100644
index 0000000..ccbeb08
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/beb169c7-11ea-fff2-efe5-0f24dc881df2.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/black.tga b/linden/indra/newview/skins/default/textures/black.tga
new file mode 100644
index 0000000..e69be08
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/black.tga differ
diff --git a/linden/indra/newview/skins/default/textures/btn_chatbar.tga b/linden/indra/newview/skins/default/textures/btn_chatbar.tga
new file mode 100644
index 0000000..ef16e7e
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/btn_chatbar.tga differ
diff --git a/linden/indra/newview/skins/default/textures/btn_chatbar_selected.tga b/linden/indra/newview/skins/default/textures/btn_chatbar_selected.tga
new file mode 100644
index 0000000..f113557
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/btn_chatbar_selected.tga differ
diff --git a/linden/indra/newview/skins/default/textures/button_anim_pause.tga b/linden/indra/newview/skins/default/textures/button_anim_pause.tga
new file mode 100644
index 0000000..577f919
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/button_anim_pause.tga differ
diff --git a/linden/indra/newview/skins/default/textures/button_anim_pause_disabled.tga b/linden/indra/newview/skins/default/textures/button_anim_pause_disabled.tga
new file mode 100644
index 0000000..4d604c6
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/button_anim_pause_disabled.tga differ
diff --git a/linden/indra/newview/skins/default/textures/button_anim_pause_selected.tga b/linden/indra/newview/skins/default/textures/button_anim_pause_selected.tga
new file mode 100644
index 0000000..2138431
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/button_anim_pause_selected.tga differ
diff --git a/linden/indra/newview/skins/default/textures/button_anim_play.tga b/linden/indra/newview/skins/default/textures/button_anim_play.tga
new file mode 100644
index 0000000..9ed55f8
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/button_anim_play.tga differ
diff --git a/linden/indra/newview/skins/default/textures/button_anim_play_disabled.tga b/linden/indra/newview/skins/default/textures/button_anim_play_disabled.tga
new file mode 100644
index 0000000..444062f
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/button_anim_play_disabled.tga differ
diff --git a/linden/indra/newview/skins/default/textures/button_anim_play_selected.tga b/linden/indra/newview/skins/default/textures/button_anim_play_selected.tga
new file mode 100644
index 0000000..b166a41
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/button_anim_play_selected.tga differ
diff --git a/linden/indra/newview/skins/default/textures/button_anim_stop.tga b/linden/indra/newview/skins/default/textures/button_anim_stop.tga
new file mode 100644
index 0000000..011b98c
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/button_anim_stop.tga differ
diff --git a/linden/indra/newview/skins/default/textures/button_anim_stop_disabled.tga b/linden/indra/newview/skins/default/textures/button_anim_stop_disabled.tga
new file mode 100644
index 0000000..cf1532a
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/button_anim_stop_disabled.tga differ
diff --git a/linden/indra/newview/skins/default/textures/button_anim_stop_selected.tga b/linden/indra/newview/skins/default/textures/button_anim_stop_selected.tga
new file mode 100644
index 0000000..03efac2
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/button_anim_stop_selected.tga differ
diff --git a/linden/indra/newview/skins/default/textures/button_disabled_32x128.tga b/linden/indra/newview/skins/default/textures/button_disabled_32x128.tga
new file mode 100644
index 0000000..e532366
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/button_disabled_32x128.tga differ
diff --git a/linden/indra/newview/skins/default/textures/button_enabled_32x128.tga b/linden/indra/newview/skins/default/textures/button_enabled_32x128.tga
new file mode 100644
index 0000000..9e822b2
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/button_enabled_32x128.tga differ
diff --git a/linden/indra/newview/skins/default/textures/button_enabled_selected_32x128.tga b/linden/indra/newview/skins/default/textures/button_enabled_selected_32x128.tga
new file mode 100644
index 0000000..fd7c3f4
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/button_enabled_selected_32x128.tga differ
diff --git a/linden/indra/newview/skins/default/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga b/linden/indra/newview/skins/default/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga
new file mode 100644
index 0000000..8e86ff7
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga differ
diff --git a/linden/indra/newview/skins/default/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga b/linden/indra/newview/skins/default/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga
new file mode 100644
index 0000000..4e030aa
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga differ
diff --git a/linden/indra/newview/skins/default/textures/c7d8bbf3-21ee-4f6e-9b20-3cf18425af1d.j2c b/linden/indra/newview/skins/default/textures/c7d8bbf3-21ee-4f6e-9b20-3cf18425af1d.j2c
new file mode 100644
index 0000000..0bca24d
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/c7d8bbf3-21ee-4f6e-9b20-3cf18425af1d.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/ca4e8c27-473c-eb1c-2f5d-50ee3f07d85c.j2c b/linden/indra/newview/skins/default/textures/ca4e8c27-473c-eb1c-2f5d-50ee3f07d85c.j2c
new file mode 100644
index 0000000..927af80
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/ca4e8c27-473c-eb1c-2f5d-50ee3f07d85c.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/ca7609c6-6ec6-32d9-332e-0d8f437ef644.tga b/linden/indra/newview/skins/default/textures/ca7609c6-6ec6-32d9-332e-0d8f437ef644.tga
new file mode 100644
index 0000000..0dbb8fd
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/ca7609c6-6ec6-32d9-332e-0d8f437ef644.tga differ
diff --git a/linden/indra/newview/skins/default/textures/cakeisalie.png b/linden/indra/newview/skins/default/textures/cakeisalie.png
new file mode 100644
index 0000000..bc8af84
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/cakeisalie.png differ
diff --git a/linden/indra/newview/skins/default/textures/cam_rotate_in.tga b/linden/indra/newview/skins/default/textures/cam_rotate_in.tga
new file mode 100644
index 0000000..6d464ea
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/cam_rotate_in.tga differ
diff --git a/linden/indra/newview/skins/default/textures/cam_rotate_out.tga b/linden/indra/newview/skins/default/textures/cam_rotate_out.tga
new file mode 100644
index 0000000..d890c59
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/cam_rotate_out.tga differ
diff --git a/linden/indra/newview/skins/default/textures/cam_tracking_in.tga b/linden/indra/newview/skins/default/textures/cam_tracking_in.tga
new file mode 100644
index 0000000..1978866
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/cam_tracking_in.tga differ
diff --git a/linden/indra/newview/skins/default/textures/cam_tracking_out.tga b/linden/indra/newview/skins/default/textures/cam_tracking_out.tga
new file mode 100644
index 0000000..0593e1d
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/cam_tracking_out.tga differ
diff --git a/linden/indra/newview/skins/default/textures/cam_zoom_minus_in.tga b/linden/indra/newview/skins/default/textures/cam_zoom_minus_in.tga
new file mode 100644
index 0000000..de87c5f
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/cam_zoom_minus_in.tga differ
diff --git a/linden/indra/newview/skins/default/textures/cam_zoom_out.tga b/linden/indra/newview/skins/default/textures/cam_zoom_out.tga
new file mode 100644
index 0000000..935573b
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/cam_zoom_out.tga differ
diff --git a/linden/indra/newview/skins/default/textures/cam_zoom_plus_in.tga b/linden/indra/newview/skins/default/textures/cam_zoom_plus_in.tga
new file mode 100644
index 0000000..27b49e7
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/cam_zoom_plus_in.tga differ
diff --git a/linden/indra/newview/skins/default/textures/cce0f112-878f-4586-a2e2-a8f104bba271.j2c b/linden/indra/newview/skins/default/textures/cce0f112-878f-4586-a2e2-a8f104bba271.j2c
new file mode 100644
index 0000000..2915b5d
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/cce0f112-878f-4586-a2e2-a8f104bba271.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/cdd9a9fc-6d0b-f90d-8416-c72b6019bca8.j2c b/linden/indra/newview/skins/default/textures/cdd9a9fc-6d0b-f90d-8416-c72b6019bca8.j2c
new file mode 100644
index 0000000..d6e52c2
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/cdd9a9fc-6d0b-f90d-8416-c72b6019bca8.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga b/linden/indra/newview/skins/default/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga
new file mode 100644
index 0000000..a6e11d5
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga differ
diff --git a/linden/indra/newview/skins/default/textures/ceilingcat.png b/linden/indra/newview/skins/default/textures/ceilingcat.png
new file mode 100644
index 0000000..5cf5285
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/ceilingcat.png differ
diff --git a/linden/indra/newview/skins/default/textures/checkbox_disabled_false.tga b/linden/indra/newview/skins/default/textures/checkbox_disabled_false.tga
new file mode 100644
index 0000000..16c2392
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/checkbox_disabled_false.tga differ
diff --git a/linden/indra/newview/skins/default/textures/checkbox_disabled_true.tga b/linden/indra/newview/skins/default/textures/checkbox_disabled_true.tga
new file mode 100644
index 0000000..04a8d51
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/checkbox_disabled_true.tga differ
diff --git a/linden/indra/newview/skins/default/textures/checkbox_enabled_false.tga b/linden/indra/newview/skins/default/textures/checkbox_enabled_false.tga
new file mode 100644
index 0000000..a604a44
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/checkbox_enabled_false.tga differ
diff --git a/linden/indra/newview/skins/default/textures/checkbox_enabled_true.tga b/linden/indra/newview/skins/default/textures/checkbox_enabled_true.tga
new file mode 100644
index 0000000..4a1b504
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/checkbox_enabled_true.tga differ
diff --git a/linden/indra/newview/skins/default/textures/checkerboard_transparency_bg.png b/linden/indra/newview/skins/default/textures/checkerboard_transparency_bg.png
new file mode 100644
index 0000000..9a16935
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/checkerboard_transparency_bg.png differ
diff --git a/linden/indra/newview/skins/default/textures/circle.tga b/linden/indra/newview/skins/default/textures/circle.tga
new file mode 100644
index 0000000..d7097e3
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/circle.tga differ
diff --git a/linden/indra/newview/skins/default/textures/close_in_blue.tga b/linden/indra/newview/skins/default/textures/close_in_blue.tga
new file mode 100644
index 0000000..8200eba
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/close_in_blue.tga differ
diff --git a/linden/indra/newview/skins/default/textures/close_inactive_blue.tga b/linden/indra/newview/skins/default/textures/close_inactive_blue.tga
new file mode 100644
index 0000000..191c5d3
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/close_inactive_blue.tga differ
diff --git a/linden/indra/newview/skins/default/textures/closebox.tga b/linden/indra/newview/skins/default/textures/closebox.tga
new file mode 100644
index 0000000..294d4fb
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/closebox.tga differ
diff --git a/linden/indra/newview/skins/default/textures/cloud-particle.j2c b/linden/indra/newview/skins/default/textures/cloud-particle.j2c
new file mode 100644
index 0000000..6c03bf6
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/cloud-particle.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/color_swatch_alpha.tga b/linden/indra/newview/skins/default/textures/color_swatch_alpha.tga
new file mode 100644
index 0000000..814a004
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/color_swatch_alpha.tga differ
diff --git a/linden/indra/newview/skins/default/textures/combobox_arrow.tga b/linden/indra/newview/skins/default/textures/combobox_arrow.tga
new file mode 100644
index 0000000..ad08f32
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/combobox_arrow.tga differ
diff --git a/linden/indra/newview/skins/default/textures/crosshairs.tga b/linden/indra/newview/skins/default/textures/crosshairs.tga
new file mode 100644
index 0000000..ac4d63d
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/crosshairs.tga differ
diff --git a/linden/indra/newview/skins/default/textures/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c b/linden/indra/newview/skins/default/textures/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c
new file mode 100644
index 0000000..013102c
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/d07f6eed-b96a-47cd-b51d-400ad4a1c428.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/d21e44ca-ff1c-a96e-b2ef-c0753426b7d9.j2c b/linden/indra/newview/skins/default/textures/d21e44ca-ff1c-a96e-b2ef-c0753426b7d9.j2c
new file mode 100644
index 0000000..909f9f9
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/d21e44ca-ff1c-a96e-b2ef-c0753426b7d9.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/d319ce44-0821-932a-cd18-cd1afb9d3ead.j2c b/linden/indra/newview/skins/default/textures/d319ce44-0821-932a-cd18-cd1afb9d3ead.j2c
new file mode 100644
index 0000000..152715d
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/d319ce44-0821-932a-cd18-cd1afb9d3ead.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/d691a01c-13b7-578d-57c0-5caef0b4e7e1.j2c b/linden/indra/newview/skins/default/textures/d691a01c-13b7-578d-57c0-5caef0b4e7e1.j2c
new file mode 100644
index 0000000..493a097
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/d691a01c-13b7-578d-57c0-5caef0b4e7e1.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/d7d99e40-10e2-5739-d063-91dcbdefc492.j2c b/linden/indra/newview/skins/default/textures/d7d99e40-10e2-5739-d063-91dcbdefc492.j2c
new file mode 100644
index 0000000..2db5766
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/d7d99e40-10e2-5739-d063-91dcbdefc492.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/d9258671-868f-7511-c321-7baef9e948a4.j2c b/linden/indra/newview/skins/default/textures/d9258671-868f-7511-c321-7baef9e948a4.j2c
new file mode 100644
index 0000000..d343f63
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/d9258671-868f-7511-c321-7baef9e948a4.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/darkgray.tga b/linden/indra/newview/skins/default/textures/darkgray.tga
new file mode 100644
index 0000000..2063d68
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/darkgray.tga differ
diff --git a/linden/indra/newview/skins/default/textures/db9d39ec-a896-c287-1ced-64566217021e.j2c b/linden/indra/newview/skins/default/textures/db9d39ec-a896-c287-1ced-64566217021e.j2c
new file mode 100644
index 0000000..c11984b
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/db9d39ec-a896-c287-1ced-64566217021e.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/de651394-f926-48db-b666-e49d83af1bbc.j2c b/linden/indra/newview/skins/default/textures/de651394-f926-48db-b666-e49d83af1bbc.j2c
new file mode 100644
index 0000000..11b3984
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/de651394-f926-48db-b666-e49d83af1bbc.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/default_land_picture.j2c b/linden/indra/newview/skins/default/textures/default_land_picture.j2c
new file mode 100644
index 0000000..34df029
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/default_land_picture.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/default_profile_picture.j2c b/linden/indra/newview/skins/default/textures/default_profile_picture.j2c
new file mode 100644
index 0000000..c53a22e
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/default_profile_picture.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/direction_arrow.tga b/linden/indra/newview/skins/default/textures/direction_arrow.tga
new file mode 100644
index 0000000..f3ef106
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/direction_arrow.tga differ
diff --git a/linden/indra/newview/skins/default/textures/down_arrow.png b/linden/indra/newview/skins/default/textures/down_arrow.png
new file mode 100644
index 0000000..155f80c
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/down_arrow.png differ
diff --git a/linden/indra/newview/skins/default/textures/e121e2fc-7573-740f-edfd-0d45a9ba486e.j2c b/linden/indra/newview/skins/default/textures/e121e2fc-7573-740f-edfd-0d45a9ba486e.j2c
new file mode 100644
index 0000000..d88c13a
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/e121e2fc-7573-740f-edfd-0d45a9ba486e.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/e3369e02-93e1-43dc-b9c0-4533db0963d0.tga b/linden/indra/newview/skins/default/textures/e3369e02-93e1-43dc-b9c0-4533db0963d0.tga
new file mode 100644
index 0000000..0d127f9
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/e3369e02-93e1-43dc-b9c0-4533db0963d0.tga differ
diff --git a/linden/indra/newview/skins/default/textures/e38248f9-f2ee-2c9f-aa49-4860857e3b08.j2c b/linden/indra/newview/skins/default/textures/e38248f9-f2ee-2c9f-aa49-4860857e3b08.j2c
new file mode 100644
index 0000000..8c2c107
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/e38248f9-f2ee-2c9f-aa49-4860857e3b08.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/e569711a-27c2-aad4-9246-0c910239a179.j2c b/linden/indra/newview/skins/default/textures/e569711a-27c2-aad4-9246-0c910239a179.j2c
new file mode 100644
index 0000000..9be14d4
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/e569711a-27c2-aad4-9246-0c910239a179.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/e674ca0c-a387-4dae-a0b4-db6bd073faa5.j2c b/linden/indra/newview/skins/default/textures/e674ca0c-a387-4dae-a0b4-db6bd073faa5.j2c
new file mode 100644
index 0000000..9541c5d
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/e674ca0c-a387-4dae-a0b4-db6bd073faa5.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/e97cf410-8e61-7005-ec06-629eba4cd1fb.tga b/linden/indra/newview/skins/default/textures/e97cf410-8e61-7005-ec06-629eba4cd1fb.tga
new file mode 100644
index 0000000..6fdba25
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/e97cf410-8e61-7005-ec06-629eba4cd1fb.tga differ
diff --git a/linden/indra/newview/skins/default/textures/easteregg.png b/linden/indra/newview/skins/default/textures/easteregg.png
new file mode 100644
index 0000000..75eaef7
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/easteregg.png differ
diff --git a/linden/indra/newview/skins/default/textures/ebf2aa19-6c34-c5d8-4f14-853da1241f91.j2c b/linden/indra/newview/skins/default/textures/ebf2aa19-6c34-c5d8-4f14-853da1241f91.j2c
new file mode 100644
index 0000000..cb0bb9c
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/ebf2aa19-6c34-c5d8-4f14-853da1241f91.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/eye_button_active.tga b/linden/indra/newview/skins/default/textures/eye_button_active.tga
new file mode 100644
index 0000000..014f785
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/eye_button_active.tga differ
diff --git a/linden/indra/newview/skins/default/textures/eye_button_inactive.tga b/linden/indra/newview/skins/default/textures/eye_button_inactive.tga
new file mode 100644
index 0000000..8666f0b
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/eye_button_inactive.tga differ
diff --git a/linden/indra/newview/skins/default/textures/f2d7b6f6-4200-1e9a-fd5b-96459e950f94.j2c b/linden/indra/newview/skins/default/textures/f2d7b6f6-4200-1e9a-fd5b-96459e950f94.j2c
new file mode 100644
index 0000000..cb8a0cb
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/f2d7b6f6-4200-1e9a-fd5b-96459e950f94.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/f4b6b161-6530-6679-1a84-adfcb71a8b12.j2c b/linden/indra/newview/skins/default/textures/f4b6b161-6530-6679-1a84-adfcb71a8b12.j2c
new file mode 100644
index 0000000..73f80eb
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/f4b6b161-6530-6679-1a84-adfcb71a8b12.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/f54a0c32-3cd1-d49a-5b4f-7b792bebc204.j2c b/linden/indra/newview/skins/default/textures/f54a0c32-3cd1-d49a-5b4f-7b792bebc204.j2c
new file mode 100644
index 0000000..03d4b1a
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/f54a0c32-3cd1-d49a-5b4f-7b792bebc204.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/f9bbb2fe-584b-4c01-86fc-599c69534c1b.tga b/linden/indra/newview/skins/default/textures/f9bbb2fe-584b-4c01-86fc-599c69534c1b.tga
new file mode 100644
index 0000000..3706c96
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/f9bbb2fe-584b-4c01-86fc-599c69534c1b.tga differ
diff --git a/linden/indra/newview/skins/default/textures/fb1fecba-9585-415b-ad15-6e6e3d6c5479.j2c b/linden/indra/newview/skins/default/textures/fb1fecba-9585-415b-ad15-6e6e3d6c5479.j2c
new file mode 100644
index 0000000..8cdf151
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/fb1fecba-9585-415b-ad15-6e6e3d6c5479.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/fb2ae204-3fd1-df33-594f-c9f882830e66.j2c b/linden/indra/newview/skins/default/textures/fb2ae204-3fd1-df33-594f-c9f882830e66.j2c
new file mode 100644
index 0000000..2db8517
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/fb2ae204-3fd1-df33-594f-c9f882830e66.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/fc987bf9-b8cb-f8e5-45f2-d664ca6bd3eb.j2c b/linden/indra/newview/skins/default/textures/fc987bf9-b8cb-f8e5-45f2-d664ca6bd3eb.j2c
new file mode 100644
index 0000000..49913c5
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/fc987bf9-b8cb-f8e5-45f2-d664ca6bd3eb.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga b/linden/indra/newview/skins/default/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga
new file mode 100644
index 0000000..3335526
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga differ
diff --git a/linden/indra/newview/skins/default/textures/ff_edit_mine.tga b/linden/indra/newview/skins/default/textures/ff_edit_mine.tga
new file mode 100644
index 0000000..8f0c35b
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/ff_edit_mine.tga differ
diff --git a/linden/indra/newview/skins/default/textures/ff_edit_mine_button.tga b/linden/indra/newview/skins/default/textures/ff_edit_mine_button.tga
new file mode 100644
index 0000000..07627a6
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/ff_edit_mine_button.tga differ
diff --git a/linden/indra/newview/skins/default/textures/ff_edit_theirs.tga b/linden/indra/newview/skins/default/textures/ff_edit_theirs.tga
new file mode 100644
index 0000000..005ada2
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/ff_edit_theirs.tga differ
diff --git a/linden/indra/newview/skins/default/textures/ff_edit_theirs_button.tga b/linden/indra/newview/skins/default/textures/ff_edit_theirs_button.tga
new file mode 100644
index 0000000..798ef64
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/ff_edit_theirs_button.tga differ
diff --git a/linden/indra/newview/skins/default/textures/ff_online_status_button.tga b/linden/indra/newview/skins/default/textures/ff_online_status_button.tga
new file mode 100644
index 0000000..9076df6
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/ff_online_status_button.tga differ
diff --git a/linden/indra/newview/skins/default/textures/ff_visible_map.tga b/linden/indra/newview/skins/default/textures/ff_visible_map.tga
new file mode 100644
index 0000000..a4dad78
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/ff_visible_map.tga differ
diff --git a/linden/indra/newview/skins/default/textures/ff_visible_map_button.tga b/linden/indra/newview/skins/default/textures/ff_visible_map_button.tga
new file mode 100644
index 0000000..8d13ade
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/ff_visible_map_button.tga differ
diff --git a/linden/indra/newview/skins/default/textures/ff_visible_online.tga b/linden/indra/newview/skins/default/textures/ff_visible_online.tga
new file mode 100644
index 0000000..74e3a4e
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/ff_visible_online.tga differ
diff --git a/linden/indra/newview/skins/default/textures/ff_visible_online_button.tga b/linden/indra/newview/skins/default/textures/ff_visible_online_button.tga
new file mode 100644
index 0000000..08a6cbe
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/ff_visible_online_button.tga differ
diff --git a/linden/indra/newview/skins/default/textures/flyout_btn_left.tga b/linden/indra/newview/skins/default/textures/flyout_btn_left.tga
new file mode 100644
index 0000000..1424bc0
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/flyout_btn_left.tga differ
diff --git a/linden/indra/newview/skins/default/textures/flyout_btn_left_disabled.tga b/linden/indra/newview/skins/default/textures/flyout_btn_left_disabled.tga
new file mode 100644
index 0000000..a3b2eeb
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/flyout_btn_left_disabled.tga differ
diff --git a/linden/indra/newview/skins/default/textures/flyout_btn_left_selected.tga b/linden/indra/newview/skins/default/textures/flyout_btn_left_selected.tga
new file mode 100644
index 0000000..9dd74b1
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/flyout_btn_left_selected.tga differ
diff --git a/linden/indra/newview/skins/default/textures/flyout_btn_right.tga b/linden/indra/newview/skins/default/textures/flyout_btn_right.tga
new file mode 100644
index 0000000..ad6aa3f
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/flyout_btn_right.tga differ
diff --git a/linden/indra/newview/skins/default/textures/flyout_btn_right_disabled.tga b/linden/indra/newview/skins/default/textures/flyout_btn_right_disabled.tga
new file mode 100644
index 0000000..a3745b2
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/flyout_btn_right_disabled.tga differ
diff --git a/linden/indra/newview/skins/default/textures/flyout_btn_right_selected.tga b/linden/indra/newview/skins/default/textures/flyout_btn_right_selected.tga
new file mode 100644
index 0000000..fcba74d
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/flyout_btn_right_selected.tga differ
diff --git a/linden/indra/newview/skins/default/textures/folder_arrow.tga b/linden/indra/newview/skins/default/textures/folder_arrow.tga
new file mode 100644
index 0000000..77d4707
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/folder_arrow.tga differ
diff --git a/linden/indra/newview/skins/default/textures/foot_shadow.j2c b/linden/indra/newview/skins/default/textures/foot_shadow.j2c
new file mode 100644
index 0000000..f9ce9da
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/foot_shadow.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/go-home-4.png b/linden/indra/newview/skins/default/textures/go-home-4.png
new file mode 100644
index 0000000..058c00a
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/go-home-4.png differ
diff --git a/linden/indra/newview/skins/default/textures/go-next-4.png b/linden/indra/newview/skins/default/textures/go-next-4.png
new file mode 100644
index 0000000..b4362c1
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/go-next-4.png differ
diff --git a/linden/indra/newview/skins/default/textures/go-previous-4.png b/linden/indra/newview/skins/default/textures/go-previous-4.png
new file mode 100644
index 0000000..d5a677e
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/go-previous-4.png differ
diff --git a/linden/indra/newview/skins/default/textures/hugs.png b/linden/indra/newview/skins/default/textures/hugs.png
new file mode 100644
index 0000000..d612793
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/hugs.png differ
diff --git a/linden/indra/newview/skins/default/textures/icn_active-speakers-dot-lvl0.tga b/linden/indra/newview/skins/default/textures/icn_active-speakers-dot-lvl0.tga
new file mode 100644
index 0000000..35846ce
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_active-speakers-dot-lvl0.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_active-speakers-dot-lvl1.tga b/linden/indra/newview/skins/default/textures/icn_active-speakers-dot-lvl1.tga
new file mode 100644
index 0000000..1f9f564
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_active-speakers-dot-lvl1.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_active-speakers-dot-lvl2.tga b/linden/indra/newview/skins/default/textures/icn_active-speakers-dot-lvl2.tga
new file mode 100644
index 0000000..b2e5609
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_active-speakers-dot-lvl2.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_active-speakers-typing1.tga b/linden/indra/newview/skins/default/textures/icn_active-speakers-typing1.tga
new file mode 100644
index 0000000..3706c96
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_active-speakers-typing1.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_active-speakers-typing2.tga b/linden/indra/newview/skins/default/textures/icn_active-speakers-typing2.tga
new file mode 100644
index 0000000..0d127f9
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_active-speakers-typing2.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_active-speakers-typing3.tga b/linden/indra/newview/skins/default/textures/icn_active-speakers-typing3.tga
new file mode 100644
index 0000000..031b3ad
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_active-speakers-typing3.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_chatbar.tga b/linden/indra/newview/skins/default/textures/icn_chatbar.tga
new file mode 100644
index 0000000..5d4fd41
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_chatbar.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_clear_lineeditor.tga b/linden/indra/newview/skins/default/textures/icn_clear_lineeditor.tga
new file mode 100644
index 0000000..8cd8310
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_clear_lineeditor.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_label_media.tga b/linden/indra/newview/skins/default/textures/icn_label_media.tga
new file mode 100644
index 0000000..43dd342
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_label_media.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_label_music.tga b/linden/indra/newview/skins/default/textures/icn_label_music.tga
new file mode 100644
index 0000000..9470601
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_label_music.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_label_web.tga b/linden/indra/newview/skins/default/textures/icn_label_web.tga
new file mode 100644
index 0000000..7c9131d
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_label_web.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_media-pause.tga b/linden/indra/newview/skins/default/textures/icn_media-pause.tga
new file mode 100644
index 0000000..0713af0
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_media-pause.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_media-pause_active.tga b/linden/indra/newview/skins/default/textures/icn_media-pause_active.tga
new file mode 100644
index 0000000..2138431
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_media-pause_active.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_media-pause_disabled.tga b/linden/indra/newview/skins/default/textures/icn_media-pause_disabled.tga
new file mode 100644
index 0000000..4d604c6
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_media-pause_disabled.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_media-pause_enabled.tga b/linden/indra/newview/skins/default/textures/icn_media-pause_enabled.tga
new file mode 100644
index 0000000..577f919
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_media-pause_enabled.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_media-play.tga b/linden/indra/newview/skins/default/textures/icn_media-play.tga
new file mode 100644
index 0000000..bdd9f16
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_media-play.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_media-play_active.tga b/linden/indra/newview/skins/default/textures/icn_media-play_active.tga
new file mode 100644
index 0000000..b166a41
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_media-play_active.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_media-play_disabled.tga b/linden/indra/newview/skins/default/textures/icn_media-play_disabled.tga
new file mode 100644
index 0000000..444062f
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_media-play_disabled.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_media-play_enabled.tga b/linden/indra/newview/skins/default/textures/icn_media-play_enabled.tga
new file mode 100644
index 0000000..9ed55f8
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_media-play_enabled.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_media-stop_active.tga b/linden/indra/newview/skins/default/textures/icn_media-stop_active.tga
new file mode 100644
index 0000000..03efac2
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_media-stop_active.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_media-stop_disabled.tga b/linden/indra/newview/skins/default/textures/icn_media-stop_disabled.tga
new file mode 100644
index 0000000..cf1532a
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_media-stop_disabled.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_media-stop_enabled.tga b/linden/indra/newview/skins/default/textures/icn_media-stop_enabled.tga
new file mode 100644
index 0000000..011b98c
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_media-stop_enabled.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_media.tga b/linden/indra/newview/skins/default/textures/icn_media.tga
new file mode 100644
index 0000000..43dd342
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_media.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_media_movie.tga b/linden/indra/newview/skins/default/textures/icn_media_movie.tga
new file mode 100644
index 0000000..43dd342
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_media_movie.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_media_web.tga b/linden/indra/newview/skins/default/textures/icn_media_web.tga
new file mode 100644
index 0000000..7c9131d
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_media_web.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_music-pause.tga b/linden/indra/newview/skins/default/textures/icn_music-pause.tga
new file mode 100644
index 0000000..548ccf4
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_music-pause.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_music-play.tga b/linden/indra/newview/skins/default/textures/icn_music-play.tga
new file mode 100644
index 0000000..1a67d34
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_music-play.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_music.tga b/linden/indra/newview/skins/default/textures/icn_music.tga
new file mode 100644
index 0000000..9470601
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_music.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_pause.tga b/linden/indra/newview/skins/default/textures/icn_pause.tga
new file mode 100644
index 0000000..5107993
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_pause.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_play.tga b/linden/indra/newview/skins/default/textures/icn_play.tga
new file mode 100644
index 0000000..eb2c0f3
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_play.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_rounded-text-field.tga b/linden/indra/newview/skins/default/textures/icn_rounded-text-field.tga
new file mode 100644
index 0000000..7da504f
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_rounded-text-field.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_scrollbar.tga b/linden/indra/newview/skins/default/textures/icn_scrollbar.tga
new file mode 100644
index 0000000..a19a8a5
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_scrollbar.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_scrollbar_bg.tga b/linden/indra/newview/skins/default/textures/icn_scrollbar_bg.tga
new file mode 100644
index 0000000..1e4bc7a
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_scrollbar_bg.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_scrollbar_thumb.tga b/linden/indra/newview/skins/default/textures/icn_scrollbar_thumb.tga
new file mode 100644
index 0000000..d63c314
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_scrollbar_thumb.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_slide-groove_dark.tga b/linden/indra/newview/skins/default/textures/icn_slide-groove_dark.tga
new file mode 100644
index 0000000..0fa0ccb
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_slide-groove_dark.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_slide-highlight.tga b/linden/indra/newview/skins/default/textures/icn_slide-highlight.tga
new file mode 100644
index 0000000..66d8d89
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_slide-highlight.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_slide-thumb_dark.tga b/linden/indra/newview/skins/default/textures/icn_slide-thumb_dark.tga
new file mode 100644
index 0000000..fa96812
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_slide-thumb_dark.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_speaker-muted_dark.tga b/linden/indra/newview/skins/default/textures/icn_speaker-muted_dark.tga
new file mode 100644
index 0000000..a7d29a1
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_speaker-muted_dark.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_speaker_dark.tga b/linden/indra/newview/skins/default/textures/icn_speaker_dark.tga
new file mode 100644
index 0000000..e778ad0
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_speaker_dark.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_stop.tga b/linden/indra/newview/skins/default/textures/icn_stop.tga
new file mode 100644
index 0000000..7a53bcc
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_stop.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_textfield_enabled.tga b/linden/indra/newview/skins/default/textures/icn_textfield_enabled.tga
new file mode 100644
index 0000000..fc681a1
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_textfield_enabled.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_toolbar_build.tga b/linden/indra/newview/skins/default/textures/icn_toolbar_build.tga
new file mode 100644
index 0000000..e1a814b
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_toolbar_build.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_toolbar_fly.tga b/linden/indra/newview/skins/default/textures/icn_toolbar_fly.tga
new file mode 100644
index 0000000..e1a814b
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_toolbar_fly.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_toolbar_inventory.tga b/linden/indra/newview/skins/default/textures/icn_toolbar_inventory.tga
new file mode 100644
index 0000000..e1a814b
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_toolbar_inventory.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_toolbar_map.tga b/linden/indra/newview/skins/default/textures/icn_toolbar_map.tga
new file mode 100644
index 0000000..e1a814b
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_toolbar_map.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_toolbar_minimap.tga b/linden/indra/newview/skins/default/textures/icn_toolbar_minimap.tga
new file mode 100644
index 0000000..e1a814b
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_toolbar_minimap.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_toolbar_search.tga b/linden/indra/newview/skins/default/textures/icn_toolbar_search.tga
new file mode 100644
index 0000000..e1a814b
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_toolbar_search.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_toolbar_snapshot.tga b/linden/indra/newview/skins/default/textures/icn_toolbar_snapshot.tga
new file mode 100644
index 0000000..e1a814b
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_toolbar_snapshot.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_voice-call-end.tga b/linden/indra/newview/skins/default/textures/icn_voice-call-end.tga
new file mode 100644
index 0000000..2da4e85
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_voice-call-end.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_voice-call-start.tga b/linden/indra/newview/skins/default/textures/icn_voice-call-start.tga
new file mode 100644
index 0000000..07701cb
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_voice-call-start.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_voice-groupfocus.tga b/linden/indra/newview/skins/default/textures/icn_voice-groupfocus.tga
new file mode 100644
index 0000000..9f48d46
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_voice-groupfocus.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_voice-localchat.tga b/linden/indra/newview/skins/default/textures/icn_voice-localchat.tga
new file mode 100644
index 0000000..7cf267e
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_voice-localchat.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_voice-pvtfocus.tga b/linden/indra/newview/skins/default/textures/icn_voice-pvtfocus.tga
new file mode 100644
index 0000000..abadb09
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_voice-pvtfocus.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_voice_ptt-off.tga b/linden/indra/newview/skins/default/textures/icn_voice_ptt-off.tga
new file mode 100644
index 0000000..15ecbdf
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_voice_ptt-off.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_voice_ptt-on-lvl1.tga b/linden/indra/newview/skins/default/textures/icn_voice_ptt-on-lvl1.tga
new file mode 100644
index 0000000..ae72af1
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_voice_ptt-on-lvl1.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_voice_ptt-on-lvl2.tga b/linden/indra/newview/skins/default/textures/icn_voice_ptt-on-lvl2.tga
new file mode 100644
index 0000000..4dfc2dd
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_voice_ptt-on-lvl2.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_voice_ptt-on-lvl3.tga b/linden/indra/newview/skins/default/textures/icn_voice_ptt-on-lvl3.tga
new file mode 100644
index 0000000..018b0be
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_voice_ptt-on-lvl3.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icn_voice_ptt-on.tga b/linden/indra/newview/skins/default/textures/icn_voice_ptt-on.tga
new file mode 100644
index 0000000..9eb6431
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icn_voice_ptt-on.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icon_auction.tga b/linden/indra/newview/skins/default/textures/icon_auction.tga
new file mode 100644
index 0000000..d121833
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icon_auction.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icon_avatar_offline.tga b/linden/indra/newview/skins/default/textures/icon_avatar_offline.tga
new file mode 100644
index 0000000..cfa95eb
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icon_avatar_offline.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icon_avatar_online.tga b/linden/indra/newview/skins/default/textures/icon_avatar_online.tga
new file mode 100644
index 0000000..4522121
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icon_avatar_online.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icon_day_cycle.tga b/linden/indra/newview/skins/default/textures/icon_day_cycle.tga
new file mode 100644
index 0000000..2d5dee1
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icon_day_cycle.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icon_diurnal.tga b/linden/indra/newview/skins/default/textures/icon_diurnal.tga
new file mode 100644
index 0000000..fc720c8
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icon_diurnal.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icon_event.tga b/linden/indra/newview/skins/default/textures/icon_event.tga
new file mode 100644
index 0000000..7805dbc
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icon_event.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icon_event_adult.tga b/linden/indra/newview/skins/default/textures/icon_event_adult.tga
new file mode 100644
index 0000000..c344fb1
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icon_event_adult.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icon_event_mature.tga b/linden/indra/newview/skins/default/textures/icon_event_mature.tga
new file mode 100644
index 0000000..61c879b
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icon_event_mature.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icon_for_sale.tga b/linden/indra/newview/skins/default/textures/icon_for_sale.tga
new file mode 100644
index 0000000..455b1ae
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icon_for_sale.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icon_for_sale_adult.tga b/linden/indra/newview/skins/default/textures/icon_for_sale_adult.tga
new file mode 100644
index 0000000..6a99188
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icon_for_sale_adult.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icon_group.tga b/linden/indra/newview/skins/default/textures/icon_group.tga
new file mode 100644
index 0000000..22122d6
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icon_group.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icon_groupnotice.tga b/linden/indra/newview/skins/default/textures/icon_groupnotice.tga
new file mode 100644
index 0000000..edf2c61
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icon_groupnotice.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icon_groupnoticeinventory.tga b/linden/indra/newview/skins/default/textures/icon_groupnoticeinventory.tga
new file mode 100644
index 0000000..f313906
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icon_groupnoticeinventory.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icon_lock.tga b/linden/indra/newview/skins/default/textures/icon_lock.tga
new file mode 100644
index 0000000..23521aa
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icon_lock.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icon_place.tga b/linden/indra/newview/skins/default/textures/icon_place.tga
new file mode 100644
index 0000000..2170c98
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icon_place.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icon_popular.tga b/linden/indra/newview/skins/default/textures/icon_popular.tga
new file mode 100644
index 0000000..f1165b8
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icon_popular.tga differ
diff --git a/linden/indra/newview/skins/default/textures/icon_top_pick.tga b/linden/indra/newview/skins/default/textures/icon_top_pick.tga
new file mode 100644
index 0000000..0b34882
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/icon_top_pick.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_folder_animation.tga b/linden/indra/newview/skins/default/textures/inv_folder_animation.tga
new file mode 100644
index 0000000..1b4df7a
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_folder_animation.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_folder_bodypart.tga b/linden/indra/newview/skins/default/textures/inv_folder_bodypart.tga
new file mode 100644
index 0000000..abcb1bd
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_folder_bodypart.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_folder_callingcard.tga b/linden/indra/newview/skins/default/textures/inv_folder_callingcard.tga
new file mode 100644
index 0000000..db7d8f7
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_folder_callingcard.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_folder_clothing.tga b/linden/indra/newview/skins/default/textures/inv_folder_clothing.tga
new file mode 100644
index 0000000..d214789
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_folder_clothing.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_folder_gesture.tga b/linden/indra/newview/skins/default/textures/inv_folder_gesture.tga
new file mode 100644
index 0000000..83accbb
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_folder_gesture.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_folder_landmark.tga b/linden/indra/newview/skins/default/textures/inv_folder_landmark.tga
new file mode 100644
index 0000000..6923dd2
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_folder_landmark.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_folder_lostandfound.tga b/linden/indra/newview/skins/default/textures/inv_folder_lostandfound.tga
new file mode 100644
index 0000000..67f9a9a
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_folder_lostandfound.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_folder_notecard.tga b/linden/indra/newview/skins/default/textures/inv_folder_notecard.tga
new file mode 100644
index 0000000..400ef3c
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_folder_notecard.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_folder_object.tga b/linden/indra/newview/skins/default/textures/inv_folder_object.tga
new file mode 100644
index 0000000..c3d04bf
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_folder_object.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_folder_plain_closed.tga b/linden/indra/newview/skins/default/textures/inv_folder_plain_closed.tga
new file mode 100644
index 0000000..e351836
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_folder_plain_closed.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_folder_plain_open.tga b/linden/indra/newview/skins/default/textures/inv_folder_plain_open.tga
new file mode 100644
index 0000000..7bc8034
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_folder_plain_open.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_folder_script.tga b/linden/indra/newview/skins/default/textures/inv_folder_script.tga
new file mode 100644
index 0000000..3e1a164
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_folder_script.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_folder_snapshot.tga b/linden/indra/newview/skins/default/textures/inv_folder_snapshot.tga
new file mode 100644
index 0000000..d32538d
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_folder_snapshot.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_folder_sound.tga b/linden/indra/newview/skins/default/textures/inv_folder_sound.tga
new file mode 100644
index 0000000..5e54c47
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_folder_sound.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_folder_texture.tga b/linden/indra/newview/skins/default/textures/inv_folder_texture.tga
new file mode 100644
index 0000000..4fe75d0
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_folder_texture.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_folder_trash.tga b/linden/indra/newview/skins/default/textures/inv_folder_trash.tga
new file mode 100644
index 0000000..54043e9
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_folder_trash.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_alpha.tga b/linden/indra/newview/skins/default/textures/inv_item_alpha.tga
new file mode 100644
index 0000000..b041492
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_alpha.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_animation.tga b/linden/indra/newview/skins/default/textures/inv_item_animation.tga
new file mode 100644
index 0000000..2b12b28
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_animation.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_attach.tga b/linden/indra/newview/skins/default/textures/inv_item_attach.tga
new file mode 100644
index 0000000..0538993
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_attach.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_callingcard_offline.tga b/linden/indra/newview/skins/default/textures/inv_item_callingcard_offline.tga
new file mode 100644
index 0000000..44222d3
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_callingcard_offline.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_callingcard_online.tga b/linden/indra/newview/skins/default/textures/inv_item_callingcard_online.tga
new file mode 100644
index 0000000..42be4d2
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_callingcard_online.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_clothing.tga b/linden/indra/newview/skins/default/textures/inv_item_clothing.tga
new file mode 100644
index 0000000..4c4c939
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_clothing.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_eyes.tga b/linden/indra/newview/skins/default/textures/inv_item_eyes.tga
new file mode 100644
index 0000000..053ffbe
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_eyes.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_gesture.tga b/linden/indra/newview/skins/default/textures/inv_item_gesture.tga
new file mode 100644
index 0000000..52ac90c
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_gesture.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_gloves.tga b/linden/indra/newview/skins/default/textures/inv_item_gloves.tga
new file mode 100644
index 0000000..2604171
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_gloves.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_hair.tga b/linden/indra/newview/skins/default/textures/inv_item_hair.tga
new file mode 100644
index 0000000..03156a7
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_hair.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_jacket.tga b/linden/indra/newview/skins/default/textures/inv_item_jacket.tga
new file mode 100644
index 0000000..f37c593
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_jacket.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_landmark.tga b/linden/indra/newview/skins/default/textures/inv_item_landmark.tga
new file mode 100644
index 0000000..c161deb
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_landmark.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_landmark_visited.tga b/linden/indra/newview/skins/default/textures/inv_item_landmark_visited.tga
new file mode 100644
index 0000000..372a0f6
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_landmark_visited.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_notecard.tga b/linden/indra/newview/skins/default/textures/inv_item_notecard.tga
new file mode 100644
index 0000000..2534d1b
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_notecard.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_object.tga b/linden/indra/newview/skins/default/textures/inv_item_object.tga
new file mode 100644
index 0000000..edad15f
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_object.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_object_multi.tga b/linden/indra/newview/skins/default/textures/inv_item_object_multi.tga
new file mode 100644
index 0000000..7af666b
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_object_multi.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_pants.tga b/linden/indra/newview/skins/default/textures/inv_item_pants.tga
new file mode 100644
index 0000000..ec3246e
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_pants.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_script.tga b/linden/indra/newview/skins/default/textures/inv_item_script.tga
new file mode 100644
index 0000000..e396d09
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_script.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_script_dangerous.tga b/linden/indra/newview/skins/default/textures/inv_item_script_dangerous.tga
new file mode 100644
index 0000000..1ee742a
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_script_dangerous.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_shape.tga b/linden/indra/newview/skins/default/textures/inv_item_shape.tga
new file mode 100644
index 0000000..5d9db4e
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_shape.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_shirt.tga b/linden/indra/newview/skins/default/textures/inv_item_shirt.tga
new file mode 100644
index 0000000..2e1c627
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_shirt.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_shoes.tga b/linden/indra/newview/skins/default/textures/inv_item_shoes.tga
new file mode 100644
index 0000000..ae93bfe
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_shoes.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_skin.tga b/linden/indra/newview/skins/default/textures/inv_item_skin.tga
new file mode 100644
index 0000000..f0d7f20
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_skin.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_skirt.tga b/linden/indra/newview/skins/default/textures/inv_item_skirt.tga
new file mode 100644
index 0000000..d8f3972
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_skirt.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_snapshot.tga b/linden/indra/newview/skins/default/textures/inv_item_snapshot.tga
new file mode 100644
index 0000000..c9d41a6
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_snapshot.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_socks.tga b/linden/indra/newview/skins/default/textures/inv_item_socks.tga
new file mode 100644
index 0000000..dabcf6d
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_socks.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_sound.tga b/linden/indra/newview/skins/default/textures/inv_item_sound.tga
new file mode 100644
index 0000000..efa1132
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_sound.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_tattoo.tga b/linden/indra/newview/skins/default/textures/inv_item_tattoo.tga
new file mode 100644
index 0000000..fdf6c0a
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_tattoo.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_texture.tga b/linden/indra/newview/skins/default/textures/inv_item_texture.tga
new file mode 100644
index 0000000..fc5a420
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_texture.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_underpants.tga b/linden/indra/newview/skins/default/textures/inv_item_underpants.tga
new file mode 100644
index 0000000..e712f9c
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_underpants.tga differ
diff --git a/linden/indra/newview/skins/default/textures/inv_item_undershirt.tga b/linden/indra/newview/skins/default/textures/inv_item_undershirt.tga
new file mode 100644
index 0000000..c7b4aae
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/inv_item_undershirt.tga differ
diff --git a/linden/indra/newview/skins/default/textures/lag_status_critical.tga b/linden/indra/newview/skins/default/textures/lag_status_critical.tga
new file mode 100644
index 0000000..bbc71d9
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/lag_status_critical.tga differ
diff --git a/linden/indra/newview/skins/default/textures/lag_status_good.tga b/linden/indra/newview/skins/default/textures/lag_status_good.tga
new file mode 100644
index 0000000..680ba90
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/lag_status_good.tga differ
diff --git a/linden/indra/newview/skins/default/textures/lag_status_warning.tga b/linden/indra/newview/skins/default/textures/lag_status_warning.tga
new file mode 100644
index 0000000..13ce3cc
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/lag_status_warning.tga differ
diff --git a/linden/indra/newview/skins/default/textures/legend.tga b/linden/indra/newview/skins/default/textures/legend.tga
new file mode 100644
index 0000000..0dbb8fd
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/legend.tga differ
diff --git a/linden/indra/newview/skins/default/textures/lightgray.tga b/linden/indra/newview/skins/default/textures/lightgray.tga
new file mode 100644
index 0000000..2063d68
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/lightgray.tga differ
diff --git a/linden/indra/newview/skins/default/textures/locked_image.j2c b/linden/indra/newview/skins/default/textures/locked_image.j2c
new file mode 100644
index 0000000..9e8998d
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/locked_image.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/map_avatar_16.tga b/linden/indra/newview/skins/default/textures/map_avatar_16.tga
new file mode 100644
index 0000000..ce129e3
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/map_avatar_16.tga differ
diff --git a/linden/indra/newview/skins/default/textures/map_avatar_32.tga b/linden/indra/newview/skins/default/textures/map_avatar_32.tga
new file mode 100644
index 0000000..aebeab4
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/map_avatar_32.tga differ
diff --git a/linden/indra/newview/skins/default/textures/map_avatar_8.tga b/linden/indra/newview/skins/default/textures/map_avatar_8.tga
new file mode 100644
index 0000000..28552f2
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/map_avatar_8.tga differ
diff --git a/linden/indra/newview/skins/default/textures/map_avatar_above_32.tga b/linden/indra/newview/skins/default/textures/map_avatar_above_32.tga
new file mode 100644
index 0000000..65bd056
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/map_avatar_above_32.tga differ
diff --git a/linden/indra/newview/skins/default/textures/map_avatar_above_8.tga b/linden/indra/newview/skins/default/textures/map_avatar_above_8.tga
new file mode 100644
index 0000000..193428e
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/map_avatar_above_8.tga differ
diff --git a/linden/indra/newview/skins/default/textures/map_avatar_below_32.tga b/linden/indra/newview/skins/default/textures/map_avatar_below_32.tga
new file mode 100644
index 0000000..496c44b
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/map_avatar_below_32.tga differ
diff --git a/linden/indra/newview/skins/default/textures/map_avatar_below_8.tga b/linden/indra/newview/skins/default/textures/map_avatar_below_8.tga
new file mode 100644
index 0000000..9e14bfa
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/map_avatar_below_8.tga differ
diff --git a/linden/indra/newview/skins/default/textures/map_avatar_you_32.tga b/linden/indra/newview/skins/default/textures/map_avatar_you_32.tga
new file mode 100644
index 0000000..782207e
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/map_avatar_you_32.tga differ
diff --git a/linden/indra/newview/skins/default/textures/map_avatar_you_8.tga b/linden/indra/newview/skins/default/textures/map_avatar_you_8.tga
new file mode 100644
index 0000000..61f319f
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/map_avatar_you_8.tga differ
diff --git a/linden/indra/newview/skins/default/textures/map_event.tga b/linden/indra/newview/skins/default/textures/map_event.tga
new file mode 100644
index 0000000..c229b37
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/map_event.tga differ
diff --git a/linden/indra/newview/skins/default/textures/map_event_adult.tga b/linden/indra/newview/skins/default/textures/map_event_adult.tga
new file mode 100644
index 0000000..c344fb1
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/map_event_adult.tga differ
diff --git a/linden/indra/newview/skins/default/textures/map_event_mature.tga b/linden/indra/newview/skins/default/textures/map_event_mature.tga
new file mode 100644
index 0000000..61c879b
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/map_event_mature.tga differ
diff --git a/linden/indra/newview/skins/default/textures/map_home.tga b/linden/indra/newview/skins/default/textures/map_home.tga
new file mode 100644
index 0000000..7478de3
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/map_home.tga differ
diff --git a/linden/indra/newview/skins/default/textures/map_infohub.tga b/linden/indra/newview/skins/default/textures/map_infohub.tga
new file mode 100644
index 0000000..d0134fa
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/map_infohub.tga differ
diff --git a/linden/indra/newview/skins/default/textures/map_telehub.tga b/linden/indra/newview/skins/default/textures/map_telehub.tga
new file mode 100644
index 0000000..ef63a3e
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/map_telehub.tga differ
diff --git a/linden/indra/newview/skins/default/textures/map_track_16.tga b/linden/indra/newview/skins/default/textures/map_track_16.tga
new file mode 100644
index 0000000..451ce24
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/map_track_16.tga differ
diff --git a/linden/indra/newview/skins/default/textures/map_track_8.tga b/linden/indra/newview/skins/default/textures/map_track_8.tga
new file mode 100644
index 0000000..53425ff
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/map_track_8.tga differ
diff --git a/linden/indra/newview/skins/default/textures/media_btn_back.png b/linden/indra/newview/skins/default/textures/media_btn_back.png
new file mode 100644
index 0000000..9783a03
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/media_btn_back.png differ
diff --git a/linden/indra/newview/skins/default/textures/media_btn_done.png b/linden/indra/newview/skins/default/textures/media_btn_done.png
new file mode 100644
index 0000000..f407aa3
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/media_btn_done.png differ
diff --git a/linden/indra/newview/skins/default/textures/media_btn_forward.png b/linden/indra/newview/skins/default/textures/media_btn_forward.png
new file mode 100644
index 0000000..4e7e609
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/media_btn_forward.png differ
diff --git a/linden/indra/newview/skins/default/textures/media_btn_home.png b/linden/indra/newview/skins/default/textures/media_btn_home.png
new file mode 100644
index 0000000..cc59ddf
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/media_btn_home.png differ
diff --git a/linden/indra/newview/skins/default/textures/media_btn_newwindow.png b/linden/indra/newview/skins/default/textures/media_btn_newwindow.png
new file mode 100644
index 0000000..c5f9c97
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/media_btn_newwindow.png differ
diff --git a/linden/indra/newview/skins/default/textures/media_btn_optimalzoom.png b/linden/indra/newview/skins/default/textures/media_btn_optimalzoom.png
new file mode 100644
index 0000000..dd68edc
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/media_btn_optimalzoom.png differ
diff --git a/linden/indra/newview/skins/default/textures/media_btn_reload.png b/linden/indra/newview/skins/default/textures/media_btn_reload.png
new file mode 100644
index 0000000..afbfe8f
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/media_btn_reload.png differ
diff --git a/linden/indra/newview/skins/default/textures/media_btn_scrolldown.png b/linden/indra/newview/skins/default/textures/media_btn_scrolldown.png
new file mode 100644
index 0000000..ad921d5
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/media_btn_scrolldown.png differ
diff --git a/linden/indra/newview/skins/default/textures/media_btn_scrollleft.png b/linden/indra/newview/skins/default/textures/media_btn_scrollleft.png
new file mode 100644
index 0000000..a69c7e7
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/media_btn_scrollleft.png differ
diff --git a/linden/indra/newview/skins/default/textures/media_btn_scrollright.png b/linden/indra/newview/skins/default/textures/media_btn_scrollright.png
new file mode 100644
index 0000000..c553449
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/media_btn_scrollright.png differ
diff --git a/linden/indra/newview/skins/default/textures/media_btn_scrollup.png b/linden/indra/newview/skins/default/textures/media_btn_scrollup.png
new file mode 100644
index 0000000..ef37529
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/media_btn_scrollup.png differ
diff --git a/linden/indra/newview/skins/default/textures/media_btn_stoploading.png b/linden/indra/newview/skins/default/textures/media_btn_stoploading.png
new file mode 100644
index 0000000..8578d75
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/media_btn_stoploading.png differ
diff --git a/linden/indra/newview/skins/default/textures/media_icon.tga b/linden/indra/newview/skins/default/textures/media_icon.tga
new file mode 100644
index 0000000..289520c
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/media_icon.tga differ
diff --git a/linden/indra/newview/skins/default/textures/media_panel_bg.png b/linden/indra/newview/skins/default/textures/media_panel_bg.png
new file mode 100644
index 0000000..975dc3e
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/media_panel_bg.png differ
diff --git a/linden/indra/newview/skins/default/textures/media_panel_divider.png b/linden/indra/newview/skins/default/textures/media_panel_divider.png
new file mode 100644
index 0000000..5f947e8
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/media_panel_divider.png differ
diff --git a/linden/indra/newview/skins/default/textures/media_panel_hoverrectangle.png b/linden/indra/newview/skins/default/textures/media_panel_hoverrectangle.png
new file mode 100644
index 0000000..1cdeabf
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/media_panel_hoverrectangle.png differ
diff --git a/linden/indra/newview/skins/default/textures/media_panel_scrollbg.png b/linden/indra/newview/skins/default/textures/media_panel_scrollbg.png
new file mode 100644
index 0000000..2b63c9f
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/media_panel_scrollbg.png differ
diff --git a/linden/indra/newview/skins/default/textures/minimize.tga b/linden/indra/newview/skins/default/textures/minimize.tga
new file mode 100644
index 0000000..a21fd91
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/minimize.tga differ
diff --git a/linden/indra/newview/skins/default/textures/minimize_inactive.tga b/linden/indra/newview/skins/default/textures/minimize_inactive.tga
new file mode 100644
index 0000000..fcd62aa
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/minimize_inactive.tga differ
diff --git a/linden/indra/newview/skins/default/textures/minimize_pressed.tga b/linden/indra/newview/skins/default/textures/minimize_pressed.tga
new file mode 100644
index 0000000..0061dd5
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/minimize_pressed.tga differ
diff --git a/linden/indra/newview/skins/default/textures/missing_asset.tga b/linden/indra/newview/skins/default/textures/missing_asset.tga
new file mode 100644
index 0000000..9a43f4d
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/missing_asset.tga differ
diff --git a/linden/indra/newview/skins/default/textures/move_backward_in.tga b/linden/indra/newview/skins/default/textures/move_backward_in.tga
new file mode 100644
index 0000000..b4c5eb7
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/move_backward_in.tga differ
diff --git a/linden/indra/newview/skins/default/textures/move_backward_out.tga b/linden/indra/newview/skins/default/textures/move_backward_out.tga
new file mode 100644
index 0000000..bef71ab
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/move_backward_out.tga differ
diff --git a/linden/indra/newview/skins/default/textures/move_down_in.tga b/linden/indra/newview/skins/default/textures/move_down_in.tga
new file mode 100644
index 0000000..c11fac2
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/move_down_in.tga differ
diff --git a/linden/indra/newview/skins/default/textures/move_down_out.tga b/linden/indra/newview/skins/default/textures/move_down_out.tga
new file mode 100644
index 0000000..7e7a658
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/move_down_out.tga differ
diff --git a/linden/indra/newview/skins/default/textures/move_forward_in.tga b/linden/indra/newview/skins/default/textures/move_forward_in.tga
new file mode 100644
index 0000000..f963f5b
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/move_forward_in.tga differ
diff --git a/linden/indra/newview/skins/default/textures/move_forward_out.tga b/linden/indra/newview/skins/default/textures/move_forward_out.tga
new file mode 100644
index 0000000..730b9c3
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/move_forward_out.tga differ
diff --git a/linden/indra/newview/skins/default/textures/move_left_in.tga b/linden/indra/newview/skins/default/textures/move_left_in.tga
new file mode 100644
index 0000000..c2dd4f8
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/move_left_in.tga differ
diff --git a/linden/indra/newview/skins/default/textures/move_left_out.tga b/linden/indra/newview/skins/default/textures/move_left_out.tga
new file mode 100644
index 0000000..af2e239
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/move_left_out.tga differ
diff --git a/linden/indra/newview/skins/default/textures/move_right_in.tga b/linden/indra/newview/skins/default/textures/move_right_in.tga
new file mode 100644
index 0000000..cfb297f
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/move_right_in.tga differ
diff --git a/linden/indra/newview/skins/default/textures/move_right_out.tga b/linden/indra/newview/skins/default/textures/move_right_out.tga
new file mode 100644
index 0000000..e56e5fd
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/move_right_out.tga differ
diff --git a/linden/indra/newview/skins/default/textures/move_turn_left_in.tga b/linden/indra/newview/skins/default/textures/move_turn_left_in.tga
new file mode 100644
index 0000000..6692330
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/move_turn_left_in.tga differ
diff --git a/linden/indra/newview/skins/default/textures/move_turn_left_out.tga b/linden/indra/newview/skins/default/textures/move_turn_left_out.tga
new file mode 100644
index 0000000..669b89f
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/move_turn_left_out.tga differ
diff --git a/linden/indra/newview/skins/default/textures/move_turn_right_in.tga b/linden/indra/newview/skins/default/textures/move_turn_right_in.tga
new file mode 100644
index 0000000..0ac750d
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/move_turn_right_in.tga differ
diff --git a/linden/indra/newview/skins/default/textures/move_turn_right_out.tga b/linden/indra/newview/skins/default/textures/move_turn_right_out.tga
new file mode 100644
index 0000000..6a203bc
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/move_turn_right_out.tga differ
diff --git a/linden/indra/newview/skins/default/textures/move_up_in.tga b/linden/indra/newview/skins/default/textures/move_up_in.tga
new file mode 100644
index 0000000..6a78e41
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/move_up_in.tga differ
diff --git a/linden/indra/newview/skins/default/textures/move_up_out.tga b/linden/indra/newview/skins/default/textures/move_up_out.tga
new file mode 100644
index 0000000..54bb853
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/move_up_out.tga differ
diff --git a/linden/indra/newview/skins/default/textures/music_icon.tga b/linden/indra/newview/skins/default/textures/music_icon.tga
new file mode 100644
index 0000000..aeaff02
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/music_icon.tga differ
diff --git a/linden/indra/newview/skins/default/textures/mute_icon.tga b/linden/indra/newview/skins/default/textures/mute_icon.tga
new file mode 100644
index 0000000..879b9e6
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/mute_icon.tga differ
diff --git a/linden/indra/newview/skins/default/textures/noentrylines.j2c b/linden/indra/newview/skins/default/textures/noentrylines.j2c
new file mode 100644
index 0000000..93ec176
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/noentrylines.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/noentrypasslines.j2c b/linden/indra/newview/skins/default/textures/noentrypasslines.j2c
new file mode 100644
index 0000000..800c466
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/noentrypasslines.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/nomnom.png b/linden/indra/newview/skins/default/textures/nomnom.png
new file mode 100644
index 0000000..ffc70ef
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/nomnom.png differ
diff --git a/linden/indra/newview/skins/default/textures/notify_box_icon.tga b/linden/indra/newview/skins/default/textures/notify_box_icon.tga
new file mode 100644
index 0000000..0672c89
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/notify_box_icon.tga differ
diff --git a/linden/indra/newview/skins/default/textures/notify_caution_icon.tga b/linden/indra/newview/skins/default/textures/notify_caution_icon.tga
new file mode 100644
index 0000000..abc23d1
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/notify_caution_icon.tga differ
diff --git a/linden/indra/newview/skins/default/textures/notify_next.png b/linden/indra/newview/skins/default/textures/notify_next.png
new file mode 100644
index 0000000..2235d25
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/notify_next.png differ
diff --git a/linden/indra/newview/skins/default/textures/notify_tip_icon.tga b/linden/indra/newview/skins/default/textures/notify_tip_icon.tga
new file mode 100644
index 0000000..f79a634
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/notify_tip_icon.tga differ
diff --git a/linden/indra/newview/skins/default/textures/object_cone.tga b/linden/indra/newview/skins/default/textures/object_cone.tga
new file mode 100644
index 0000000..f21a033
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/object_cone.tga differ
diff --git a/linden/indra/newview/skins/default/textures/object_cone_active.tga b/linden/indra/newview/skins/default/textures/object_cone_active.tga
new file mode 100644
index 0000000..c7b3517
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/object_cone_active.tga differ
diff --git a/linden/indra/newview/skins/default/textures/object_cube.tga b/linden/indra/newview/skins/default/textures/object_cube.tga
new file mode 100644
index 0000000..4bb5cfe
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/object_cube.tga differ
diff --git a/linden/indra/newview/skins/default/textures/object_cube_active.tga b/linden/indra/newview/skins/default/textures/object_cube_active.tga
new file mode 100644
index 0000000..1153845
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/object_cube_active.tga differ
diff --git a/linden/indra/newview/skins/default/textures/object_cylinder.tga b/linden/indra/newview/skins/default/textures/object_cylinder.tga
new file mode 100644
index 0000000..f28c3cb
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/object_cylinder.tga differ
diff --git a/linden/indra/newview/skins/default/textures/object_cylinder_active.tga b/linden/indra/newview/skins/default/textures/object_cylinder_active.tga
new file mode 100644
index 0000000..64132f9
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/object_cylinder_active.tga differ
diff --git a/linden/indra/newview/skins/default/textures/object_grass.tga b/linden/indra/newview/skins/default/textures/object_grass.tga
new file mode 100644
index 0000000..b0deccc
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/object_grass.tga differ
diff --git a/linden/indra/newview/skins/default/textures/object_grass_active.tga b/linden/indra/newview/skins/default/textures/object_grass_active.tga
new file mode 100644
index 0000000..265d489
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/object_grass_active.tga differ
diff --git a/linden/indra/newview/skins/default/textures/object_hemi_cone.tga b/linden/indra/newview/skins/default/textures/object_hemi_cone.tga
new file mode 100644
index 0000000..9465777
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/object_hemi_cone.tga differ
diff --git a/linden/indra/newview/skins/default/textures/object_hemi_cone_active.tga b/linden/indra/newview/skins/default/textures/object_hemi_cone_active.tga
new file mode 100644
index 0000000..bbe51a5
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/object_hemi_cone_active.tga differ
diff --git a/linden/indra/newview/skins/default/textures/object_hemi_cylinder.tga b/linden/indra/newview/skins/default/textures/object_hemi_cylinder.tga
new file mode 100644
index 0000000..db7132b
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/object_hemi_cylinder.tga differ
diff --git a/linden/indra/newview/skins/default/textures/object_hemi_cylinder_active.tga b/linden/indra/newview/skins/default/textures/object_hemi_cylinder_active.tga
new file mode 100644
index 0000000..1a86794
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/object_hemi_cylinder_active.tga differ
diff --git a/linden/indra/newview/skins/default/textures/object_hemi_sphere.tga b/linden/indra/newview/skins/default/textures/object_hemi_sphere.tga
new file mode 100644
index 0000000..0ce884c
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/object_hemi_sphere.tga differ
diff --git a/linden/indra/newview/skins/default/textures/object_hemi_sphere_active.tga b/linden/indra/newview/skins/default/textures/object_hemi_sphere_active.tga
new file mode 100644
index 0000000..e6e2ffb
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/object_hemi_sphere_active.tga differ
diff --git a/linden/indra/newview/skins/default/textures/object_prism.tga b/linden/indra/newview/skins/default/textures/object_prism.tga
new file mode 100644
index 0000000..0b25d11
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/object_prism.tga differ
diff --git a/linden/indra/newview/skins/default/textures/object_prism_active.tga b/linden/indra/newview/skins/default/textures/object_prism_active.tga
new file mode 100644
index 0000000..0486b3a
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/object_prism_active.tga differ
diff --git a/linden/indra/newview/skins/default/textures/object_pyramid.tga b/linden/indra/newview/skins/default/textures/object_pyramid.tga
new file mode 100644
index 0000000..f9ecde8
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/object_pyramid.tga differ
diff --git a/linden/indra/newview/skins/default/textures/object_pyramid_active.tga b/linden/indra/newview/skins/default/textures/object_pyramid_active.tga
new file mode 100644
index 0000000..f022c33
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/object_pyramid_active.tga differ
diff --git a/linden/indra/newview/skins/default/textures/object_ring.tga b/linden/indra/newview/skins/default/textures/object_ring.tga
new file mode 100644
index 0000000..6e891a3
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/object_ring.tga differ
diff --git a/linden/indra/newview/skins/default/textures/object_ring_active.tga b/linden/indra/newview/skins/default/textures/object_ring_active.tga
new file mode 100644
index 0000000..c0b8ca0
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/object_ring_active.tga differ
diff --git a/linden/indra/newview/skins/default/textures/object_sphere.tga b/linden/indra/newview/skins/default/textures/object_sphere.tga
new file mode 100644
index 0000000..22440ed
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/object_sphere.tga differ
diff --git a/linden/indra/newview/skins/default/textures/object_sphere_active.tga b/linden/indra/newview/skins/default/textures/object_sphere_active.tga
new file mode 100644
index 0000000..7f189cb
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/object_sphere_active.tga differ
diff --git a/linden/indra/newview/skins/default/textures/object_tetrahedron.tga b/linden/indra/newview/skins/default/textures/object_tetrahedron.tga
new file mode 100644
index 0000000..e61ee4e
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/object_tetrahedron.tga differ
diff --git a/linden/indra/newview/skins/default/textures/object_tetrahedron_active.tga b/linden/indra/newview/skins/default/textures/object_tetrahedron_active.tga
new file mode 100644
index 0000000..c34cc04
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/object_tetrahedron_active.tga differ
diff --git a/linden/indra/newview/skins/default/textures/object_torus.tga b/linden/indra/newview/skins/default/textures/object_torus.tga
new file mode 100644
index 0000000..e01e225
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/object_torus.tga differ
diff --git a/linden/indra/newview/skins/default/textures/object_torus_active.tga b/linden/indra/newview/skins/default/textures/object_torus_active.tga
new file mode 100644
index 0000000..275e63a
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/object_torus_active.tga differ
diff --git a/linden/indra/newview/skins/default/textures/object_tree.tga b/linden/indra/newview/skins/default/textures/object_tree.tga
new file mode 100644
index 0000000..0b5a1c7
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/object_tree.tga differ
diff --git a/linden/indra/newview/skins/default/textures/object_tree_active.tga b/linden/indra/newview/skins/default/textures/object_tree_active.tga
new file mode 100644
index 0000000..171cb41
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/object_tree_active.tga differ
diff --git a/linden/indra/newview/skins/default/textures/object_tube.tga b/linden/indra/newview/skins/default/textures/object_tube.tga
new file mode 100644
index 0000000..be8a341
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/object_tube.tga differ
diff --git a/linden/indra/newview/skins/default/textures/object_tube_active.tga b/linden/indra/newview/skins/default/textures/object_tube_active.tga
new file mode 100644
index 0000000..ea5dc2d
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/object_tube_active.tga differ
diff --git a/linden/indra/newview/skins/default/textures/octopus.png b/linden/indra/newview/skins/default/textures/octopus.png
new file mode 100644
index 0000000..91765f9
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/octopus.png differ
diff --git a/linden/indra/newview/skins/default/textures/pixiesmall.j2c b/linden/indra/newview/skins/default/textures/pixiesmall.j2c
new file mode 100644
index 0000000..a1ff640
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/pixiesmall.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/progress_fill.tga b/linden/indra/newview/skins/default/textures/progress_fill.tga
new file mode 100644
index 0000000..a913fe7
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/progress_fill.tga differ
diff --git a/linden/indra/newview/skins/default/textures/progressbar_fill.tga b/linden/indra/newview/skins/default/textures/progressbar_fill.tga
new file mode 100644
index 0000000..5b0dc64
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/progressbar_fill.tga differ
diff --git a/linden/indra/newview/skins/default/textures/progressbar_track.tga b/linden/indra/newview/skins/default/textures/progressbar_track.tga
new file mode 100644
index 0000000..cbe87e7
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/progressbar_track.tga differ
diff --git a/linden/indra/newview/skins/default/textures/propertyline.tga b/linden/indra/newview/skins/default/textures/propertyline.tga
new file mode 100644
index 0000000..0c504ee
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/propertyline.tga differ
diff --git a/linden/indra/newview/skins/default/textures/ptt_lock_off.tga b/linden/indra/newview/skins/default/textures/ptt_lock_off.tga
new file mode 100644
index 0000000..09c4798
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/ptt_lock_off.tga differ
diff --git a/linden/indra/newview/skins/default/textures/ptt_lock_on.tga b/linden/indra/newview/skins/default/textures/ptt_lock_on.tga
new file mode 100644
index 0000000..dfb8ce2
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/ptt_lock_on.tga differ
diff --git a/linden/indra/newview/skins/default/textures/radio_active_false.tga b/linden/indra/newview/skins/default/textures/radio_active_false.tga
new file mode 100644
index 0000000..9630373
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/radio_active_false.tga differ
diff --git a/linden/indra/newview/skins/default/textures/radio_active_true.tga b/linden/indra/newview/skins/default/textures/radio_active_true.tga
new file mode 100644
index 0000000..f49297f
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/radio_active_true.tga differ
diff --git a/linden/indra/newview/skins/default/textures/radio_inactive_false.tga b/linden/indra/newview/skins/default/textures/radio_inactive_false.tga
new file mode 100644
index 0000000..9f9589e
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/radio_inactive_false.tga differ
diff --git a/linden/indra/newview/skins/default/textures/radio_inactive_true.tga b/linden/indra/newview/skins/default/textures/radio_inactive_true.tga
new file mode 100644
index 0000000..ca69cc6
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/radio_inactive_true.tga differ
diff --git a/linden/indra/newview/skins/default/textures/resize_handle_bottom_right_blue.tga b/linden/indra/newview/skins/default/textures/resize_handle_bottom_right_blue.tga
new file mode 100644
index 0000000..f47aacf
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/resize_handle_bottom_right_blue.tga differ
diff --git a/linden/indra/newview/skins/default/textures/restore.tga b/linden/indra/newview/skins/default/textures/restore.tga
new file mode 100644
index 0000000..87910e2
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/restore.tga differ
diff --git a/linden/indra/newview/skins/default/textures/restore_inactive.tga b/linden/indra/newview/skins/default/textures/restore_inactive.tga
new file mode 100644
index 0000000..dbbec7e
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/restore_inactive.tga differ
diff --git a/linden/indra/newview/skins/default/textures/restore_pressed.tga b/linden/indra/newview/skins/default/textures/restore_pressed.tga
new file mode 100644
index 0000000..1922ca8
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/restore_pressed.tga differ
diff --git a/linden/indra/newview/skins/default/textures/rounded_square.j2c b/linden/indra/newview/skins/default/textures/rounded_square.j2c
new file mode 100644
index 0000000..c8bb572
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/rounded_square.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/rounded_square_soft.j2c b/linden/indra/newview/skins/default/textures/rounded_square_soft.j2c
new file mode 100644
index 0000000..56e56c1
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/rounded_square_soft.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/script_error.j2c b/linden/indra/newview/skins/default/textures/script_error.j2c
new file mode 100644
index 0000000..893cb64
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/script_error.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/scrollbutton_down_in_blue.tga b/linden/indra/newview/skins/default/textures/scrollbutton_down_in_blue.tga
new file mode 100644
index 0000000..5e73799
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/scrollbutton_down_in_blue.tga differ
diff --git a/linden/indra/newview/skins/default/textures/scrollbutton_down_out_blue.tga b/linden/indra/newview/skins/default/textures/scrollbutton_down_out_blue.tga
new file mode 100644
index 0000000..c5cf9bf
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/scrollbutton_down_out_blue.tga differ
diff --git a/linden/indra/newview/skins/default/textures/scrollbutton_left_in_blue.tga b/linden/indra/newview/skins/default/textures/scrollbutton_left_in_blue.tga
new file mode 100644
index 0000000..480842a
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/scrollbutton_left_in_blue.tga differ
diff --git a/linden/indra/newview/skins/default/textures/scrollbutton_left_out_blue.tga b/linden/indra/newview/skins/default/textures/scrollbutton_left_out_blue.tga
new file mode 100644
index 0000000..71aad79
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/scrollbutton_left_out_blue.tga differ
diff --git a/linden/indra/newview/skins/default/textures/scrollbutton_right_in_blue.tga b/linden/indra/newview/skins/default/textures/scrollbutton_right_in_blue.tga
new file mode 100644
index 0000000..6d7f13b
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/scrollbutton_right_in_blue.tga differ
diff --git a/linden/indra/newview/skins/default/textures/scrollbutton_right_out_blue.tga b/linden/indra/newview/skins/default/textures/scrollbutton_right_out_blue.tga
new file mode 100644
index 0000000..0edc59a
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/scrollbutton_right_out_blue.tga differ
diff --git a/linden/indra/newview/skins/default/textures/scrollbutton_up_in_blue.tga b/linden/indra/newview/skins/default/textures/scrollbutton_up_in_blue.tga
new file mode 100644
index 0000000..4c6a8fe
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/scrollbutton_up_in_blue.tga differ
diff --git a/linden/indra/newview/skins/default/textures/scrollbutton_up_out_blue.tga b/linden/indra/newview/skins/default/textures/scrollbutton_up_out_blue.tga
new file mode 100644
index 0000000..5cd5dff
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/scrollbutton_up_out_blue.tga differ
diff --git a/linden/indra/newview/skins/default/textures/silhouette.j2c b/linden/indra/newview/skins/default/textures/silhouette.j2c
new file mode 100644
index 0000000..3859d4c
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/silhouette.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/skin_thumbnail_dark.png b/linden/indra/newview/skins/default/textures/skin_thumbnail_dark.png
new file mode 100644
index 0000000..2cac829
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/skin_thumbnail_dark.png differ
diff --git a/linden/indra/newview/skins/default/textures/skin_thumbnail_default.png b/linden/indra/newview/skins/default/textures/skin_thumbnail_default.png
new file mode 100644
index 0000000..40fe64b
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/skin_thumbnail_default.png differ
diff --git a/linden/indra/newview/skins/default/textures/skin_thumbnail_emerald.png b/linden/indra/newview/skins/default/textures/skin_thumbnail_emerald.png
new file mode 100644
index 0000000..ab35bc0
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/skin_thumbnail_emerald.png differ
diff --git a/linden/indra/newview/skins/default/textures/skin_thumbnail_gemini.png b/linden/indra/newview/skins/default/textures/skin_thumbnail_gemini.png
new file mode 100644
index 0000000..156da53
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/skin_thumbnail_gemini.png differ
diff --git a/linden/indra/newview/skins/default/textures/skin_thumbnail_gred.png b/linden/indra/newview/skins/default/textures/skin_thumbnail_gred.png
new file mode 100644
index 0000000..8271354
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/skin_thumbnail_gred.png differ
diff --git a/linden/indra/newview/skins/default/textures/skin_thumbnail_pslgreen.png b/linden/indra/newview/skins/default/textures/skin_thumbnail_pslgreen.png
new file mode 100644
index 0000000..73e117e
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/skin_thumbnail_pslgreen.png differ
diff --git a/linden/indra/newview/skins/default/textures/skin_thumbnail_pslpurple.png b/linden/indra/newview/skins/default/textures/skin_thumbnail_pslpurple.png
new file mode 100644
index 0000000..902ad82
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/skin_thumbnail_pslpurple.png differ
diff --git a/linden/indra/newview/skins/default/textures/skin_thumbnail_ruby.png b/linden/indra/newview/skins/default/textures/skin_thumbnail_ruby.png
new file mode 100644
index 0000000..d45e75a
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/skin_thumbnail_ruby.png differ
diff --git a/linden/indra/newview/skins/default/textures/skin_thumbnail_saphire.png b/linden/indra/newview/skins/default/textures/skin_thumbnail_saphire.png
new file mode 100644
index 0000000..7ec8e19
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/skin_thumbnail_saphire.png differ
diff --git a/linden/indra/newview/skins/default/textures/skin_thumbnail_silver.png b/linden/indra/newview/skins/default/textures/skin_thumbnail_silver.png
new file mode 100644
index 0000000..51707bb
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/skin_thumbnail_silver.png differ
diff --git a/linden/indra/newview/skins/default/textures/slim_icon_16_viewer.tga b/linden/indra/newview/skins/default/textures/slim_icon_16_viewer.tga
new file mode 100644
index 0000000..552181d
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/slim_icon_16_viewer.tga differ
diff --git a/linden/indra/newview/skins/default/textures/sm_rounded_corners_simple.tga b/linden/indra/newview/skins/default/textures/sm_rounded_corners_simple.tga
new file mode 100644
index 0000000..85157e4
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/sm_rounded_corners_simple.tga differ
diff --git a/linden/indra/newview/skins/default/textures/smicon_warn.tga b/linden/indra/newview/skins/default/textures/smicon_warn.tga
new file mode 100644
index 0000000..90ccaa0
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/smicon_warn.tga differ
diff --git a/linden/indra/newview/skins/default/textures/spacer24.tga b/linden/indra/newview/skins/default/textures/spacer24.tga
new file mode 100644
index 0000000..c7cab6b
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/spacer24.tga differ
diff --git a/linden/indra/newview/skins/default/textures/spacer35.tga b/linden/indra/newview/skins/default/textures/spacer35.tga
new file mode 100644
index 0000000..b88bc66
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/spacer35.tga differ
diff --git a/linden/indra/newview/skins/default/textures/spin_down_in_blue.tga b/linden/indra/newview/skins/default/textures/spin_down_in_blue.tga
new file mode 100644
index 0000000..b9eb36b
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/spin_down_in_blue.tga differ
diff --git a/linden/indra/newview/skins/default/textures/spin_down_out_blue.tga b/linden/indra/newview/skins/default/textures/spin_down_out_blue.tga
new file mode 100644
index 0000000..c9cb5e8
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/spin_down_out_blue.tga differ
diff --git a/linden/indra/newview/skins/default/textures/spin_up_in_blue.tga b/linden/indra/newview/skins/default/textures/spin_up_in_blue.tga
new file mode 100644
index 0000000..b604b88
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/spin_up_in_blue.tga differ
diff --git a/linden/indra/newview/skins/default/textures/spin_up_out_blue.tga b/linden/indra/newview/skins/default/textures/spin_up_out_blue.tga
new file mode 100644
index 0000000..4e3941e
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/spin_up_out_blue.tga differ
diff --git a/linden/indra/newview/skins/default/textures/square_btn_32x128.tga b/linden/indra/newview/skins/default/textures/square_btn_32x128.tga
new file mode 100644
index 0000000..d7ce58d
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/square_btn_32x128.tga differ
diff --git a/linden/indra/newview/skins/default/textures/square_btn_selected_32x128.tga b/linden/indra/newview/skins/default/textures/square_btn_selected_32x128.tga
new file mode 100644
index 0000000..59ca365
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/square_btn_selected_32x128.tga differ
diff --git a/linden/indra/newview/skins/default/textures/startup_logo.j2c b/linden/indra/newview/skins/default/textures/startup_logo.j2c
new file mode 100644
index 0000000..d1b991f
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/startup_logo.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/status_busy.tga b/linden/indra/newview/skins/default/textures/status_busy.tga
new file mode 100644
index 0000000..7743d9c
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/status_busy.tga differ
diff --git a/linden/indra/newview/skins/default/textures/status_buy_currency.tga b/linden/indra/newview/skins/default/textures/status_buy_currency.tga
new file mode 100644
index 0000000..e4dc5f2
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/status_buy_currency.tga differ
diff --git a/linden/indra/newview/skins/default/textures/status_buy_currency_pressed.tga b/linden/indra/newview/skins/default/textures/status_buy_currency_pressed.tga
new file mode 100644
index 0000000..22cec7a
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/status_buy_currency_pressed.tga differ
diff --git a/linden/indra/newview/skins/default/textures/status_buy_land.tga b/linden/indra/newview/skins/default/textures/status_buy_land.tga
new file mode 100644
index 0000000..53ed744
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/status_buy_land.tga differ
diff --git a/linden/indra/newview/skins/default/textures/status_buy_land_pressed.tga b/linden/indra/newview/skins/default/textures/status_buy_land_pressed.tga
new file mode 100644
index 0000000..c51c031
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/status_buy_land_pressed.tga differ
diff --git a/linden/indra/newview/skins/default/textures/status_health.tga b/linden/indra/newview/skins/default/textures/status_health.tga
new file mode 100644
index 0000000..3d5f455
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/status_health.tga differ
diff --git a/linden/indra/newview/skins/default/textures/status_money.tga b/linden/indra/newview/skins/default/textures/status_money.tga
new file mode 100644
index 0000000..d5be31f
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/status_money.tga differ
diff --git a/linden/indra/newview/skins/default/textures/status_no_build.tga b/linden/indra/newview/skins/default/textures/status_no_build.tga
new file mode 100644
index 0000000..8e471e1
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/status_no_build.tga differ
diff --git a/linden/indra/newview/skins/default/textures/status_no_fly.tga b/linden/indra/newview/skins/default/textures/status_no_fly.tga
new file mode 100644
index 0000000..cde2700
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/status_no_fly.tga differ
diff --git a/linden/indra/newview/skins/default/textures/status_no_push.tga b/linden/indra/newview/skins/default/textures/status_no_push.tga
new file mode 100644
index 0000000..5ccbfa5
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/status_no_push.tga differ
diff --git a/linden/indra/newview/skins/default/textures/status_no_scripts.tga b/linden/indra/newview/skins/default/textures/status_no_scripts.tga
new file mode 100644
index 0000000..52ecdb1
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/status_no_scripts.tga differ
diff --git a/linden/indra/newview/skins/default/textures/status_no_voice.tga b/linden/indra/newview/skins/default/textures/status_no_voice.tga
new file mode 100644
index 0000000..4ab4498
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/status_no_voice.tga differ
diff --git a/linden/indra/newview/skins/default/textures/status_script_debug.tga b/linden/indra/newview/skins/default/textures/status_script_debug.tga
new file mode 100644
index 0000000..6fca614
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/status_script_debug.tga differ
diff --git a/linden/indra/newview/skins/default/textures/status_search.tga b/linden/indra/newview/skins/default/textures/status_search.tga
new file mode 100644
index 0000000..3ac10c4
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/status_search.tga differ
diff --git a/linden/indra/newview/skins/default/textures/status_search_btn.png b/linden/indra/newview/skins/default/textures/status_search_btn.png
new file mode 100644
index 0000000..67f6133
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/status_search_btn.png differ
diff --git a/linden/indra/newview/skins/default/textures/status_search_btn_pressed.png b/linden/indra/newview/skins/default/textures/status_search_btn_pressed.png
new file mode 100644
index 0000000..1437273
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/status_search_btn_pressed.png differ
diff --git a/linden/indra/newview/skins/default/textures/status_voice.tga b/linden/indra/newview/skins/default/textures/status_voice.tga
new file mode 100644
index 0000000..4ab4498
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/status_voice.tga differ
diff --git a/linden/indra/newview/skins/default/textures/tab_background_darkpurple.tga b/linden/indra/newview/skins/default/textures/tab_background_darkpurple.tga
new file mode 100644
index 0000000..8169f98
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/tab_background_darkpurple.tga differ
diff --git a/linden/indra/newview/skins/default/textures/tab_background_lightgrey.tga b/linden/indra/newview/skins/default/textures/tab_background_lightgrey.tga
new file mode 100644
index 0000000..c2f8818
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/tab_background_lightgrey.tga differ
diff --git a/linden/indra/newview/skins/default/textures/tab_background_purple.tga b/linden/indra/newview/skins/default/textures/tab_background_purple.tga
new file mode 100644
index 0000000..aa01b3c
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/tab_background_purple.tga differ
diff --git a/linden/indra/newview/skins/default/textures/tab_bottom_blue.tga b/linden/indra/newview/skins/default/textures/tab_bottom_blue.tga
new file mode 100644
index 0000000..0734279
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/tab_bottom_blue.tga differ
diff --git a/linden/indra/newview/skins/default/textures/tab_bottom_selected_blue.tga b/linden/indra/newview/skins/default/textures/tab_bottom_selected_blue.tga
new file mode 100644
index 0000000..e7c2afd
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/tab_bottom_selected_blue.tga differ
diff --git a/linden/indra/newview/skins/default/textures/tab_left.tga b/linden/indra/newview/skins/default/textures/tab_left.tga
new file mode 100644
index 0000000..7e3c4a5
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/tab_left.tga differ
diff --git a/linden/indra/newview/skins/default/textures/tab_left_selected.tga b/linden/indra/newview/skins/default/textures/tab_left_selected.tga
new file mode 100644
index 0000000..944aa35
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/tab_left_selected.tga differ
diff --git a/linden/indra/newview/skins/default/textures/tab_top_blue.tga b/linden/indra/newview/skins/default/textures/tab_top_blue.tga
new file mode 100644
index 0000000..7ec2ba3
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/tab_top_blue.tga differ
diff --git a/linden/indra/newview/skins/default/textures/tab_top_selected_blue.tga b/linden/indra/newview/skins/default/textures/tab_top_selected_blue.tga
new file mode 100644
index 0000000..375ceea
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/tab_top_selected_blue.tga differ
diff --git a/linden/indra/newview/skins/default/textures/tabarea.tga b/linden/indra/newview/skins/default/textures/tabarea.tga
new file mode 100644
index 0000000..5517aeb
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/tabarea.tga differ
diff --git a/linden/indra/newview/skins/default/textures/tearoff_pressed.tga b/linden/indra/newview/skins/default/textures/tearoff_pressed.tga
new file mode 100644
index 0000000..620d109
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/tearoff_pressed.tga differ
diff --git a/linden/indra/newview/skins/default/textures/tearoffbox.tga b/linden/indra/newview/skins/default/textures/tearoffbox.tga
new file mode 100644
index 0000000..0670d2e
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/tearoffbox.tga differ
diff --git a/linden/indra/newview/skins/default/textures/tool_dozer.tga b/linden/indra/newview/skins/default/textures/tool_dozer.tga
new file mode 100644
index 0000000..ec3a7bf
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/tool_dozer.tga differ
diff --git a/linden/indra/newview/skins/default/textures/tool_dozer_active.tga b/linden/indra/newview/skins/default/textures/tool_dozer_active.tga
new file mode 100644
index 0000000..714815a
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/tool_dozer_active.tga differ
diff --git a/linden/indra/newview/skins/default/textures/tool_zoom.tga b/linden/indra/newview/skins/default/textures/tool_zoom.tga
new file mode 100644
index 0000000..5558f3f
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/tool_zoom.tga differ
diff --git a/linden/indra/newview/skins/default/textures/tool_zoom_active.tga b/linden/indra/newview/skins/default/textures/tool_zoom_active.tga
new file mode 100644
index 0000000..8759546
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/tool_zoom_active.tga differ
diff --git a/linden/indra/newview/skins/default/textures/toolbar_bg.tga b/linden/indra/newview/skins/default/textures/toolbar_bg.tga
new file mode 100644
index 0000000..3a05776
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/toolbar_bg.tga differ
diff --git a/linden/indra/newview/skins/default/textures/toolbar_btn_disabled.tga b/linden/indra/newview/skins/default/textures/toolbar_btn_disabled.tga
new file mode 100644
index 0000000..8bfabf8
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/toolbar_btn_disabled.tga differ
diff --git a/linden/indra/newview/skins/default/textures/toolbar_btn_enabled.tga b/linden/indra/newview/skins/default/textures/toolbar_btn_enabled.tga
new file mode 100644
index 0000000..69a3315
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/toolbar_btn_enabled.tga differ
diff --git a/linden/indra/newview/skins/default/textures/toolbar_btn_selected.tga b/linden/indra/newview/skins/default/textures/toolbar_btn_selected.tga
new file mode 100644
index 0000000..38d280a
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/toolbar_btn_selected.tga differ
diff --git a/linden/indra/newview/skins/default/textures/toolbar_tab.tga b/linden/indra/newview/skins/default/textures/toolbar_tab.tga
new file mode 100644
index 0000000..5ea1a28
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/toolbar_tab.tga differ
diff --git a/linden/indra/newview/skins/default/textures/up_arrow.png b/linden/indra/newview/skins/default/textures/up_arrow.png
new file mode 100644
index 0000000..fe68ad4
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/up_arrow.png differ
diff --git a/linden/indra/newview/skins/default/textures/up_arrow.tga b/linden/indra/newview/skins/default/textures/up_arrow.tga
new file mode 100644
index 0000000..c2bd8cc
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/up_arrow.tga differ
diff --git a/linden/indra/newview/skins/default/textures/uv_test1.bmp b/linden/indra/newview/skins/default/textures/uv_test1.bmp
new file mode 100644
index 0000000..a6ad9bc
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/uv_test1.bmp differ
diff --git a/linden/indra/newview/skins/default/textures/uv_test1.j2c b/linden/indra/newview/skins/default/textures/uv_test1.j2c
new file mode 100644
index 0000000..3d5b541
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/uv_test1.j2c differ
diff --git a/linden/indra/newview/skins/default/textures/uv_test2.tga b/linden/indra/newview/skins/default/textures/uv_test2.tga
new file mode 100644
index 0000000..a16000d
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/uv_test2.tga differ
diff --git a/linden/indra/newview/skins/default/textures/view-refresh-5.png b/linden/indra/newview/skins/default/textures/view-refresh-5.png
new file mode 100644
index 0000000..cb5d1b9
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/view-refresh-5.png differ
diff --git a/linden/indra/newview/skins/default/textures/white.tga b/linden/indra/newview/skins/default/textures/white.tga
new file mode 100644
index 0000000..9fe6863
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/white.tga differ
diff --git a/linden/indra/newview/skins/default/textures/zombiecat.png b/linden/indra/newview/skins/default/textures/zombiecat.png
new file mode 100644
index 0000000..93392c0
Binary files /dev/null and b/linden/indra/newview/skins/default/textures/zombiecat.png differ
diff --git a/linden/indra/newview/skins/gemini/colors.xml b/linden/indra/newview/skins/gemini/colors.xml
new file mode 100644
index 0000000..71a7787
--- /dev/null
+++ b/linden/indra/newview/skins/gemini/colors.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<settings version = "101">
+</settings>
diff --git a/linden/indra/newview/skins/gemini/colors_base.xml b/linden/indra/newview/skins/gemini/colors_base.xml
new file mode 100644
index 0000000..935c6d3
--- /dev/null
+++ b/linden/indra/newview/skins/gemini/colors_base.xml
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<settings version = "101">
+    
+<!-- WINDOWS -->
+<TitleBarFocusColor value="0, 0, 0, 0" />	<!-- Focused window title bar highlight, no equivalent for unfocused windows -->
+<FloaterFocusBorderColor value="0, 0, 0, 50" />
+<FloaterUnfocusBorderColor value="0, 0, 0, 80" />
+<FocusBackgroundColor value="33, 33, 33, 255" />	<!-- Background color of focused floaters -->
+<DefaultBackgroundColor value="33, 33, 33, 192" />	<!-- Background color for unfocused floaters -->
+<ColorDropShadow value="0, 0, 0, 180" />		<!-- The drop shadow behind windows and menus -->
+<DefaultHighlightDark value="26, 26, 26, 255" />
+<DefaultHighlightLight value="66, 66, 66, 255" />
+<DefaultShadowDark value="26, 26, 26, 255" />
+<DefaultShadowLight value="0, 0, 0, 255" />
+
+<!-- LABELS -->
+<LabelDisabledColor value="255, 255, 255, 30" />
+<LabelSelectedColor value="255, 255, 255, 128" />
+<LabelSelectedDisabledColor value="255, 255, 255, 80" />
+<LabelTextColor value="255, 255, 255, 90" />
+
+<!-- LOGIN -->
+<LoginProgressBarBgColor value="255, 255, 255, 255" />
+<LoginProgressBarFgColor value="255, 255, 255, 255" />
+<LoginProgressBoxBorderColor value="0, 30, 60, 0" />
+<LoginProgressBoxCenterColor value="0, 0, 0, 200" />
+<LoginProgressBoxShadowColor value="0, 0, 0, 200" />
+<LoginProgressBoxTextColor value="255, 255, 255, 255"/>
+
+<!-- BUTTONS -->
+<ButtonLabelColor value="255, 255, 255, 128" /> 	<!-- Text labels for buttons, like the "OK" text -->
+<ButtonLabelSelectedColor value="255, 255, 255, 255" />
+<ButtonLabelDisabledColor value="255, 255, 255, 66" />
+<ButtonLabelSelectedDisabledColor value="255, 255, 255, 66" />
+<ButtonSelectedBgColor value="62, 62, 62, 255" />
+<ButtonSelectedColor value="255, 255, 255, 255" />
+<ButtonUnselectedBgColor value="62, 62, 62, 255" />
+<ButtonUnselectedFgColor value="255, 255, 255, 255" />
+<ButtonBorderColor value="239, 156, 0, 255" />
+<ButtonFlashBgColor value="255, 255, 255, 128" />
+<ButtonColor value="255, 255, 255, 128" /> 		<!-- Blended with button art, usually left as opaque white -->
+<ButtonImageColor value="255, 255, 255, 128" /> 	<!-- Blended with button art, usually left as opaque white -->
+
+<!-- SLIDERS -->
+<SliderDisabledThumbColor value="0, 0, 0, 255" />
+<SliderThumbCenterColor value="200, 200, 200, 255" />
+<SliderThumbOutlineColor value="255, 255, 255, 255" />
+<SliderTrackColor value="255, 255, 255, 255" />
+
+<!-- TEXTFIELDS -->
+<TextBgFocusColor value="11, 11, 11, 255" />		<!-- Text field background when receiving input (focused) -->
+<TextBgReadOnlyColor value="11, 11, 11, 160" />	        <!-- Text field background when read-only -->
+<TextBgWriteableColor value="11, 11, 11, 80" />	<!-- Text field background when not receiving input (unfocused) -->
+<TextCursorColor value="128, 128, 128, 200" />
+<TextFgColor value="255, 255, 255, 222" />
+<TextFgReadOnlyColor value="255, 255, 255, 80" />
+<TextFgTentativeColor value="255, 255, 255, 80" />
+<TextEmbeddedItemReadOnlyColor value="255, 255, 255, 80" />	<!-- i.e. About Land name that you don't own -->
+<TextEmbeddedItemColor value="0, 255, 128, 255" />
+<TextDefaultColor value="255, 255, 255, 222"/>
+<TextLinkColor value="144, 165, 208, 255"/>
+<TextLinkHoverColor value="255, 255, 255, 255"/>
+  
+<!-- LISTBOXES -->
+<ScrollBgReadOnlyColor value="33, 33, 33, 80" />
+<ScrollBgWriteableColor value="33, 33, 33, 80" />
+<ScrollBGStripeColor value="100, 100, 100, 25" />
+<ScrollDisabledColor value="33, 33, 33, 204" />
+<ScrollSelectedBGColor value="222, 222, 222, 150" />
+<ScrollSelectedFGColor value="255, 255, 255, 255" />	            <!-- Text color -->
+<ScrollUnselectedColor value="222, 222, 222, 150" />	            <!-- Text color -->
+<ScrollHighlightedColor value="222, 222, 222, 80" />	    <!-- Hover color -->
+<ScrollbarThumbColor value="66, 66, 66, 80" />            <!-- Scroll bar-->
+<ScrollbarTrackColor value="10, 10, 10, 80" />          <!-- Scroll bar background-->
+
+<!-- MENUS -->
+<MenuBarBgColor value="33, 33, 33, 255" />
+<MenuBarGodBgColor value="33, 33, 33, 255" />
+<MenuNonProductionGodBgColor value="0, 128, 0, 255" />
+<MenuNonProductionBgColor value="128, 0, 0, 255" />
+<MenuDefaultBgColor value="33, 33, 33, 255" />
+<MenuItemDisabledColor value="125, 125, 125, 75" />        <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
+<MenuItemEnabledColor value="255, 255, 255, 255" />         <!-- Menu text color; also text color for pie menus and treeviews (like Inventory) -->
+<MenuItemHighlightBgColor value="80, 80, 80, 200" />
+<MenuItemHighlightFgColor value="255, 255, 255, 255" />	    <!-- Highlighted menu text color; also treeview node selection highlight -->
+<MenuPopupBgColor value="33, 33, 33, 255" />
+
+<!--  PIE MENUS -->
+<PieMenuBgColor value="33, 33, 33, 128" />
+<PieMenuLineColor value="0, 0, 0, 128" />
+<PieMenuSelectedColor value="255, 255, 255, 128" />
+
+<!-- TOOLTIPS -->
+<ToolTipBgColor value="33, 33, 33, 255" />
+<ToolTipBorderColor value="11, 11, 11, 255" />
+<ToolTipTextColor value="255, 255, 255, 255" />
+
+<!-- NOTIFICATION POP-UPS -->
+<NotifyBoxColor value="66, 66, 66, 255" />
+<NotifyTextColor value="255, 255, 255, 128" />
+<NotifyCautionBoxColor value="254, 209, 118, 255" /> 	<!-- the background color of caution permissions prompts -->
+<NotifyCautionWarnColor value="0, 0, 0, 255" /> 	<!-- the foreground color of the special title text in caution permissions prompts -->
+<GroupNotifyBoxColor value="66, 66, 66, 255" />
+<GroupNotifyTextColor value="255, 255, 255, 128" />
+
+<!-- CHAT AND IM HISTORY TEXTBOX COLORS -->
+<ChatHistoryBgColor value="0, 0, 0, 0" />
+<ChatHistoryTextColor value="255, 255, 255, 255" />
+<IMHistoryBgColor value="0, 0, 0, 0" />
+<IMHistoryTextColor value="255, 255, 255, 255" />
+
+<!-- IN-WORLD SELECTION -->
+<SilhouetteParentColor value="255, 255, 0, 255" />
+<SilhouetteChildColor value="32, 106, 196, 255" />
+<HighlightParentColor value="171, 212, 245, 255" />
+<HighlightChildColor value="171, 212, 245, 255" />
+<HighlightInspectColor value="255, 0, 255, 255" />
+
+<!-- EDIT MODE GRID -->
+<GridFocusPointColor value="255, 255, 255, 128" />
+<GridlineColor value="255, 255, 255, 255" />
+<GridlineBGColor value="235, 235, 255, 200" />
+<GridlineShadowColor value="0, 0, 0, 80" />
+
+<!-- PROPERTY LINES -->
+<PropertyColorAvail value="0, 0, 0, 0" />
+<PropertyColorGroup value="0, 184, 184, 102" />
+<PropertyColorOther value="255, 0, 0, 102" />
+<PropertyColorSelf value="0, 255, 0, 102" />
+<PropertyColorForSale value="255, 128, 0, 102" />
+<PropertyColorAuction value="128, 0, 255, 102" />	<!-- Match the color on the world map -->
+
+<!-- Icon Enable/Disable -->
+<IconEnabledColor value="255, 255, 255, 255"/>
+<IconDisabledColor value="255, 255, 255, 200"/>
+
+<!-- MAP -->
+<MapAvatar value="70, 255, 70, 255" />
+<MapFriend value="255, 210, 150, 255" />
+<MapMuted value="110, 110, 110, 220" />
+
+<!-- MINI-MAP -->
+<NetMapBackgroundColor value="0, 0, 0, 77" />
+<NetMapYouOwnAboveWater value="0, 255, 255, 255" />
+<NetMapYouOwnBelowWater value="0, 200, 200, 255" />
+<NetMapGroupOwnAboveWater value="255, 0, 255, 255" />
+<NetMapGroupOwnBelowWater value="200, 0, 200, 255" />
+<NetMapOtherOwnAboveWater value="60, 60, 60, 255" />
+<NetMapOtherOwnBelowWater value="30, 30, 30, 255" />
+<NetMapThisRegion value="255, 255, 255, 255" />
+<NetMapLiveRegion value="204, 204, 204, 255" />
+<NetMapDeadRegion value="255, 128, 128, 255" />
+<NetMapFrustum value="255, 255, 255, 70" />
+<NetMapFrustumRotating value="255, 255, 255, 100" />
+
+<!-- HELP WINDOW -->
+<HelpBgColor value="200, 209, 204, 255" />
+<HelpFgColor value="0, 0, 0, 255" />
+<HelpScrollTrackColor value="183, 184, 188, 255" />
+<HelpScrollThumbColor value="80, 96, 124, 255" />
+<HelpScrollHighlightColor value="115, 132, 155, 255" />
+<HelpScrollShadowColor value="0, 0, 0, 255" />
+
+<!-- MISC -->
+<AvatarNameColor value="251, 175, 93, 255" /> 		<!-- Text color of avatar nametags -->
+<FocusColor value="255, 255, 255, 20" /> 		<!-- Color of the glow around UI controls with keyboard focus -->
+<FloaterButtonImageColor value="255, 255, 255, 80" /> 	<!-- The floater buttons (like the close box) are white images that receive this color. -->
+<ButtonCautionImageColor value="255, 255,  255, 255" />	<!-- Match the caution dialog buttons to the default -->
+<HealthTextColor value="255, 255, 255, 255" />
+<MapAutopilotColor value="255, 255, 255, 255" />
+<ContextSilhouetteColor value="255, 255, 255, 255" />	<!-- For "context" highlighting, i.e. pie menu -->
+<ScriptBgReadOnlyColor value="100, 100, 100, 255" />
+<ParcelTextColor value="144, 165, 208, 255" />		<!-- Parcel name on menu bar, normal state -->
+<ParcelHoverColor value="255, 255, 255, 255" />		<!-- Parcel name on menu bar, hover state -->
+<TimeTextColor value="255, 255, 255, 255" />		<!-- SL Time on menu bar -->
+<BalanceTextColor value="255, 255, 255, 255" />		<!-- Linden dollar balance on menu bar -->
+<HealthTextColor value="255, 255, 255, 255" />		<!-- Damage meter text on menu bar -->
+<GroupOverTierColor value="255, 255, 255, 255" />		<!-- Warning text in Group Info window -->
+<FilterBackgroundColor value="0, 0, 0, 255" />         <!-- Matching region of Inventory search text -->
+<FilterTextColor value="255, 255, 255, 128" />
+<InventoryItemSuffixColor value="128, 128, 128, 255" />     <!-- "worn", "no modify", etc-->
+<InventorySearchStatusColor value="255, 255, 255, 128" />
+<ConsoleBackground value="0, 0, 0, 255" />
+<FolderViewLoadingMessageTextColor value="255, 255, 255, 128"/>     <!-- "loading..." in the inv -->
+<InventoryBackgroundColor value="11, 11, 11, 80"/>
+<DefaultListText value="255, 255, 255, 255"/> <!-- We are replacing all the hardcoded black text with this color so we can make skins with white text on dark background -->
+<ComboBoxBg value="11, 11, 11, 255"/>
+<AvatarListTextDistNormalRange value="255, 255, 255, 255"/>
+<AvatarListTextDistShoutRange value="255, 255, 255, 128"/>
+<AvatarListTextDistOver value="255, 66, 66, 128"/>
+<AvatarListTextAgeYoung value="255, 0, 0, 255"/>
+<AvatarListTextAgeNormal value="255, 255, 255, 255"/>
+
+<!-- Alert box colors -->
+<AlertBoxColor value="33, 33, 33, 255" />               <!-- Warnings floaters, like when returning objects -->
+<AlertTextColor value="128, 128, 128, 255" />
+<AlertCautionBoxColor value="254, 209, 118, 255" />	<!-- Background color of caution alerts -->
+<AlertCautionTextColor value="0, 0, 0, 255" />		<!-- Foreground color of the special title text in caution alerts -->
+
+<!--  Multi sliders, as in the sky animation setting -->
+<MultiSliderDisabledThumbColor value="0, 0, 0, 255"/>
+<MultiSliderThumbCenterColor value="183, 184, 188, 255"/>
+<MultiSliderThumbOutlineColor value="0, 0, 0, 255"/>
+<MultiSliderTrackColor value="30, 30, 30, 255"/>
+<MultiSliderThumbCenterSelectedColor value="255, 50, 50, 255"/>
+<MultiSliderTriangleColor value="255, 255, 50, 255"/>
+
+</settings>
diff --git a/linden/indra/newview/skins/gemini/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga b/linden/indra/newview/skins/gemini/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga
new file mode 100644
index 0000000..4937760
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/0498c309-5306-43cd-82a2-ae31d096cdef.tga b/linden/indra/newview/skins/gemini/textures/0498c309-5306-43cd-82a2-ae31d096cdef.tga
new file mode 100644
index 0000000..d7097e3
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/0498c309-5306-43cd-82a2-ae31d096cdef.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/07d0ea4c-af0c-aad1-dbbf-c24020ff2b80.tga b/linden/indra/newview/skins/gemini/textures/07d0ea4c-af0c-aad1-dbbf-c24020ff2b80.tga
new file mode 100644
index 0000000..5cf32fb
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/07d0ea4c-af0c-aad1-dbbf-c24020ff2b80.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/09a324a8-acc1-d9cd-2cbd-7465d90d3a98.tga b/linden/indra/newview/skins/gemini/textures/09a324a8-acc1-d9cd-2cbd-7465d90d3a98.tga
new file mode 100644
index 0000000..77d4707
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/09a324a8-acc1-d9cd-2cbd-7465d90d3a98.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/0e82d24e-ed45-41bc-b090-94c97c1caab2.tga b/linden/indra/newview/skins/gemini/textures/0e82d24e-ed45-41bc-b090-94c97c1caab2.tga
new file mode 100644
index 0000000..b2e5609
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/0e82d24e-ed45-41bc-b090-94c97c1caab2.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/111b39de-8928-4690-b7b2-e17d5c960277.tga b/linden/indra/newview/skins/gemini/textures/111b39de-8928-4690-b7b2-e17d5c960277.tga
new file mode 100644
index 0000000..0febf4e
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/111b39de-8928-4690-b7b2-e17d5c960277.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/13dd1d96-6836-461e-8a4c-36003065c59b.tga b/linden/indra/newview/skins/gemini/textures/13dd1d96-6836-461e-8a4c-36003065c59b.tga
new file mode 100644
index 0000000..031b3ad
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/13dd1d96-6836-461e-8a4c-36003065c59b.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/34c9398d-bb78-4643-9633-46a2fa3e9637.tga b/linden/indra/newview/skins/gemini/textures/34c9398d-bb78-4643-9633-46a2fa3e9637.tga
new file mode 100644
index 0000000..58cd2cd
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/34c9398d-bb78-4643-9633-46a2fa3e9637.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/37c8e000-6aa2-41ef-8f86-e0c2e60bfa42.tga b/linden/indra/newview/skins/gemini/textures/37c8e000-6aa2-41ef-8f86-e0c2e60bfa42.tga
new file mode 100644
index 0000000..879b9e6
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/37c8e000-6aa2-41ef-8f86-e0c2e60bfa42.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/39801651-26cb-4926-af57-7af9352c273c.tga b/linden/indra/newview/skins/gemini/textures/39801651-26cb-4926-af57-7af9352c273c.tga
new file mode 100644
index 0000000..f2fdd07
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/39801651-26cb-4926-af57-7af9352c273c.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga b/linden/indra/newview/skins/gemini/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga
new file mode 100644
index 0000000..fb6dac0
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/43f0a590-f3d3-48b5-b460-f5b3e6e03626.tga b/linden/indra/newview/skins/gemini/textures/43f0a590-f3d3-48b5-b460-f5b3e6e03626.tga
new file mode 100644
index 0000000..340f321
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/43f0a590-f3d3-48b5-b460-f5b3e6e03626.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/47a8c844-cd2a-4b1a-be01-df8b1612fe5d.tga b/linden/indra/newview/skins/gemini/textures/47a8c844-cd2a-4b1a-be01-df8b1612fe5d.tga
new file mode 100644
index 0000000..505f6ed
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/47a8c844-cd2a-4b1a-be01-df8b1612fe5d.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/5748decc-f629-461c-9a36-a35a221fe21f.tga b/linden/indra/newview/skins/gemini/textures/5748decc-f629-461c-9a36-a35a221fe21f.tga
new file mode 100644
index 0000000..55e3793
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/5748decc-f629-461c-9a36-a35a221fe21f.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/6002a571-549c-472c-9443-9ab35b1a55ed.tga b/linden/indra/newview/skins/gemini/textures/6002a571-549c-472c-9443-9ab35b1a55ed.tga
new file mode 100644
index 0000000..fc720c8
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/6002a571-549c-472c-9443-9ab35b1a55ed.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/73577b7b-19c3-4050-a19d-36bc2408aa79.tga b/linden/indra/newview/skins/gemini/textures/73577b7b-19c3-4050-a19d-36bc2408aa79.tga
new file mode 100644
index 0000000..35846ce
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/73577b7b-19c3-4050-a19d-36bc2408aa79.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/74e1a96f-4833-a24d-a1bb-1bce1468b0e7.tga b/linden/indra/newview/skins/gemini/textures/74e1a96f-4833-a24d-a1bb-1bce1468b0e7.tga
new file mode 100644
index 0000000..c359f2f
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/74e1a96f-4833-a24d-a1bb-1bce1468b0e7.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga b/linden/indra/newview/skins/gemini/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga
new file mode 100644
index 0000000..a9bb908
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga b/linden/indra/newview/skins/gemini/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga
new file mode 100644
index 0000000..83ee56b
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/89e9fc7c-0b16-457d-be4f-136270759c4d.tga b/linden/indra/newview/skins/gemini/textures/89e9fc7c-0b16-457d-be4f-136270759c4d.tga
new file mode 100644
index 0000000..6cc9ea1
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/89e9fc7c-0b16-457d-be4f-136270759c4d.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/8f761ce3-5939-4d3a-8991-00064fdfacf9.tga b/linden/indra/newview/skins/gemini/textures/8f761ce3-5939-4d3a-8991-00064fdfacf9.tga
new file mode 100644
index 0000000..1f9f564
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/8f761ce3-5939-4d3a-8991-00064fdfacf9.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/9beb8cdd-3dce-53c2-b28e-e1f3bc2ec0a4.tga b/linden/indra/newview/skins/gemini/textures/9beb8cdd-3dce-53c2-b28e-e1f3bc2ec0a4.tga
new file mode 100644
index 0000000..c8491a0
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/9beb8cdd-3dce-53c2-b28e-e1f3bc2ec0a4.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga b/linden/indra/newview/skins/gemini/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga
new file mode 100644
index 0000000..79b0e2f
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/account_id_green.tga b/linden/indra/newview/skins/gemini/textures/account_id_green.tga
new file mode 100644
index 0000000..9be215e
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/account_id_green.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/account_id_orange.tga b/linden/indra/newview/skins/gemini/textures/account_id_orange.tga
new file mode 100644
index 0000000..6b41e86
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/account_id_orange.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/active_speakers.tga b/linden/indra/newview/skins/gemini/textures/active_speakers.tga
new file mode 100644
index 0000000..02d3643
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/active_speakers.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/active_voice_tab.tga b/linden/indra/newview/skins/gemini/textures/active_voice_tab.tga
new file mode 100644
index 0000000..2d0dfaa
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/active_voice_tab.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/alpha_gradient.tga b/linden/indra/newview/skins/gemini/textures/alpha_gradient.tga
new file mode 100644
index 0000000..6fdba25
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/alpha_gradient.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/arrow_down.tga b/linden/indra/newview/skins/gemini/textures/arrow_down.tga
new file mode 100644
index 0000000..81dc9d3
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/arrow_down.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/arrow_up.tga b/linden/indra/newview/skins/gemini/textures/arrow_up.tga
new file mode 100644
index 0000000..22195cf
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/arrow_up.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/avatar_gone.tga b/linden/indra/newview/skins/gemini/textures/avatar_gone.tga
new file mode 100644
index 0000000..e5c2c07
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/avatar_gone.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/avatar_new.tga b/linden/indra/newview/skins/gemini/textures/avatar_new.tga
new file mode 100644
index 0000000..854b70c
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/avatar_new.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/avatar_sound.tga b/linden/indra/newview/skins/gemini/textures/avatar_sound.tga
new file mode 100644
index 0000000..ec5dacb
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/avatar_sound.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/avatar_typing.tga b/linden/indra/newview/skins/gemini/textures/avatar_typing.tga
new file mode 100644
index 0000000..2c54902
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/avatar_typing.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga b/linden/indra/newview/skins/gemini/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga
new file mode 100644
index 0000000..4ca322e
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/black.tga b/linden/indra/newview/skins/gemini/textures/black.tga
new file mode 100644
index 0000000..e69be08
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/black.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/btn_chatbar.tga b/linden/indra/newview/skins/gemini/textures/btn_chatbar.tga
new file mode 100644
index 0000000..4c16c3a
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/btn_chatbar.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/btn_chatbar_selected.tga b/linden/indra/newview/skins/gemini/textures/btn_chatbar_selected.tga
new file mode 100644
index 0000000..ab0c5d7
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/btn_chatbar_selected.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/button_anim_pause.tga b/linden/indra/newview/skins/gemini/textures/button_anim_pause.tga
new file mode 100644
index 0000000..955bd56
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/button_anim_pause.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/button_anim_pause_disabled.tga b/linden/indra/newview/skins/gemini/textures/button_anim_pause_disabled.tga
new file mode 100644
index 0000000..a24871e
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/button_anim_pause_disabled.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/button_anim_pause_selected.tga b/linden/indra/newview/skins/gemini/textures/button_anim_pause_selected.tga
new file mode 100644
index 0000000..c70e39a
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/button_anim_pause_selected.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/button_anim_play.tga b/linden/indra/newview/skins/gemini/textures/button_anim_play.tga
new file mode 100644
index 0000000..7fe54bb
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/button_anim_play.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/button_anim_play_disabled.tga b/linden/indra/newview/skins/gemini/textures/button_anim_play_disabled.tga
new file mode 100644
index 0000000..c969ff6
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/button_anim_play_disabled.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/button_anim_play_selected.tga b/linden/indra/newview/skins/gemini/textures/button_anim_play_selected.tga
new file mode 100644
index 0000000..627b61a
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/button_anim_play_selected.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/button_anim_stop.tga b/linden/indra/newview/skins/gemini/textures/button_anim_stop.tga
new file mode 100644
index 0000000..f5d5f47
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/button_anim_stop.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/button_anim_stop_disabled.tga b/linden/indra/newview/skins/gemini/textures/button_anim_stop_disabled.tga
new file mode 100644
index 0000000..25f6287
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/button_anim_stop_disabled.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/button_anim_stop_selected.tga b/linden/indra/newview/skins/gemini/textures/button_anim_stop_selected.tga
new file mode 100644
index 0000000..b11a317
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/button_anim_stop_selected.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/button_disabled_32x128.tga b/linden/indra/newview/skins/gemini/textures/button_disabled_32x128.tga
new file mode 100644
index 0000000..7bb8648
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/button_disabled_32x128.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/button_enabled_32x128.tga b/linden/indra/newview/skins/gemini/textures/button_enabled_32x128.tga
new file mode 100644
index 0000000..a6fab50
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/button_enabled_32x128.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/button_enabled_selected_32x128.tga b/linden/indra/newview/skins/gemini/textures/button_enabled_selected_32x128.tga
new file mode 100644
index 0000000..a93ae11
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/button_enabled_selected_32x128.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga b/linden/indra/newview/skins/gemini/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga
new file mode 100644
index 0000000..7df1677
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga b/linden/indra/newview/skins/gemini/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga
new file mode 100644
index 0000000..4672546
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/ca7609c6-6ec6-32d9-332e-0d8f437ef644.tga b/linden/indra/newview/skins/gemini/textures/ca7609c6-6ec6-32d9-332e-0d8f437ef644.tga
new file mode 100644
index 0000000..0dbb8fd
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/ca7609c6-6ec6-32d9-332e-0d8f437ef644.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/cam_rotate_in.tga b/linden/indra/newview/skins/gemini/textures/cam_rotate_in.tga
new file mode 100644
index 0000000..06e9b6a
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/cam_rotate_in.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/cam_rotate_out.tga b/linden/indra/newview/skins/gemini/textures/cam_rotate_out.tga
new file mode 100644
index 0000000..becd1f1
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/cam_rotate_out.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/cam_tracking_in.tga b/linden/indra/newview/skins/gemini/textures/cam_tracking_in.tga
new file mode 100644
index 0000000..dbf3578
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/cam_tracking_in.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/cam_tracking_out.tga b/linden/indra/newview/skins/gemini/textures/cam_tracking_out.tga
new file mode 100644
index 0000000..2159358
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/cam_tracking_out.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/cam_zoom_minus_in.tga b/linden/indra/newview/skins/gemini/textures/cam_zoom_minus_in.tga
new file mode 100644
index 0000000..ae4dbce
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/cam_zoom_minus_in.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/cam_zoom_out.tga b/linden/indra/newview/skins/gemini/textures/cam_zoom_out.tga
new file mode 100644
index 0000000..30cd4a6
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/cam_zoom_out.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/cam_zoom_plus_in.tga b/linden/indra/newview/skins/gemini/textures/cam_zoom_plus_in.tga
new file mode 100644
index 0000000..1af847c
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/cam_zoom_plus_in.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga b/linden/indra/newview/skins/gemini/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga
new file mode 100644
index 0000000..a31d5e5
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/checkbox_disabled_false.tga b/linden/indra/newview/skins/gemini/textures/checkbox_disabled_false.tga
new file mode 100644
index 0000000..d44a00b
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/checkbox_disabled_false.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/checkbox_disabled_true.tga b/linden/indra/newview/skins/gemini/textures/checkbox_disabled_true.tga
new file mode 100644
index 0000000..cbeba01
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/checkbox_disabled_true.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/checkbox_enabled_false.tga b/linden/indra/newview/skins/gemini/textures/checkbox_enabled_false.tga
new file mode 100644
index 0000000..f1a1456
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/checkbox_enabled_false.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/checkbox_enabled_true.tga b/linden/indra/newview/skins/gemini/textures/checkbox_enabled_true.tga
new file mode 100644
index 0000000..8b9e7a9
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/checkbox_enabled_true.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/checkerboard_transparency_bg.png b/linden/indra/newview/skins/gemini/textures/checkerboard_transparency_bg.png
new file mode 100644
index 0000000..9a16935
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/checkerboard_transparency_bg.png differ
diff --git a/linden/indra/newview/skins/gemini/textures/circle.tga b/linden/indra/newview/skins/gemini/textures/circle.tga
new file mode 100644
index 0000000..d7097e3
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/circle.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/close_in_blue.tga b/linden/indra/newview/skins/gemini/textures/close_in_blue.tga
new file mode 100644
index 0000000..8200eba
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/close_in_blue.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/close_inactive_blue.tga b/linden/indra/newview/skins/gemini/textures/close_inactive_blue.tga
new file mode 100644
index 0000000..191c5d3
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/close_inactive_blue.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/closebox.tga b/linden/indra/newview/skins/gemini/textures/closebox.tga
new file mode 100644
index 0000000..294d4fb
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/closebox.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/color_swatch_alpha.tga b/linden/indra/newview/skins/gemini/textures/color_swatch_alpha.tga
new file mode 100644
index 0000000..814a004
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/color_swatch_alpha.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/combobox_arrow.tga b/linden/indra/newview/skins/gemini/textures/combobox_arrow.tga
new file mode 100644
index 0000000..ad08f32
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/combobox_arrow.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/crosshairs.tga b/linden/indra/newview/skins/gemini/textures/crosshairs.tga
new file mode 100644
index 0000000..ac4d63d
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/crosshairs.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/darkgray.tga b/linden/indra/newview/skins/gemini/textures/darkgray.tga
new file mode 100644
index 0000000..2063d68
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/darkgray.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/direction_arrow.tga b/linden/indra/newview/skins/gemini/textures/direction_arrow.tga
new file mode 100644
index 0000000..f3ef106
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/direction_arrow.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/down_arrow.png b/linden/indra/newview/skins/gemini/textures/down_arrow.png
new file mode 100644
index 0000000..155f80c
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/down_arrow.png differ
diff --git a/linden/indra/newview/skins/gemini/textures/e3369e02-93e1-43dc-b9c0-4533db0963d0.tga b/linden/indra/newview/skins/gemini/textures/e3369e02-93e1-43dc-b9c0-4533db0963d0.tga
new file mode 100644
index 0000000..0d127f9
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/e3369e02-93e1-43dc-b9c0-4533db0963d0.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/e97cf410-8e61-7005-ec06-629eba4cd1fb.tga b/linden/indra/newview/skins/gemini/textures/e97cf410-8e61-7005-ec06-629eba4cd1fb.tga
new file mode 100644
index 0000000..6fdba25
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/e97cf410-8e61-7005-ec06-629eba4cd1fb.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/eye_button_active.tga b/linden/indra/newview/skins/gemini/textures/eye_button_active.tga
new file mode 100644
index 0000000..4dfdfc2
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/eye_button_active.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/eye_button_inactive.tga b/linden/indra/newview/skins/gemini/textures/eye_button_inactive.tga
new file mode 100644
index 0000000..dbe24ae
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/eye_button_inactive.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/f9bbb2fe-584b-4c01-86fc-599c69534c1b.tga b/linden/indra/newview/skins/gemini/textures/f9bbb2fe-584b-4c01-86fc-599c69534c1b.tga
new file mode 100644
index 0000000..3706c96
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/f9bbb2fe-584b-4c01-86fc-599c69534c1b.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga b/linden/indra/newview/skins/gemini/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga
new file mode 100644
index 0000000..3335526
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/ff_edit_mine.tga b/linden/indra/newview/skins/gemini/textures/ff_edit_mine.tga
new file mode 100644
index 0000000..8f0c35b
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/ff_edit_mine.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/ff_edit_mine_button.tga b/linden/indra/newview/skins/gemini/textures/ff_edit_mine_button.tga
new file mode 100644
index 0000000..07627a6
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/ff_edit_mine_button.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/ff_edit_theirs.tga b/linden/indra/newview/skins/gemini/textures/ff_edit_theirs.tga
new file mode 100644
index 0000000..005ada2
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/ff_edit_theirs.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/ff_edit_theirs_button.tga b/linden/indra/newview/skins/gemini/textures/ff_edit_theirs_button.tga
new file mode 100644
index 0000000..798ef64
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/ff_edit_theirs_button.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/ff_online_status_button.tga b/linden/indra/newview/skins/gemini/textures/ff_online_status_button.tga
new file mode 100644
index 0000000..9076df6
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/ff_online_status_button.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/ff_visible_map.tga b/linden/indra/newview/skins/gemini/textures/ff_visible_map.tga
new file mode 100644
index 0000000..a4dad78
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/ff_visible_map.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/ff_visible_map_button.tga b/linden/indra/newview/skins/gemini/textures/ff_visible_map_button.tga
new file mode 100644
index 0000000..8d13ade
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/ff_visible_map_button.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/ff_visible_online.tga b/linden/indra/newview/skins/gemini/textures/ff_visible_online.tga
new file mode 100644
index 0000000..74e3a4e
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/ff_visible_online.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/ff_visible_online_button.tga b/linden/indra/newview/skins/gemini/textures/ff_visible_online_button.tga
new file mode 100644
index 0000000..08a6cbe
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/ff_visible_online_button.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/flag_blue.tga b/linden/indra/newview/skins/gemini/textures/flag_blue.tga
new file mode 100644
index 0000000..e61e7a9
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/flag_blue.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/flag_green.tga b/linden/indra/newview/skins/gemini/textures/flag_green.tga
new file mode 100644
index 0000000..5f0f05c
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/flag_green.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/flag_orange.tga b/linden/indra/newview/skins/gemini/textures/flag_orange.tga
new file mode 100644
index 0000000..6e73c31
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/flag_orange.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/flag_pink.tga b/linden/indra/newview/skins/gemini/textures/flag_pink.tga
new file mode 100644
index 0000000..ccf52b9
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/flag_pink.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/flag_purple.tga b/linden/indra/newview/skins/gemini/textures/flag_purple.tga
new file mode 100644
index 0000000..3ef8f09
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/flag_purple.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/flag_red.tga b/linden/indra/newview/skins/gemini/textures/flag_red.tga
new file mode 100644
index 0000000..87afb59
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/flag_red.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/flag_yellow.tga b/linden/indra/newview/skins/gemini/textures/flag_yellow.tga
new file mode 100644
index 0000000..4c4a647
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/flag_yellow.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/flyout_btn_left.tga b/linden/indra/newview/skins/gemini/textures/flyout_btn_left.tga
new file mode 100644
index 0000000..a17a87d
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/flyout_btn_left.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/flyout_btn_left_disabled.tga b/linden/indra/newview/skins/gemini/textures/flyout_btn_left_disabled.tga
new file mode 100644
index 0000000..917e49e
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/flyout_btn_left_disabled.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/flyout_btn_left_selected.tga b/linden/indra/newview/skins/gemini/textures/flyout_btn_left_selected.tga
new file mode 100644
index 0000000..448b4ed
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/flyout_btn_left_selected.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/flyout_btn_right.tga b/linden/indra/newview/skins/gemini/textures/flyout_btn_right.tga
new file mode 100644
index 0000000..eb7180b
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/flyout_btn_right.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/flyout_btn_right_disabled.tga b/linden/indra/newview/skins/gemini/textures/flyout_btn_right_disabled.tga
new file mode 100644
index 0000000..800c569
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/flyout_btn_right_disabled.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/flyout_btn_right_selected.tga b/linden/indra/newview/skins/gemini/textures/flyout_btn_right_selected.tga
new file mode 100644
index 0000000..40fd65f
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/flyout_btn_right_selected.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/folder_arrow.tga b/linden/indra/newview/skins/gemini/textures/folder_arrow.tga
new file mode 100644
index 0000000..77d4707
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/folder_arrow.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_active-speakers-dot-lvl0.tga b/linden/indra/newview/skins/gemini/textures/icn_active-speakers-dot-lvl0.tga
new file mode 100644
index 0000000..35846ce
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_active-speakers-dot-lvl0.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_active-speakers-dot-lvl1.tga b/linden/indra/newview/skins/gemini/textures/icn_active-speakers-dot-lvl1.tga
new file mode 100644
index 0000000..1f9f564
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_active-speakers-dot-lvl1.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_active-speakers-dot-lvl2.tga b/linden/indra/newview/skins/gemini/textures/icn_active-speakers-dot-lvl2.tga
new file mode 100644
index 0000000..b2e5609
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_active-speakers-dot-lvl2.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_active-speakers-typing1.tga b/linden/indra/newview/skins/gemini/textures/icn_active-speakers-typing1.tga
new file mode 100644
index 0000000..3706c96
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_active-speakers-typing1.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_active-speakers-typing2.tga b/linden/indra/newview/skins/gemini/textures/icn_active-speakers-typing2.tga
new file mode 100644
index 0000000..0d127f9
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_active-speakers-typing2.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_active-speakers-typing3.tga b/linden/indra/newview/skins/gemini/textures/icn_active-speakers-typing3.tga
new file mode 100644
index 0000000..031b3ad
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_active-speakers-typing3.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_chatbar.tga b/linden/indra/newview/skins/gemini/textures/icn_chatbar.tga
new file mode 100644
index 0000000..5d4fd41
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_chatbar.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_clear_lineeditor.tga b/linden/indra/newview/skins/gemini/textures/icn_clear_lineeditor.tga
new file mode 100644
index 0000000..8cd8310
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_clear_lineeditor.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_label_media.tga b/linden/indra/newview/skins/gemini/textures/icn_label_media.tga
new file mode 100644
index 0000000..6f5090a
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_label_media.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_label_music.tga b/linden/indra/newview/skins/gemini/textures/icn_label_music.tga
new file mode 100644
index 0000000..31120a5
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_label_music.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_label_web.tga b/linden/indra/newview/skins/gemini/textures/icn_label_web.tga
new file mode 100644
index 0000000..5122641
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_label_web.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_media-pause.tga b/linden/indra/newview/skins/gemini/textures/icn_media-pause.tga
new file mode 100644
index 0000000..0b53137
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_media-pause.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_media-pause_active.tga b/linden/indra/newview/skins/gemini/textures/icn_media-pause_active.tga
new file mode 100644
index 0000000..c70e39a
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_media-pause_active.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_media-pause_disabled.tga b/linden/indra/newview/skins/gemini/textures/icn_media-pause_disabled.tga
new file mode 100644
index 0000000..a24871e
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_media-pause_disabled.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_media-pause_enabled.tga b/linden/indra/newview/skins/gemini/textures/icn_media-pause_enabled.tga
new file mode 100644
index 0000000..955bd56
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_media-pause_enabled.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_media-play.tga b/linden/indra/newview/skins/gemini/textures/icn_media-play.tga
new file mode 100644
index 0000000..c7b0bcb
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_media-play.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_media-play_active.tga b/linden/indra/newview/skins/gemini/textures/icn_media-play_active.tga
new file mode 100644
index 0000000..627b61a
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_media-play_active.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_media-play_disabled.tga b/linden/indra/newview/skins/gemini/textures/icn_media-play_disabled.tga
new file mode 100644
index 0000000..c969ff6
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_media-play_disabled.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_media-play_enabled.tga b/linden/indra/newview/skins/gemini/textures/icn_media-play_enabled.tga
new file mode 100644
index 0000000..7fe54bb
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_media-play_enabled.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_media-stop_active.tga b/linden/indra/newview/skins/gemini/textures/icn_media-stop_active.tga
new file mode 100644
index 0000000..b11a317
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_media-stop_active.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_media-stop_disabled.tga b/linden/indra/newview/skins/gemini/textures/icn_media-stop_disabled.tga
new file mode 100644
index 0000000..25f6287
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_media-stop_disabled.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_media-stop_enabled.tga b/linden/indra/newview/skins/gemini/textures/icn_media-stop_enabled.tga
new file mode 100644
index 0000000..f5d5f47
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_media-stop_enabled.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_media.tga b/linden/indra/newview/skins/gemini/textures/icn_media.tga
new file mode 100644
index 0000000..6f5090a
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_media.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_media_movie.tga b/linden/indra/newview/skins/gemini/textures/icn_media_movie.tga
new file mode 100644
index 0000000..6f5090a
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_media_movie.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_media_web.tga b/linden/indra/newview/skins/gemini/textures/icn_media_web.tga
new file mode 100644
index 0000000..5122641
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_media_web.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_music-pause.tga b/linden/indra/newview/skins/gemini/textures/icn_music-pause.tga
new file mode 100644
index 0000000..0af8e25
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_music-pause.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_music-play.tga b/linden/indra/newview/skins/gemini/textures/icn_music-play.tga
new file mode 100644
index 0000000..8e4a70c
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_music-play.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_music.tga b/linden/indra/newview/skins/gemini/textures/icn_music.tga
new file mode 100644
index 0000000..31120a5
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_music.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_pause.tga b/linden/indra/newview/skins/gemini/textures/icn_pause.tga
new file mode 100644
index 0000000..5107993
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_pause.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_play.tga b/linden/indra/newview/skins/gemini/textures/icn_play.tga
new file mode 100644
index 0000000..eb2c0f3
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_play.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_rounded-text-field.tga b/linden/indra/newview/skins/gemini/textures/icn_rounded-text-field.tga
new file mode 100644
index 0000000..7da504f
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_rounded-text-field.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_scrollbar.tga b/linden/indra/newview/skins/gemini/textures/icn_scrollbar.tga
new file mode 100644
index 0000000..a19a8a5
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_scrollbar.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_scrollbar_bg.tga b/linden/indra/newview/skins/gemini/textures/icn_scrollbar_bg.tga
new file mode 100644
index 0000000..1e4bc7a
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_scrollbar_bg.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_scrollbar_thumb.tga b/linden/indra/newview/skins/gemini/textures/icn_scrollbar_thumb.tga
new file mode 100644
index 0000000..d63c314
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_scrollbar_thumb.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_slide-groove_dark.tga b/linden/indra/newview/skins/gemini/textures/icn_slide-groove_dark.tga
new file mode 100644
index 0000000..ce0bd07
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_slide-groove_dark.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_slide-highlight.tga b/linden/indra/newview/skins/gemini/textures/icn_slide-highlight.tga
new file mode 100644
index 0000000..5b971e6
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_slide-highlight.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_slide-thumb_dark.tga b/linden/indra/newview/skins/gemini/textures/icn_slide-thumb_dark.tga
new file mode 100644
index 0000000..e4c1b09
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_slide-thumb_dark.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_speaker-muted_dark.tga b/linden/indra/newview/skins/gemini/textures/icn_speaker-muted_dark.tga
new file mode 100644
index 0000000..a7d29a1
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_speaker-muted_dark.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_speaker_dark.tga b/linden/indra/newview/skins/gemini/textures/icn_speaker_dark.tga
new file mode 100644
index 0000000..f2f24ef
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_speaker_dark.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_stop.tga b/linden/indra/newview/skins/gemini/textures/icn_stop.tga
new file mode 100644
index 0000000..7a53bcc
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_stop.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_textfield_enabled.tga b/linden/indra/newview/skins/gemini/textures/icn_textfield_enabled.tga
new file mode 100644
index 0000000..fc681a1
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_textfield_enabled.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_toolbar_build.tga b/linden/indra/newview/skins/gemini/textures/icn_toolbar_build.tga
new file mode 100644
index 0000000..e1a814b
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_toolbar_build.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_toolbar_fly.tga b/linden/indra/newview/skins/gemini/textures/icn_toolbar_fly.tga
new file mode 100644
index 0000000..e1a814b
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_toolbar_fly.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_toolbar_inventory.tga b/linden/indra/newview/skins/gemini/textures/icn_toolbar_inventory.tga
new file mode 100644
index 0000000..e1a814b
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_toolbar_inventory.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_toolbar_map.tga b/linden/indra/newview/skins/gemini/textures/icn_toolbar_map.tga
new file mode 100644
index 0000000..e1a814b
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_toolbar_map.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_toolbar_minimap.tga b/linden/indra/newview/skins/gemini/textures/icn_toolbar_minimap.tga
new file mode 100644
index 0000000..e1a814b
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_toolbar_minimap.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_toolbar_search.tga b/linden/indra/newview/skins/gemini/textures/icn_toolbar_search.tga
new file mode 100644
index 0000000..e1a814b
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_toolbar_search.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_toolbar_snapshot.tga b/linden/indra/newview/skins/gemini/textures/icn_toolbar_snapshot.tga
new file mode 100644
index 0000000..e1a814b
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_toolbar_snapshot.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_voice-call-end.tga b/linden/indra/newview/skins/gemini/textures/icn_voice-call-end.tga
new file mode 100644
index 0000000..2da4e85
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_voice-call-end.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_voice-call-start.tga b/linden/indra/newview/skins/gemini/textures/icn_voice-call-start.tga
new file mode 100644
index 0000000..07701cb
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_voice-call-start.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_voice-groupfocus.tga b/linden/indra/newview/skins/gemini/textures/icn_voice-groupfocus.tga
new file mode 100644
index 0000000..9f48d46
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_voice-groupfocus.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_voice-localchat.tga b/linden/indra/newview/skins/gemini/textures/icn_voice-localchat.tga
new file mode 100644
index 0000000..7cf267e
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_voice-localchat.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_voice-pvtfocus.tga b/linden/indra/newview/skins/gemini/textures/icn_voice-pvtfocus.tga
new file mode 100644
index 0000000..abadb09
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_voice-pvtfocus.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_voice_ptt-off.tga b/linden/indra/newview/skins/gemini/textures/icn_voice_ptt-off.tga
new file mode 100644
index 0000000..15ecbdf
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_voice_ptt-off.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_voice_ptt-on-lvl1.tga b/linden/indra/newview/skins/gemini/textures/icn_voice_ptt-on-lvl1.tga
new file mode 100644
index 0000000..ae72af1
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_voice_ptt-on-lvl1.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_voice_ptt-on-lvl2.tga b/linden/indra/newview/skins/gemini/textures/icn_voice_ptt-on-lvl2.tga
new file mode 100644
index 0000000..4dfc2dd
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_voice_ptt-on-lvl2.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_voice_ptt-on-lvl3.tga b/linden/indra/newview/skins/gemini/textures/icn_voice_ptt-on-lvl3.tga
new file mode 100644
index 0000000..018b0be
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_voice_ptt-on-lvl3.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icn_voice_ptt-on.tga b/linden/indra/newview/skins/gemini/textures/icn_voice_ptt-on.tga
new file mode 100644
index 0000000..9eb6431
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icn_voice_ptt-on.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icon_auction.tga b/linden/indra/newview/skins/gemini/textures/icon_auction.tga
new file mode 100644
index 0000000..d121833
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icon_auction.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icon_avatar_expand.png b/linden/indra/newview/skins/gemini/textures/icon_avatar_expand.png
new file mode 100644
index 0000000..47698e9
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icon_avatar_expand.png differ
diff --git a/linden/indra/newview/skins/gemini/textures/icon_avatar_offline.tga b/linden/indra/newview/skins/gemini/textures/icon_avatar_offline.tga
new file mode 100644
index 0000000..cfa95eb
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icon_avatar_offline.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icon_avatar_online.tga b/linden/indra/newview/skins/gemini/textures/icon_avatar_online.tga
new file mode 100644
index 0000000..4522121
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icon_avatar_online.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icon_day_cycle.tga b/linden/indra/newview/skins/gemini/textures/icon_day_cycle.tga
new file mode 100644
index 0000000..2d5dee1
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icon_day_cycle.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icon_diurnal.tga b/linden/indra/newview/skins/gemini/textures/icon_diurnal.tga
new file mode 100644
index 0000000..fc720c8
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icon_diurnal.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icon_event.tga b/linden/indra/newview/skins/gemini/textures/icon_event.tga
new file mode 100644
index 0000000..7805dbc
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icon_event.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icon_event_mature.tga b/linden/indra/newview/skins/gemini/textures/icon_event_mature.tga
new file mode 100644
index 0000000..61c879b
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icon_event_mature.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icon_for_sale.tga b/linden/indra/newview/skins/gemini/textures/icon_for_sale.tga
new file mode 100644
index 0000000..455b1ae
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icon_for_sale.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icon_group.tga b/linden/indra/newview/skins/gemini/textures/icon_group.tga
new file mode 100644
index 0000000..22122d6
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icon_group.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icon_groupnotice.tga b/linden/indra/newview/skins/gemini/textures/icon_groupnotice.tga
new file mode 100644
index 0000000..edf2c61
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icon_groupnotice.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icon_groupnoticeinventory.tga b/linden/indra/newview/skins/gemini/textures/icon_groupnoticeinventory.tga
new file mode 100644
index 0000000..f313906
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icon_groupnoticeinventory.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icon_lock.tga b/linden/indra/newview/skins/gemini/textures/icon_lock.tga
new file mode 100644
index 0000000..23521aa
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icon_lock.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icon_place.tga b/linden/indra/newview/skins/gemini/textures/icon_place.tga
new file mode 100644
index 0000000..2170c98
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icon_place.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icon_popular.tga b/linden/indra/newview/skins/gemini/textures/icon_popular.tga
new file mode 100644
index 0000000..f1165b8
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icon_popular.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/icon_top_pick.tga b/linden/indra/newview/skins/gemini/textures/icon_top_pick.tga
new file mode 100644
index 0000000..0b34882
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/icon_top_pick.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/info_error.tga b/linden/indra/newview/skins/gemini/textures/info_error.tga
new file mode 100644
index 0000000..d5d71ad
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/info_error.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/info_fetching.tga b/linden/indra/newview/skins/gemini/textures/info_fetching.tga
new file mode 100644
index 0000000..d9faa40
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/info_fetching.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/info_unknown.tga b/linden/indra/newview/skins/gemini/textures/info_unknown.tga
new file mode 100644
index 0000000..b04e4b0
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/info_unknown.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_folder_animation.tga b/linden/indra/newview/skins/gemini/textures/inv_folder_animation.tga
new file mode 100644
index 0000000..1b4df7a
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_folder_animation.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_folder_bodypart.tga b/linden/indra/newview/skins/gemini/textures/inv_folder_bodypart.tga
new file mode 100644
index 0000000..abcb1bd
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_folder_bodypart.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_folder_callingcard.tga b/linden/indra/newview/skins/gemini/textures/inv_folder_callingcard.tga
new file mode 100644
index 0000000..db7d8f7
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_folder_callingcard.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_folder_clothing.tga b/linden/indra/newview/skins/gemini/textures/inv_folder_clothing.tga
new file mode 100644
index 0000000..d214789
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_folder_clothing.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_folder_gesture.tga b/linden/indra/newview/skins/gemini/textures/inv_folder_gesture.tga
new file mode 100644
index 0000000..83accbb
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_folder_gesture.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_folder_landmark.tga b/linden/indra/newview/skins/gemini/textures/inv_folder_landmark.tga
new file mode 100644
index 0000000..6923dd2
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_folder_landmark.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_folder_lostandfound.tga b/linden/indra/newview/skins/gemini/textures/inv_folder_lostandfound.tga
new file mode 100644
index 0000000..67f9a9a
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_folder_lostandfound.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_folder_notecard.tga b/linden/indra/newview/skins/gemini/textures/inv_folder_notecard.tga
new file mode 100644
index 0000000..400ef3c
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_folder_notecard.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_folder_object.tga b/linden/indra/newview/skins/gemini/textures/inv_folder_object.tga
new file mode 100644
index 0000000..c3d04bf
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_folder_object.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_folder_plain_closed.tga b/linden/indra/newview/skins/gemini/textures/inv_folder_plain_closed.tga
new file mode 100644
index 0000000..e351836
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_folder_plain_closed.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_folder_plain_open.tga b/linden/indra/newview/skins/gemini/textures/inv_folder_plain_open.tga
new file mode 100644
index 0000000..7bc8034
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_folder_plain_open.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_folder_script.tga b/linden/indra/newview/skins/gemini/textures/inv_folder_script.tga
new file mode 100644
index 0000000..3e1a164
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_folder_script.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_folder_snapshot.tga b/linden/indra/newview/skins/gemini/textures/inv_folder_snapshot.tga
new file mode 100644
index 0000000..d32538d
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_folder_snapshot.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_folder_sound.tga b/linden/indra/newview/skins/gemini/textures/inv_folder_sound.tga
new file mode 100644
index 0000000..5e54c47
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_folder_sound.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_folder_texture.tga b/linden/indra/newview/skins/gemini/textures/inv_folder_texture.tga
new file mode 100644
index 0000000..4fe75d0
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_folder_texture.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_folder_trash.tga b/linden/indra/newview/skins/gemini/textures/inv_folder_trash.tga
new file mode 100644
index 0000000..54043e9
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_folder_trash.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_item_animation.tga b/linden/indra/newview/skins/gemini/textures/inv_item_animation.tga
new file mode 100644
index 0000000..2b12b28
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_item_animation.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_item_attach.tga b/linden/indra/newview/skins/gemini/textures/inv_item_attach.tga
new file mode 100644
index 0000000..0538993
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_item_attach.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_item_callingcard_offline.tga b/linden/indra/newview/skins/gemini/textures/inv_item_callingcard_offline.tga
new file mode 100644
index 0000000..44222d3
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_item_callingcard_offline.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_item_callingcard_online.tga b/linden/indra/newview/skins/gemini/textures/inv_item_callingcard_online.tga
new file mode 100644
index 0000000..42be4d2
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_item_callingcard_online.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_item_clothing.tga b/linden/indra/newview/skins/gemini/textures/inv_item_clothing.tga
new file mode 100644
index 0000000..4c4c939
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_item_clothing.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_item_eyes.tga b/linden/indra/newview/skins/gemini/textures/inv_item_eyes.tga
new file mode 100644
index 0000000..053ffbe
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_item_eyes.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_item_gesture.tga b/linden/indra/newview/skins/gemini/textures/inv_item_gesture.tga
new file mode 100644
index 0000000..52ac90c
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_item_gesture.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_item_gloves.tga b/linden/indra/newview/skins/gemini/textures/inv_item_gloves.tga
new file mode 100644
index 0000000..2604171
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_item_gloves.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_item_hair.tga b/linden/indra/newview/skins/gemini/textures/inv_item_hair.tga
new file mode 100644
index 0000000..03156a7
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_item_hair.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_item_jacket.tga b/linden/indra/newview/skins/gemini/textures/inv_item_jacket.tga
new file mode 100644
index 0000000..f37c593
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_item_jacket.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_item_landmark.tga b/linden/indra/newview/skins/gemini/textures/inv_item_landmark.tga
new file mode 100644
index 0000000..c161deb
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_item_landmark.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_item_landmark_visited.tga b/linden/indra/newview/skins/gemini/textures/inv_item_landmark_visited.tga
new file mode 100644
index 0000000..372a0f6
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_item_landmark_visited.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_item_notecard.tga b/linden/indra/newview/skins/gemini/textures/inv_item_notecard.tga
new file mode 100644
index 0000000..2534d1b
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_item_notecard.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_item_object.tga b/linden/indra/newview/skins/gemini/textures/inv_item_object.tga
new file mode 100644
index 0000000..edad15f
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_item_object.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_item_object_multi.tga b/linden/indra/newview/skins/gemini/textures/inv_item_object_multi.tga
new file mode 100644
index 0000000..7af666b
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_item_object_multi.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_item_pants.tga b/linden/indra/newview/skins/gemini/textures/inv_item_pants.tga
new file mode 100644
index 0000000..ec3246e
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_item_pants.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_item_script.tga b/linden/indra/newview/skins/gemini/textures/inv_item_script.tga
new file mode 100644
index 0000000..e396d09
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_item_script.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_item_script_dangerous.tga b/linden/indra/newview/skins/gemini/textures/inv_item_script_dangerous.tga
new file mode 100644
index 0000000..1ee742a
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_item_script_dangerous.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_item_shape.tga b/linden/indra/newview/skins/gemini/textures/inv_item_shape.tga
new file mode 100644
index 0000000..5d9db4e
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_item_shape.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_item_shirt.tga b/linden/indra/newview/skins/gemini/textures/inv_item_shirt.tga
new file mode 100644
index 0000000..2e1c627
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_item_shirt.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_item_shoes.tga b/linden/indra/newview/skins/gemini/textures/inv_item_shoes.tga
new file mode 100644
index 0000000..ae93bfe
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_item_shoes.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_item_skin.tga b/linden/indra/newview/skins/gemini/textures/inv_item_skin.tga
new file mode 100644
index 0000000..f0d7f20
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_item_skin.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_item_skirt.tga b/linden/indra/newview/skins/gemini/textures/inv_item_skirt.tga
new file mode 100644
index 0000000..d8f3972
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_item_skirt.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_item_snapshot.tga b/linden/indra/newview/skins/gemini/textures/inv_item_snapshot.tga
new file mode 100644
index 0000000..c9d41a6
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_item_snapshot.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_item_socks.tga b/linden/indra/newview/skins/gemini/textures/inv_item_socks.tga
new file mode 100644
index 0000000..dabcf6d
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_item_socks.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_item_sound.tga b/linden/indra/newview/skins/gemini/textures/inv_item_sound.tga
new file mode 100644
index 0000000..efa1132
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_item_sound.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_item_texture.tga b/linden/indra/newview/skins/gemini/textures/inv_item_texture.tga
new file mode 100644
index 0000000..fc5a420
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_item_texture.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_item_underpants.tga b/linden/indra/newview/skins/gemini/textures/inv_item_underpants.tga
new file mode 100644
index 0000000..e712f9c
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_item_underpants.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/inv_item_undershirt.tga b/linden/indra/newview/skins/gemini/textures/inv_item_undershirt.tga
new file mode 100644
index 0000000..c7b4aae
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/inv_item_undershirt.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/lag_status_critical.tga b/linden/indra/newview/skins/gemini/textures/lag_status_critical.tga
new file mode 100644
index 0000000..bbc71d9
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/lag_status_critical.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/lag_status_good.tga b/linden/indra/newview/skins/gemini/textures/lag_status_good.tga
new file mode 100644
index 0000000..680ba90
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/lag_status_good.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/lag_status_warning.tga b/linden/indra/newview/skins/gemini/textures/lag_status_warning.tga
new file mode 100644
index 0000000..13ce3cc
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/lag_status_warning.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/legend.tga b/linden/indra/newview/skins/gemini/textures/legend.tga
new file mode 100644
index 0000000..0dbb8fd
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/legend.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/lightgray.tga b/linden/indra/newview/skins/gemini/textures/lightgray.tga
new file mode 100644
index 0000000..2063d68
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/lightgray.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/map_avatar_16.tga b/linden/indra/newview/skins/gemini/textures/map_avatar_16.tga
new file mode 100644
index 0000000..ce129e3
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/map_avatar_16.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/map_avatar_32.tga b/linden/indra/newview/skins/gemini/textures/map_avatar_32.tga
new file mode 100644
index 0000000..aebeab4
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/map_avatar_32.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/map_avatar_8.tga b/linden/indra/newview/skins/gemini/textures/map_avatar_8.tga
new file mode 100644
index 0000000..28552f2
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/map_avatar_8.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/map_avatar_above_32.tga b/linden/indra/newview/skins/gemini/textures/map_avatar_above_32.tga
new file mode 100644
index 0000000..65bd056
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/map_avatar_above_32.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/map_avatar_above_8.tga b/linden/indra/newview/skins/gemini/textures/map_avatar_above_8.tga
new file mode 100644
index 0000000..193428e
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/map_avatar_above_8.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/map_avatar_below_32.tga b/linden/indra/newview/skins/gemini/textures/map_avatar_below_32.tga
new file mode 100644
index 0000000..496c44b
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/map_avatar_below_32.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/map_avatar_below_8.tga b/linden/indra/newview/skins/gemini/textures/map_avatar_below_8.tga
new file mode 100644
index 0000000..9e14bfa
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/map_avatar_below_8.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/map_avatar_you_32.tga b/linden/indra/newview/skins/gemini/textures/map_avatar_you_32.tga
new file mode 100644
index 0000000..782207e
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/map_avatar_you_32.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/map_avatar_you_8.tga b/linden/indra/newview/skins/gemini/textures/map_avatar_you_8.tga
new file mode 100644
index 0000000..61f319f
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/map_avatar_you_8.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/map_event.tga b/linden/indra/newview/skins/gemini/textures/map_event.tga
new file mode 100644
index 0000000..c229b37
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/map_event.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/map_event_mature.tga b/linden/indra/newview/skins/gemini/textures/map_event_mature.tga
new file mode 100644
index 0000000..61c879b
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/map_event_mature.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/map_home.tga b/linden/indra/newview/skins/gemini/textures/map_home.tga
new file mode 100644
index 0000000..7478de3
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/map_home.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/map_infohub.tga b/linden/indra/newview/skins/gemini/textures/map_infohub.tga
new file mode 100644
index 0000000..d0134fa
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/map_infohub.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/map_telehub.tga b/linden/indra/newview/skins/gemini/textures/map_telehub.tga
new file mode 100644
index 0000000..ef63a3e
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/map_telehub.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/map_track_16.tga b/linden/indra/newview/skins/gemini/textures/map_track_16.tga
new file mode 100644
index 0000000..451ce24
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/map_track_16.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/map_track_8.tga b/linden/indra/newview/skins/gemini/textures/map_track_8.tga
new file mode 100644
index 0000000..53425ff
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/map_track_8.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/media_icon.tga b/linden/indra/newview/skins/gemini/textures/media_icon.tga
new file mode 100644
index 0000000..289520c
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/media_icon.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/minimize.tga b/linden/indra/newview/skins/gemini/textures/minimize.tga
new file mode 100644
index 0000000..a21fd91
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/minimize.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/minimize_inactive.tga b/linden/indra/newview/skins/gemini/textures/minimize_inactive.tga
new file mode 100644
index 0000000..fcd62aa
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/minimize_inactive.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/minimize_pressed.tga b/linden/indra/newview/skins/gemini/textures/minimize_pressed.tga
new file mode 100644
index 0000000..0061dd5
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/minimize_pressed.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/missing_asset.tga b/linden/indra/newview/skins/gemini/textures/missing_asset.tga
new file mode 100644
index 0000000..9a43f4d
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/missing_asset.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/move_backward_in.tga b/linden/indra/newview/skins/gemini/textures/move_backward_in.tga
new file mode 100644
index 0000000..6a20f9d
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/move_backward_in.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/move_backward_out.tga b/linden/indra/newview/skins/gemini/textures/move_backward_out.tga
new file mode 100644
index 0000000..4ec091f
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/move_backward_out.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/move_down_in.tga b/linden/indra/newview/skins/gemini/textures/move_down_in.tga
new file mode 100644
index 0000000..4abfc72
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/move_down_in.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/move_down_out.tga b/linden/indra/newview/skins/gemini/textures/move_down_out.tga
new file mode 100644
index 0000000..8af4f12
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/move_down_out.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/move_forward_in.tga b/linden/indra/newview/skins/gemini/textures/move_forward_in.tga
new file mode 100644
index 0000000..bdaa7b4
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/move_forward_in.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/move_forward_out.tga b/linden/indra/newview/skins/gemini/textures/move_forward_out.tga
new file mode 100644
index 0000000..7aa345b
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/move_forward_out.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/move_left_in.tga b/linden/indra/newview/skins/gemini/textures/move_left_in.tga
new file mode 100644
index 0000000..4a28396
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/move_left_in.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/move_left_out.tga b/linden/indra/newview/skins/gemini/textures/move_left_out.tga
new file mode 100644
index 0000000..b391bdd
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/move_left_out.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/move_right_in.tga b/linden/indra/newview/skins/gemini/textures/move_right_in.tga
new file mode 100644
index 0000000..b1c33e2
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/move_right_in.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/move_right_out.tga b/linden/indra/newview/skins/gemini/textures/move_right_out.tga
new file mode 100644
index 0000000..c7446e7
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/move_right_out.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/move_turn_left_in.tga b/linden/indra/newview/skins/gemini/textures/move_turn_left_in.tga
new file mode 100644
index 0000000..ae6217b
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/move_turn_left_in.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/move_turn_left_out.tga b/linden/indra/newview/skins/gemini/textures/move_turn_left_out.tga
new file mode 100644
index 0000000..ab3abb6
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/move_turn_left_out.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/move_turn_right_in.tga b/linden/indra/newview/skins/gemini/textures/move_turn_right_in.tga
new file mode 100644
index 0000000..8bfea07
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/move_turn_right_in.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/move_turn_right_out.tga b/linden/indra/newview/skins/gemini/textures/move_turn_right_out.tga
new file mode 100644
index 0000000..0ddb51a
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/move_turn_right_out.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/move_up_in.tga b/linden/indra/newview/skins/gemini/textures/move_up_in.tga
new file mode 100644
index 0000000..876ce4a
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/move_up_in.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/move_up_out.tga b/linden/indra/newview/skins/gemini/textures/move_up_out.tga
new file mode 100644
index 0000000..7c04936
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/move_up_out.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/music_icon.tga b/linden/indra/newview/skins/gemini/textures/music_icon.tga
new file mode 100644
index 0000000..aeaff02
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/music_icon.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/mute_icon.tga b/linden/indra/newview/skins/gemini/textures/mute_icon.tga
new file mode 100644
index 0000000..879b9e6
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/mute_icon.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/notify_box_icon.tga b/linden/indra/newview/skins/gemini/textures/notify_box_icon.tga
new file mode 100644
index 0000000..0672c89
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/notify_box_icon.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/notify_caution_icon.tga b/linden/indra/newview/skins/gemini/textures/notify_caution_icon.tga
new file mode 100644
index 0000000..abc23d1
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/notify_caution_icon.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/notify_next.png b/linden/indra/newview/skins/gemini/textures/notify_next.png
new file mode 100644
index 0000000..6faa14a
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/notify_next.png differ
diff --git a/linden/indra/newview/skins/gemini/textures/notify_tip_icon.tga b/linden/indra/newview/skins/gemini/textures/notify_tip_icon.tga
new file mode 100644
index 0000000..f79a634
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/notify_tip_icon.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/object_cone.tga b/linden/indra/newview/skins/gemini/textures/object_cone.tga
new file mode 100644
index 0000000..f21a033
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/object_cone.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/object_cone_active.tga b/linden/indra/newview/skins/gemini/textures/object_cone_active.tga
new file mode 100644
index 0000000..6f071c5
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/object_cone_active.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/object_cube.tga b/linden/indra/newview/skins/gemini/textures/object_cube.tga
new file mode 100644
index 0000000..f8a9cae
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/object_cube.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/object_cube_active.tga b/linden/indra/newview/skins/gemini/textures/object_cube_active.tga
new file mode 100644
index 0000000..4f87127
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/object_cube_active.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/object_cylinder.tga b/linden/indra/newview/skins/gemini/textures/object_cylinder.tga
new file mode 100644
index 0000000..f28c3cb
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/object_cylinder.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/object_cylinder_active.tga b/linden/indra/newview/skins/gemini/textures/object_cylinder_active.tga
new file mode 100644
index 0000000..0b84518
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/object_cylinder_active.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/object_grass.tga b/linden/indra/newview/skins/gemini/textures/object_grass.tga
new file mode 100644
index 0000000..b0deccc
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/object_grass.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/object_grass_active.tga b/linden/indra/newview/skins/gemini/textures/object_grass_active.tga
new file mode 100644
index 0000000..b9fef12
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/object_grass_active.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/object_hemi_cone.tga b/linden/indra/newview/skins/gemini/textures/object_hemi_cone.tga
new file mode 100644
index 0000000..9465777
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/object_hemi_cone.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/object_hemi_cone_active.tga b/linden/indra/newview/skins/gemini/textures/object_hemi_cone_active.tga
new file mode 100644
index 0000000..f52a10f
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/object_hemi_cone_active.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/object_hemi_cylinder.tga b/linden/indra/newview/skins/gemini/textures/object_hemi_cylinder.tga
new file mode 100644
index 0000000..db7132b
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/object_hemi_cylinder.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/object_hemi_cylinder_active.tga b/linden/indra/newview/skins/gemini/textures/object_hemi_cylinder_active.tga
new file mode 100644
index 0000000..e1b1d6a
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/object_hemi_cylinder_active.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/object_hemi_sphere.tga b/linden/indra/newview/skins/gemini/textures/object_hemi_sphere.tga
new file mode 100644
index 0000000..0ce884c
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/object_hemi_sphere.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/object_hemi_sphere_active.tga b/linden/indra/newview/skins/gemini/textures/object_hemi_sphere_active.tga
new file mode 100644
index 0000000..4c7282e
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/object_hemi_sphere_active.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/object_prism.tga b/linden/indra/newview/skins/gemini/textures/object_prism.tga
new file mode 100644
index 0000000..0b25d11
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/object_prism.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/object_prism_active.tga b/linden/indra/newview/skins/gemini/textures/object_prism_active.tga
new file mode 100644
index 0000000..99c6647
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/object_prism_active.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/object_pyramid.tga b/linden/indra/newview/skins/gemini/textures/object_pyramid.tga
new file mode 100644
index 0000000..f9ecde8
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/object_pyramid.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/object_pyramid_active.tga b/linden/indra/newview/skins/gemini/textures/object_pyramid_active.tga
new file mode 100644
index 0000000..2c714d5
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/object_pyramid_active.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/object_ring.tga b/linden/indra/newview/skins/gemini/textures/object_ring.tga
new file mode 100644
index 0000000..c82566e
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/object_ring.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/object_ring_active.tga b/linden/indra/newview/skins/gemini/textures/object_ring_active.tga
new file mode 100644
index 0000000..a935d5e
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/object_ring_active.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/object_sphere.tga b/linden/indra/newview/skins/gemini/textures/object_sphere.tga
new file mode 100644
index 0000000..22440ed
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/object_sphere.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/object_sphere_active.tga b/linden/indra/newview/skins/gemini/textures/object_sphere_active.tga
new file mode 100644
index 0000000..13092e2
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/object_sphere_active.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/object_tetrahedron.tga b/linden/indra/newview/skins/gemini/textures/object_tetrahedron.tga
new file mode 100644
index 0000000..e61ee4e
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/object_tetrahedron.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/object_tetrahedron_active.tga b/linden/indra/newview/skins/gemini/textures/object_tetrahedron_active.tga
new file mode 100644
index 0000000..95a50dc
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/object_tetrahedron_active.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/object_torus.tga b/linden/indra/newview/skins/gemini/textures/object_torus.tga
new file mode 100644
index 0000000..e01e225
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/object_torus.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/object_torus_active.tga b/linden/indra/newview/skins/gemini/textures/object_torus_active.tga
new file mode 100644
index 0000000..0552476
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/object_torus_active.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/object_tree.tga b/linden/indra/newview/skins/gemini/textures/object_tree.tga
new file mode 100644
index 0000000..0b5a1c7
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/object_tree.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/object_tree_active.tga b/linden/indra/newview/skins/gemini/textures/object_tree_active.tga
new file mode 100644
index 0000000..d730fea
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/object_tree_active.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/object_tube.tga b/linden/indra/newview/skins/gemini/textures/object_tube.tga
new file mode 100644
index 0000000..be8a341
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/object_tube.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/object_tube_active.tga b/linden/indra/newview/skins/gemini/textures/object_tube_active.tga
new file mode 100644
index 0000000..a9efb3a
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/object_tube_active.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/payment_info_charter.tga b/linden/indra/newview/skins/gemini/textures/payment_info_charter.tga
new file mode 100644
index 0000000..6205da7
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/payment_info_charter.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/payment_info_filled.tga b/linden/indra/newview/skins/gemini/textures/payment_info_filled.tga
new file mode 100644
index 0000000..65e6196
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/payment_info_filled.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/payment_info_used.tga b/linden/indra/newview/skins/gemini/textures/payment_info_used.tga
new file mode 100644
index 0000000..345b3b3
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/payment_info_used.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/preview.png b/linden/indra/newview/skins/gemini/textures/preview.png
new file mode 100644
index 0000000..156da53
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/preview.png differ
diff --git a/linden/indra/newview/skins/gemini/textures/progress_fill.tga b/linden/indra/newview/skins/gemini/textures/progress_fill.tga
new file mode 100644
index 0000000..9cf5270
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/progress_fill.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/progressbar_fill.tga b/linden/indra/newview/skins/gemini/textures/progressbar_fill.tga
new file mode 100644
index 0000000..c6aaf86
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/progressbar_fill.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/progressbar_track.tga b/linden/indra/newview/skins/gemini/textures/progressbar_track.tga
new file mode 100644
index 0000000..7a5b5d5
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/progressbar_track.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/propertyline.tga b/linden/indra/newview/skins/gemini/textures/propertyline.tga
new file mode 100644
index 0000000..0c504ee
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/propertyline.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/ptt_lock_off.tga b/linden/indra/newview/skins/gemini/textures/ptt_lock_off.tga
new file mode 100644
index 0000000..09c4798
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/ptt_lock_off.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/ptt_lock_on.tga b/linden/indra/newview/skins/gemini/textures/ptt_lock_on.tga
new file mode 100644
index 0000000..dfb8ce2
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/ptt_lock_on.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/radio_active_false.tga b/linden/indra/newview/skins/gemini/textures/radio_active_false.tga
new file mode 100644
index 0000000..edcf411
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/radio_active_false.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/radio_active_true.tga b/linden/indra/newview/skins/gemini/textures/radio_active_true.tga
new file mode 100644
index 0000000..adfc155
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/radio_active_true.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/radio_inactive_false.tga b/linden/indra/newview/skins/gemini/textures/radio_inactive_false.tga
new file mode 100644
index 0000000..748f009
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/radio_inactive_false.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/radio_inactive_true.tga b/linden/indra/newview/skins/gemini/textures/radio_inactive_true.tga
new file mode 100644
index 0000000..98c9eb8
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/radio_inactive_true.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/resize_handle_bottom_right_blue.tga b/linden/indra/newview/skins/gemini/textures/resize_handle_bottom_right_blue.tga
new file mode 100644
index 0000000..9843938
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/resize_handle_bottom_right_blue.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/restore.tga b/linden/indra/newview/skins/gemini/textures/restore.tga
new file mode 100644
index 0000000..87910e2
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/restore.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/restore_inactive.tga b/linden/indra/newview/skins/gemini/textures/restore_inactive.tga
new file mode 100644
index 0000000..dbbec7e
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/restore_inactive.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/restore_pressed.tga b/linden/indra/newview/skins/gemini/textures/restore_pressed.tga
new file mode 100644
index 0000000..1922ca8
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/restore_pressed.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/scrollbutton_down_in_blue.tga b/linden/indra/newview/skins/gemini/textures/scrollbutton_down_in_blue.tga
new file mode 100644
index 0000000..5e73799
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/scrollbutton_down_in_blue.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/scrollbutton_down_out_blue.tga b/linden/indra/newview/skins/gemini/textures/scrollbutton_down_out_blue.tga
new file mode 100644
index 0000000..c5cf9bf
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/scrollbutton_down_out_blue.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/scrollbutton_left_in_blue.tga b/linden/indra/newview/skins/gemini/textures/scrollbutton_left_in_blue.tga
new file mode 100644
index 0000000..480842a
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/scrollbutton_left_in_blue.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/scrollbutton_left_out_blue.tga b/linden/indra/newview/skins/gemini/textures/scrollbutton_left_out_blue.tga
new file mode 100644
index 0000000..71aad79
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/scrollbutton_left_out_blue.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/scrollbutton_right_in_blue.tga b/linden/indra/newview/skins/gemini/textures/scrollbutton_right_in_blue.tga
new file mode 100644
index 0000000..6d7f13b
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/scrollbutton_right_in_blue.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/scrollbutton_right_out_blue.tga b/linden/indra/newview/skins/gemini/textures/scrollbutton_right_out_blue.tga
new file mode 100644
index 0000000..0edc59a
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/scrollbutton_right_out_blue.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/scrollbutton_up_in_blue.tga b/linden/indra/newview/skins/gemini/textures/scrollbutton_up_in_blue.tga
new file mode 100644
index 0000000..4c6a8fe
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/scrollbutton_up_in_blue.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/scrollbutton_up_out_blue.tga b/linden/indra/newview/skins/gemini/textures/scrollbutton_up_out_blue.tga
new file mode 100644
index 0000000..5cd5dff
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/scrollbutton_up_out_blue.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/slim_icon_16_viewer.tga b/linden/indra/newview/skins/gemini/textures/slim_icon_16_viewer.tga
new file mode 100644
index 0000000..552181d
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/slim_icon_16_viewer.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/sm_rounded_corners_simple.tga b/linden/indra/newview/skins/gemini/textures/sm_rounded_corners_simple.tga
new file mode 100644
index 0000000..85157e4
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/sm_rounded_corners_simple.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/smicon_warn.tga b/linden/indra/newview/skins/gemini/textures/smicon_warn.tga
new file mode 100644
index 0000000..90ccaa0
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/smicon_warn.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/spacer24.tga b/linden/indra/newview/skins/gemini/textures/spacer24.tga
new file mode 100644
index 0000000..c7cab6b
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/spacer24.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/spacer35.tga b/linden/indra/newview/skins/gemini/textures/spacer35.tga
new file mode 100644
index 0000000..b88bc66
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/spacer35.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/spin_down_in_blue.tga b/linden/indra/newview/skins/gemini/textures/spin_down_in_blue.tga
new file mode 100644
index 0000000..b9eb36b
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/spin_down_in_blue.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/spin_down_out_blue.tga b/linden/indra/newview/skins/gemini/textures/spin_down_out_blue.tga
new file mode 100644
index 0000000..c9cb5e8
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/spin_down_out_blue.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/spin_up_in_blue.tga b/linden/indra/newview/skins/gemini/textures/spin_up_in_blue.tga
new file mode 100644
index 0000000..b604b88
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/spin_up_in_blue.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/spin_up_out_blue.tga b/linden/indra/newview/skins/gemini/textures/spin_up_out_blue.tga
new file mode 100644
index 0000000..4e3941e
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/spin_up_out_blue.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/square_btn_32x128.tga b/linden/indra/newview/skins/gemini/textures/square_btn_32x128.tga
new file mode 100644
index 0000000..d8591d1
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/square_btn_32x128.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/square_btn_selected_32x128.tga b/linden/indra/newview/skins/gemini/textures/square_btn_selected_32x128.tga
new file mode 100644
index 0000000..f830e7f
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/square_btn_selected_32x128.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/startup_logo.j2c b/linden/indra/newview/skins/gemini/textures/startup_logo.j2c
new file mode 100644
index 0000000..589e69a
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/startup_logo.j2c differ
diff --git a/linden/indra/newview/skins/gemini/textures/status_busy.tga b/linden/indra/newview/skins/gemini/textures/status_busy.tga
new file mode 100644
index 0000000..7743d9c
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/status_busy.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/status_buy_currency.tga b/linden/indra/newview/skins/gemini/textures/status_buy_currency.tga
new file mode 100644
index 0000000..d72078a
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/status_buy_currency.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/status_buy_currency_pressed.tga b/linden/indra/newview/skins/gemini/textures/status_buy_currency_pressed.tga
new file mode 100644
index 0000000..acb0479
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/status_buy_currency_pressed.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/status_buy_land.tga b/linden/indra/newview/skins/gemini/textures/status_buy_land.tga
new file mode 100644
index 0000000..4903837
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/status_buy_land.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/status_buy_land_pressed.tga b/linden/indra/newview/skins/gemini/textures/status_buy_land_pressed.tga
new file mode 100644
index 0000000..af5d189
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/status_buy_land_pressed.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/status_health.tga b/linden/indra/newview/skins/gemini/textures/status_health.tga
new file mode 100644
index 0000000..3d5f455
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/status_health.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/status_money.tga b/linden/indra/newview/skins/gemini/textures/status_money.tga
new file mode 100644
index 0000000..d5be31f
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/status_money.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/status_no_build.tga b/linden/indra/newview/skins/gemini/textures/status_no_build.tga
new file mode 100644
index 0000000..8e471e1
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/status_no_build.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/status_no_fly.tga b/linden/indra/newview/skins/gemini/textures/status_no_fly.tga
new file mode 100644
index 0000000..cde2700
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/status_no_fly.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/status_no_push.tga b/linden/indra/newview/skins/gemini/textures/status_no_push.tga
new file mode 100644
index 0000000..5ccbfa5
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/status_no_push.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/status_no_scripts.tga b/linden/indra/newview/skins/gemini/textures/status_no_scripts.tga
new file mode 100644
index 0000000..52ecdb1
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/status_no_scripts.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/status_no_voice.tga b/linden/indra/newview/skins/gemini/textures/status_no_voice.tga
new file mode 100644
index 0000000..4ab4498
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/status_no_voice.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/status_script_debug.tga b/linden/indra/newview/skins/gemini/textures/status_script_debug.tga
new file mode 100644
index 0000000..6fca614
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/status_script_debug.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/status_search.tga b/linden/indra/newview/skins/gemini/textures/status_search.tga
new file mode 100644
index 0000000..3ac10c4
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/status_search.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/status_search_btn.png b/linden/indra/newview/skins/gemini/textures/status_search_btn.png
new file mode 100644
index 0000000..67f6133
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/status_search_btn.png differ
diff --git a/linden/indra/newview/skins/gemini/textures/status_search_btn_pressed.png b/linden/indra/newview/skins/gemini/textures/status_search_btn_pressed.png
new file mode 100644
index 0000000..1437273
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/status_search_btn_pressed.png differ
diff --git a/linden/indra/newview/skins/gemini/textures/status_voice.tga b/linden/indra/newview/skins/gemini/textures/status_voice.tga
new file mode 100644
index 0000000..4ab4498
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/status_voice.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/tab_background_darkpurple.tga b/linden/indra/newview/skins/gemini/textures/tab_background_darkpurple.tga
new file mode 100644
index 0000000..8169f98
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/tab_background_darkpurple.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/tab_background_lightgrey.tga b/linden/indra/newview/skins/gemini/textures/tab_background_lightgrey.tga
new file mode 100644
index 0000000..c2f8818
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/tab_background_lightgrey.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/tab_background_purple.tga b/linden/indra/newview/skins/gemini/textures/tab_background_purple.tga
new file mode 100644
index 0000000..aa01b3c
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/tab_background_purple.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/tab_bottom_blue.tga b/linden/indra/newview/skins/gemini/textures/tab_bottom_blue.tga
new file mode 100644
index 0000000..0fc6b04
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/tab_bottom_blue.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/tab_bottom_selected_blue.tga b/linden/indra/newview/skins/gemini/textures/tab_bottom_selected_blue.tga
new file mode 100644
index 0000000..b991521
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/tab_bottom_selected_blue.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/tab_left.tga b/linden/indra/newview/skins/gemini/textures/tab_left.tga
new file mode 100644
index 0000000..5552bec
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/tab_left.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/tab_left_selected.tga b/linden/indra/newview/skins/gemini/textures/tab_left_selected.tga
new file mode 100644
index 0000000..82386cc
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/tab_left_selected.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/tab_top_blue.tga b/linden/indra/newview/skins/gemini/textures/tab_top_blue.tga
new file mode 100644
index 0000000..3f63a4f
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/tab_top_blue.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/tab_top_selected_blue.tga b/linden/indra/newview/skins/gemini/textures/tab_top_selected_blue.tga
new file mode 100644
index 0000000..3ff4821
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/tab_top_selected_blue.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/tabarea.tga b/linden/indra/newview/skins/gemini/textures/tabarea.tga
new file mode 100644
index 0000000..5517aeb
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/tabarea.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/tearoff_pressed.tga b/linden/indra/newview/skins/gemini/textures/tearoff_pressed.tga
new file mode 100644
index 0000000..620d109
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/tearoff_pressed.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/tearoffbox.tga b/linden/indra/newview/skins/gemini/textures/tearoffbox.tga
new file mode 100644
index 0000000..0670d2e
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/tearoffbox.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/textures.xml b/linden/indra/newview/skins/gemini/textures/textures.xml
new file mode 100644
index 0000000..2c4b0cb
--- /dev/null
+++ b/linden/indra/newview/skins/gemini/textures/textures.xml
@@ -0,0 +1,382 @@
+<textures version="101">
+
+  <texture name="icn_scrollbar_thumb.tga" preload="true" scale_top="7" scale_left="4" scale_bottom="8" scale_right="4" />
+  <texture name="icn_scrollbar_bg.tga" preload="true" scale_top="7" scale_left="4" scale_bottom="8" scale_right="4" />
+  <texture name="sm_rounded_corners_simple.tga" scale_left="4" scale_top="4" scale_bottom="4" scale_right="4"/>
+  <texture name="icn_textfield_enabled.tga" scale_left="5" scale_top="5" scale_bottom="5" scale_right="5"/>
+  
+  <texture name="button_disabled_32x128.tga" preload="true" scale_left="16" scale_top="16" scale_right="112" scale_bottom="16" />
+  
+  <texture name="button_enabled_32x128.tga" preload="true" scale_left="16" scale_top="16" scale_right="112" scale_bottom="16" />
+  
+  <texture name="toolbar_btn_enabled.tga" scale_left="7" scale_top="32" scale_right="121" scale_bottom="0" /> 
+
+  <texture name="toolbar_btn_disabled.tga" scale_left="7" scale_top="32" scale_right="121" scale_bottom="0" /> 
+  
+  <texture name="toolbar_btn_selected.tga" scale_left="7" scale_top="32" scale_right="121" scale_bottom="0" /> 
+  
+  <texture name="button_enabled_selected_32x128.tga" preload="true" scale_left="16" scale_top="16" scale_right="112" scale_bottom="16" />
+  
+  <texture name="checkbox_disabled_false.tga"	preload="true"/>
+  <texture name="checkbox_disabled_true.tga"	preload="true"/>
+  <texture name="checkbox_enabled_false.tga"	preload="true"/>
+  <texture name="checkbox_enabled_true.tga"	preload="true"/>
+  
+  <texture name="close_in_blue.tga"	preload="true"/>
+ 
+  <texture name="minimize.tga"	preload="true"/>
+  <texture name="minimize_pressed.tga"	preload="true"/>
+  
+  <texture name="radio_active_false.tga"	preload="true"/>
+  <texture name="radio_active_true.tga"	preload="true"/>
+  <texture name="radio_inactive_false.tga"	preload="true"/>
+  <texture name="radio_inactive_true.tga"	preload="true"/>
+  
+  <texture name="combobox_arrow.tga"	preload="true"/>
+  
+  <texture name="resize_handle_bottom_right_blue.tga" preload="true"/>
+  
+  <texture name="rounded_square.tga"	file_name="rounded_square.j2c" preload="true" scale_left="16" scale_top="16" scale_right="112" scale_bottom="16"/>
+  
+  <texture name="rounded_square_soft.tga"	file_name="rounded_square_soft.j2c" preload="true" scale_left="16" scale_top="16" scale_right="112" scale_bottom="16"/>
+  
+  <texture name="toolbar_tab.tga"	preload="true" scale_left="6" scale_top="42" scale_right="104" scale_bottom="8"/>
+  <texture name="toolbar_bg.tga"	preload="true" scale_left="6" scale_top="42" scale_right="96" scale_bottom="16"/>
+  
+  <texture name="progressbar_fill.tga"	preload="true" scale_left="10" scale_top="7" scale_right="65" scale_bottom="7"/>
+  <texture name="progressbar_track.tga"	preload="true" scale_left="10" scale_top="7" scale_right="80" scale_bottom="7"/>
+  
+  <texture name="scrollbutton_down_in_blue.tga"	preload="true"/>
+  <texture name="scrollbutton_down_out_blue.tga"	preload="true"/>
+  <texture name="scrollbutton_left_in_blue.tga"	preload="true"/>
+  <texture name="scrollbutton_left_out_blue.tga"	preload="true"/>
+  <texture name="scrollbutton_right_in_blue.tga"	preload="true"/>
+  <texture name="scrollbutton_right_out_blue.tga"	preload="true"/>
+  <texture name="scrollbutton_up_in_blue.tga"	preload="true"/>
+  <texture name="scrollbutton_up_out_blue.tga"	preload="true"/>
+  <texture name="spin_down_in_blue.tga"	preload="true"/>
+  <texture name="spin_down_out_blue.tga"	preload="true"/>
+  <texture name="spin_up_in_blue.tga"	preload="true"/>
+  <texture name="spin_up_out_blue.tga"	preload="true"/>
+  
+  <texture name="square_btn_32x128.tga"	preload="true" scale_left="8" scale_top="10" scale_right="120" scale_bottom="10"/>
+  <texture name="square_btn_selected_32x128.tga"	preload="true" scale_left="2" scale_top="10" scale_right="126" scale_bottom="10"/>
+  
+  <texture name="tab_bottom_blue.tga"	preload="true" scale_left="8" scale_top="8" scale_right="120" scale_bottom="9"/>
+  <texture name="tab_bottom_selected_blue.tga"	preload="true" scale_left="8" scale_top="8" scale_right="96" scale_bottom="9"/>
+  <texture name="tab_left.tga"	preload="true" scale_left="8" scale_top="8" scale_right="120" scale_bottom="9"/>
+  <texture name="tab_left_selected.tga"	preload="true" scale_left="8" scale_top="8" scale_right="96" scale_bottom="9"/>
+  <texture name="tab_top_blue.tga"	preload="true" scale_left="8" scale_top="8" scale_right="120" scale_bottom="9"/>
+  <texture name="tab_top_selected_blue.tga" preload="true" scale_left="8" scale_top="8" scale_right="96" scale_bottom="9"/>
+  
+  <texture name="startup_logo.j2c" preload="true"/>
+  <texture name="color_swatch_alpha.tga" preload="true"/>
+
+  <texture name="active_voice_tab.tga"/>
+  <texture name="button_anim_pause.tga"/>
+  <texture name="button_anim_pause_selected.tga"/>
+  <texture name="button_anim_play.tga"/>
+  <texture name="button_anim_play_selected.tga"/>
+  <texture name="button_anim_stop.tga"/>
+  <texture name="button_anim_stop_selected.tga"/>
+  <texture name="crosshairs.tga"/>
+  <texture name="direction_arrow.tga"/>
+  <texture name="foot_shadow.j2c" use_mips="true"/>
+
+  <texture name="icon_auction.tga"/>
+  <texture name="icon_avatar_offline.tga"/>
+  <texture name="icon_avatar_online.tga"/>
+  <texture name="icon_day_cycle.tga"/>
+  <texture name="icon_diurnal.tga"/>
+  <texture name="icon_event.tga"/>
+  <texture name="icon_event_mature.tga"/>
+  <texture name="icon_for_sale.tga"/>
+  <texture name="icon_group.tga"/>
+  <texture name="icon_groupnotice.tga"/>
+  <texture name="icon_groupnoticeinventory.tga"/>
+  <texture name="icon_lock.tga"/>
+  <texture name="icon_place.tga"/>
+  <texture name="icon_popular.tga"/>
+  <texture name="icon_top_pick.tga"/>
+
+  <texture name="inv_folder_animation.tga"/>
+  <texture name="inv_folder_bodypart.tga"/>
+  <texture name="inv_folder_callingcard.tga"/>
+  <texture name="inv_folder_clothing.tga"/>
+  <texture name="inv_folder_gesture.tga"/>
+  <texture name="inv_folder_landmark.tga"/>
+  <texture name="inv_folder_lostandfound.tga"/>
+  <texture name="inv_folder_notecard.tga"/>
+  <texture name="inv_folder_object.tga"/>
+  <texture name="inv_folder_plain_closed.tga"/>
+  <texture name="inv_folder_script.tga"/>
+  <texture name="inv_folder_snapshot.tga"/>
+  <texture name="inv_folder_sound.tga"/>
+  <texture name="inv_folder_texture.tga"/>
+  <texture name="inv_folder_trash.tga"/>
+  
+  <texture name="inv_item_animation.tga"/>
+  <texture name="inv_item_skin.tga"/>
+  <texture name="inv_item_callingcard_offline.tga"/>
+  <texture name="inv_item_callingcard_online.tga"/>
+  <texture name="inv_item_eyes.tga"/>
+  <texture name="inv_item_gesture.tga"/>
+  <texture name="inv_item_gloves.tga"/>
+  <texture name="inv_item_hair.tga"/>
+  <texture name="inv_item_jacket.tga"/>
+  <texture name="inv_item_landmark.tga"/>
+  <texture name="inv_item_landmark_visited.tga"/>
+  <texture name="inv_item_notecard.tga"/>
+  <texture name="inv_item_object.tga"/>
+  <texture name="inv_item_object_multi.tga"/>
+  <texture name="inv_item_pants.tga"/>
+  <texture name="inv_item_script.tga"/>
+  <texture name="inv_item_shape.tga"/>
+  <texture name="inv_item_shirt.tga"/>
+  <texture name="inv_item_shoes.tga"/>
+  <texture name="inv_item_skirt.tga"/>
+  <texture name="inv_item_snapshot.tga"/>
+  <texture name="inv_item_socks.tga"/>
+  <texture name="inv_item_sound.tga"/>
+  <texture name="inv_item_texture.tga"/>
+  <texture name="inv_item_underpants.tga"/>
+  <texture name="inv_item_undershirt.tga"/>
+  
+  <texture name="lag_status_critical.tga"/>
+  <texture name="lag_status_good.tga"/>
+  <texture name="lag_status_warning.tga"/>
+  
+  <texture name="legend.tga"/>
+  
+  <texture name="map_avatar_16.tga"/>
+  <texture name="map_avatar_8.tga"/>
+  <texture name="map_avatar_you_8.tga"/>
+  <texture name="map_event.tga"/>
+  <texture name="map_event_mature.tga"/>
+  <texture name="map_home.tga"/>
+  <texture name="map_infohub.tga"/>
+  <texture name="map_telehub.tga"/>
+  <texture name="map_track_16.tga"/>
+  
+  <texture name="media_icon.tga" file_name="icn_label_media.tga" />
+  <texture name="music_icon.tga" file_name="icn_label_music.tga" />
+  <texture name="noentrylines.j2c" use_mips="true"/>
+  <texture name="noentrypasslines.j2c" use_mips="true"/>
+  
+  <texture name="notify_tip_icon.tga"/>
+  <texture name="notify_caution_icon.tga"/>
+  <texture name="notify_next.png" preload="true"/>
+  <texture name="notify_box_icon.tga"/>
+  
+  <texture name="object_cone.tga"/>
+  <texture name="object_cone_active.tga"/>
+  <texture name="object_cube.tga"/>
+  <texture name="object_cube_active.tga"/>
+  <texture name="object_cylinder.tga"/>
+  <texture name="object_cylinder_active.tga"/>
+  <texture name="object_grass.tga"/>
+  <texture name="object_grass_active.tga"/>
+  <texture name="object_hemi_cone.tga"/>
+  <texture name="object_hemi_cone_active.tga"/>
+  <texture name="object_hemi_cylinder.tga"/>
+  <texture name="object_hemi_cylinder_active.tga"/>
+  <texture name="object_hemi_sphere.tga"/>
+  <texture name="object_hemi_sphere_active.tga"/>
+  <texture name="object_prism.tga"/>
+  <texture name="object_prism_active.tga"/>
+  <texture name="object_pyramid.tga"/>
+  <texture name="object_pyramid_active.tga"/>
+  <texture name="object_ring.tga"/>
+  <texture name="object_ring_active.tga"/>
+  <texture name="object_sphere.tga"/>
+  <texture name="object_sphere_active.tga"/>
+  <texture name="object_tetrahedron.tga"/>
+  <texture name="object_tetrahedron_active.tga"/>
+  <texture name="object_torus.tga"/>
+  <texture name="object_torus_active.tga"/>
+  <texture name="object_tree.tga"/>
+  <texture name="object_tree_active.tga"/>
+  <texture name="object_tube.tga"/>
+  <texture name="object_tube_active.tga"/>
+  
+  <texture name="pixiesmall.j2c" use_mips="true"/>
+  <texture name="script_error.j2c" use_mips="true"/>
+  <texture name="silhouette.j2c" use_mips="true"/>
+  
+  <texture name="status_no_build.tga"/>
+  <texture name="status_voice.tga"/>
+  <texture name="status_buy_currency.tga"/>
+  <texture name="status_buy_currency_pressed.tga"/>
+  <texture name="status_buy_land.tga"/>
+  <texture name="status_buy_land_pressed.tga"/>
+  <texture name="status_no_fly.tga"/>
+  <texture name="status_health.tga"/>
+  <texture name="status_no_push.tga"/>
+  <texture name="status_no_scripts.tga"/>
+  
+  <texture name="tool_dozer.tga"/>
+  <texture name="tool_dozer_active.tga"/>
+  <texture name="tool_zoom.tga"/>
+  <texture name="tool_zoom_active.tga"/>
+
+  <texture name="icn_active-speakers-dot-lvl0.tga"/>
+  <texture name="icn_active-speakers-dot-lvl1.tga"/>
+  <texture name="icn_active-speakers-dot-lvl2.tga"/>
+  <texture name="icn_active-speakers-typing1.tga"/>
+  <texture name="icn_active-speakers-typing2.tga"/>
+  <texture name="icn_active-speakers-typing3.tga"/>
+  
+  <texture name="icn_voice_ptt-off.tga"/>
+  <texture name="icn_voice_ptt-on.tga"/>
+  <texture name="icn_voice_ptt-on-lvl1.tga"/>
+  <texture name="icn_voice_ptt-on-lvl2.tga"/>
+  <texture name="icn_voice_ptt-on-lvl3.tga"/>
+  <texture name="icn_voice-call-end.tga"/>
+  <texture name="icn_voice-call-start.tga"/>
+  
+  <texture name="mute_icon.tga"/>
+  
+  <texture name="icn_slide-groove_dark.tga" scale_left="2" scale_top="5" scale_right="29" scale_bottom="4"/>
+  <texture name="icn_slide-highlight.tga" scale_left="2" scale_top="5" scale_right="29" scale_bottom="4"/>
+  <texture name="icn_slide-thumb_dark.tga" scale_left="2" scale_top="5" scale_right="29" scale_bottom="4"/>
+  
+  <texture name="icn_speaker-muted_dark.tga"/>
+  <texture name="icn_speaker_dark.tga"/>
+
+  <texture name="icn_voice-localchat.tga"/>
+  <texture name="icn_voice-groupfocus.tga"/>
+  <texture name="icn_voice-pvtfocus.tga"/>
+  
+  <texture name="icn_media-pause.tga"/>
+  <texture name="icn_media-play.tga"/>
+  <texture name="icn_music-play.tga"/>
+  <texture name="icn_music-pause.tga"/>
+  <texture name="icn_media_web.tga" preload="true"/>
+  <texture name="icn_media_movie.tga" preload="true"/>
+  
+  <texture name="icn_chatbar.tga"/>
+  <texture name="btn_chatbar.tga" scale_left="20" scale_top="24" scale_right="44" scale_bottom="0"/>
+  <texture name="btn_chatbar_selected.tga" scale_left="20" scale_top="24" scale_right="44" scale_bottom="0"/>
+  
+  <texture name="icn_rounded-text-field.tga"/>
+
+  <texture name="flyout_btn_right_selected.tga" scale_left="0" scale_top="30" scale_right="32" scale_bottom="0"/>
+  
+  <texture name="flyout_btn_right.tga" scale_left="0" scale_top="30" scale_right="32" scale_bottom="0"/>
+  
+  <texture name="flyout_btn_right_disabled.tga" scale_left="0" scale_top="30" scale_right="32" scale_bottom="0"/>
+  
+  <texture name="flyout_btn_left_selected.tga" scale_left="16" scale_top="15" scale_right="112" scale_bottom="15"/>
+  
+  <texture name="flyout_btn_left.tga" scale_left="16" scale_top="15" scale_right="112" scale_bottom="15"/>
+  
+  <texture name="flyout_btn_left_disabled.tga" scale_left="16" scale_top="15" scale_right="112" scale_bottom="15"/>
+
+  <texture name="UIImgResizeBottomRightUUID" file_name="resize_handle_bottom_right_blue.tga"/>
+
+  <texture name="UIImgBtnForwardOutUUID" file_name="move_forward_out.tga" preload="true"/>
+  <texture name="UIImgBtnForwardInUUID" file_name="move_forward_in.tga" preload="true"/>
+  <texture name="UIImgBtnSlideLeftOutUUID" file_name="move_left_out.tga" preload="true"/>
+  <texture name="UIImgBtnSlideLeftInUUID" file_name="move_left_in.tga" preload="true"/>
+  <texture name="UIImgBtnLeftOutUUID"	file_name="move_turn_left_out.tga" preload="true"/>
+  <texture name="UIImgBtnLeftInUUID"	file_name="move_turn_left_in.tga" preload="true"/>
+  <texture name="UIImgBtnRightOutUUID" file_name="move_turn_right_out.tga" preload="true"/>
+  <texture name="UIImgBtnRightInUUID"	file_name="move_turn_right_in.tga" preload="true"/>
+  <texture name="UIImgBtnSlideRightOutUUID" file_name="move_right_out.tga" preload="true"/>
+  <texture name="UIImgBtnSlideRightInUUID" file_name="move_right_in.tga" preload="true"/>
+  <texture name="UIImgBtnMoveUpInUUID" file_name="move_up_in.tga" preload="true"/>
+  <texture name="UIImgBtnMoveUpOutUUID" file_name="move_up_out.tga" preload="true"/>
+  <texture name="UIImgBtnMoveDownInUUID" file_name="move_down_in.tga" preload="true"/>
+  <texture name="UIImgBtnMoveDownOutUUID" file_name="move_down_out.tga" preload="true"/>
+  
+  <texture name="cam_rotate_out.tga" preload="true"/>
+  <texture name="cam_rotate_in.tga" preload="true"/>
+  <texture name="cam_zoom_out.tga" preload="true"/>
+  <texture name="cam_zoom_plus_in.tga" preload="true"/>
+  <texture name="cam_zoom_minus_in.tga" preload="true"/>
+
+  <texture name="UIImgBtnScrollUpOutUUID" file_name="scrollbutton_up_out_blue.tga"/>
+  <texture name="UIImgBtnScrollUpInUUID" file_name="scrollbutton_up_in_blue.tga"/>
+  <texture name="UIImgBtnScrollDownOutUUID" file_name="scrollbutton_down_out_blue.tga"/>
+  <texture name="UIImgBtnScrollDownInUUID" file_name="scrollbutton_down_in_blue.tga"/>
+  <texture name="UIImgBtnScrollLeftOutUUID" file_name="scrollbutton_left_out_blue.tga"/>
+  <texture name="UIImgBtnScrollLeftInUUID" file_name="scrollbutton_left_in_blue.tga"/>
+  <texture name="UIImgBtnScrollRightOutUUID" file_name="scrollbutton_right_out_blue.tga"/>
+  <texture name="UIImgBtnScrollRightInUUID" file_name="scrollbutton_right_in_blue.tga"/>
+
+  <texture name="UIImgBtnJumpLeftOutUUID" file_name="3c18c87e-5f50-14e2-e744-f44734aa365f.tga"/>
+  <texture name="UIImgBtnJumpLeftInUUID" file_name="9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga"/>
+  <texture name="UIImgBtnJumpRightOutUUID" file_name="ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga"/>
+  <texture name="UIImgBtnJumpRightInUUID" file_name="7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga"/>
+
+  <texture name="UIImgBtnSpinUpOutUUID"	file_name="spin_up_out_blue.tga"/>
+  <texture name="UIImgBtnSpinUpInUUID"	file_name="spin_up_in_blue.tga"/>
+  <texture name="UIImgBtnSpinDownOutUUID"	file_name="spin_down_out_blue.tga"/>
+  <texture name="UIImgBtnSpinDownInUUID"	file_name="spin_down_in_blue.tga"/>
+
+  <texture name="UIImgRadioActiveUUID"	file_name="radio_active_false.tga"/>
+  <texture name="UIImgRadioActiveSelectedUUID" file_name="radio_active_true.tga"/>
+  <texture name="UIImgRadioInactiveUUID"	file_name="radio_inactive_false.tga"/>
+  <texture name="UIImgRadioInactiveSelectedUUID" file_name="radio_inactive_true.tga"/>
+
+  <texture name="UIImgCheckboxActiveUUID"	file_name="checkbox_enabled_false.tga"/>
+  <texture name="UIImgCheckboxActiveSelectedUUID" file_name="checkbox_enabled_true.tga"/>
+  <texture name="UIImgCheckboxInactiveUUID" file_name="checkbox_disabled_false.tga"/>
+  <texture name="UIImgCheckboxInactiveSelectedUUID" file_name="checkbox_disabled_true.tga"/>
+
+  <texture name="UIImgBtnTabTopOutUUID"	file_name="tab_top_blue.tga"/>
+  <texture name="UIImgBtnTabTopInUUID"	file_name="tab_top_selected_blue.tga"/>
+  <texture name="UIImgBtnTabBottomOutUUID" file_name="tab_bottom_blue.tga"/>
+  <texture name="UIImgBtnTabBottomInUUID"	file_name="tab_bottom_selected_blue.tga"/>
+
+  <texture name="UIImgGrabUUID"	file_name="c63f124c-6340-4fbf-b59e-0869a44adb64.tga"/>
+  <texture name="UIImgGrabSelectedUUID"	file_name="c1e21504-f136-451d-b8e9-929037812f1d.tga"/>
+
+  <!--<texture name="UIImgScaleUUID" 			file_name="88a90fef-b448-4883-9344-ecf378a60433.tga"/>-->
+
+  <texture name="UIImgFaceUUID"	file_name="ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga"/>
+  <texture name="UIImgFaceSelectedUUID"	file_name="b4870163-6208-42a9-9801-93133bf9a6cd.tga"/>
+
+  <texture name="UIImgCreateUUID"	file_name="7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga"/>
+  <texture name="UIImgCreateSelectedUUID"	file_name="0098b015-3daf-4cfe-a72f-915369ea97c2.tga"/>
+
+  <texture name="UIImgBtnCloseInactiveUUID" file_name="close_inactive_blue.tga"/>
+  <texture name="UIImgBtnCloseActiveUUID"	file_name="closebox.tga"/>
+  <texture name="UIImgBtnClosePressedUUID" file_name="close_in_blue.tga"/>
+  <texture name="icn_clear_lineeditor.tga" />
+  
+  <texture name="up_arrow.tga" file_name="up_arrow.png"/>
+  <texture name="down_arrow.tga" file_name="down_arrow.png"/>
+
+
+  <texture name="UIImgBtnMinimizeInactiveUUID" file_name="minimize_inactive.tga"/>
+  <texture name="UIImgBtnMinimizeActiveUUID" file_name="minimize.tga"/>
+  <texture name="UIImgBtnMinimizePressedUUID" file_name="minimize_pressed.tga"/>
+
+  <texture name="UIImgBtnRestoreInactiveUUID" file_name="restore_inactive.tga"/>
+  <texture name="UIImgBtnRestoreActiveUUID" file_name="restore.tga"/>
+  <texture name="UIImgBtnRestorePressedUUID" file_name="restore_pressed.tga"/>
+
+  <texture name="UIImgBtnTearOffInactiveUUID" file_name="tearoffbox.tga"/>
+  <texture name="UIImgBtnTearOffActiveUUID" file_name="tearoffbox.tga"/>
+  <texture name="UIImgBtnTearOffPressedUUID" file_name="tearoff_pressed.tga"/>
+
+  <texture name="UIImgCrosshairsUUID" file_name="crosshairs.tga"/>
+  <texture name="icn_label_music.tga"/>
+  <texture name="icn_label_media.tga"/>
+  <texture name="arrow_down.tga"/>
+  <texture name="cloud-particle.j2c" use_mips="true"/>
+  
+  <texture name="skin_thumbnail_default.png" preload="true" />
+  <texture name="skin_thumbnail_silver.png" preload="true" />  
+  <texture name="skin_thumbnail_dark.png" preload="true" />
+  <texture name="skin_thumbnail_emerald.png" preload="true" />  
+  <texture name="skin_thumbnail_gred.png" preload="true" />
+  <texture name="skin_thumbnail_ruby.png" preload="true" />
+  <texture name="skin_thumbnail_pslgreen.png" preload="true" />
+  <texture name="skin_thumbnail_pslpurple.png" preload="true" />
+  <texture name="skin_thumbnail_saphire.png" preload="true" />
+  
+  <texture name="icon_avatar_expand.png" preload="true" />
+  
+</textures>
diff --git a/linden/indra/newview/skins/gemini/textures/tool_dozer.tga b/linden/indra/newview/skins/gemini/textures/tool_dozer.tga
new file mode 100644
index 0000000..6f196ab
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/tool_dozer.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/tool_dozer_active.tga b/linden/indra/newview/skins/gemini/textures/tool_dozer_active.tga
new file mode 100644
index 0000000..f618a6c
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/tool_dozer_active.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/tool_zoom.tga b/linden/indra/newview/skins/gemini/textures/tool_zoom.tga
new file mode 100644
index 0000000..d48798e
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/tool_zoom.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/tool_zoom_active.tga b/linden/indra/newview/skins/gemini/textures/tool_zoom_active.tga
new file mode 100644
index 0000000..6988870
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/tool_zoom_active.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/toolbar_bg.tga b/linden/indra/newview/skins/gemini/textures/toolbar_bg.tga
new file mode 100644
index 0000000..3a05776
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/toolbar_bg.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/toolbar_btn_disabled.tga b/linden/indra/newview/skins/gemini/textures/toolbar_btn_disabled.tga
new file mode 100644
index 0000000..7bb8648
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/toolbar_btn_disabled.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/toolbar_btn_enabled.tga b/linden/indra/newview/skins/gemini/textures/toolbar_btn_enabled.tga
new file mode 100644
index 0000000..a6fab50
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/toolbar_btn_enabled.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/toolbar_btn_selected.tga b/linden/indra/newview/skins/gemini/textures/toolbar_btn_selected.tga
new file mode 100644
index 0000000..a93ae11
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/toolbar_btn_selected.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/toolbar_tab.tga b/linden/indra/newview/skins/gemini/textures/toolbar_tab.tga
new file mode 100644
index 0000000..5ea1a28
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/toolbar_tab.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/up_arrow.png b/linden/indra/newview/skins/gemini/textures/up_arrow.png
new file mode 100644
index 0000000..fe68ad4
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/up_arrow.png differ
diff --git a/linden/indra/newview/skins/gemini/textures/up_arrow.tga b/linden/indra/newview/skins/gemini/textures/up_arrow.tga
new file mode 100644
index 0000000..c2bd8cc
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/up_arrow.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/uv_test2.tga b/linden/indra/newview/skins/gemini/textures/uv_test2.tga
new file mode 100644
index 0000000..a16000d
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/uv_test2.tga differ
diff --git a/linden/indra/newview/skins/gemini/textures/white.tga b/linden/indra/newview/skins/gemini/textures/white.tga
new file mode 100644
index 0000000..9fe6863
Binary files /dev/null and b/linden/indra/newview/skins/gemini/textures/white.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga b/linden/indra/newview/skins/silver/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga
new file mode 100644
index 0000000..5c86082
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/0098b015-3daf-4cfe-a72f-915369ea97c2.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga b/linden/indra/newview/skins/silver/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga
new file mode 100644
index 0000000..79ba740
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/3c18c87e-5f50-14e2-e744-f44734aa365f.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga b/linden/indra/newview/skins/silver/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga
new file mode 100644
index 0000000..60c62e9
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/7a0b1bdb-b5d9-4df5-bac2-ba230da93b5b.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga b/linden/indra/newview/skins/silver/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga
new file mode 100644
index 0000000..7b55a05
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/7dabc040-ec13-2309-ddf7-4f161f6de2f4.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga b/linden/indra/newview/skins/silver/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga
new file mode 100644
index 0000000..4bed5ce
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/9cad3e6d-2d6d-107d-f8ab-5ba272b5bfe1.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/active_speakers.tga b/linden/indra/newview/skins/silver/textures/active_speakers.tga
new file mode 100644
index 0000000..ccd902c
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/active_speakers.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/active_voice_tab.tga b/linden/indra/newview/skins/silver/textures/active_voice_tab.tga
new file mode 100644
index 0000000..1a68c98
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/active_voice_tab.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/arrow_down.tga b/linden/indra/newview/skins/silver/textures/arrow_down.tga
new file mode 100644
index 0000000..5b05df1
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/arrow_down.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/arrow_left.tga b/linden/indra/newview/skins/silver/textures/arrow_left.tga
new file mode 100644
index 0000000..43fbf12
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/arrow_left.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/arrow_right.tga b/linden/indra/newview/skins/silver/textures/arrow_right.tga
new file mode 100644
index 0000000..a92ac9c
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/arrow_right.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/arrow_up.tga b/linden/indra/newview/skins/silver/textures/arrow_up.tga
new file mode 100644
index 0000000..2c27ed1
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/arrow_up.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga b/linden/indra/newview/skins/silver/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga
new file mode 100644
index 0000000..4bc75f5
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/b4870163-6208-42a9-9801-93133bf9a6cd.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/black.tga b/linden/indra/newview/skins/silver/textures/black.tga
new file mode 100644
index 0000000..e368ea4
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/black.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/btn_chatbar.tga b/linden/indra/newview/skins/silver/textures/btn_chatbar.tga
new file mode 100644
index 0000000..52bd97a
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/btn_chatbar.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/btn_chatbar_selected.tga b/linden/indra/newview/skins/silver/textures/btn_chatbar_selected.tga
new file mode 100644
index 0000000..b8398b5
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/btn_chatbar_selected.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/button_anim_pause.tga b/linden/indra/newview/skins/silver/textures/button_anim_pause.tga
new file mode 100644
index 0000000..ccd4a08
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/button_anim_pause.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/button_anim_pause_selected.tga b/linden/indra/newview/skins/silver/textures/button_anim_pause_selected.tga
new file mode 100644
index 0000000..d1f9a66
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/button_anim_pause_selected.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/button_anim_play.tga b/linden/indra/newview/skins/silver/textures/button_anim_play.tga
new file mode 100644
index 0000000..a19dffd
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/button_anim_play.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/button_anim_play_selected.tga b/linden/indra/newview/skins/silver/textures/button_anim_play_selected.tga
new file mode 100644
index 0000000..143ec5d
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/button_anim_play_selected.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/button_anim_stop.tga b/linden/indra/newview/skins/silver/textures/button_anim_stop.tga
new file mode 100644
index 0000000..2615d26
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/button_anim_stop.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/button_anim_stop_selected.tga b/linden/indra/newview/skins/silver/textures/button_anim_stop_selected.tga
new file mode 100644
index 0000000..a271b3e
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/button_anim_stop_selected.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/button_disabled_32x128.tga b/linden/indra/newview/skins/silver/textures/button_disabled_32x128.tga
new file mode 100644
index 0000000..9be524e
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/button_disabled_32x128.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/button_enabled_32x128.tga b/linden/indra/newview/skins/silver/textures/button_enabled_32x128.tga
new file mode 100644
index 0000000..3ca7479
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/button_enabled_32x128.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/button_enabled_selected_32x128.tga b/linden/indra/newview/skins/silver/textures/button_enabled_selected_32x128.tga
new file mode 100644
index 0000000..759b639
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/button_enabled_selected_32x128.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga b/linden/indra/newview/skins/silver/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga
new file mode 100644
index 0000000..79abce1
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/c1e21504-f136-451d-b8e9-929037812f1d.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga b/linden/indra/newview/skins/silver/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga
new file mode 100644
index 0000000..061f1f2
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/c63f124c-6340-4fbf-b59e-0869a44adb64.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga b/linden/indra/newview/skins/silver/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga
new file mode 100644
index 0000000..50d686f
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/ce15fd63-b0b6-463c-a37d-ea6393208b3e.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/checkbox_disabled_false.tga b/linden/indra/newview/skins/silver/textures/checkbox_disabled_false.tga
new file mode 100644
index 0000000..074ded7
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/checkbox_disabled_false.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/checkbox_disabled_true.tga b/linden/indra/newview/skins/silver/textures/checkbox_disabled_true.tga
new file mode 100644
index 0000000..79d2590
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/checkbox_disabled_true.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/checkbox_enabled_false.tga b/linden/indra/newview/skins/silver/textures/checkbox_enabled_false.tga
new file mode 100644
index 0000000..8e5796f
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/checkbox_enabled_false.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/checkbox_enabled_true.tga b/linden/indra/newview/skins/silver/textures/checkbox_enabled_true.tga
new file mode 100644
index 0000000..175b07d
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/checkbox_enabled_true.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/close_in_blue.tga b/linden/indra/newview/skins/silver/textures/close_in_blue.tga
new file mode 100644
index 0000000..69f3831
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/close_in_blue.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/close_inactive_blue.tga b/linden/indra/newview/skins/silver/textures/close_inactive_blue.tga
new file mode 100644
index 0000000..fcd62aa
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/close_inactive_blue.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/closebox.tga b/linden/indra/newview/skins/silver/textures/closebox.tga
new file mode 100644
index 0000000..616dc48
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/closebox.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/combobox_arrow.tga b/linden/indra/newview/skins/silver/textures/combobox_arrow.tga
new file mode 100644
index 0000000..0f3efe9
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/combobox_arrow.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/darkgray.tga b/linden/indra/newview/skins/silver/textures/darkgray.tga
new file mode 100644
index 0000000..e69be08
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/darkgray.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/down_arrow.png b/linden/indra/newview/skins/silver/textures/down_arrow.png
new file mode 100644
index 0000000..ea89b50
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/down_arrow.png differ
diff --git a/linden/indra/newview/skins/silver/textures/eye_button_active.tga b/linden/indra/newview/skins/silver/textures/eye_button_active.tga
new file mode 100644
index 0000000..5c849eb
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/eye_button_active.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/eye_button_inactive.tga b/linden/indra/newview/skins/silver/textures/eye_button_inactive.tga
new file mode 100644
index 0000000..82809c2
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/eye_button_inactive.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga b/linden/indra/newview/skins/silver/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga
new file mode 100644
index 0000000..ac9213b
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/ff9a71eb-7414-4cf8-866e-a701deb7c3cf.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/ff_edit_mine_button.tga b/linden/indra/newview/skins/silver/textures/ff_edit_mine_button.tga
new file mode 100644
index 0000000..4d54e42
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/ff_edit_mine_button.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/ff_edit_theirs_button.tga b/linden/indra/newview/skins/silver/textures/ff_edit_theirs_button.tga
new file mode 100644
index 0000000..1fc2f04
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/ff_edit_theirs_button.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/ff_online_status_button.tga b/linden/indra/newview/skins/silver/textures/ff_online_status_button.tga
new file mode 100644
index 0000000..5772a94
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/ff_online_status_button.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/ff_visible_map_button.tga b/linden/indra/newview/skins/silver/textures/ff_visible_map_button.tga
new file mode 100644
index 0000000..be1ef1e
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/ff_visible_map_button.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/ff_visible_online_button.tga b/linden/indra/newview/skins/silver/textures/ff_visible_online_button.tga
new file mode 100644
index 0000000..e27c2f6
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/ff_visible_online_button.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/flyout_btn_left.tga b/linden/indra/newview/skins/silver/textures/flyout_btn_left.tga
new file mode 100644
index 0000000..6263f6e
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/flyout_btn_left.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/flyout_btn_left_disabled.tga b/linden/indra/newview/skins/silver/textures/flyout_btn_left_disabled.tga
new file mode 100644
index 0000000..a63c8c0
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/flyout_btn_left_disabled.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/flyout_btn_left_selected.tga b/linden/indra/newview/skins/silver/textures/flyout_btn_left_selected.tga
new file mode 100644
index 0000000..c22a71b
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/flyout_btn_left_selected.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/flyout_btn_right.tga b/linden/indra/newview/skins/silver/textures/flyout_btn_right.tga
new file mode 100644
index 0000000..b86451f
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/flyout_btn_right.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/flyout_btn_right_disabled.tga b/linden/indra/newview/skins/silver/textures/flyout_btn_right_disabled.tga
new file mode 100644
index 0000000..c4efcaa
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/flyout_btn_right_disabled.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/flyout_btn_right_selected.tga b/linden/indra/newview/skins/silver/textures/flyout_btn_right_selected.tga
new file mode 100644
index 0000000..e6d79e2
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/flyout_btn_right_selected.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_chatbar.tga b/linden/indra/newview/skins/silver/textures/icn_chatbar.tga
new file mode 100644
index 0000000..67662f7
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_chatbar.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_label_media.tga b/linden/indra/newview/skins/silver/textures/icn_label_media.tga
new file mode 100644
index 0000000..603d607
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_label_media.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_label_music.tga b/linden/indra/newview/skins/silver/textures/icn_label_music.tga
new file mode 100644
index 0000000..9acf8f4
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_label_music.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_label_web.tga b/linden/indra/newview/skins/silver/textures/icn_label_web.tga
new file mode 100644
index 0000000..577fc02
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_label_web.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_media-pause.tga b/linden/indra/newview/skins/silver/textures/icn_media-pause.tga
new file mode 100644
index 0000000..a2cfeee
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_media-pause.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_media-play.tga b/linden/indra/newview/skins/silver/textures/icn_media-play.tga
new file mode 100644
index 0000000..c810318
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_media-play.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_media_movie.tga b/linden/indra/newview/skins/silver/textures/icn_media_movie.tga
new file mode 100644
index 0000000..603d607
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_media_movie.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_media_web.tga b/linden/indra/newview/skins/silver/textures/icn_media_web.tga
new file mode 100644
index 0000000..bf962ae
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_media_web.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_music-pause.tga b/linden/indra/newview/skins/silver/textures/icn_music-pause.tga
new file mode 100644
index 0000000..cfa092c
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_music-pause.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_music-play.tga b/linden/indra/newview/skins/silver/textures/icn_music-play.tga
new file mode 100644
index 0000000..1854abc
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_music-play.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_pause.tga b/linden/indra/newview/skins/silver/textures/icn_pause.tga
new file mode 100644
index 0000000..2808510
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_pause.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_play.tga b/linden/indra/newview/skins/silver/textures/icn_play.tga
new file mode 100644
index 0000000..0833398
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_play.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_rounded-text-field.tga b/linden/indra/newview/skins/silver/textures/icn_rounded-text-field.tga
new file mode 100644
index 0000000..20953ad
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_rounded-text-field.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_slide-groove_dark.tga b/linden/indra/newview/skins/silver/textures/icn_slide-groove_dark.tga
new file mode 100644
index 0000000..5ce7a9b
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_slide-groove_dark.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_slide-highlight.tga b/linden/indra/newview/skins/silver/textures/icn_slide-highlight.tga
new file mode 100644
index 0000000..e626c5a
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_slide-highlight.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_slide-thumb_dark.tga b/linden/indra/newview/skins/silver/textures/icn_slide-thumb_dark.tga
new file mode 100644
index 0000000..86c6e59
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_slide-thumb_dark.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_speaker-muted_dark.tga b/linden/indra/newview/skins/silver/textures/icn_speaker-muted_dark.tga
new file mode 100644
index 0000000..0a4bb99
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_speaker-muted_dark.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_speaker_dark.tga b/linden/indra/newview/skins/silver/textures/icn_speaker_dark.tga
new file mode 100644
index 0000000..d19ce60
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_speaker_dark.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_stop.tga b/linden/indra/newview/skins/silver/textures/icn_stop.tga
new file mode 100644
index 0000000..c7f12f2
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_stop.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_toolbar_build.tga b/linden/indra/newview/skins/silver/textures/icn_toolbar_build.tga
new file mode 100644
index 0000000..3a56ea7
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_toolbar_build.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_toolbar_fly.tga b/linden/indra/newview/skins/silver/textures/icn_toolbar_fly.tga
new file mode 100644
index 0000000..da3d694
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_toolbar_fly.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_toolbar_inventory.tga b/linden/indra/newview/skins/silver/textures/icn_toolbar_inventory.tga
new file mode 100644
index 0000000..3197c08
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_toolbar_inventory.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_toolbar_map.tga b/linden/indra/newview/skins/silver/textures/icn_toolbar_map.tga
new file mode 100644
index 0000000..ba7bf97
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_toolbar_map.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_toolbar_minimap.tga b/linden/indra/newview/skins/silver/textures/icn_toolbar_minimap.tga
new file mode 100644
index 0000000..d574584
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_toolbar_minimap.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_toolbar_search.tga b/linden/indra/newview/skins/silver/textures/icn_toolbar_search.tga
new file mode 100644
index 0000000..bf1702e
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_toolbar_search.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_toolbar_snapshot.tga b/linden/indra/newview/skins/silver/textures/icn_toolbar_snapshot.tga
new file mode 100644
index 0000000..e8bfaa7
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_toolbar_snapshot.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_voice-call-end.tga b/linden/indra/newview/skins/silver/textures/icn_voice-call-end.tga
new file mode 100644
index 0000000..7792bc1
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_voice-call-end.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_voice-call-start.tga b/linden/indra/newview/skins/silver/textures/icn_voice-call-start.tga
new file mode 100644
index 0000000..062820b
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_voice-call-start.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_voice-groupfocus.tga b/linden/indra/newview/skins/silver/textures/icn_voice-groupfocus.tga
new file mode 100644
index 0000000..6d49ede
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_voice-groupfocus.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_voice-localchat.tga b/linden/indra/newview/skins/silver/textures/icn_voice-localchat.tga
new file mode 100644
index 0000000..8a377c1
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_voice-localchat.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_voice-pvtfocus.tga b/linden/indra/newview/skins/silver/textures/icn_voice-pvtfocus.tga
new file mode 100644
index 0000000..d858245
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_voice-pvtfocus.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_voice_ptt-off.tga b/linden/indra/newview/skins/silver/textures/icn_voice_ptt-off.tga
new file mode 100644
index 0000000..d7e9cd2
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_voice_ptt-off.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_voice_ptt-on-lvl1.tga b/linden/indra/newview/skins/silver/textures/icn_voice_ptt-on-lvl1.tga
new file mode 100644
index 0000000..99c9a71
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_voice_ptt-on-lvl1.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_voice_ptt-on-lvl2.tga b/linden/indra/newview/skins/silver/textures/icn_voice_ptt-on-lvl2.tga
new file mode 100644
index 0000000..26ae300
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_voice_ptt-on-lvl2.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_voice_ptt-on-lvl3.tga b/linden/indra/newview/skins/silver/textures/icn_voice_ptt-on-lvl3.tga
new file mode 100644
index 0000000..4b8f5a2
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_voice_ptt-on-lvl3.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icn_voice_ptt-on.tga b/linden/indra/newview/skins/silver/textures/icn_voice_ptt-on.tga
new file mode 100644
index 0000000..b712c81
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icn_voice_ptt-on.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icon_auction.tga b/linden/indra/newview/skins/silver/textures/icon_auction.tga
new file mode 100644
index 0000000..76d1227
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icon_auction.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icon_avatar_offline.tga b/linden/indra/newview/skins/silver/textures/icon_avatar_offline.tga
new file mode 100644
index 0000000..ea6a076
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icon_avatar_offline.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icon_avatar_online.tga b/linden/indra/newview/skins/silver/textures/icon_avatar_online.tga
new file mode 100644
index 0000000..13f8da8
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icon_avatar_online.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icon_day_cycle.tga b/linden/indra/newview/skins/silver/textures/icon_day_cycle.tga
new file mode 100644
index 0000000..98927fc
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icon_day_cycle.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icon_event.tga b/linden/indra/newview/skins/silver/textures/icon_event.tga
new file mode 100644
index 0000000..2c06d08
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icon_event.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icon_event_mature.tga b/linden/indra/newview/skins/silver/textures/icon_event_mature.tga
new file mode 100644
index 0000000..71067c0
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icon_event_mature.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icon_for_sale.tga b/linden/indra/newview/skins/silver/textures/icon_for_sale.tga
new file mode 100644
index 0000000..cb7f313
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icon_for_sale.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icon_group.tga b/linden/indra/newview/skins/silver/textures/icon_group.tga
new file mode 100644
index 0000000..faecb81
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icon_group.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icon_groupnotice.tga b/linden/indra/newview/skins/silver/textures/icon_groupnotice.tga
new file mode 100644
index 0000000..115e4e2
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icon_groupnotice.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icon_groupnoticeinventory.tga b/linden/indra/newview/skins/silver/textures/icon_groupnoticeinventory.tga
new file mode 100644
index 0000000..f713020
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icon_groupnoticeinventory.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icon_lock.tga b/linden/indra/newview/skins/silver/textures/icon_lock.tga
new file mode 100644
index 0000000..98d8a2d
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icon_lock.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/icon_top_pick.tga b/linden/indra/newview/skins/silver/textures/icon_top_pick.tga
new file mode 100644
index 0000000..0b34882
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/icon_top_pick.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_animation.tga b/linden/indra/newview/skins/silver/textures/inv_folder_animation.tga
new file mode 100644
index 0000000..7466825
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_folder_animation.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_bodypart.tga b/linden/indra/newview/skins/silver/textures/inv_folder_bodypart.tga
new file mode 100644
index 0000000..3262605
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_folder_bodypart.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_callingcard.tga b/linden/indra/newview/skins/silver/textures/inv_folder_callingcard.tga
new file mode 100644
index 0000000..d7e0ab7
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_folder_callingcard.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_clothing.tga b/linden/indra/newview/skins/silver/textures/inv_folder_clothing.tga
new file mode 100644
index 0000000..bce4a65
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_folder_clothing.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_gesture.tga b/linden/indra/newview/skins/silver/textures/inv_folder_gesture.tga
new file mode 100644
index 0000000..9392256
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_folder_gesture.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_landmark.tga b/linden/indra/newview/skins/silver/textures/inv_folder_landmark.tga
new file mode 100644
index 0000000..0f57ccf
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_folder_landmark.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_lostandfound.tga b/linden/indra/newview/skins/silver/textures/inv_folder_lostandfound.tga
new file mode 100644
index 0000000..1285c25
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_folder_lostandfound.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_notecard.tga b/linden/indra/newview/skins/silver/textures/inv_folder_notecard.tga
new file mode 100644
index 0000000..daebd14
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_folder_notecard.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_object.tga b/linden/indra/newview/skins/silver/textures/inv_folder_object.tga
new file mode 100644
index 0000000..f3e9ea0
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_folder_object.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_plain_closed.tga b/linden/indra/newview/skins/silver/textures/inv_folder_plain_closed.tga
new file mode 100644
index 0000000..84d116a
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_folder_plain_closed.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_plain_open.tga b/linden/indra/newview/skins/silver/textures/inv_folder_plain_open.tga
new file mode 100644
index 0000000..d536448
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_folder_plain_open.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_script.tga b/linden/indra/newview/skins/silver/textures/inv_folder_script.tga
new file mode 100644
index 0000000..b8a04e4
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_folder_script.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_snapshot.tga b/linden/indra/newview/skins/silver/textures/inv_folder_snapshot.tga
new file mode 100644
index 0000000..468ec2c
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_folder_snapshot.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_sound.tga b/linden/indra/newview/skins/silver/textures/inv_folder_sound.tga
new file mode 100644
index 0000000..c58300b
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_folder_sound.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_texture.tga b/linden/indra/newview/skins/silver/textures/inv_folder_texture.tga
new file mode 100644
index 0000000..6a321cf
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_folder_texture.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_folder_trash.tga b/linden/indra/newview/skins/silver/textures/inv_folder_trash.tga
new file mode 100644
index 0000000..7aa6b93
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_folder_trash.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_animation.tga b/linden/indra/newview/skins/silver/textures/inv_item_animation.tga
new file mode 100644
index 0000000..637033a
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_item_animation.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_attach.tga b/linden/indra/newview/skins/silver/textures/inv_item_attach.tga
new file mode 100644
index 0000000..55469f6
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_item_attach.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_callingcard_offline.tga b/linden/indra/newview/skins/silver/textures/inv_item_callingcard_offline.tga
new file mode 100644
index 0000000..ad8658c
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_item_callingcard_offline.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_callingcard_online.tga b/linden/indra/newview/skins/silver/textures/inv_item_callingcard_online.tga
new file mode 100644
index 0000000..9660601
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_item_callingcard_online.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_clothing.tga b/linden/indra/newview/skins/silver/textures/inv_item_clothing.tga
new file mode 100644
index 0000000..b786426
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_item_clothing.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_eyes.tga b/linden/indra/newview/skins/silver/textures/inv_item_eyes.tga
new file mode 100644
index 0000000..18e8368
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_item_eyes.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_gesture.tga b/linden/indra/newview/skins/silver/textures/inv_item_gesture.tga
new file mode 100644
index 0000000..a6fe629
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_item_gesture.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_gloves.tga b/linden/indra/newview/skins/silver/textures/inv_item_gloves.tga
new file mode 100644
index 0000000..bcc6aee
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_item_gloves.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_hair.tga b/linden/indra/newview/skins/silver/textures/inv_item_hair.tga
new file mode 100644
index 0000000..686214e
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_item_hair.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_jacket.tga b/linden/indra/newview/skins/silver/textures/inv_item_jacket.tga
new file mode 100644
index 0000000..69c5f07
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_item_jacket.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_landmark.tga b/linden/indra/newview/skins/silver/textures/inv_item_landmark.tga
new file mode 100644
index 0000000..833d4e6
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_item_landmark.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_landmark_visited.tga b/linden/indra/newview/skins/silver/textures/inv_item_landmark_visited.tga
new file mode 100644
index 0000000..283f0ec
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_item_landmark_visited.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_notecard.tga b/linden/indra/newview/skins/silver/textures/inv_item_notecard.tga
new file mode 100644
index 0000000..0ad68d0
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_item_notecard.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_object.tga b/linden/indra/newview/skins/silver/textures/inv_item_object.tga
new file mode 100644
index 0000000..c749105
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_item_object.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_object_multi.tga b/linden/indra/newview/skins/silver/textures/inv_item_object_multi.tga
new file mode 100644
index 0000000..4b3a590
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_item_object_multi.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_pants.tga b/linden/indra/newview/skins/silver/textures/inv_item_pants.tga
new file mode 100644
index 0000000..38dbc57
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_item_pants.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_script.tga b/linden/indra/newview/skins/silver/textures/inv_item_script.tga
new file mode 100644
index 0000000..1203e8a
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_item_script.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_shape.tga b/linden/indra/newview/skins/silver/textures/inv_item_shape.tga
new file mode 100644
index 0000000..2e8a5a7
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_item_shape.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_shirt.tga b/linden/indra/newview/skins/silver/textures/inv_item_shirt.tga
new file mode 100644
index 0000000..8c6f5eb
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_item_shirt.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_shoes.tga b/linden/indra/newview/skins/silver/textures/inv_item_shoes.tga
new file mode 100644
index 0000000..ac7a2b0
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_item_shoes.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_skin.tga b/linden/indra/newview/skins/silver/textures/inv_item_skin.tga
new file mode 100644
index 0000000..ab4169f
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_item_skin.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_skirt.tga b/linden/indra/newview/skins/silver/textures/inv_item_skirt.tga
new file mode 100644
index 0000000..4476040
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_item_skirt.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_snapshot.tga b/linden/indra/newview/skins/silver/textures/inv_item_snapshot.tga
new file mode 100644
index 0000000..3adf4e5
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_item_snapshot.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_socks.tga b/linden/indra/newview/skins/silver/textures/inv_item_socks.tga
new file mode 100644
index 0000000..2d7bb7e
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_item_socks.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_sound.tga b/linden/indra/newview/skins/silver/textures/inv_item_sound.tga
new file mode 100644
index 0000000..7ef9052
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_item_sound.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_texture.tga b/linden/indra/newview/skins/silver/textures/inv_item_texture.tga
new file mode 100644
index 0000000..6b4269d
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_item_texture.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_underpants.tga b/linden/indra/newview/skins/silver/textures/inv_item_underpants.tga
new file mode 100644
index 0000000..f679e34
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_item_underpants.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/inv_item_undershirt.tga b/linden/indra/newview/skins/silver/textures/inv_item_undershirt.tga
new file mode 100644
index 0000000..359e3d7
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/inv_item_undershirt.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/lightgray.tga b/linden/indra/newview/skins/silver/textures/lightgray.tga
new file mode 100644
index 0000000..e69be08
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/lightgray.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/map_avatar_16.tga b/linden/indra/newview/skins/silver/textures/map_avatar_16.tga
new file mode 100644
index 0000000..f59e9e9
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/map_avatar_16.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/map_avatar_you_8.tga b/linden/indra/newview/skins/silver/textures/map_avatar_you_8.tga
new file mode 100644
index 0000000..8500ead
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/map_avatar_you_8.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/map_event.tga b/linden/indra/newview/skins/silver/textures/map_event.tga
new file mode 100644
index 0000000..2c06d08
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/map_event.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/map_event_adult.tga b/linden/indra/newview/skins/silver/textures/map_event_adult.tga
new file mode 100644
index 0000000..f548126
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/map_event_adult.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/map_event_mature.tga b/linden/indra/newview/skins/silver/textures/map_event_mature.tga
new file mode 100644
index 0000000..71067c0
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/map_event_mature.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/map_home.tga b/linden/indra/newview/skins/silver/textures/map_home.tga
new file mode 100644
index 0000000..acaaa3d
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/map_home.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/map_infohub.tga b/linden/indra/newview/skins/silver/textures/map_infohub.tga
new file mode 100644
index 0000000..545b8e5
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/map_infohub.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/map_telehub.tga b/linden/indra/newview/skins/silver/textures/map_telehub.tga
new file mode 100644
index 0000000..57aa723
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/map_telehub.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/minimize.tga b/linden/indra/newview/skins/silver/textures/minimize.tga
new file mode 100644
index 0000000..c1ab0f9
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/minimize.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/minimize_inactive.tga b/linden/indra/newview/skins/silver/textures/minimize_inactive.tga
new file mode 100644
index 0000000..191c5d3
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/minimize_inactive.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/minimize_pressed.tga b/linden/indra/newview/skins/silver/textures/minimize_pressed.tga
new file mode 100644
index 0000000..07368e5
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/minimize_pressed.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/notify_next.png b/linden/indra/newview/skins/silver/textures/notify_next.png
new file mode 100644
index 0000000..b160ef7
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/notify_next.png differ
diff --git a/linden/indra/newview/skins/silver/textures/object_cone.tga b/linden/indra/newview/skins/silver/textures/object_cone.tga
new file mode 100644
index 0000000..1bbca75
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/object_cone.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/object_cone_active.tga b/linden/indra/newview/skins/silver/textures/object_cone_active.tga
new file mode 100644
index 0000000..7b8799d
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/object_cone_active.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/object_cube.tga b/linden/indra/newview/skins/silver/textures/object_cube.tga
new file mode 100644
index 0000000..c08f874
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/object_cube.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/object_cube_active.tga b/linden/indra/newview/skins/silver/textures/object_cube_active.tga
new file mode 100644
index 0000000..fac474e
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/object_cube_active.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/object_cylinder.tga b/linden/indra/newview/skins/silver/textures/object_cylinder.tga
new file mode 100644
index 0000000..271c841
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/object_cylinder.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/object_cylinder_active.tga b/linden/indra/newview/skins/silver/textures/object_cylinder_active.tga
new file mode 100644
index 0000000..5dc5c5e
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/object_cylinder_active.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/object_grass.tga b/linden/indra/newview/skins/silver/textures/object_grass.tga
new file mode 100644
index 0000000..3e6b8f8
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/object_grass.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/object_grass_active.tga b/linden/indra/newview/skins/silver/textures/object_grass_active.tga
new file mode 100644
index 0000000..98f84e5
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/object_grass_active.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/object_hemi_cone.tga b/linden/indra/newview/skins/silver/textures/object_hemi_cone.tga
new file mode 100644
index 0000000..7b7cc63
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/object_hemi_cone.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/object_hemi_cone_active.tga b/linden/indra/newview/skins/silver/textures/object_hemi_cone_active.tga
new file mode 100644
index 0000000..eabec15
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/object_hemi_cone_active.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/object_hemi_cylinder.tga b/linden/indra/newview/skins/silver/textures/object_hemi_cylinder.tga
new file mode 100644
index 0000000..dc15140
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/object_hemi_cylinder.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/object_hemi_cylinder_active.tga b/linden/indra/newview/skins/silver/textures/object_hemi_cylinder_active.tga
new file mode 100644
index 0000000..8047d7f
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/object_hemi_cylinder_active.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/object_hemi_sphere.tga b/linden/indra/newview/skins/silver/textures/object_hemi_sphere.tga
new file mode 100644
index 0000000..9f21f3a
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/object_hemi_sphere.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/object_hemi_sphere_active.tga b/linden/indra/newview/skins/silver/textures/object_hemi_sphere_active.tga
new file mode 100644
index 0000000..c6d20e0
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/object_hemi_sphere_active.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/object_prism.tga b/linden/indra/newview/skins/silver/textures/object_prism.tga
new file mode 100644
index 0000000..489fa35
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/object_prism.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/object_prism_active.tga b/linden/indra/newview/skins/silver/textures/object_prism_active.tga
new file mode 100644
index 0000000..b53b897
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/object_prism_active.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/object_pyramid.tga b/linden/indra/newview/skins/silver/textures/object_pyramid.tga
new file mode 100644
index 0000000..69a1d09
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/object_pyramid.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/object_pyramid_active.tga b/linden/indra/newview/skins/silver/textures/object_pyramid_active.tga
new file mode 100644
index 0000000..98aaade
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/object_pyramid_active.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/object_ring.tga b/linden/indra/newview/skins/silver/textures/object_ring.tga
new file mode 100644
index 0000000..4dd05e4
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/object_ring.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/object_ring_active.tga b/linden/indra/newview/skins/silver/textures/object_ring_active.tga
new file mode 100644
index 0000000..4e98b59
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/object_ring_active.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/object_sphere.tga b/linden/indra/newview/skins/silver/textures/object_sphere.tga
new file mode 100644
index 0000000..e6a41d5
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/object_sphere.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/object_sphere_active.tga b/linden/indra/newview/skins/silver/textures/object_sphere_active.tga
new file mode 100644
index 0000000..33c944a
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/object_sphere_active.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/object_tetrahedron.tga b/linden/indra/newview/skins/silver/textures/object_tetrahedron.tga
new file mode 100644
index 0000000..01e02cd
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/object_tetrahedron.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/object_tetrahedron_active.tga b/linden/indra/newview/skins/silver/textures/object_tetrahedron_active.tga
new file mode 100644
index 0000000..3e30a7c
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/object_tetrahedron_active.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/object_torus.tga b/linden/indra/newview/skins/silver/textures/object_torus.tga
new file mode 100644
index 0000000..8c9f665
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/object_torus.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/object_torus_active.tga b/linden/indra/newview/skins/silver/textures/object_torus_active.tga
new file mode 100644
index 0000000..53d2da8
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/object_torus_active.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/object_tree.tga b/linden/indra/newview/skins/silver/textures/object_tree.tga
new file mode 100644
index 0000000..dc427e9
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/object_tree.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/object_tree_active.tga b/linden/indra/newview/skins/silver/textures/object_tree_active.tga
new file mode 100644
index 0000000..36509fd
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/object_tree_active.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/object_tube.tga b/linden/indra/newview/skins/silver/textures/object_tube.tga
new file mode 100644
index 0000000..b53d1e9
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/object_tube.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/object_tube_active.tga b/linden/indra/newview/skins/silver/textures/object_tube_active.tga
new file mode 100644
index 0000000..c990b0b
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/object_tube_active.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/progressbar_fill.tga b/linden/indra/newview/skins/silver/textures/progressbar_fill.tga
new file mode 100644
index 0000000..f078013
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/progressbar_fill.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/progressbar_track.tga b/linden/indra/newview/skins/silver/textures/progressbar_track.tga
new file mode 100644
index 0000000..2057071
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/progressbar_track.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/ptt_lock_off.tga b/linden/indra/newview/skins/silver/textures/ptt_lock_off.tga
new file mode 100644
index 0000000..d15ce1f
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/ptt_lock_off.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/ptt_lock_on.tga b/linden/indra/newview/skins/silver/textures/ptt_lock_on.tga
new file mode 100644
index 0000000..1e21fce
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/ptt_lock_on.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/radio_active_false.tga b/linden/indra/newview/skins/silver/textures/radio_active_false.tga
new file mode 100644
index 0000000..02043ae
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/radio_active_false.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/radio_active_true.tga b/linden/indra/newview/skins/silver/textures/radio_active_true.tga
new file mode 100644
index 0000000..bf1035a
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/radio_active_true.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/radio_inactive_false.tga b/linden/indra/newview/skins/silver/textures/radio_inactive_false.tga
new file mode 100644
index 0000000..48a9342
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/radio_inactive_false.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/radio_inactive_true.tga b/linden/indra/newview/skins/silver/textures/radio_inactive_true.tga
new file mode 100644
index 0000000..785b3fa
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/radio_inactive_true.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/resize_handle_bottom_right_blue.tga b/linden/indra/newview/skins/silver/textures/resize_handle_bottom_right_blue.tga
new file mode 100644
index 0000000..6c3a6ad
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/resize_handle_bottom_right_blue.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/restore.tga b/linden/indra/newview/skins/silver/textures/restore.tga
new file mode 100644
index 0000000..8263ae1
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/restore.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/restore_inactive.tga b/linden/indra/newview/skins/silver/textures/restore_inactive.tga
new file mode 100644
index 0000000..191c5d3
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/restore_inactive.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/restore_pressed.tga b/linden/indra/newview/skins/silver/textures/restore_pressed.tga
new file mode 100644
index 0000000..aa44394
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/restore_pressed.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/rounded_square.tga b/linden/indra/newview/skins/silver/textures/rounded_square.tga
new file mode 100644
index 0000000..c8fc7b7
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/rounded_square.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/rounded_square_soft.tga b/linden/indra/newview/skins/silver/textures/rounded_square_soft.tga
new file mode 100644
index 0000000..0e5bc79
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/rounded_square_soft.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/scrollbutton_down_in_blue.tga b/linden/indra/newview/skins/silver/textures/scrollbutton_down_in_blue.tga
new file mode 100644
index 0000000..fd870b5
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/scrollbutton_down_in_blue.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/scrollbutton_down_out_blue.tga b/linden/indra/newview/skins/silver/textures/scrollbutton_down_out_blue.tga
new file mode 100644
index 0000000..1f95b34
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/scrollbutton_down_out_blue.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/scrollbutton_left_in_blue.tga b/linden/indra/newview/skins/silver/textures/scrollbutton_left_in_blue.tga
new file mode 100644
index 0000000..595fd59
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/scrollbutton_left_in_blue.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/scrollbutton_left_out_blue.tga b/linden/indra/newview/skins/silver/textures/scrollbutton_left_out_blue.tga
new file mode 100644
index 0000000..86c0987
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/scrollbutton_left_out_blue.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/scrollbutton_right_in_blue.tga b/linden/indra/newview/skins/silver/textures/scrollbutton_right_in_blue.tga
new file mode 100644
index 0000000..790e515
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/scrollbutton_right_in_blue.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/scrollbutton_right_out_blue.tga b/linden/indra/newview/skins/silver/textures/scrollbutton_right_out_blue.tga
new file mode 100644
index 0000000..4f37667
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/scrollbutton_right_out_blue.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/scrollbutton_up_in_blue.tga b/linden/indra/newview/skins/silver/textures/scrollbutton_up_in_blue.tga
new file mode 100644
index 0000000..4955af7
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/scrollbutton_up_in_blue.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/scrollbutton_up_out_blue.tga b/linden/indra/newview/skins/silver/textures/scrollbutton_up_out_blue.tga
new file mode 100644
index 0000000..e66696b
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/scrollbutton_up_out_blue.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/sm_rounded_corners_simple.tga b/linden/indra/newview/skins/silver/textures/sm_rounded_corners_simple.tga
new file mode 100644
index 0000000..30bbbb4
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/sm_rounded_corners_simple.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/spin_down_in_blue.tga b/linden/indra/newview/skins/silver/textures/spin_down_in_blue.tga
new file mode 100644
index 0000000..ce8576a
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/spin_down_in_blue.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/spin_down_out_blue.tga b/linden/indra/newview/skins/silver/textures/spin_down_out_blue.tga
new file mode 100644
index 0000000..ff53284
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/spin_down_out_blue.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/spin_up_in_blue.tga b/linden/indra/newview/skins/silver/textures/spin_up_in_blue.tga
new file mode 100644
index 0000000..de36da6
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/spin_up_in_blue.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/spin_up_out_blue.tga b/linden/indra/newview/skins/silver/textures/spin_up_out_blue.tga
new file mode 100644
index 0000000..743d2c5
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/spin_up_out_blue.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/square_btn_32x128.tga b/linden/indra/newview/skins/silver/textures/square_btn_32x128.tga
new file mode 100644
index 0000000..e14e45b
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/square_btn_32x128.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/square_btn_selected_32x128.tga b/linden/indra/newview/skins/silver/textures/square_btn_selected_32x128.tga
new file mode 100644
index 0000000..749c0f4
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/square_btn_selected_32x128.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/startup_logo.j2c b/linden/indra/newview/skins/silver/textures/startup_logo.j2c
new file mode 100644
index 0000000..e3332cb
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/startup_logo.j2c differ
diff --git a/linden/indra/newview/skins/silver/textures/status_buy_currency.tga b/linden/indra/newview/skins/silver/textures/status_buy_currency.tga
new file mode 100644
index 0000000..9898005
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/status_buy_currency.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/status_buy_currency_pressed.tga b/linden/indra/newview/skins/silver/textures/status_buy_currency_pressed.tga
new file mode 100644
index 0000000..9d5d164
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/status_buy_currency_pressed.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/status_buy_land.tga b/linden/indra/newview/skins/silver/textures/status_buy_land.tga
new file mode 100644
index 0000000..dded697
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/status_buy_land.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/status_buy_land_pressed.tga b/linden/indra/newview/skins/silver/textures/status_buy_land_pressed.tga
new file mode 100644
index 0000000..f5c5fba
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/status_buy_land_pressed.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/status_health.tga b/linden/indra/newview/skins/silver/textures/status_health.tga
new file mode 100644
index 0000000..c29a965
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/status_health.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/status_no_build.tga b/linden/indra/newview/skins/silver/textures/status_no_build.tga
new file mode 100644
index 0000000..fbd463f
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/status_no_build.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/status_no_fly.tga b/linden/indra/newview/skins/silver/textures/status_no_fly.tga
new file mode 100644
index 0000000..d93c531
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/status_no_fly.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/status_no_push.tga b/linden/indra/newview/skins/silver/textures/status_no_push.tga
new file mode 100644
index 0000000..578f0d9
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/status_no_push.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/status_no_scripts.tga b/linden/indra/newview/skins/silver/textures/status_no_scripts.tga
new file mode 100644
index 0000000..a020f4c
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/status_no_scripts.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/status_no_voice.tga b/linden/indra/newview/skins/silver/textures/status_no_voice.tga
new file mode 100644
index 0000000..9e34801
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/status_no_voice.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/status_search.tga b/linden/indra/newview/skins/silver/textures/status_search.tga
new file mode 100644
index 0000000..12de046
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/status_search.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/status_voice.tga b/linden/indra/newview/skins/silver/textures/status_voice.tga
new file mode 100644
index 0000000..9e34801
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/status_voice.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/tab_bottom_blue.tga b/linden/indra/newview/skins/silver/textures/tab_bottom_blue.tga
new file mode 100644
index 0000000..1c68257
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/tab_bottom_blue.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/tab_bottom_selected_blue.tga b/linden/indra/newview/skins/silver/textures/tab_bottom_selected_blue.tga
new file mode 100644
index 0000000..60887a8
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/tab_bottom_selected_blue.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/tab_left.tga b/linden/indra/newview/skins/silver/textures/tab_left.tga
new file mode 100644
index 0000000..b2cd44b
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/tab_left.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/tab_left_selected.tga b/linden/indra/newview/skins/silver/textures/tab_left_selected.tga
new file mode 100644
index 0000000..3c959a2
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/tab_left_selected.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/tab_top_blue.tga b/linden/indra/newview/skins/silver/textures/tab_top_blue.tga
new file mode 100644
index 0000000..f522c86
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/tab_top_blue.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/tab_top_selected_blue.tga b/linden/indra/newview/skins/silver/textures/tab_top_selected_blue.tga
new file mode 100644
index 0000000..66d3541
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/tab_top_selected_blue.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/tearoff_pressed.tga b/linden/indra/newview/skins/silver/textures/tearoff_pressed.tga
new file mode 100644
index 0000000..cea2fdc
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/tearoff_pressed.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/tearoffbox.tga b/linden/indra/newview/skins/silver/textures/tearoffbox.tga
new file mode 100644
index 0000000..6a11c07
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/tearoffbox.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/tool_dozer.tga b/linden/indra/newview/skins/silver/textures/tool_dozer.tga
new file mode 100644
index 0000000..0bb1a2e
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/tool_dozer.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/tool_dozer_active.tga b/linden/indra/newview/skins/silver/textures/tool_dozer_active.tga
new file mode 100644
index 0000000..faf232d
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/tool_dozer_active.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/tool_zoom.tga b/linden/indra/newview/skins/silver/textures/tool_zoom.tga
new file mode 100644
index 0000000..0a467b7
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/tool_zoom.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/tool_zoom_active.tga b/linden/indra/newview/skins/silver/textures/tool_zoom_active.tga
new file mode 100644
index 0000000..cee7e50
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/tool_zoom_active.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/toolbar_bg.tga b/linden/indra/newview/skins/silver/textures/toolbar_bg.tga
new file mode 100644
index 0000000..d4525d1
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/toolbar_bg.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/toolbar_btn_disabled.tga b/linden/indra/newview/skins/silver/textures/toolbar_btn_disabled.tga
new file mode 100644
index 0000000..9be524e
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/toolbar_btn_disabled.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/toolbar_btn_enabled.tga b/linden/indra/newview/skins/silver/textures/toolbar_btn_enabled.tga
new file mode 100644
index 0000000..6cd80b4
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/toolbar_btn_enabled.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/toolbar_btn_selected.tga b/linden/indra/newview/skins/silver/textures/toolbar_btn_selected.tga
new file mode 100644
index 0000000..d1d63f3
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/toolbar_btn_selected.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/toolbar_tab.tga b/linden/indra/newview/skins/silver/textures/toolbar_tab.tga
new file mode 100644
index 0000000..e241f2e
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/toolbar_tab.tga differ
diff --git a/linden/indra/newview/skins/silver/textures/up_arrow.png b/linden/indra/newview/skins/silver/textures/up_arrow.png
new file mode 100644
index 0000000..31f1c38
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/up_arrow.png differ
diff --git a/linden/indra/newview/skins/silver/textures/white.tga b/linden/indra/newview/skins/silver/textures/white.tga
new file mode 100644
index 0000000..55e3793
Binary files /dev/null and b/linden/indra/newview/skins/silver/textures/white.tga differ
diff --git a/linden/indra/newview/viewer.icns b/linden/indra/newview/viewer.icns
new file mode 100644
index 0000000..ac649ca
Binary files /dev/null and b/linden/indra/newview/viewer.icns differ
diff --git a/linden/install.xml b/linden/install.xml
index e8fb391..3e5810a 100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -166,25 +166,6 @@
           </map>
         </map>
       </map>
-      <key>artwork</key>
-      <map>
-        <key>copyright</key>
-        <string>Second Life(TM) Viewer Artwork. Copyright (C) 2008 Linden Research, Inc. With additions by the Imprudence team.</string>
-        <key>description</key>
-        <string>The artwork used in the client, such as UI textures and branding.</string>
-        <key>license</key>
-        <string>creative commons attribution-share alike 3.0</string>
-        <key>packages</key>
-        <map>
-          <key>common</key>
-          <map>
-            <key>md5sum</key>
-            <string>b587e60245ad4c40b13daa6d4021a63b</string>
-            <key>url</key>
-            <uri>http://download.kokuaviewer.org/files/extras/imprudence-artwork-20110525.tar.bz2</uri>
-          </map>
-        </map>
-      </map>
       <key>berkeley</key>
       <map>
         <key>copyright</key>
@@ -422,46 +403,6 @@
            </map>
         </map>
       </map>
-      <key>fonts</key>
-      <map>
-        <key>description</key>
-        <string>Fonts used by the viewer.</string>
-        <key>copyright</key>
-        <string>Various (see contents)</string>
-        <key>license</key>
-        <string>multiple</string>
-        <key>packages</key>
-        <map>
-          <key>darwin</key>
-          <map>
-            <key>md5sum</key>
-            <string>d6368fb96e6dd653d6ccc7d18502184e</string>
-            <key>url</key>
-            <uri>http://imprudenceviewer.org/download/extras/imprudence-fonts-20100910.tar.bz2</uri>
-          </map>
-          <key>linux</key>
-          <map>
-            <key>md5sum</key>
-            <string>d6368fb96e6dd653d6ccc7d18502184e</string>
-            <key>url</key>
-            <uri>http://imprudenceviewer.org/download/extras/imprudence-fonts-20100910.tar.bz2</uri>
-          </map>
-          <key>linux64</key>
-          <map>
-            <key>md5sum</key>
-            <string>d6368fb96e6dd653d6ccc7d18502184e</string>
-            <key>url</key>
-            <uri>http://imprudenceviewer.org/download/extras/imprudence-fonts-20100910.tar.bz2</uri>
-          </map>
-          <key>windows</key>
-          <map>
-            <key>md5sum</key>
-            <string>d6368fb96e6dd653d6ccc7d18502184e</string>
-            <key>url</key>
-            <uri>http://imprudenceviewer.org/download/extras/imprudence-fonts-20100910.tar.bz2</uri>
-          </map>
-        </map>
-      </map>
 	  <key>freeglut</key>
 			<map>
 				<key>license</key>
-- 
cgit v1.1


From 0a9d76228f2a8de70fb813d01d86e7669429c137 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Mon, 5 Mar 2012 03:35:18 +1000
Subject: Fixes http://redmine.kokuaviewer.org/issues/1124 and makes sure there
 are no other ways to side step the SecondLife grid checks.

---
 linden/indra/newview/hippogridmanager.cpp | 21 ++++++++++++++++++++-
 linden/indra/newview/hippogridmanager.h   |  2 ++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/linden/indra/newview/hippogridmanager.cpp b/linden/indra/newview/hippogridmanager.cpp
index 4c46d3e..1dfb9ac 100644
--- a/linden/indra/newview/hippogridmanager.cpp
+++ b/linden/indra/newview/hippogridmanager.cpp
@@ -51,7 +51,7 @@
 #include "llxorcipher.h"	// saved password, MAC address
 
 #include "hipporestrequest.h"
-
+#include <boost/algorithm/string.hpp>
 
 // ********************************************************************
 // Global Variables
@@ -101,9 +101,27 @@ HippoGridInfo::HippoGridInfo(const std::string& gridNick) :
 	mGridNick = sanitizeGridNick(nick);
 }
 
+// Check if this really is a SecondLife grid, to prevent cheating.
+void HippoGridInfo::checkLoginURIforSecondLifeness()
+{
+	LLURI loginURI(mLoginURI);
+	std::string host = loginURI.hostName();
+	size_t found;
+
+	boost::algorithm::to_lower(host);
+
+	found = host.rfind("lindenlab.com");
+	if ((found + 13) == host.size())
+	    mPlatform = PLATFORM_SECONDLIFE;
+	found = host.rfind("secondlife.com");
+	if ((found + 14) == host.size())
+	    mPlatform = PLATFORM_SECONDLIFE;
+}
+
 void HippoGridInfo::setPlatform(Platform platform)
 {
 	mPlatform = platform;
+	checkLoginURIforSecondLifeness();
 	if (mPlatform == PLATFORM_SECONDLIFE)
 	{
 		mCurrencySymbol = "L$";
@@ -136,6 +154,7 @@ void HippoGridInfo::setLoginURI(const std::string& loginURI)
 {
 	std::string uri = loginURI;
 	mLoginURI = sanitizeURI(uri);
+	checkLoginURIforSecondLifeness();
 }
 
 void HippoGridInfo::setHelperURI(const std::string& helperURI)
diff --git a/linden/indra/newview/hippogridmanager.h b/linden/indra/newview/hippogridmanager.h
index c983c9d..8e77f99 100644
--- a/linden/indra/newview/hippogridmanager.h
+++ b/linden/indra/newview/hippogridmanager.h
@@ -165,6 +165,8 @@ private:
 	};
 	XmlState mXmlState;
 
+	void checkLoginURIforSecondLifeness();
+
 	static std::string sanitizeURI(std::string &uri);
 	void formatFee(std::string &fee, S32 cost, bool showFree) const;
 
-- 
cgit v1.1


From 7772e9ec7c99e11bf8f21939587b5f24a457daae Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Mon, 5 Mar 2012 06:27:54 +1000
Subject: Fixes http://redmine.kokuaviewer.org/issues/585

---
 linden/indra/llui/llcombobox.cpp                  | 5 +++--
 linden/indra/llui/llcombobox.h                    | 5 +++--
 linden/indra/newview/skins/gemini/colors_base.xml | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/linden/indra/llui/llcombobox.cpp b/linden/indra/llui/llcombobox.cpp
index f3ef83e..9b86486 100644
--- a/linden/indra/llui/llcombobox.cpp
+++ b/linden/indra/llui/llcombobox.cpp
@@ -75,7 +75,8 @@ LLComboBox::LLComboBox(	const std::string& name, const LLRect &rect, const std::
 	mListPosition(BELOW),
 	mPrearrangeCallback( NULL ),
 	mTextEntryCallback( NULL ),
-	mLabel(label)
+	mLabel(label),
+	mListColor(LLUI::sColorsGroup->getColor("ComboBoxBg"))
 {
 	if (font)
 	{
@@ -109,7 +110,7 @@ LLComboBox::LLComboBox(	const std::string& name, const LLRect &rect, const std::
 	mList = new LLScrollListCtrl(std::string("ComboBox"), LLRect(), mGLFont,
 								 &LLComboBox::onItemSelected, this, FALSE);
 	mList->setVisible(FALSE);
-	mList->setBgWriteableColor( LLColor4(1,1,1,1) );
+	mList->setBgWriteableColor(mListColor);
 	mList->setCommitOnKeyboardMovement(FALSE);
 	addChild(mList);
 
diff --git a/linden/indra/llui/llcombobox.h b/linden/indra/llui/llcombobox.h
index f92fe44..12637a0 100644
--- a/linden/indra/llui/llcombobox.h
+++ b/linden/indra/llui/llcombobox.h
@@ -187,12 +187,13 @@ public:
 	virtual void	hideList();
 
 protected:
-	LLButton*			mButton;
+	LLButton*		mButton;
 	LLScrollListCtrl*	mList;
 	EPreferredPosition	mListPosition;
 	LLPointer<LLUIImage>	mArrowImage;
-	std::string			mLabel;
+	std::string		mLabel;
 	const LLFontGL*		mGLFont;
+	LLColor4		mListColor;
 
 private:
 	S32					mButtonPadding;
diff --git a/linden/indra/newview/skins/gemini/colors_base.xml b/linden/indra/newview/skins/gemini/colors_base.xml
index 935c6d3..b4b9269 100644
--- a/linden/indra/newview/skins/gemini/colors_base.xml
+++ b/linden/indra/newview/skins/gemini/colors_base.xml
@@ -66,7 +66,7 @@
 <ScrollBgWriteableColor value="33, 33, 33, 80" />
 <ScrollBGStripeColor value="100, 100, 100, 25" />
 <ScrollDisabledColor value="33, 33, 33, 204" />
-<ScrollSelectedBGColor value="222, 222, 222, 150" />
+<ScrollSelectedBGColor value="33, 33, 33, 204" />
 <ScrollSelectedFGColor value="255, 255, 255, 255" />	            <!-- Text color -->
 <ScrollUnselectedColor value="222, 222, 222, 150" />	            <!-- Text color -->
 <ScrollHighlightedColor value="222, 222, 222, 80" />	    <!-- Hover color -->
-- 
cgit v1.1


From f1d82b1deb654cce599be8e58a15bf13138aabb1 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sun, 11 Mar 2012 04:26:48 +1000
Subject: Just adding a TODO.

---
 linden/indra/newview/hippoupdate.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/linden/indra/newview/hippoupdate.cpp b/linden/indra/newview/hippoupdate.cpp
index 192e3d7..848a8fd 100644
--- a/linden/indra/newview/hippoupdate.cpp
+++ b/linden/indra/newview/hippoupdate.cpp
@@ -18,6 +18,7 @@
 std::string gHippoChannel;
 
 
+// TODO - Um, WTH?  Is this actually used anywhere?
 // static
 bool HippoUpdate::checkUpdate()
 {
-- 
cgit v1.1


From f2715ed85d43b7c7fa4f86e3c3b4118c4cd5ce4d Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sun, 11 Mar 2012 04:31:18 +1000
Subject: Fix http://redmine.kokuaviewer.org/issues/1126 and as a bonus, now
 using blowfish to encrypt passwords.

---
 linden/indra/llmessage/llblowfishcipher.cpp |  69 +++++++++--
 linden/indra/newview/hippogridmanager.cpp   | 177 ++++++++++++++++++++--------
 linden/indra/newview/hippogridmanager.h     |   3 +
 linden/indra/newview/llappviewer.cpp        |   9 +-
 4 files changed, 200 insertions(+), 58 deletions(-)

diff --git a/linden/indra/llmessage/llblowfishcipher.cpp b/linden/indra/llmessage/llblowfishcipher.cpp
index f24d103..e9d4a7c 100644
--- a/linden/indra/llmessage/llblowfishcipher.cpp
+++ b/linden/indra/llmessage/llblowfishcipher.cpp
@@ -73,13 +73,13 @@ U32 LLBlowfishCipher::encrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len)
     unsigned char initial_vector[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
 	EVP_EncryptInit_ex(&context, NULL, NULL, mSecret, initial_vector);
 
-    int blocksize = EVP_CIPHER_CTX_block_size(&context);
-    int keylen = EVP_CIPHER_CTX_key_length(&context);
-    int iv_length = EVP_CIPHER_CTX_iv_length(&context);
-    lldebugs << "LLBlowfishCipher blocksize " << blocksize
-		<< " keylen " << keylen
-		<< " iv_len " << iv_length
-		<< llendl;
+//    int blocksize = EVP_CIPHER_CTX_block_size(&context);
+//    int keylen = EVP_CIPHER_CTX_key_length(&context);
+//    int iv_length = EVP_CIPHER_CTX_iv_length(&context);
+//    lldebugs << "LLBlowfishCipher blocksize " << blocksize
+//		<< " keylen " << keylen
+//		<< " iv_len " << iv_length
+//		<< llendl;
 
 	int output_len = 0;
 	int temp_len = 0;
@@ -113,7 +113,60 @@ ERROR:
 // virtual
 U32 LLBlowfishCipher::decrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len)
 {
-	llerrs << "LLBlowfishCipher decrypt unsupported" << llendl;
+	if (!src || !src_len || !dst || !dst_len) return 0;
+	if (src_len > dst_len) return 0;
+
+	// OpenSSL uses "cipher contexts" to hold encryption parameters.
+    EVP_CIPHER_CTX context;
+    EVP_CIPHER_CTX_init(&context);
+
+	// We want a blowfish cyclic block chain cipher, but need to set 
+	// the key length before we pass in a key, so call EncryptInit 
+	// first with NULLs.
+	EVP_DecryptInit_ex(&context, EVP_bf_cbc(), NULL, NULL, NULL);
+	EVP_CIPHER_CTX_set_key_length(&context, (int)mSecretSize);
+	
+	// Complete initialization.  Per EVP_EncryptInit man page, the
+	// cipher pointer must be NULL.  Apparently initial_vector must
+	// be 8 bytes for blowfish, as this is the block size.
+    unsigned char initial_vector[] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+	EVP_DecryptInit_ex(&context, NULL, NULL, mSecret, initial_vector);
+
+//    int blocksize = EVP_CIPHER_CTX_block_size(&context);
+//    int keylen = EVP_CIPHER_CTX_key_length(&context);
+//    int iv_length = EVP_CIPHER_CTX_iv_length(&context);
+//    lldebugs << "LLBlowfishCipher blocksize " << blocksize
+//		<< " keylen " << keylen
+//		<< " iv_len " << iv_length
+//		<< llendl;
+
+	int output_len = 0;
+	int temp_len = 0;
+	if (!EVP_DecryptUpdate(&context,
+			dst,
+			&output_len,
+			src,
+			src_len))
+	{
+		llwarns << "LLBlowfishCipher::decrypt EVP_DecryptUpdate failure" << llendl;
+		goto ERROR;
+	}
+
+	// There may be some final data left to decrypt if the input is
+	// not an exact multiple of the block size.
+	if (!EVP_DecryptFinal_ex(&context, (unsigned char*)(dst + output_len), &temp_len))
+	{
+		llwarns << "LLBlowfishCipher::decrypt EVP_DecryptFinal failure" << llendl;
+		goto ERROR;
+	}
+	output_len += temp_len;
+
+	EVP_CIPHER_CTX_cleanup(&context);
+	return output_len;
+
+ERROR:
+	EVP_CIPHER_CTX_cleanup(&context);
+	return 0;
 	return 0;
 }
 
diff --git a/linden/indra/newview/hippogridmanager.cpp b/linden/indra/newview/hippogridmanager.cpp
index 1dfb9ac..11b144e 100644
--- a/linden/indra/newview/hippogridmanager.cpp
+++ b/linden/indra/newview/hippogridmanager.cpp
@@ -49,6 +49,7 @@
 #include "llviewernetwork.h" // gMacAddress
 #include "llweb.h"
 #include "llxorcipher.h"	// saved password, MAC address
+#include "llblowfishcipher.h"
 
 #include "hipporestrequest.h"
 #include <boost/algorithm/string.hpp>
@@ -87,6 +88,7 @@ HippoGridInfo::HippoGridInfo(const std::string& gridNick) :
 	mFirstName(LLStringUtil::null),
 	mLastName(LLStringUtil::null),
 	mPasswordAvatar(LLStringUtil::null),
+	mEncryptedPassword(LLStringUtil::null),
 	mXmlState(XML_VOID),
 	mVoiceConnector("SLVoice"),
 	mRenderCompat(false),
@@ -423,12 +425,115 @@ void HippoGridInfo::formatFee(std::string &fee, S32 cost, bool showFree) const
 	}
 }
 
+const S32 HASHED_LENGTH = 32;
+
+void HippoGridInfo::setEncryptedPassword(const std::string& encrypted_password)
+{
+	int i;
+	LLBlowfishCipher cipher(gMACAddress, 6);
+	size_t encrypted_size = cipher.requiredEncryptionSpace(HASHED_LENGTH);
+
+	if (encrypted_password.empty())
+	{
+		// Check if we have a password hash to encrypt.
+		if (mPasswordAvatar.empty())
+			mEncryptedPassword = "";
+		else
+		{
+			// In theory, this is used to convert old style Imprudence 1.4 beta 2 and earlier passwords.
+			// Encipher with MAC address
+			char out[HASHED_LENGTH * 2 + 1];
+
+/*  indra/llmessage/llmail.cpp says "blowfish-not-supported-on-windows", but we shall see.
+#if LL_WINDOWS
+			LLXORCipher cipherX(gMACAddress, 6);
+			cipherX.encrypt(mPasswordAvatar.c_str(), HASHED_LENGTH);
+#else
+*/
+			U8* encrypted = new U8[encrypted_size];
+			U8* password = (U8 *) mPasswordAvatar.c_str();
+
+			cipher.encrypt(password, HASHED_LENGTH, encrypted, HASHED_LENGTH);
+			for (i = 0; i < HASHED_LENGTH; i++)
+			{
+				sprintf(out + i * 2, "%02x", encrypted[i]);
+			}
+			out[HASHED_LENGTH * 2]='\0';
+			mEncryptedPassword.assign(out);
+		}
+
+		return;
+	}
+
+	if (encrypted_password == mEncryptedPassword)
+	{
+		return;
+	}
+
+	// Max "actual" password length is 16 characters.
+	// Hex digests are always 32 characters.
+	// Encrypted passwords stored as hex digits are 64 characters.
+	if (encrypted_password.length() == (HASHED_LENGTH * 2))
+	{
+		// This is actually encrypted, as found in the grids file.
+		mEncryptedPassword.assign(encrypted_password);
+	}
+	else
+	{
+		// Should never happen, this is only called from the file reading bit.
+		llwarns << "Encrypted password corrupted." << llendl;
+		return;
+	}
+
+	std::string hashed_password("");
+
+	// Decrypt it for the password hash.
+	// Decipher with MAC address
+	U8 buffer[HASHED_LENGTH + 1];
+	char in[HASHED_LENGTH * 2 + 1];
+
+	LLStringUtil::copy(in, mEncryptedPassword.c_str(), HASHED_LENGTH * 2 + 1);
+/*  indra/llmessage/llmail.cpp says "blowfish-not-supported-on-windows", but we shall see.
+#if LL_WINDOWS
+	for (i = 0; i < HASHED_LENGTH; i++)
+	{
+		sscanf(in + i * 2, "%2hhx", &buffer[i]);
+	}
+	// Note that an XOR "cipher" is a lousy one when the secret is repeated several times like it is here.
+	LLXORCipher cipher(gMACAddress, 6);
+	cipher.decrypt(buffer, HASHED_LENGTH);
+#else
+*/
+	U8* encrypted = new U8[encrypted_size];
+	for (i = 0; i < HASHED_LENGTH; i++)
+	{
+		sscanf(in + i * 2, "%2hhx", &encrypted[i]);
+	}
+	// Not sure why, but this prints a warning saying it failed, even though it works.  Which does not matter that much, we don't use the return value anyway.
+	cipher.decrypt(encrypted, HASHED_LENGTH, buffer, HASHED_LENGTH);
+	buffer[HASHED_LENGTH] = '\0';
+
+	// Check to see if the mac address generated a bad hashed
+	// password. It should be a hex-string or else the mac adress has
+	// changed. This is a security feature to make sure that if you
+	// get someone's grid_info.xml file, you cannot hack their account.
+	// This is a lousy way to check.
+	if (is_hex_string(buffer, HASHED_LENGTH))
+	{
+		hashed_password.assign((char*)buffer);
+	}
+
+	mPasswordAvatar.assign(hashed_password);
+}
 
 void HippoGridInfo::setPassword(const std::string& unhashed_password)
 {
+	int i;
+
 	if (unhashed_password.empty())
 	{
 		mPasswordAvatar = "";
+		mEncryptedPassword = "";
 		return;
 	}
 
@@ -454,59 +559,38 @@ void HippoGridInfo::setPassword(const std::string& unhashed_password)
 		hashed_password = munged_password;
 	}
 
-	// need to fix the bug in this
-	/*
-
+	// Encrypt it for storing in the grids file.
 	// Encipher with MAC address
-	const S32 HASHED_LENGTH = 32;
-	U8 buffer[HASHED_LENGTH+1];
-
-	LLStringUtil::copy((char*)buffer, hashed_password.c_str(), HASHED_LENGTH+1);
+	char out[HASHED_LENGTH * 2 + 1];
 
-	LLXORCipher cipher(gMACAddress, 6);
-	cipher.encrypt(buffer, HASHED_LENGTH);
+/*  indra/llmessage/llmail.cpp says "blowfish-not-supported-on-windows", but we shall see.
+#if LL_WINDOWS
+	LLXORCipher cipherX(gMACAddress, 6);
+	cipherX.encrypt(hashed_password.c_str(), HASHED_LENGTH);
+#else
+*/
+	LLBlowfishCipher cipher(gMACAddress, 6);
+	size_t encrypted_size = cipher.requiredEncryptionSpace(HASHED_LENGTH);
+	U8* encrypted = new U8[encrypted_size];
+	U8* password = (U8 *) hashed_password.c_str();
 
-	mPasswordAvatar.assign((char*)buffer);
-	*/
+	cipher.encrypt(password, HASHED_LENGTH, encrypted, HASHED_LENGTH);
+	for (i = 0; i < HASHED_LENGTH; i++)
+	{
+		sprintf(out + i * 2, "%02x", encrypted[i]);
+	}
+	out[HASHED_LENGTH * 2]='\0';
+	mEncryptedPassword.assign(out);
 	mPasswordAvatar.assign(hashed_password);
 }
 
+std::string HippoGridInfo::getEncryptedPassword() const
+{
+	return mEncryptedPassword;
+}
 
 std::string HippoGridInfo::getPassword() const
 {
-	// need to fix the bug in this
-	/*
-	if (mPasswordAvatar.empty() || mPasswordAvatar.length() == 32)
-	{
-		return mPasswordAvatar;
-	}
-
-	std::string hashed_password("");
-
-	// UUID is 16 bytes, written into ASCII is 32 characters
-	// without trailing \0
-	const S32 HASHED_LENGTH = 32;
-	U8 buffer[HASHED_LENGTH+1];
-
-	LLStringUtil::copy((char*)buffer, mPasswordAvatar.c_str(), HASHED_LENGTH+1);
-	
-	// Decipher with MAC address
-	LLXORCipher cipher(gMACAddress, 6);
-	cipher.decrypt(buffer, HASHED_LENGTH);
-
-	buffer[HASHED_LENGTH] = '\0';
-
-	// Check to see if the mac address generated a bad hashed
-	// password. It should be a hex-string or else the mac adress has
-	// changed. This is a security feature to make sure that if you
-	// get someone's grid_info.xml file, you cannot hack their account.
-	if (is_hex_string(buffer, HASHED_LENGTH))
-	{
-		hashed_password.assign((char*)buffer);
-	}
-
-	return hashed_password;
-	*/
 	return mPasswordAvatar;
 }
 
@@ -909,7 +993,9 @@ void HippoGridManager::parseData(LLSD &gridInfo, bool mergeIfNewer)
 			if (gridMap.has("render_compat")) grid->setRenderCompat(gridMap["render_compat"]);
 			if (gridMap.has("firstname")) grid->setFirstName(gridMap["firstname"]);
 			if (gridMap.has("lastname")) grid->setLastName(gridMap["lastname"]);
+			// Reading this one coz there are some old files in the wild that have it, but not encryptedpassword.
 			if (gridMap.has("avatarpassword")) grid->setPassword(gridMap["avatarpassword"]);
+			if (gridMap.has("encryptedpassword")) grid->setEncryptedPassword(gridMap["encryptedpassword"]);
 			if (gridMap.has("username")) grid->setUsername(gridMap["username"]);
 			if (gridMap.has("username_compat")) grid->setUsernameCompat(gridMap["username_compat"]);
 			if (newGrid) addGrid(grid);
@@ -945,8 +1031,7 @@ void HippoGridManager::saveFile()
 		gridInfo[i]["password"] = grid->getPasswordURL();
 		gridInfo[i]["firstname"] = grid->getFirstName();
 		gridInfo[i]["lastname"] = grid->getLastName();
-		gridInfo[i]["avatarpassword"] = grid->getPassword();
-		
+		gridInfo[i]["encryptedpassword"] = grid->getEncryptedPassword();
 		gridInfo[i]["search"] = grid->getSearchURL();
 		gridInfo[i]["render_compat"] = grid->isRenderCompat();
 
diff --git a/linden/indra/newview/hippogridmanager.h b/linden/indra/newview/hippogridmanager.h
index 8e77f99..c289349 100644
--- a/linden/indra/newview/hippogridmanager.h
+++ b/linden/indra/newview/hippogridmanager.h
@@ -89,6 +89,7 @@ public:
 	const std::string& getLastName()			const { return mLastName; }
 	const std::string& getUsername()			const { return mUsername; }
 	std::string getPassword()				const;
+	std::string getEncryptedPassword()			const;
 	const std::string& getVoiceConnector()		const { return mVoiceConnector; }
 	S32 getMaxAgentGroups()						const { return mMaxAgentGroups; }
 	const std::string& getCurrencySymbol()		const { return mCurrencySymbol; }
@@ -115,6 +116,7 @@ public:
 	void setFirstName(const std::string& firstName)				{ mFirstName = firstName; }
 	void setLastName(const std::string& lastName)				{ mLastName = lastName; }
 	void setPassword(const std::string& unhashed_password);
+	void setEncryptedPassword(const std::string& encrypted_password);
 	void setVoiceConnector(const std::string& vc)				{ mVoiceConnector = vc; }
 	void setCurrencySymbol(const std::string& sym)				{ mCurrencySymbol = sym.substr(0, 3); }
 	void setRealCurrencySymbol(const std::string& sym)			{ mRealCurrencySymbol = sym.substr(0, 3); }
@@ -146,6 +148,7 @@ private:
 	std::string mFirstName;
 	std::string mLastName;
 	std::string mPasswordAvatar;
+	std::string mEncryptedPassword;
 	bool		mRenderCompat;
 	S32			mMaxAgentGroups;
 
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index b96f6c2..e02bfc7 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -611,6 +611,11 @@ bool LLAppViewer::init()
 	// Always add the version to the top of the log--makes debugging easier -- MC
 	llinfos << ViewerInfo::prettyInfo() << llendl;
 
+	// Always fetch the Ethernet MAC address, needed both for login
+	// and password load.  Need to do this before initConfiguration(),
+	// as the password loading part needs the MAC.
+	LLUUID::getNodeID(gMACAddress);
+
     if (!initConfiguration())
 		return false;
 
@@ -743,10 +748,6 @@ bool LLAppViewer::init()
 		return false;
 	}
 
-	// Always fetch the Ethernet MAC address, needed both for login
-	// and password load.
-	LLUUID::getNodeID(gMACAddress);
-
 	// Prepare for out-of-memory situations, during which we will crash on
 	// purpose and save a dump.
 #if LL_WINDOWS && LL_RELEASE_FOR_DOWNLOAD && LL_USE_SMARTHEAP
-- 
cgit v1.1


From e3fcedc0ddbbdc4fe3b1faa0c46cdf77bb4ea1a9 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Wed, 14 Mar 2012 11:57:45 +1000
Subject: Apply various Mac build patches from Mimika Oh and Nemurimasu Neiro
 to fix up http://redmine.kokuaviewer.org/issues/598 and
 http://redmine.kokuaviewer.org/issues/602

---
 linden/indra/cmake/Variables.cmake       | 11 ++++++++++-
 linden/indra/develop.py                  |  5 +++++
 linden/indra/llui/llresmgr.cpp           |  9 +++++++--
 linden/indra/mac_updater/mac_updater.cpp |  6 +++---
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/linden/indra/cmake/Variables.cmake b/linden/indra/cmake/Variables.cmake
index 6b7ded3..25d7a17 100644
--- a/linden/indra/cmake/Variables.cmake
+++ b/linden/indra/cmake/Variables.cmake
@@ -80,10 +80,19 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
   set(DARWIN 1)
+
+  # Incorporated settings from
+  # http://imprudenceviewer.org/w/index.php?title=How_to_compile&oldid=1647#Mac
+  # so that people don't have to set them every time they run develop.py
+  set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION  "4.0")
+  set(CMAKE_XCODE_ATTRIBUTE_ARCHS '$(ARCHS_STANDARD_32_BIT)')
+  set(CMAKE_XCODE_ATTRIBUTE_VALID_ARCHS "i386 ppc")
+  # set(CMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH "NO")
+
   # set this dynamically from the build system now -
   # NOTE: wont have a distributable build unless you add this on the configure line with:
   # -DCMAKE_OSX_ARCHITECTURES:STRING='i386;ppc'
-  set(CMAKE_OSX_ARCHITECTURES i386)
+  set(CMAKE_OSX_ARCHITECTURES i386;ppc)
   set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX10.5.sdk)
   if (CMAKE_OSX_ARCHITECTURES MATCHES "i386")
     set(ARCH i386)
diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index 2f07e9e..3760609 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -435,7 +435,12 @@ class DarwinSetup(UnixSetup):
             type=self.build_type
             )
         if self.universal == 'ON':
+            args['universal'] = '-DCMAKE_OSX_ARCHITECTURES:STRING=\'i386;ppc\''
+        elif self.arch == 'ppc':
+            args['universal'] = '-DCMAKE_OSX_ARCHITECTURES:STRING=\'ppc\''
+        else:
             args['universal'] = '-DCMAKE_OSX_ARCHITECTURES:STRING=\'i386\''
+
         #if simple:
         #    return 'cmake %(opts)s %(dir)r' % args
         return ('cmake -G %(generator)r '
diff --git a/linden/indra/llui/llresmgr.cpp b/linden/indra/llui/llresmgr.cpp
index 22610ca..a16cfdf 100644
--- a/linden/indra/llui/llresmgr.cpp
+++ b/linden/indra/llui/llresmgr.cpp
@@ -266,8 +266,13 @@ std::string LLResMgr::getMonetaryString( S32 input ) const
 			default:  			// Unknown -- use the US defaults.
 			case LLLOCALE_USA: 
 			case LLLOCALE_UK:	// UK ends up being the same as US for the items used here.
-				fakeconv.negative_sign = "-";
-				fakeconv.mon_grouping = "\x03\x03\x00";	// commas every 3 digits
+						// Mac OS X 10.6 SDK's struct lconv contains "char *" not
+						// "const char *" so these char arrays work around the error
+						// this causes in GCC 4.2, even though they won't be modified.
+				static char negative_sign[] = "-";
+				static char mon_grouping[] = "\x03\x03\x00";
+				fakeconv.negative_sign = negative_sign;
+				fakeconv.mon_grouping = mon_grouping;  // commas every 3 digits
 				fakeconv.n_sign_posn = 1; // negative sign before the string
 			break;
 		}
diff --git a/linden/indra/mac_updater/mac_updater.cpp b/linden/indra/mac_updater/mac_updater.cpp
index 03c6f6f..cab9e54 100644
--- a/linden/indra/mac_updater/mac_updater.cpp
+++ b/linden/indra/mac_updater/mac_updater.cpp
@@ -68,8 +68,8 @@ EventHandlerRef gEventHandler = NULL;
 OSStatus gFailure = noErr;
 Boolean gCancelled = false;
 
-char *gUpdateURL;
-char *gProductName;
+const char *gUpdateURL;
+const char *gProductName;
 
 void *updatethreadproc(void*);
 
@@ -1032,7 +1032,7 @@ void *updatethreadproc(void*)
 		if(!mountOutput.empty())
 		{
 			const char *s = mountOutput.c_str();
-			char *prefix = "/dev/";
+			const char *prefix = "/dev/";
 			char *sub = strstr(s, prefix);
 			
 			if(sub != NULL)
-- 
cgit v1.1


From 89a4500baca11a25b556d4a5bdcad7767bc0a207 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Mon, 19 Mar 2012 09:05:29 +1000
Subject: Fix up the missing default colour.

---
 linden/indra/newview/skins/default/colors_base.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/linden/indra/newview/skins/default/colors_base.xml b/linden/indra/newview/skins/default/colors_base.xml
index b90f8aa..f97267a 100644
--- a/linden/indra/newview/skins/default/colors_base.xml
+++ b/linden/indra/newview/skins/default/colors_base.xml
@@ -205,5 +205,6 @@
 <ContextSilhouetteColor value="239, 156, 0, 255" />     <!-- For "context" highlighting, i.e. pie menu -->
 <GroupOverTierColor value="110, 15, 15, 255" />         <!-- Warning text in Group Info window -->
 <ConsoleBackground value="0, 0, 0, 255" />              <!-- Background for inworld chat -->
+<ComboBoxBg value="255, 255, 255, 255"/>
  
 </settings>
-- 
cgit v1.1


From 23e81a5276878e5f3cad03750b4c0a24a1aaa4d6 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Tue, 20 Mar 2012 22:27:09 +1000
Subject: Remove a duplicate return statement.  Thanks to Nicky Perian for
 pointing this out.

---
 linden/indra/llmessage/llblowfishcipher.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/linden/indra/llmessage/llblowfishcipher.cpp b/linden/indra/llmessage/llblowfishcipher.cpp
index e9d4a7c..3eebfad 100644
--- a/linden/indra/llmessage/llblowfishcipher.cpp
+++ b/linden/indra/llmessage/llblowfishcipher.cpp
@@ -167,7 +167,6 @@ U32 LLBlowfishCipher::decrypt(const U8* src, U32 src_len, U8* dst, U32 dst_len)
 ERROR:
 	EVP_CIPHER_CTX_cleanup(&context);
 	return 0;
-	return 0;
 }
 
 // virtual
-- 
cgit v1.1


From bbcf8197af92fa245038d9313a9eacc1255f77f1 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Tue, 20 Mar 2012 23:12:04 +1000
Subject: Let it build under gcc 4.5.2.  Thanks to Lord Drakeo for fixing this.

---
 linden/indra/newview/llviewerobjectlist.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp
index ad92fe3..d0aa4b1 100644
--- a/linden/indra/newview/llviewerobjectlist.cpp
+++ b/linden/indra/newview/llviewerobjectlist.cpp
@@ -639,7 +639,7 @@ void LLViewerObjectList::updateApparentAngles(LLAgent &agent)
 		mCurLazyUpdateIndex = 0;
 	}
 
-	mCurBin = (++mCurBin) % NUM_BINS;
+	mCurBin = (mCurBin + 1) % NUM_BINS;
 
 	LLVOAvatar::cullAvatarsByPixelArea();
 }
-- 
cgit v1.1


From 304f811a55ba2fe339973304d73e957273f01ca7 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Thu, 22 Mar 2012 20:59:01 +1000
Subject: Removing ancient, left over, broken and never used, hippo update
 code.

---
 linden/indra/newview/hippoupdate.cpp | 93 ------------------------------------
 linden/indra/newview/hippoupdate.h   | 12 -----
 linden/indra/newview/llappviewer.cpp |  1 -
 3 files changed, 106 deletions(-)
 delete mode 100644 linden/indra/newview/hippoupdate.cpp
 delete mode 100644 linden/indra/newview/hippoupdate.h

diff --git a/linden/indra/newview/hippoupdate.cpp b/linden/indra/newview/hippoupdate.cpp
deleted file mode 100644
index 848a8fd..0000000
--- a/linden/indra/newview/hippoupdate.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-
-#include "hippoupdate.h"
-
-#include <cstdio>
-#include <list>
-#include <vector>
-
-#include <stdtypes.h>
-#include <llhttpclient.h>
-#include <llmemory.h>
-//#include <llversionviewer.h>
-#include "llviewercontrol.h"
-#include "llviewernetwork.h"
-#include "llweb.h"
-#include <llwindow.h>
-
-
-std::string gHippoChannel;
-
-
-// TODO - Um, WTH?  Is this actually used anywhere?
-// static
-bool HippoUpdate::checkUpdate()
-{
-	llinfos << "Hippo Update Check..." << llendl;
-
-	// get channel name
-	gHippoChannel = gSavedSettings.getString("ChannelName");
-
-	// get mac address
-	char macAddress[18];
-	sprintf(macAddress, "%02x:%02x:%02x:%02x:%02x:%02x",
-		gMACAddress[0], gMACAddress[1], gMACAddress[2], gMACAddress[3], gMACAddress[4], gMACAddress[5]);
-
-	// build URL for update check
-	char url[1000];
-	snprintf(url, 1000, 
-/*		"http://update.mjm.game-host.org/os/viewer.php?"
-		"product=%s&channel=%s&"
-		"version_major=%d&version_minor=%d&version_patch=%d&version_base=%s&"
-		"platform=%s&mac=%s",
-		LL_PRODUCT, LL_CHANNEL_CSTR,
-		LL_VERSION_MAJOR, LL_VERSION_MINOR, LL_VERSION_PATCH, LL_VERSION_BASE,
-		LL_PLATFORM*/"", macAddress);
-
-	// query update server
-	std::string escaped_url = LLWeb::escapeURL(url);
-	LLSD response = LLHTTPClient::blockingGet(escaped_url.c_str());
-
-	// check response, return on error
-	S32 status = response["status"].asInteger();
-	if ((status != 200) || !response["body"].isMap()) {
-		llinfos << "Hippo Update failed (" << status << "): "
-			<< (response["body"].isString()? response["body"].asString(): "<unknown error>")
-			<< llendl;
-		return true;
-	}
-
-	// get data from response
-	LLSD data = response["body"];
-	std::string webpage = (data.has("webpage") && data["webpage"].isString())? data["webpage"].asString(): "";
-	std::string message = (data.has("message") && data["message"].isString())? data["message"].asString(): "";
-	std::string yourVersion = (data.has("yourVersion") && data["yourVersion"].isString())? data["yourVersion"].asString(): "";
-	std::string curVersion = (data.has("curVersion") && data["curVersion"].isString())? data["curVersion"].asString(): "";
-	bool update = (data.has("update") && data["update"].isBoolean())? data["update"].asBoolean(): false;
-	bool mandatory = (data.has("mandatory") && data["mandatory"].isBoolean())? data["mandatory"].asBoolean(): false;
-
-	// log and return, if no update available
-	llinfos << "Your version is " << yourVersion << ", current version is " << curVersion << '.' << llendl;
-	if (!update) return true;
-	llinfos << "Update is " << (mandatory? "mandatory.": "optional.") << llendl;
-
-	// show update dialog
-	char msg[1000];
-	snprintf(msg, 1000,
-		"There is a new viewer version available.\n"
-		"\n"
-		"Your version: %s\n"
-		"Current version: %s\n"
-		"%s\n"
-		"Do you want to visit the web site?",
-		yourVersion.c_str(), curVersion.c_str(),
-		mandatory? "\nThis is a mandatory update.\n": "");
-	S32 button = OSMessageBox(msg, "Hippo OpenSim Viewer Update", OSMB_YESNO);
-	if (button == OSBTN_YES) {
-		llinfos << "Taking user to " << webpage << llendl;
-		LLWeb::loadURLExternal(webpage);
-		// exit the viewer
-		return false;
-	}
-
-	return !mandatory;
-}
diff --git a/linden/indra/newview/hippoupdate.h b/linden/indra/newview/hippoupdate.h
deleted file mode 100644
index 559c8b3..0000000
--- a/linden/indra/newview/hippoupdate.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef __HIPPO_UPDATE_H__
-#define __HIPPO_UPDATE_H__
-
-
-class HippoUpdate
-{
-  public:
-	static bool checkUpdate();
-};
-
-
-#endif
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index e02bfc7..33a71fe 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -179,7 +179,6 @@
 
 #include "hippogridmanager.h"
 #include "hippolimits.h"
-#include "hippoupdate.h"
 
 // [RLVa:KB]
 #include "rlvhandler.h"
-- 
cgit v1.1


From 98a699b1eeadd456aa7cdbfb54e3b318eaa22785 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 31 Mar 2012 22:56:33 +1000
Subject: Just some whitespace cleanup, coz my editor insists, coz I told it to
 insist.

---
 .../lscript/lscript_library/lscript_library.cpp    | 58 +++++++++++-----------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/linden/indra/lscript/lscript_library/lscript_library.cpp b/linden/indra/lscript/lscript_library/lscript_library.cpp
index e379192..e6ea37d 100644
--- a/linden/indra/lscript/lscript_library/lscript_library.cpp
+++ b/linden/indra/lscript/lscript_library/lscript_library.cpp
@@ -1,11 +1,11 @@
-/** 
+/**
  * @file lscript_library.cpp
  * @brief external library interface
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
- * 
+ *
  * Copyright (c) 2002-2009, Linden Research, Inc.
- * 
+ *
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
@@ -13,17 +13,17 @@
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
  * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
+ *
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
  * online at
  * http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
+ *
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
  * and agree to abide by those obligations.
- * 
+ *
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
@@ -37,7 +37,7 @@
 //  ##  ##  ## ##     ## ########  ## ## ##  ##  ## ## ## ##   ####  ##   ##
 //  ##  ##  ## ######### ##   ##   ##  ####  ##  ##  #### ##    ##
 //  ##  ##  ## ##     ## ##    ##  ##   ###  ##  ##   ### ##    ##  #### ####
-//   ###  ###  ##     ## ##     ## ##    ## #### ##    ##  ######   #### #### 
+//   ###  ###  ##     ## ##     ## ##    ## #### ##    ##  ######   #### ####
 //
 // When adding functions, they <b>MUST</b> be appended to the end of
 // the init() method. The init() associates the name with a number,
@@ -335,7 +335,7 @@ void LLScriptLibrary::init()
 
 	addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llSetRemoteScriptAccessPin", NULL, "i", "llSetRemoteScriptAccessPin(integer pin)\nIf pin is set to a non-zero number, the task will accept remote script\nloads via llRemoteLoadScriptPin if it passes in the correct pin.\nOthersise, llRemoteLoadScriptPin is ignored."));
 	addFunction(new LLScriptLibraryFunction(10.f, 3.f, dummy_func, "llRemoteLoadScriptPin", NULL, "ksiii", "llRemoteLoadScriptPin(key target, string name, integer pin, integer running, integer start_param)\nIf the owner of the object this script is attached can modify target,\nthey are in the same region,\nand the matching pin is used,\ncopy script name onto target,\nif running == TRUE, start the script with param."));
-	
+
 	addFunction(new LLScriptLibraryFunction(10.f, 1.f, dummy_func, "llOpenRemoteDataChannel", NULL, NULL, "llOpenRemoteDataChannel()\nCreates a channel to listen for XML-RPC calls.  Will trigger a remote_data event with channel id once it is available."));
 	addFunction(new LLScriptLibraryFunction(10.f, 3.f, dummy_func, "llSendRemoteData", "k", "ksis", "key llSendRemoteData(key channel, string dest, integer idata, string sdata)\nSend an XML-RPC request to dest through channel with payload of channel (in a string), integer idata and string sdata.\nA message identifier key is returned.\nAn XML-RPC reply will trigger a remote_data event and reference the message id.\nThe message_id is returned."));
 	addFunction(new LLScriptLibraryFunction(10.f, 3.f, dummy_func, "llRemoteDataReply", NULL, "kksi", "llRemoteDataReply(key channel, key message_id, string sdata, integer idata)\nSend an XML-RPC reply to message_id on channel with payload of string sdata and integer idata"));
@@ -351,7 +351,7 @@ void LLScriptLibrary::init()
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llLog", "f", "f", "float llLog(float val)\nReturns the base e log of val if val > 0, otherwise returns 0."));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetAnimationList", "l", "k", "list llGetAnimationList(key id)\nGets a list of all playing animations for avatar id"));
 	addFunction(new LLScriptLibraryFunction(10.f, 2.f, dummy_func, "llSetParcelMusicURL", NULL, "s", "llSetParcelMusicURL(string url)\nSets the streaming audio URL for the parcel object is on"));
-	
+
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetRootPosition", "v", NULL, "vector llGetRootPosition()\nGets the global position of the root object of the object script is attached to"));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetRootRotation", "q", NULL, "rotation llGetRootRotation()\nGets the global rotation of the root object of the object script is attached to"));
 
@@ -370,7 +370,7 @@ void LLScriptLibrary::init()
 	addFunction(new LLScriptLibraryFunction(10.f, 0.0f, dummy_func, "llBase64ToInteger", "i", "s", "integer llBase64ToInteger(string str)\nBig endian decode of a Base64 string into an integer."));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetGMTclock", "f", "", "float llGetGMTclock()\nGets the time in seconds since midnight in GMT"));
 	addFunction(new LLScriptLibraryFunction(10.f, 10.f, dummy_func, "llGetSimulatorHostname", "s", "", "string llGetSimulatorHostname()\nGets the hostname of the machine script is running on (same as string in viewer Help dialog)"));
-	
+
 	addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llSetLocalRot", NULL, "q", "llSetLocalRot(rotation rot)\nsets the rotation of a child prim relative to the root prim"));
 
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llParseStringKeepNulls", "l", "sll", "list llParseStringKeepNulls(string src, list separators, list spacers)\nBreaks src into a list, discarding separators, keeping spacers (separators and spacers must be lists of strings, maximum of 8 each), keeping any null values generated."));
@@ -393,12 +393,12 @@ void LLScriptLibrary::init()
 	addFunction(new LLScriptLibraryFunction(10.f, 2.f, dummy_func, "llParcelMediaQuery", "l", "l", "list llParcelMediaQuery(list query)\nSends a list of queries, returns a list of results."));
 
 	addFunction(new LLScriptLibraryFunction(10.f, 1.f, dummy_func, "llModPow", "i", "iii", "integer llModPow(integer a, integer b, integer c)\nReturns a raised to the b power, mod c. ( (a**b)%c ).  b is capped at 0xFFFF (16 bits)."));
-	
+
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetInventoryType", "i", "s", "integer llGetInventoryType(string name)\nReturns the type of the inventory name"));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetPayPrice", NULL, "il", "llSetPayPrice(integer price, list quick_pay_buttons)\nSets the default amount when someone chooses to pay this object."));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetCameraPos", "v", "", "vector llGetCameraPos()\nGets current camera position for agent task has permissions for."));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetCameraRot", "q", "", "rotation llGetCameraRot()\nGets current camera orientation for agent task has permissions for."));
-	
+
 	addFunction(new LLScriptLibraryFunction(10.f, 20.f, dummy_func, "llSetPrimURL", NULL, "s", "llSetPrimURL(string url)\nUpdates the URL for the web page shown on the sides of the object."));
 	addFunction(new LLScriptLibraryFunction(10.f, 20.f, dummy_func, "llRefreshPrimURL", NULL, "", "llRefreshPrimURL()\nReloads the web page shown on the sides of the object."));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llEscapeURL", "s", "s", "string llEscapeURL(string url)\nReturns and escaped/encoded version of url, replacing spaces with %20 etc."));
@@ -411,7 +411,7 @@ void LLScriptLibrary::init()
 
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llSetCameraParams",			 NULL, "l", "llSetCameraParams(list rules)\nSets multiple camera parameters at once.\nList format is [ rule1, data1, rule2, data2 . . . rulen, datan ]"));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llClearCameraParams",		 NULL, NULL, "llClearCameraParams()\nResets all camera parameters to default values and turns off scripted camera control."));
-	
+
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llListStatistics", "f", "il", "float llListStatistics(integer operation, list l)\nPerform statistical aggregate functions on list l using LIST_STAT_* operations."));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetUnixTime", "i", NULL, "integer llGetUnixTime()\nGet the number of seconds elapsed since 00:00 hours, Jan 1, 1970 UTC from the system clock."));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetParcelFlags", "i", "v", "integer llGetParcelFlags(vector pos)\nGet the parcel flags (PARCEL_FLAG_*) for the parcel including the point pos."));
@@ -433,7 +433,7 @@ void LLScriptLibrary::init()
 	addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llSetLinkPrimitiveParams", NULL, "il", "llSetLinkPrimitiveParams(integer linknumber, list rules)\nSet primitive parameters for linknumber based on rules."));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.2f, dummy_func, "llSetLinkTexture", NULL, "isi", "llSetLinkTexture(integer link_pos, string texture, integer face)\nSets the texture of face for link_pos"));
 
-	
+
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llStringTrim", "s", "si", "string llStringTrim(string src, integer trim_type)\nTrim leading and/or trailing spaces from a string.\nUses trim_type of STRING_TRIM, STRING_TRIM_HEAD or STRING_TRIM_TAIL."));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llRegionSay", NULL, "is", "llRegionSay(integer channel, string msg)\nbroadcasts msg to entire region on channel (not 0.)"));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "llGetObjectDetails", "l", "kl", "list llGetObjectDetails(key id, list params)\nGets the object details specified in params for the object with key id.\nDetails are OBJECT_NAME, _DESC, _POS, _ROT, _VELOCITY, _OWNER, _GROUP, _CREATOR."));
@@ -484,25 +484,25 @@ void LLScriptLibrary::init()
 	// documented and therefore the description may be incomplete and require further attention.
 	// OpenSimulator is written in C# and not CPP therefore some values for example "double = float" etc. are different.
 
-	// OSSL corrections and syntax additions added + set in same order as found in OSSL_stub.cs of OpenSim Source (Updated PM October-21-2010 
-	// based on OpenSimulator Ver. 0.7.x DEV/Master Git # a7acb650d400a280a7b9edabd304376dff9c81af - a7acb65-r/14142 
-	// Updates by WhiteStar Magic 
+	// OSSL corrections and syntax additions added + set in same order as found in OSSL_stub.cs of OpenSim Source (Updated PM October-21-2010
+	// based on OpenSimulator Ver. 0.7.x DEV/Master Git # a7acb650d400a280a7b9edabd304376dff9c81af - a7acb65-r/14142
+	// Updates by WhiteStar Magic
 
-	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetRegionWaterHeight", NULL, "f", "osSetRegionWaterHeight(float height)\nAdjusts Water Height on region.\n(OpenSim only.)"));	
+	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetRegionWaterHeight", NULL, "f", "osSetRegionWaterHeight(float height)\nAdjusts Water Height on region.\n(OpenSim only.)"));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetRegionSunSettings", NULL, "iif", "osSetRegionSunSettings(integer useEstateSun, integer sunFixed, float sunHour)\nChanges the Estate Sun Settings, then Triggers a Sun Update\n'sunFixed' TRUE (1) to keep the sun stationary, FALSE (0) to use global time\n'sunHour' The \"Sun Hour\" that is desired, 0...24, with 0 just after SunRise.\n(OpenSim only.)"));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetEstateSunSettings", NULL, "if", "osSetEstateSunSettings(integer sunFixed, float sunHour)\nsunFixed = 0 or 1, sunHour = 00.00 to 24.00.\n(OpenSim only.)"));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osGetCurrentSunHour", "f", NULL, "float osGetCurrentSunHour()\nReturns Float Value of Current Sun Hour 0...24 0 = sunrise.\n(OpenSim only.)"));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSunGetParam","f", "s", "float osSunGetParam(string param)\nReturns current float values for param\nwhere param = day_length, year_length, day_night_offset, update_interval.\n(OpenSim only.)"));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSunSetParam", "sf", NULL, "osSunSetParam(string param, float value)\nSet's Sun Param for SunSet,\nosSunSetParam(day_length, 24.0)\nwhere param = day_length, year_length, day_night_offset, update_interval.\n(OpenSim only.)"));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osWindActiveModelPluginName", "s", NULL, "string osWindActiveModelPluginName()\nReturns the Current Working Wind Module Installed\nThese are SimpleRandomWind or ConfigurableWind, optionally others.\n(OpenSim only.)"));
-    addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osParcelJoin", NULL, "vv", "osParcelJoin(vector pos1, vector pos2))\nJoins Parcels @ X,Y coordinates.\n(OpenSim only.)"));	 
-    addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osParcelSubdivide", NULL, "vv", "osParcelSubdivide(vector pos1, vector pos2))\nSubdivides Parcels @ X,Y coordinates.\n(OpenSim only.)"));	 
-    addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osParcelSetDetails", NULL, "vv", "osParcelSetDetails(vector pos, list rules))\nSet Parcel details.\n(OpenSim only.)"));	 
-	// addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osWindParamSet", NULL, "ssf", "osWindParamSet(string plugin, string param, float value)Send Param to Specified Wind Plugin with new value.\n(OpenSim only.)")); 
-	// addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osWindParamGet", "f", "ss", "float osWindParamGet(string plugin, string param)\n Returns Current param from specified Wind Plugin Module.\n(OpenSim only.)")); 
+    addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osParcelJoin", NULL, "vv", "osParcelJoin(vector pos1, vector pos2))\nJoins Parcels @ X,Y coordinates.\n(OpenSim only.)"));
+    addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osParcelSubdivide", NULL, "vv", "osParcelSubdivide(vector pos1, vector pos2))\nSubdivides Parcels @ X,Y coordinates.\n(OpenSim only.)"));
+    addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osParcelSetDetails", NULL, "vv", "osParcelSetDetails(vector pos, list rules))\nSet Parcel details.\n(OpenSim only.)"));
+	// addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osWindParamSet", NULL, "ssf", "osWindParamSet(string plugin, string param, float value)Send Param to Specified Wind Plugin with new value.\n(OpenSim only.)"));
+	// addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osWindParamGet", "f", "ss", "float osWindParamGet(string plugin, string param)\n Returns Current param from specified Wind Plugin Module.\n(OpenSim only.)"));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osList2Double", "f", "si", "double osList2Double(list src, int index)\nReturns Double (float) Value from src at index.\n(OpenSim only.)"));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetDynamicTextureURL", NULL, "ssssi", "osSetDynamicTextureURL(string dynamicID, string contentType, string url, string extraParams, int timer )\n(OpenSim only.)"));
-	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetDynamicTextureData", NULL, "ssssi", "osSetDynamicTextureData(string dynamicID, string contentType, string data, string extraParams, int timer)\nWrites text and vector graphics onto a prim face.\n(OpenSim only.)"));	
+	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetDynamicTextureData", NULL, "ssssi", "osSetDynamicTextureData(string dynamicID, string contentType, string data, string extraParams, int timer)\nWrites text and vector graphics onto a prim face.\n(OpenSim only.)"));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetDynamicTextureURLBlend", NULL, "ssssii", "osSetDynamicTextureURLBlend(string dynamicID, string contentType, string url, string extraParams, int timer, int alpha)\n(OpenSim only.)"));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetDynamicTextureDataBlend", NULL, "ssssii", "osSetDynamicTextureDataBlend(string dynamicID, string contentType, string data, string extraParams, int timer, int alpha)\n(OpenSim only.)"));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetDynamicTextureURLBlendFace", NULL, "ssssfiiii", "osSetDynamicTextureURLBlendFace(string dynamicID, string contentType, string url, string extraParams, bool blend, int disp, int timer, int alpha, int face)\nLoads a web texture on a prim.\n(OpenSim only.)"));
@@ -512,7 +512,7 @@ void LLScriptLibrary::init()
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osTerrainFlush", NULL, NULL, "osTerrainFlush()\nUpdates terrain data. Call this after you are done using osTerrainSetHeight.\n(OpenSim only.)"));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osRegionRestart", NULL, "f", "int osRegionRestart(double seconds)\nRestart the current region in the specified number of seconds from now.\n(OpenSim only.)"));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osRegionNotice",NULL, "s", "osRegionNotice(string msg)\nBroadcasts a notification message to all agents on the current region.\n(OpenSim only.)"));
-	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osConsoleCommand", NULL, "s", "osConsoleCommand(string command)\nIssues commands directly to the OpenSim server console.\n(OpenSim only.)"));	
+	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osConsoleCommand", NULL, "s", "osConsoleCommand(string command)\nIssues commands directly to the OpenSim server console.\n(OpenSim only.)"));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetParcelMediaURL", NULL, "s", "osSetParcelMediaURL(string url)\nSets Parcel Media URL.\n(OpenSim only.)"));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetParcelSIPAddress", NULL, "s", "osSetParcelSIPAddress(string SIPAddress)\nSets Parcel SIP Address for Voice.\n(OpenSim only.)"));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetPrimFloatOnWater", NULL, "i", "osSetPrimFloatOnWater(int floatYN)\nMake Physical prims float at the water level, TRUE or FALSE.\n(OpenSim only.)"));
@@ -568,10 +568,10 @@ void LLScriptLibrary::init()
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetSpeed", NULL, "kf", "osSetSpeed(key AVATAR, float SpeedModifier)\nMultiplies the normal running, walking, and flying speed of the specified avatar.\n(OpenSim only.)"));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osCauseDamage", NULL, "kf", "osCauseDamage(key AVATAR, float damage)\nCauses damage to specified AVATAR (UUID).\n(OpenSim only.)"));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osCauseHealing", NULL, "kf", "osCauseHealing(key AVATAR, float healing)\nCauses Healing to specified AVATAR (UUID).\n(OpenSim only.)"));
-	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osGetPrimitiveParams", "l", "kl", "List osGetPrimitiveParams(key prim, list rules)\nGets primitive Params.\n(OpenSim only.)")); 
-	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetPrimitiveParams", NULL, "kl", "osSetPrimitiveParams(key prim, list rules)\nSets primitive Params.\n(OpenSim only.)")); 
-	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetProjectionParams", NULL, "kikfff", "osSetProjectionParams(key prim. bool projection, key texture, float fov, float focus, float amb)\nSet Projection Paramaters (bool = true / false)\n(OpenSim only.)")); 
-	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osUnixTimeToTimestamp", "s", "i", "osUnixTimeToTimestamp(integer unixtime)\nConverts unixtime to an llGetTimeStamp() formated string.\n(OpenSim only.)")); 
+	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osGetPrimitiveParams", "l", "kl", "List osGetPrimitiveParams(key prim, list rules)\nGets primitive Params.\n(OpenSim only.)"));
+	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetPrimitiveParams", NULL, "kl", "osSetPrimitiveParams(key prim, list rules)\nSets primitive Params.\n(OpenSim only.)"));
+	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osSetProjectionParams", NULL, "kikfff", "osSetProjectionParams(key prim. bool projection, key texture, float fov, float focus, float amb)\nSet Projection Paramaters (bool = true / false)\n(OpenSim only.)"));
+	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "osUnixTimeToTimestamp", "s", "i", "osUnixTimeToTimestamp(integer unixtime)\nConverts unixtime to an llGetTimeStamp() formated string.\n(OpenSim only.)"));
 
 	// LightShare functions
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "cmSetWindlightScene", "i", "l", "integer cmSetWindlightScene(list rules)\nSet the current WindLight scene. Restricted to estate managers and owners only."));
-- 
cgit v1.1


From 7a1e2893bca561419323d496f9737861f9381ab8 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 31 Mar 2012 22:56:58 +1000
Subject: Comment answering a question in a previous comment.

---
 linden/indra/lscript/lscript_library/lscript_library.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/linden/indra/lscript/lscript_library/lscript_library.cpp b/linden/indra/lscript/lscript_library/lscript_library.cpp
index e6ea37d..9752c22 100644
--- a/linden/indra/lscript/lscript_library/lscript_library.cpp
+++ b/linden/indra/lscript/lscript_library/lscript_library.cpp
@@ -579,6 +579,7 @@ void LLScriptLibrary::init()
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "cmGetWindlightScene", "l", "l", "list cmGetWindlightScene(list rules)\nGet the current WindLight settings."));
 	// LightShare functions - alternate versions
 	// don't ask me why they renamed 'em, but we need to include both versions -- MC
+	// cm refers to a proprietary fork of OpenSim used by Meta 7 and Avination, they where renamed to ls when LightShare was released to the wild.
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "lsSetWindlightScene", "i", "l", "integer lsSetWindlightScene(list rules)\nSet the current WindLight scene. Restricted to estate managers and owners only."));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "lsSetWindlightSceneTargeted", "i", "lk", "integer lsSetWindlightSceneTargeted(list rules, key target)\nSet the current WindLight scene directed to a specific avatar. Restricted to estate managers and owners only."));
 	addFunction(new LLScriptLibraryFunction(10.f, 0.f, dummy_func, "lsGetWindlightScene", "l", "l", "list lsGetWindlightScene(list rules)\nGet the current WindLight settings."));
-- 
cgit v1.1


From ea9739bd2c5121f1368518163c8242c9c34830fe Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 31 Mar 2012 22:57:34 +1000
Subject: Remove some left over WindLight cruft.

---
 linden/indra/newview/CMakeLists.txt              |   1 -
 linden/indra/newview/llfloaterenvsettings.cpp    |  15 --
 linden/indra/newview/windlightsettingsupdate.cpp | 200 -----------------------
 3 files changed, 216 deletions(-)
 delete mode 100644 linden/indra/newview/windlightsettingsupdate.cpp

diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 2a976ff..1db6eab 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -503,7 +503,6 @@ set(viewer_SOURCE_FILES
     slfloatermediafilter.cpp
     viewerinfo.cpp
     viewertime.cpp
-    windlightsettingsupdate.cpp
     wlfloatermanager.cpp
     wlfloaterwindlightsend.cpp
     wlretrievesettings.cpp
diff --git a/linden/indra/newview/llfloaterenvsettings.cpp b/linden/indra/newview/llfloaterenvsettings.cpp
index 801ff49..2cb1988 100644
--- a/linden/indra/newview/llfloaterenvsettings.cpp
+++ b/linden/indra/newview/llfloaterenvsettings.cpp
@@ -291,21 +291,6 @@ void LLFloaterEnvSettings::onOpenWLManager(void* userData)
 	WLFloaterManager::show();
 }
 
-void LLFloaterEnvSettings::onSubmitWindlight(void* userData)
-{
-	Meta7WindlightPacket * wl = new Meta7WindlightPacket();
-
-	LLWaterParamManager * param_mgr = LLWaterParamManager::instance();
-	wl->reflectionWaveletScale.X = param_mgr->mNormalScale.mX;
-	wl->reflectionWaveletScale.Y = param_mgr->mNormalScale.mY;
-	wl->reflectionWaveletScale.Z = param_mgr->mNormalScale.mZ;
-
-	
-	std::vector<std::string> strings;
-	strings.push_back((char*)wl);
-	send_generic_message("Windlight", strings);
-}
-
 void LLFloaterEnvSettings::onUseEstateTime(void* userData)
 {
 	if(LLFloaterWindLight::isOpen())
diff --git a/linden/indra/newview/windlightsettingsupdate.cpp b/linden/indra/newview/windlightsettingsupdate.cpp
deleted file mode 100644
index ad6e7c9..0000000
--- a/linden/indra/newview/windlightsettingsupdate.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * @file kowopenregionsettings.cpp
- * @brief Handler for OpenRegionInfo event queue message.
- *
- * Copyright (c) 2010, Patrick Sapinski
- *
- * The source code in this file ("Source Code") is provided to you
- * under the terms of the GNU General Public License, version 2.0
- * ("GPL"). Terms of the GPL can be found in doc/GPL-license.txt in
- * this distribution, or online at
- * http://secondlifegrid.net/programs/open_source/licensing/gplv2
- *
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at
- * http://secondlifegrid.net/programs/open_source/licensing/flossexception
- *
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- *
- * ALL SOURCE CODE IS PROVIDED "AS IS." THE AUTHOR MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- */
-
-#include "llviewerprecompiledheaders.h"
-#include "llhttpnode.h"
-#include "hippolimits.h"
-#include "llfloatertools.h"
-#include "llviewercontrol.h"
-#include "llagent.h"
-#include "llsurface.h"
-#include "llviewerregion.h"
-#include "llviewerobject.h"
-
-#include "linden_common.h"
-#include "llwaterparammanager.h"
-#include "llwaterparamset.h"
-#include "llwlparammanager.h"
-#include "llwlparamset.h"
-#include "message.h"
-#include "meta7windlight.h"
-#include "lightshare.h"
-#include "wlsettingsmanager.h"
-
-//DEBUG includes
-//#include "llsdserialize.h" //LLSDNotationStreamer - for dumping LLSD to string
-
-class WindLightSettingsUpdate : public LLHTTPNode
-{
-	/*virtual*/ void post(
-		LLHTTPNode::ResponsePtr response,
-		const LLSD& context,
-		const LLSD& input) const
-	{
-		if (!input.isMap() || !input.has("body"))
-		{
-			llinfos << "malformed WindLightSettingsUpdate update!" << llendl;	 
-			return;
-		}
-		LLWaterParamSet* mWater;
-		LLWLParamSet* mSky;
-		LLUUID* mWaterNormal;
-
-		mWater = new LLWaterParamSet();
-		mSky = new LLWLParamSet();
-		mWaterNormal = new LLUUID();
-
-		LLSD body = input["body"];
-		
-		mWater->set("waterFogColor",
-			body["waterColorX"].asReal()   / 256.f,
-			body["waterColorY"].asReal()   / 256.f,
-			body["waterColorZ"].asReal()   / 256.f,
-			body["waterColorW"].asReal()   / 256.f);
-		mWater->set("waterFogDensity", body["waterFogDensityExponent"].asReal());
-		mWater->set("underWaterFogMod", body["underwaterFogModifier"].asReal());
-		mWater->set("normScale", body["reflectionWaveletScaleX"].asReal(),
-			body["reflectionWaveletScaleY"].asReal(),
-			body["reflectionWaveletScaleZ"].asReal());
-		mWater->set("fresnelScale", body["fresnelScale"].asReal());
-		mWater->set("fresnelOffset", body["fresnelOffset"].asReal());
-		mWater->set("scaleAbove", body["refractScaleAbove"].asReal());
-		mWater->set("scaleBelow", body["refractScaleBelow"].asReal());
-		mWater->set("blurMultiplier", body["blurMultiplier"].asReal());
-		mWater->set("wave2Dir", body["bigWaveDirectionX"].asReal(),
-			body["bigWaveDirectionY"].asReal());
-		mWater->set("wave1Dir", body["littleWaveDirectionX"].asReal(),
-			body["littleWaveDirectionY"].asReal());
-		mWaterNormal->parseUUID(body["normalMapTexture"].asUUID().asString(), mWaterNormal);
-
-		mSky->setSunAngle(body["sunMoonPosition"].asReal());
-		mSky->setEastAngle(body["eastAngle"].asReal());
-
-		mSky->set("sunlight_color",
-						body["sunMoonColorX"].asReal() * 3.0f,
-						body["sunMoonColorY"].asReal() * 3.0f,
-						body["sunMoonColorZ"].asReal() * 3.0f,
-						body["sunMoonColorW"].asReal() * 3.0f);
-
-		mSky->set("ambient",
-						body["ambientX"].asReal() * 3.0f,
-						body["ambientY"].asReal() * 3.0f,
-						body["ambientZ"].asReal() * 3.0f,
-						body["ambientW"].asReal() * 3.0f);
-
-		mSky->set("blue_horizon",
-						body["horizonX"].asReal() * 2.0f,
-						body["horizonY"].asReal() * 2.0f,
-						body["horizonZ"].asReal() * 2.0f,
-						body["horizonW"].asReal() * 2.0f);
-
-		mSky->set("blue_density",
-						body["blueDensityX"].asReal(),
-						body["blueDensityY"].asReal(),
-						body["blueDensityZ"].asReal(),
-						1.0);
-
-		mSky->set("haze_horizon",
-						body["hazeHorizon"].asReal(),
-						body["hazeHorizon"].asReal(),
-						body["hazeHorizon"].asReal(),
-						1.f);
-
-		mSky->set("haze_density",
-						body["hazeDensity"].asReal(),
-						0.f, 0.f, 1.f);
-
-		mSky->set("cloud_shadow",
-						body["cloudCoverage"].asReal(),
-						0.f, 0.f, 1.f);
-
-		mSky->set("density_multiplier",
-						body["densityMultiplier"].asReal() / 1000.0f,
-						0.f, 0.f, 1.f);
-
-		mSky->set("distance_multiplier",
-						body["distanceMultiplier"].asReal(),
-						0.f, 0.f, 1.f);
-
-		mSky->set("max_y",
-						body["maxAltitude"].asReal(),
-						0.f, 0.f, 1.f);
-
-		mSky->set("cloud_color",
-						body["cloudColorX"].asReal(),
-						body["cloudColorY"].asReal(),
-						body["cloudColorZ"].asReal(),
-						body["cloudColorW"].asReal());
-
-		mSky->set("cloud_pos_density1",
-						body["cloudXYDensityX"].asReal(),
-						body["cloudXYDensityY"].asReal(),
-						body["cloudXYDensityZ"].asReal(),
-						1.f);
-
-		mSky->set("cloud_pos_density2",
-						body["cloudDetailXYDensityX"].asReal(),
-						body["cloudDetailXYDensityY"].asReal(),
-						body["cloudDetailXYDensityZ"].asReal(),
-						1.f);
-
-		mSky->set("cloud_scale",
-						body["cloudScale"].asReal(),
-						0.f, 0.f, 1.f);
-
-		mSky->set("gamma",
-						body["sceneGamma"].asReal(),
-						0.f, 0.f, 1.f);
-
-		mSky->set("glow",
-						(2 - body["sunGlowSize"].asReal()) * 20,
-						0.f,
-						-body["sunGlowFocus"].asReal() * 5,
-						1.f);
-
-	mSky->setCloudScrollX(body["cloudScrollX"].asReal() + 10.0f);
-	mSky->setCloudScrollY(body["cloudScrollY"].asReal() + 10.0f);
-
-	mSky->setEnableCloudScrollX(!body["cloudScrollXLock"].asBoolean());
-	mSky->setEnableCloudScrollY(!body["cloudScrollYLock"].asBoolean());
-
-	mSky->setStarBrightness(body["starBrightness"].asReal());
-
-	mSky->set("fade", body["fade"].asReal());
-
-	//Update this here.. since it isn't a part of WL... go figure
-	gHippoLimits->skyUseClassicClouds = body["drawClassicClouds"].asBoolean();
-	gSavedSettings.setF32("ClassicCloudHeight",body["classicCloudHeight"].asReal());
-	gSavedSettings.setF32("ClassicCloudRange",body["classicCloudRange"].asReal());
-
-	WLSettingsManager::Apply(mSky, mWater, mWaterNormal);
-}
-};
-
-LLHTTPRegistration<WindLightSettingsUpdate>
-gHTTPRegistrationWindLightSettingsUpdate(
-	"/message/WindLightSettingsUpdate");
\ No newline at end of file
-- 
cgit v1.1


From b8d7bea60bc3858f3298996315429319dcc9873f Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sun, 1 Apr 2012 00:27:34 +1000
Subject: More automated whitespace fixes.

---
 linden/indra/newview/llwlparammanager.cpp | 110 +++++++++++++++---------------
 linden/indra/newview/llwlparammanager.h   |  42 ++++++------
 2 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/linden/indra/newview/llwlparammanager.cpp b/linden/indra/newview/llwlparammanager.cpp
index 8007cce..010aa3d 100644
--- a/linden/indra/newview/llwlparammanager.cpp
+++ b/linden/indra/newview/llwlparammanager.cpp
@@ -3,9 +3,9 @@
  * @brief Implementation for the LLWLParamManager class.
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
- * 
+ *
  * Copyright (c) 2007-2009, Linden Research, Inc.
- * 
+ *
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
@@ -13,17 +13,17 @@
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
  * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
+ *
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
  * online at
  * http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
+ *
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
  * and agree to abide by those obligations.
- * 
+ *
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
@@ -124,9 +124,9 @@ void LLWLParamManager::loadPresets(const std::string& file_name)
 {
 	std::string path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/skies", ""));
 	LL_DEBUGS2("AppInit", "ShaderLoading") << "Loading Default WindLight settings from " << path_name << LL_ENDL;
-			
-	bool found = true;			
-	while(found) 
+
+	bool found = true;
+	while(found)
 	{
 		std::string name;
 		found = gDirUtilp->getNextFileInDir(path_name, "*.xml", name, false);
@@ -150,9 +150,9 @@ void LLWLParamManager::loadPresets(const std::string& file_name)
 
 	std::string path_name2(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/skies", ""));
 	LL_INFOS2("AppInit", "Shaders") << "Loading User WindLight settings from " << path_name2 << LL_ENDL;
-			
-	found = true;			
-	while(found) 
+
+	found = true;
+	while(found)
 	{
 		std::string name;
 		found = gDirUtilp->getNextFileInDir(path_name2, "*.xml", name, false);
@@ -176,14 +176,14 @@ void LLWLParamManager::loadPresets(const std::string& file_name)
 bool LLWLParamManager::loadPresetXML(const std::string& name, std::istream& preset_stream, bool propagate /* = false */, bool check_if_real /* = false */)
 {
 	LLSD paramsData(LLSD::emptyMap());
-	
+
 	LLPointer<LLSDParser> parser = new LLSDXMLParser();
-	
+
 	if(parser->parse(preset_stream, paramsData, LLSDSerialize::SIZE_UNLIMITED) == LLSDParser::PARSE_FAILURE)
 	{
 		return false;
 	}
-	
+
 	if(check_if_real)
 	{
 		static const char* expected_windlight_settings[] = {
@@ -220,13 +220,13 @@ bool LLWLParamManager::loadPresetXML(const std::string& name, std::istream& pres
 			}
 		}
 	}
-	
+
 	std::map<std::string, LLWLParamSet>::iterator mIt = mParamList.find(name);
 	if(mIt == mParamList.end())
 	{
 		addParamSet(name, paramsData);
 	}
-	else 
+	else
 	{
 		setParamSet(name, paramsData);
 	}
@@ -258,12 +258,12 @@ void LLWLParamManager::savePresets(const std::string & fileName)
 	//and not over the RO system wide version.
 
 	LLSD paramsData(LLSD::emptyMap());
-	
+
 	std::string pathName(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight", fileName));
 
 	for(std::map<std::string, LLWLParamSet>::iterator mIt = mParamList.begin();
 		mIt != mParamList.end();
-		++mIt) 
+		++mIt)
 	{
 		paramsData[mIt->first] = mIt->second.getAll();
 	}
@@ -295,7 +295,7 @@ bool LLWLParamManager::savePresetToNotecard(const std::string & name)
 	// Write it to a notecard
 	LLNotecard notecard;
 	notecard.setText(presetsXML.str());
- 
+
 	LLInventoryItem *item = gInventory.getItem(mParamList[name].mInventoryID);
 	if(!item)
 	{
@@ -309,13 +309,13 @@ bool LLWLParamManager::savePresetToNotecard(const std::string & name)
 		LLAssetID asset_id;
 		tid.generate();
 		asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
-		
+
 		LLVFile file(gVFS, asset_id, LLAssetType::AT_NOTECARD, LLVFile::APPEND);
-		
+
 		std::ostringstream stream;
 		notecard.exportStream(stream);
 		std::string buffer = stream.str();
-		
+
 		S32 size = buffer.length() + 1;
 		file.setMaxSize(size);
 		file.write((U8*)buffer.c_str(), size);
@@ -328,7 +328,7 @@ bool LLWLParamManager::savePresetToNotecard(const std::string & name)
 		LL_WARNS("WindLight") << "Stuff the legacy system." << LL_ENDL;
 		return false;
 	}
-	
+
 	propagateParameters();
 	return true;
 }
@@ -355,7 +355,7 @@ void LLWLParamManager::loadPreset(const std::string & name,bool propagate)
 	escaped_filename += ".xml";
 
 	std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/skies", escaped_filename));
-	LL_DEBUGS2("AppInit", "Shaders") << "Loading WindLight sky setting from " << pathName << LL_ENDL; 
+	LL_DEBUGS2("AppInit", "Shaders") << "Loading WindLight sky setting from " << pathName << LL_ENDL;
 
 	llifstream presetsXML;
 	presetsXML.open(pathName.c_str());
@@ -364,7 +364,7 @@ void LLWLParamManager::loadPreset(const std::string & name,bool propagate)
 	if(!presetsXML)
 	{
 		pathName=gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/skies", escaped_filename);
-		LL_DEBUGS2("AppInit", "Shaders")<< "Loading User WindLight sky setting from "  << LL_ENDL; 
+		LL_DEBUGS2("AppInit", "Shaders")<< "Loading User WindLight sky setting from "  << LL_ENDL;
 		presetsXML.open(pathName.c_str());
 	}
 
@@ -372,14 +372,14 @@ void LLWLParamManager::loadPreset(const std::string & name,bool propagate)
 	{
 		loadPresetXML(name, presetsXML);
 		presetsXML.close();
-	} 
-	else 
+	}
+	else
 	{
 		llwarns << "Can't find " << name << llendl;
 		return;
 	}
 
-	
+
 	if(propagate)
 	{
 		getParamSet(name, mCurParams);
@@ -387,7 +387,7 @@ void LLWLParamManager::loadPreset(const std::string & name,bool propagate)
 	}
 
 	notifyObservers();
-}	
+}
 
 void LLWLParamManager::savePreset(const std::string & name)
 {
@@ -427,7 +427,7 @@ void LLWLParamManager::updateShaderUniforms(LLGLSLShader * shader)
 	{
 		shader->uniform4fv(LLViewerShaderMgr::LIGHTNORM, 1, mRotatedLightDir.mV);
 		shader->uniform3fv("camPosLocal", 1, LLViewerCamera::getInstance()->getOrigin().mV);
-	} 
+	}
 
 	else if (shader->mShaderGroup == LLGLSLShader::SG_SKY)
 	{
@@ -435,13 +435,13 @@ void LLWLParamManager::updateShaderUniforms(LLGLSLShader * shader)
 	}
 
 	shader->uniform1f("scene_light_strength", mSceneLightStrength);
-	
+
 }
 
 void LLWLParamManager::propagateParameters(void)
 {
 	LLFastTimer ftm(LLFastTimer::FTM_UPDATE_WLPARAM);
-	
+
 	LLVector4 sunDir;
 	LLVector4 moonDir;
 
@@ -491,7 +491,7 @@ void LLWLParamManager::propagateParameters(void)
 	// bind the variables for all shaders only if we're using WindLight
 	LLViewerShaderMgr::shader_iter shaders_iter, end_shaders;
 	end_shaders = LLViewerShaderMgr::instance()->endShaders();
-	for(shaders_iter = LLViewerShaderMgr::instance()->beginShaders(); shaders_iter != end_shaders; ++shaders_iter) 
+	for(shaders_iter = LLViewerShaderMgr::instance()->beginShaders(); shaders_iter != end_shaders; ++shaders_iter)
 	{
 		if (shaders_iter->mProgramObject != 0
 			&& (gPipeline.canUseWindLightShaders()
@@ -512,29 +512,29 @@ void LLWLParamManager::propagateParameters(void)
 void LLWLParamManager::update(LLViewerCamera * cam)
 {
 	LLFastTimer ftm(LLFastTimer::FTM_UPDATE_WLPARAM);
-	
+
 	// update clouds, sun, and general
 	mCurParams.updateCloudScrolling();
-	
+
 	// update only if running
-	if(mAnimator.mIsRunning) 
+	if(mAnimator.mIsRunning)
 	{
 		mAnimator.update(mCurParams);
 	}
 
 	// update the shaders and the menu
 	propagateParameters();
-	
+
 	// sync menus if they exist
-	if(LLFloaterWindLight::isOpen()) 
+	if(LLFloaterWindLight::isOpen())
 	{
 		LLFloaterWindLight::instance()->syncMenu();
 	}
-	if(LLFloaterDayCycle::isOpen()) 
+	if(LLFloaterDayCycle::isOpen())
 	{
 		LLFloaterDayCycle::instance()->syncMenu();
 	}
-	if(LLFloaterEnvSettings::isOpen()) 
+	if(LLFloaterEnvSettings::isOpen())
 	{
 		LLFloaterEnvSettings::instance()->syncMenu();
 	}
@@ -547,8 +547,8 @@ void LLWLParamManager::update(LLViewerCamera * cam)
 	// executed some of the time.  For example for water shaders only.
 	{
 		F32 camYawDelta = mSunDeltaYaw * DEG_TO_RAD;
-		
-		LLVector3 lightNorm3(mLightDir);	
+
+		LLVector3 lightNorm3(mLightDir);
 		lightNorm3 *= LLQuaternion(-(camYaw + camYawDelta), LLVector3(0.f, 1.f, 0.f));
 		mRotatedLightDir = LLVector4(lightNorm3, 0.f);
 
@@ -621,7 +621,7 @@ void LLWLParamManager::cleanupClass()
 
 void LLWLParamManager::resetAnimator(F32 curTime, bool run)
 {
-	mAnimator.setTrack(mDay.mTimeMap, mDay.mDayRate, 
+	mAnimator.setTrack(mDay.mTimeMap, mDay.mDayRate,
 		curTime, run);
 
 	return;
@@ -630,8 +630,8 @@ bool LLWLParamManager::addParamSet(const std::string& name, LLWLParamSet& param)
 {
 	// add a new one if not one there already
 	std::map<std::string, LLWLParamSet>::iterator mIt = mParamList.find(name);
-	if(mIt == mParamList.end()) 
-	{	
+	if(mIt == mParamList.end())
+	{
 		mParamList[name] = param;
 		return true;
 	}
@@ -658,7 +658,7 @@ bool LLWLParamManager::getParamSet(const std::string& name, LLWLParamSet& param)
 {
 	// find it and set it
 	std::map<std::string, LLWLParamSet>::iterator mIt = mParamList.find(name);
-	if(mIt != mParamList.end()) 
+	if(mIt != mParamList.end())
 	{
 		param = mParamList[name];
 		param.mName = name;
@@ -678,11 +678,11 @@ bool LLWLParamManager::setParamSet(const std::string& name, LLWLParamSet& param)
 bool LLWLParamManager::setParamSet(const std::string& name, const LLSD & param)
 {
 	// quick, non robust (we won't be working with files, but assets) check
-	if(!param.isMap()) 
+	if(!param.isMap())
 	{
 		return false;
 	}
-	
+
 	mParamList[name].setAll(param);
 
 	return true;
@@ -692,7 +692,7 @@ bool LLWLParamManager::removeParamSet(const std::string& name, bool delete_from_
 {
 	// remove from param list
 	std::map<std::string, LLWLParamSet>::iterator mIt = mParamList.find(name);
-	if(mIt != mParamList.end()) 
+	if(mIt != mParamList.end())
 	{
 		mParamList.erase(mIt);
 	}
@@ -701,11 +701,11 @@ bool LLWLParamManager::removeParamSet(const std::string& name, bool delete_from_
 
 	// remove all references
 	bool stat = true;
-	do 
+	do
 	{
 		// get it
 		stat = mDay.getKey(name, key);
-		if(stat == false) 
+		if(stat == false)
 		{
 			break;
 		}
@@ -714,17 +714,17 @@ bool LLWLParamManager::removeParamSet(const std::string& name, bool delete_from_
 		stat = mDay.removeKey(key);
 
 	} while(stat == true);
-	
+
 	if(delete_from_disk)
 	{
 		std::string path_name(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/skies", ""));
-		
+
 		// use full curl escaped name
 		char * curl_str = curl_escape(name.c_str(), name.size());
 		std::string escaped_name(curl_str);
 		curl_free(curl_str);
 		curl_str = NULL;
-		
+
 		gDirUtilp->deleteFilesInDir(path_name, escaped_name + ".xml");
 	}
 
@@ -797,7 +797,7 @@ void LLWLParamManager::loadWindlightNotecard(LLVFS *vfs, const LLUUID& asset_id,
 		}
 		else
 		{
-			// We can do this because we know mCurParams 
+			// We can do this because we know mCurParams
 			sInstance->mParamList[name].mInventoryID = inventory_id;
 		}
 	}
diff --git a/linden/indra/newview/llwlparammanager.h b/linden/indra/newview/llwlparammanager.h
index fc1127e..0f7b84a 100644
--- a/linden/indra/newview/llwlparammanager.h
+++ b/linden/indra/newview/llwlparammanager.h
@@ -3,9 +3,9 @@
  * @brief Implementation for the LLWLParamManager class.
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
- * 
+ *
  * Copyright (c) 2007-2009, Linden Research, Inc.
- * 
+ *
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
@@ -13,17 +13,17 @@
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
  * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
+ *
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
  * online at
  * http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
+ *
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
  * and agree to abide by those obligations.
- * 
+ *
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
@@ -51,10 +51,10 @@ public:
 	virtual ~LLWLPresetsObserver() { };
 	virtual void changed() = 0;
 };
- 
+
 // color control
 struct WLColorControl {
-	
+
 	F32 r, g, b, i;				/// the values
 	std::string mName;			/// name to use to dereference params
 	std::string mSliderName;	/// name of the slider in menu
@@ -88,7 +88,7 @@ struct WLColorControl {
 		r = val.mV[0];
 		g = val.mV[1];
 		b = val.mV[2];
-		i = val.mV[3];		
+		i = val.mV[3];
 		return *this;
 	}
 
@@ -151,19 +151,19 @@ public:
 	/// load an individual preset into the sky from an LLSD stream
 	/// Returns whether the stream was actually reasonable XML to load from.
 	bool loadPresetXML(const std::string& name, std::istream& preset_stream, bool propogate=false, bool check_if_real=false);
-	
+
 	/// Load an individual preset from a notecard.
 	void loadPresetNotecard(const std::string& name, const LLUUID& asset_id, const LLUUID& inv_id);
-	
+
 	/// save the parameter presets to file
 	void savePreset(const std::string & name);
-	
+
 	/// save the parameter presets to file
 	bool savePresetToNotecard(const std::string & name);
 
 	/// Set shader uniforms dirty, so they'll update automatically.
 	void propagateParameters(void);
-	
+
 	/// Update shader uniforms that have changed.
 	void updateShaderUniforms(LLGLSLShader * shader);
 
@@ -181,7 +181,7 @@ public:
 
 	// get where the light is pointing
 	inline LLVector4 getRotatedLightDir(void) const;
-	
+
 	/// get the dome's offset
 	inline F32 getDomeOffset(void) const;
 
@@ -193,7 +193,7 @@ public:
 
 	// Cleanup of global data that's only inited once per class.
 	static void cleanupClass();
-	
+
 	/// add a param to the list
 	bool addParamSet(const std::string& name, LLWLParamSet& param);
 
@@ -205,9 +205,9 @@ public:
 
 	/// set the param in the list with a new param
 	bool setParamSet(const std::string& name, LLWLParamSet& param);
-	
+
 	/// set the param in the list with a new param
-	bool setParamSet(const std::string& name, LLSD const & param);	
+	bool setParamSet(const std::string& name, LLSD const & param);
 
 	/// gets rid of a parameter and any references to it
 	/// returns true if successful
@@ -249,7 +249,7 @@ public:
 	WLFloatControl mWLGamma;
 
 	F32 mSceneLightStrength;
-	
+
 	/// Atmospherics
 	WLColorControl mBlueHorizon;
 	WLColorControl mHazeDensity;
@@ -275,10 +275,10 @@ public:
 	/// sky dome
 	F32 mDomeOffset;
 	F32 mDomeRadius;
-	
+
 	// list of all the parameters, listed by name
-	std::map<std::string, LLWLParamSet> mParamList;	
-	
+	std::map<std::string, LLWLParamSet> mParamList;
+
 private:
 	// our parameter manager singleton instance
 	static LLWLParamManager * sInstance;
@@ -287,7 +287,7 @@ private:
 	LLWLParamSet* sMixSet;
 	F32 sMixTime;
 	F32 sMixCount;
-	
+
 	static std::vector<LLWLPresetsObserver*> sObservers;
 
 	static void loadWindlightNotecard(LLVFS *vfs, const LLUUID& asset_id, LLAssetType::EType asset_type, void *user_data, S32 status, LLExtStat ext_status);
-- 
cgit v1.1


From f51290b92f93818e16c059810c4a770e4cdb8798 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sun, 1 Apr 2012 00:30:02 +1000
Subject: Refactor all those little checks to see if a notecard is a WindLight
 setting card.

---
 linden/indra/newview/llfloaterwindlight.cpp |  2 +-
 linden/indra/newview/llinventorybridge.cpp  | 28 +++++++---------------------
 linden/indra/newview/llinventorybridge.h    |  3 ---
 linden/indra/newview/llpanelinventory.cpp   | 26 ++++----------------------
 linden/indra/newview/llviewermessage.cpp    |  5 ++---
 linden/indra/newview/llwlparammanager.cpp   | 18 ++++++++++++++++++
 linden/indra/newview/llwlparammanager.h     |  5 +++++
 7 files changed, 37 insertions(+), 50 deletions(-)

diff --git a/linden/indra/newview/llfloaterwindlight.cpp b/linden/indra/newview/llfloaterwindlight.cpp
index 4937232..9955783 100644
--- a/linden/indra/newview/llfloaterwindlight.cpp
+++ b/linden/indra/newview/llfloaterwindlight.cpp
@@ -873,7 +873,7 @@ void LLFloaterWindLight::onSavePreset(LLUICtrl* ctrl, void* userData)
 		{
 			// Make sure we have a ".wl" extension.
 			std::string name = comboBox->getSelectedItemLabel();
-			if(name.length() > 2 && name.compare(name.length() - 3, 3, ".wl") != 0)
+			if(!LLWLParamManager::isSkySettingsNotecard(name))
 			{
 				name += ".wl";
 			}
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index eb2170a..23d864e 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -3123,11 +3123,11 @@ void LLNotecardBridge::openItem()
 	LLViewerInventoryItem* item = getItem();
 	if (item)
 	{
-		if(isSkySetting())
+		if(LLWLParamManager::isSkySettingsNotecard(getName()))
  		{
 			LLWLParamManager::instance()->loadPresetNotecard(item->getName(), item->getAssetUUID(), mUUID);
 		}
-		else if(isWaterSetting())
+		else if(LLWLParamManager::isWaterSettingsNotecard(getName()))
 		{
 			LLWaterParamManager::instance()->loadPresetNotecard(item->getName(), item->getAssetUUID(), mUUID);
 		}
@@ -3158,13 +3158,13 @@ void LLNotecardBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 	else
 	{
 
-		if(isWindLight())
+		if(LLWLParamManager::isSettingsNotecard(getName()))
 		{
-			if(isSkySetting())
+			if(LLWLParamManager::isSkySettingsNotecard(getName()))
 			{
 				items.push_back(std::string("Use WindLight Settings"));
 			}
-			else if(isWaterSetting())
+			else if(LLWLParamManager::isWaterSettingsNotecard(getName()))
 			{
 				items.push_back(std::string("Use WaterLight Settings"));
 			}
@@ -3221,11 +3221,11 @@ void LLNotecardBridge::performAction(LLFolderView* folder, LLInventoryModel* mod
 
 LLUIImagePtr LLNotecardBridge::getIcon() const
 {
-	if(isSkySetting())
+	if(LLWLParamManager::isSkySettingsNotecard(getName()))
 	{
 		return LLUI::getUIImage("Inv_WindLight");
 	}
-	else if(isWaterSetting())
+	else if(LLWLParamManager::isWaterSettingsNotecard(getName()))
  	{
 		return LLUI::getUIImage("Inv_WaterLight");
 	}
@@ -3235,20 +3235,6 @@ LLUIImagePtr LLNotecardBridge::getIcon() const
 	}
 }
 
-bool LLNotecardBridge::isSkySetting() const
-{
-	return (getName().length() > 2 && getName().compare(getName().length() - 3, 3, ".wl") == 0);
-}
-
-bool LLNotecardBridge::isWaterSetting() const
-{
-	return (getName().length() > 2 && getName().compare(getName().length() - 3, 3, ".ww") == 0);
-}
-
-bool LLNotecardBridge::isWindLight() const
-{
-	return (isSkySetting() || isWaterSetting());
-}
 
 // +=================================================+
 // |        LLGestureBridge                          |
diff --git a/linden/indra/newview/llinventorybridge.h b/linden/indra/newview/llinventorybridge.h
index 5a53aa5..0318e6c 100644
--- a/linden/indra/newview/llinventorybridge.h
+++ b/linden/indra/newview/llinventorybridge.h
@@ -511,9 +511,6 @@ public:
 	virtual const std::string& getPrefix() { return sPrefix; }
 
 	virtual LLUIImagePtr getIcon() const;
-	bool isSkySetting() const;
-	bool isWaterSetting() const;
-	bool isWindLight() const;
 	virtual void openItem();
 	virtual void buildContextMenu(LLMenuGL& menu, U32 flags);
 	virtual void performAction(LLFolderView* folder, LLInventoryModel* model, std::string action);
diff --git a/linden/indra/newview/llpanelinventory.cpp b/linden/indra/newview/llpanelinventory.cpp
index 277ab15..8103ee9 100644
--- a/linden/indra/newview/llpanelinventory.cpp
+++ b/linden/indra/newview/llpanelinventory.cpp
@@ -81,6 +81,7 @@
 #include "llviewerobjectlist.h"
 #include "llviewerwindow.h"
 #include "llwearable.h"
+#include "llwlparammanager.h"
 
 #include "hippogridmanager.h"
 
@@ -1380,9 +1381,6 @@ public:
 	virtual LLUIImagePtr getIcon() const;
 	virtual void openItem();
 	virtual BOOL removeItem();
-	bool isSkySetting() const;
-	bool isWaterSetting() const;
-	bool isWindLight() const;
 };
 
 LLTaskNotecardBridge::LLTaskNotecardBridge(
@@ -1412,7 +1410,7 @@ void LLTaskNotecardBridge::openItem()
 		return;
 	}
 // [/RLVa:KB]
-	if(isWindLight())
+	if(LLWLParamManager::isSettingsNotecard(getName()))
 	{
 		return;
 	}
@@ -1442,11 +1440,11 @@ BOOL LLTaskNotecardBridge::removeItem()
 }
 LLUIImagePtr LLTaskNotecardBridge::getIcon() const
 {
-	if(isSkySetting())
+	if(LLWLParamManager::isSkySettingsNotecard(getName()))
 	{
 		return LLUI::getUIImage("Inv_WindLight");
 	}
-	else if(isWaterSetting())
+	else if(LLWLParamManager::isWaterSettingsNotecard(getName()))
 	{
 		return LLUI::getUIImage("Inv_WaterLight");
 	}
@@ -1456,22 +1454,6 @@ LLUIImagePtr LLTaskNotecardBridge::getIcon() const
 	}
 }
 
-bool LLTaskNotecardBridge::isSkySetting() const
-{
-	return (getName().length() > 2 && getName().compare(getName().length() - 3, 3, ".wl") == 0);
-}
-
-bool LLTaskNotecardBridge::isWaterSetting() const
-{
-	return (getName().length() > 2 && getName().compare(getName().length() - 3, 3, ".ww") == 0);
-}
-
-bool LLTaskNotecardBridge::isWindLight() const
-{
-	return (isSkySetting() || isWaterSetting());
-}
-
-
 ///----------------------------------------------------------------------------
 /// Class LLTaskGestureBridge
 ///----------------------------------------------------------------------------
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index f0c7c0c..9b1b00d 100755
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -132,6 +132,7 @@
 #include "llvlmanager.h"
 #include "llvoavatar.h"
 #include "llvotextbubble.h"
+#include "llwlparammanager.h"
 #include "llweb.h"
 #include "llworld.h"
 #include "pipeline.h"
@@ -924,9 +925,7 @@ void open_offer(const std::vector<LLUUID>& items, const std::string& from_name)
 			{
 			case LLAssetType::AT_NOTECARD:
 				// Don't show WindLight settings as notecards.
-				// *TODO: centralise all these damned .wl/.ww checks somewhere.
-				if((item->getName().length() > 2 && item->getName().compare(item->getName().length() - 3, 3, ".wl") != 0) &&
-					(item->getName().compare(item->getName().length() - 3, 3, ".ww") != 0))
+				if(!LLWLParamManager::isSettingsNotecard(item->getName()))
 				{
 					open_notecard((LLViewerInventoryItem*)item, std::string("Note: ") + item->getName(), 
 						LLUUID::null, show_keep_discard, LLUUID::null, FALSE);
diff --git a/linden/indra/newview/llwlparammanager.cpp b/linden/indra/newview/llwlparammanager.cpp
index 010aa3d..1148576 100644
--- a/linden/indra/newview/llwlparammanager.cpp
+++ b/linden/indra/newview/llwlparammanager.cpp
@@ -836,3 +836,21 @@ void LLWLParamManager::notifyObservers()
 		observer->changed();
 	}
 }
+
+// static
+bool LLWLParamManager::isWaterSettingsNotecard(std::string name)
+{
+	return (name.length() > 2 && name.compare(name.length() - 3, 3, ".ww") == 0);
+}
+
+// static
+bool LLWLParamManager::isSkySettingsNotecard(std::string name)
+{
+	return (name.length() > 2 && name.compare(name.length() - 3, 3, ".wl") == 0);
+}
+
+// static
+bool LLWLParamManager::isSettingsNotecard(std::string name)
+{
+	return (isSkySettingsNotecard(name) || isWaterSettingsNotecard(name));
+}
diff --git a/linden/indra/newview/llwlparammanager.h b/linden/indra/newview/llwlparammanager.h
index 0f7b84a..5995b9d 100644
--- a/linden/indra/newview/llwlparammanager.h
+++ b/linden/indra/newview/llwlparammanager.h
@@ -223,6 +223,11 @@ public:
 
 	void SetMixTime(LLWLParamSet* mixSet, F32 mixTime);
 
+	// Notecard settings checkers.
+	static bool isWaterSettingsNotecard(std::string name);
+	static bool isSkySettingsNotecard(std::string name);
+	static bool isSettingsNotecard(std::string name);
+
 public:
 
 	// helper variables
-- 
cgit v1.1


From 54a9c7f4f289a92d14e62547c0b47c710d48cce7 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Mon, 2 Apr 2012 01:59:23 +1000
Subject: More automated whitespace cleanups.

---
 linden/indra/newview/llviewergenericmessage.cpp |  16 +-
 linden/indra/newview/llviewermessage.cpp        | 364 ++++++++++++------------
 linden/indra/newview/wlfloatermanager.cpp       |  37 ++-
 linden/indra/newview/wlretrievesettings.cpp     |  16 +-
 4 files changed, 216 insertions(+), 217 deletions(-)

diff --git a/linden/indra/newview/llviewergenericmessage.cpp b/linden/indra/newview/llviewergenericmessage.cpp
index 8078888..536a803 100644
--- a/linden/indra/newview/llviewergenericmessage.cpp
+++ b/linden/indra/newview/llviewergenericmessage.cpp
@@ -1,12 +1,12 @@
-/** 
+/**
  * @file llviewergenericmessage.cpp
  * @brief Handle processing of "generic messages" which contain short lists of strings.
  * @author James Cook
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
- * 
+ *
  * Copyright (c) 2007-2009, Linden Research, Inc.
- * 
+ *
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
@@ -14,17 +14,17 @@
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
  * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
+ *
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
  * online at
  * http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
+ *
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
  * and agree to abide by those obligations.
- * 
+ *
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
@@ -84,7 +84,7 @@ void process_generic_message(LLMessageSystem* msg, void**)
 	msg->getUUID("AgentData", "AgentID", agent_id);
 	std::string method;
 	msg->getStringFast(_PREHASH_MethodData, _PREHASH_Method, method);
-	
+
 	// TODO: Use a proper dispatcher.
 	if(method == "Windlight")
 	{	
@@ -106,7 +106,7 @@ void process_generic_message(LLMessageSystem* msg, void**)
 
 		if(!gGenericDispatcher.dispatch(request, invoice, strings))
 		{
-			llwarns << "GenericMessage " << request << " failed to dispatch" 
+			llwarns << "GenericMessage " << request << " failed to dispatch"
 				<< llendl;
 		}
 	}
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 9b1b00d..fc72147 100755
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -1,12 +1,12 @@
 
-/** 
+/**
  * @file llviewermessage.cpp
  * @brief Dumping ground for viewer-side message system callbacks.
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
- * 
+ *
  * Copyright (c) 2002-2009, Linden Research, Inc.
- * 
+ *
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
@@ -14,17 +14,17 @@
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
  * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
+ *
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
  * online at
  * http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
+ *
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
  * and agree to abide by those obligations.
- * 
+ *
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
@@ -37,7 +37,7 @@
 
 #include <deque>
 
-#include "llaudioengine.h" 
+#include "llaudioengine.h"
 #include "indra_constants.h"
 #include "lscript_byteformat.h"
 #include "mean_collision_data.h"
@@ -196,8 +196,8 @@ const U32 OFFER_THROTTLE_MAX_COUNT=5; //number of items per time period
 const F32 OFFER_THROTTLE_TIME=10.f; //time period in seconds
 
 //script permissions
-const std::string SCRIPT_QUESTIONS[SCRIPT_PERMISSION_EOF] = 
-	{ 
+const std::string SCRIPT_QUESTIONS[SCRIPT_PERMISSION_EOF] =
+	{
 		"ScriptTakeMoney",
 		"ActOnControlInputs",
 		"RemapControlInputs",
@@ -211,7 +211,7 @@ const std::string SCRIPT_QUESTIONS[SCRIPT_PERMISSION_EOF] =
 		"ControlYourCamera"
 	};
 
-const BOOL SCRIPT_QUESTION_IS_CAUTION[SCRIPT_PERMISSION_EOF] = 
+const BOOL SCRIPT_QUESTION_IS_CAUTION[SCRIPT_PERMISSION_EOF] =
 {
 	TRUE,	// ScriptTakeMoney,
 	FALSE,	// ActOnControlInputs
@@ -463,7 +463,7 @@ void process_layer_data(LLMessageSystem *mesgsys, void **user_data)
 // 					char image_uuid_str[UUID_STR_SIZE];		/* Flawfinder: ignore */
 // 					memcpy(image_uuid_str, pos_uuid+2, UUID_STR_SIZE-1);		/* Flawfinder: ignore */
 // 					image_uuid_str[UUID_STR_SIZE-1] = 0;
-					
+
 // 					LLUUID image_uuid(image_uuid_str);
 
 // 					LL_INFOS("Messaging") << "Found UUID: " << image_uuid << LL_ENDL;
@@ -538,7 +538,7 @@ void process_layer_data(LLMessageSystem *mesgsys, void **user_data)
 // 	else
 // 	{
 // 		LLFILE* fIn = LLFile::fopen(filename, "rb");		/* Flawfinder: ignore */
-// 		if (fIn) 
+// 		if (fIn)
 // 		{
 // 			LLPointer<LLImageJ2C> ImageUtility = new LLImageJ2C;
 // 			LLPointer<LLImageTGA> TargaUtility = new LLImageTGA;
@@ -559,13 +559,13 @@ void process_layer_data(LLMessageSystem *mesgsys, void **user_data)
 
 // 			ImageUtility->updateData();
 // 			ImageUtility->decode(image, 100000.0f);
-			
+
 // 			TargaUtility->encode(image);
 // 			U8 *data = TargaUtility->getData();
 // 			S32 data_size = TargaUtility->getDataSize();
 
 // 			std::string file_path = gDirUtilp->getDirName(filename);
-			
+
 // 			std::string output_file = llformat("%s/image-%03d.tga", file_path.c_str(), image_num);//filename;
 // 			//S32 name_len = output_file.length();
 // 			//strcpy(&output_file[name_len-3], "tga");
@@ -753,10 +753,10 @@ private:
 	std::string mFromName;
 };
 
-//unlike the FetchObserver for AgentOffer, we only make one 
+//unlike the FetchObserver for AgentOffer, we only make one
 //instance of the AddedObserver for TaskOffers
-//and it never dies.  We do this because we don't know the UUID of 
-//task offers until they are accepted, so we don't wouldn't 
+//and it never dies.  We do this because we don't know the UUID of
+//task offers until they are accepted, so we don't wouldn't
 //know what to watch for, so instead we just watch for all additions.
 class LLOpenTaskOffer : public LLInventoryAddedObserver
 {
@@ -773,7 +773,7 @@ LLOpenTaskOffer* gNewInventoryObserver=NULL;
 
 void start_new_inventory_observer()
 {
-	if (!gNewInventoryObserver) //task offer observer 
+	if (!gNewInventoryObserver) //task offer observer
 	{
 		// Observer is deleted by gInventory
 		gNewInventoryObserver = new LLOpenTaskOffer;
@@ -832,7 +832,7 @@ protected:
 
 
 //Returns TRUE if we are OK, FALSE if we are throttled
-//Set check_only true if you want to know the throttle status 
+//Set check_only true if you want to know the throttle status
 //without registering a hit
 bool check_offer_throttle(const std::string& from_name, bool check_only)
 {
@@ -848,7 +848,7 @@ bool check_offer_throttle(const std::string& from_name, bool check_only)
 	{
 		return gThrottleTimer.hasExpired();
 	}
-	
+
 	if(gThrottleTimer.checkExpirationAndReset(OFFER_THROTTLE_TIME))
 	{
 		LL_DEBUGS("Messaging") << "Throttle Expired" << LL_ENDL;
@@ -894,7 +894,7 @@ bool check_offer_throttle(const std::string& from_name, bool check_only)
 		}
 	}
 }
- 
+
 void open_offer(const std::vector<LLUUID>& items, const std::string& from_name)
 {
 	std::vector<LLUUID>::const_iterator it = items.begin();
@@ -927,7 +927,7 @@ void open_offer(const std::vector<LLUUID>& items, const std::string& from_name)
 				// Don't show WindLight settings as notecards.
 				if(!LLWLParamManager::isSettingsNotecard(item->getName()))
 				{
-					open_notecard((LLViewerInventoryItem*)item, std::string("Note: ") + item->getName(), 
+					open_notecard((LLViewerInventoryItem*)item, std::string("Note: ") + item->getName(),
 						LLUUID::null, show_keep_discard, LLUUID::null, FALSE);
 				}
 				break;
@@ -943,7 +943,7 @@ void open_offer(const std::vector<LLUUID>& items, const std::string& from_name)
 			}
 		}
 		//highlight item, if it's not in the trash or lost+found
-		
+
 		// Don't auto-open the inventory floater
 		LLInventoryView* view = LLInventoryView::getActiveInventory();
 		if(!view)
@@ -1023,7 +1023,7 @@ void inventory_offer_mute_callback(const LLUUID& blocked_id,
 		OfferMatcher(const LLUUID& to_block) : blocked_id(to_block) {}
 		BOOL matches(const LLNotificationPtr notification) const
 		{
-			if(notification->getName() == "ObjectGiveItem" 
+			if(notification->getName() == "ObjectGiveItem"
 				|| notification->getName() == "ObjectGiveItemUnknownUser"
 				|| notification->getName() == "UserGiveItem")
 			{
@@ -1099,7 +1099,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 	std::string name;
 	gAgent.buildFullname(name);
 	msg->addStringFast(_PREHASH_FromAgentName, name);
-	msg->addStringFast(_PREHASH_Message, ""); 
+	msg->addStringFast(_PREHASH_Message, "");
 	msg->addU32Fast(_PREHASH_ParentEstateID, 0);
 	msg->addUUIDFast(_PREHASH_RegionID, LLUUID::null);
 	msg->addVector3Fast(_PREHASH_Position, gAgent.getPositionAgent());
@@ -1159,9 +1159,9 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 	{
 		from_string = chatHistory_string = mFromName;
 	}
-	
+
 	bool busy=FALSE;
-	
+
 	switch(button)
 	{
 	case IOR_ACCEPT:
@@ -1183,7 +1183,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 		// ACCEPT. The math for the dialog works, because the accept
 		// for inventory_offered, task_inventory_offer or
 		// group_notice_inventory is 1 greater than the offer integer value.
-		// Generates IM_INVENTORY_ACCEPTED, IM_TASK_INVENTORY_ACCEPTED, 
+		// Generates IM_INVENTORY_ACCEPTED, IM_TASK_INVENTORY_ACCEPTED,
 		// or IM_GROUP_NOTICE_INVENTORY_ACCEPTED
 		msg->addU8Fast(_PREHASH_Dialog, (U8)(mIM + 1));
 		msg->addBinaryDataFast(_PREHASH_BinaryBucket, &(mFolderID.mData),
@@ -1283,7 +1283,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 		LLFloaterChat::addChatHistory(chat);
 
 		// If it's from an agent, we have to fetch the item to throw
-		// it away. If it's from a task or group, just denying the 
+		// it away. If it's from a task or group, just denying the
 		// request will suffice to discard the item.
 		if(IM_INVENTORY_OFFERED == mIM)
 		{
@@ -1301,7 +1301,7 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD&
 			{
 				opener = discard_agent_offer;
 			}
-			
+
 		}
 		if (busy &&	(!mFromGroup && !mFromObject))
 		{
@@ -1333,7 +1333,7 @@ void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
 		info->forceResponse(IOR_BUSY);
 		return;
 	}
-	
+
 	//If muted, don't even go through the messaging stuff.  Just curtail the offer here.
 	if (LLMuteList::getInstance()->isMuted(info->mFromID, info->mFromName))
 	{
@@ -1372,7 +1372,7 @@ void inventory_offer_handler(LLOfferInfo* info, BOOL from_task)
 		}
 // [/RLVa:KB]
 	}
-	
+
 	LLSD args;
 	args["[OBJECTNAME]"] = msg;
 
@@ -1475,7 +1475,7 @@ static LLNotificationFunctorRegistration group_vote_callback_reg("GroupVote", gr
 bool lure_callback(const LLSD& notification, const LLSD& response)
 {
 	S32 option = 0;
-	if (response.isInteger()) 
+	if (response.isInteger())
 	{
 		option = response.asInteger();
 	}
@@ -1483,7 +1483,7 @@ bool lure_callback(const LLSD& notification, const LLSD& response)
 	{
 		option = LLNotification::getSelectedOption(notification, response);
 	}
-	
+
 	LLUUID from_id = notification["payload"]["from_id"].asUUID();
 	LLUUID lure_id = notification["payload"]["lure_id"].asUUID();
 	BOOL godlike = notification["payload"]["godlike"].asBoolean();
@@ -1543,7 +1543,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 	S32 binary_bucket_size;
 	LLChat chat;
 	std::string buffer;
-	
+
 	// *TODO:translate - need to fix the full name to first/last (maybe)
 	msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, from_id);
 	msg->getBOOLFast(_PREHASH_MessageBlock, _PREHASH_FromGroup, from_group);
@@ -1568,7 +1568,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 	BOOL is_owned_by_me = FALSE;
 
 	LLUUID computed_session_id = LLIMMgr::computeSessionID(dialog,from_id);
-	
+
 	chat.mMuted = is_muted && !is_linden;
 	chat.mFromID = from_id;
 	chat.mFromName = name;
@@ -1596,7 +1596,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 	|| dialog == IM_TYPING_STOP
 	|| dialog == IM_BUSY_AUTO_RESPONSE)
 	{
-		
+
 		if(session_id != computed_session_id)
 		{
 			session_id = computed_session_id;
@@ -1835,7 +1835,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 						}
 					}
 					//InstantMessageResponseItem<
-					
+
 				}
 			}
 		}
@@ -1855,10 +1855,10 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 		LLNotifications::instance().add("SystemMessageTip",args);
 		break;
 
-	case IM_NOTHING_SPECIAL: 
+	case IM_NOTHING_SPECIAL:
 		// Don't show dialog, just do IM
 		if (!gAgent.isGodlike()
-				&& gAgent.getRegion()->isPrelude() 
+				&& gAgent.getRegion()->isPrelude()
 				&& to_id.isNull() )
 		{
 			// do nothing -- don't distract newbies in
@@ -1875,11 +1875,11 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 // [/RLVa:KB]
 //		else if (offline == IM_ONLINE && !is_linden && is_busy && name != SYSTEM_FROM)
 // [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
-		else if ( (offline == IM_ONLINE && !is_linden && is_busy && name != SYSTEM_FROM) && 
+		else if ( (offline == IM_ONLINE && !is_linden && is_busy && name != SYSTEM_FROM) &&
 			      ( (!gRlvHandler.hasBehaviour(RLV_BHVR_RECVIM)) || (gRlvHandler.isException(RLV_BHVR_RECVIM, from_id))) )
 // [/RLVa:KB]
 		{
-			// return a standard "busy" message, but only do it to online IM 
+			// return a standard "busy" message, but only do it to online IM
 			// (i.e. not other auto responses and not store-and-forward IM)
 			if (!gIMMgr->hasSession(session_id))
 			{
@@ -1905,7 +1905,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			// now store incoming IM in chat history
 
 			buffer = separator_string + message.substr(message_offset);
-	
+
 			LL_INFOS("Messaging") << "process_improved_im: session_id( " << session_id << " ), from_id( " << from_id << " )" << LL_ENDL;
 
 			// add to IM panel, but do not bother the user
@@ -1936,7 +1936,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 		{
 // [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-08 (RLVa-1.0.0e)
 			// Filter region messages that weren't sent by a Linden
-			if ( (rlv_handler_t::isEnabled()) && (LLMuteList::getInstance()) && 
+			if ( (rlv_handler_t::isEnabled()) && (LLMuteList::getInstance()) &&
 				(!LLMuteList::getInstance()->isLinden(name)) && (from_id != gAgent.getID()) )
 			{
 				if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
@@ -2051,7 +2051,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 				U8 item_name[DB_INV_ITEM_NAME_BUF_SIZE];
 			}* notice_bin_bucket;
 
-			// Make sure the binary bucket is big enough to hold the header 
+			// Make sure the binary bucket is big enough to hold the header
 			// and a null terminated item name.
 			if ( (binary_bucket_size < (S32)((sizeof(notice_bucket_header_t) + sizeof(U8))))
 				|| (binary_bucket[binary_bucket_size - 1] != '\0') )
@@ -2072,7 +2072,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			if (has_inventory)
 			{
 				info = new LLOfferInfo;
-				
+
 				info->mIM = IM_GROUP_NOTICE;
 				info->mFromID = from_id;
 				info->mFromGroup = from_group;
@@ -2088,7 +2088,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 				info->mDesc = item_name;
 				info->mHost = msg->getSender();
 			}
-			
+
 			std::string str(message);
 
 			// Tokenize the string.
@@ -2292,7 +2292,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 		LL_WARNS("Messaging") << "Received IM: IM_GROUP_ELECTION_DEPRECATED" << LL_ENDL;
 	}
 	break;
-	
+
 	case IM_SESSION_SEND:
 	{
 		if (!is_linden && is_busy)
@@ -2354,7 +2354,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			{
 				group_name = std::string((char*)binary_bucket);
 			}
-			chat.mText = std::string("IM [") + group_name + std::string("] ") + name 
+			chat.mText = std::string("IM [") + group_name + std::string("] ") + name
 						+ separator_string + saved + message.substr(message_offset);
 		}
 		else
@@ -2401,7 +2401,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			}
 
 				std::string tempname = name;
-		
+
 				size_t found = tempname.find(" ");
 				while(found != std::string::npos)
 				{
@@ -2413,7 +2413,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 				{
 					name = ">>";
 					chat.mFromName = name;
-					
+
 				}
 
 			std::ostringstream link;
@@ -2465,14 +2465,14 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			gIMMgr->addMessage(session_id, from_id, name, buffer);
 		}
 		break;
-		
+
 	case IM_LURE_USER:
 		{
 			if (is_muted)
-			{ 
+			{
 				return;
 			}
-			else if (is_busy) 
+			else if (is_busy)
 			{
 				busy_message(msg,from_id);
 			}
@@ -2608,7 +2608,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			}
 
 			std::string url;
-			
+
 			url.assign((char*)binary_bucket, binary_bucket_size-1);
 			args["MESSAGE"] = message;
 			args["URL"] = url;
@@ -2658,11 +2658,11 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 			// as the database should already include the relationship.  But it
 			// doesn't hurt for dupes.
 			LLAvatarTracker::formFriendship(from_id);
-			
+
 			std::vector<std::string> strings;
 			strings.push_back(from_id.asString());
 			send_generic_message("requestonlinenotification", strings);
-			
+
 			args["NAME"] = name;
 			LLNotifications::instance().add("FriendshipAccepted", args);
 		}
@@ -2682,7 +2682,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
 	}
 }
 
-void busy_message (LLMessageSystem* msg, LLUUID from_id) 
+void busy_message (LLMessageSystem* msg, LLUUID from_id)
 {
 	if (gAgent.getBusy())
 	{
@@ -2725,7 +2725,7 @@ bool callingcard_offer_callback(const LLSD& notification, const LLSD& response)
 		msg->sendReliable(LLHost(notification["payload"]["sender"].asString()));
 		break;
 	case 1:
-		// decline		
+		// decline
 		msg->newMessageFast(_PREHASH_DeclineCallingCard);
 		msg->nextBlockFast(_PREHASH_AgentData);
 		msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
@@ -2776,7 +2776,7 @@ void process_offer_callingcard(LLMessageSystem* msg, void**)
 
 	if(!source_name.empty())
 	{
-		if (gAgent.getBusy() 
+		if (gAgent.getBusy()
 			|| LLMuteList::getInstance()->isMuted(source_id, source_name, LLMute::flagTextChat))
 		{
 			// automatically decline offer
@@ -2833,13 +2833,13 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 
 	msg->getString("ChatData", "FromName", from_name);
 	chat.mFromName = from_name;
-	
+
 	msg->getUUID("ChatData", "SourceID", from_id);
 	chat.mFromID = from_id;
-	
+
 	// Object owner for objects
 	msg->getUUID("ChatData", "OwnerID", owner_id);
-	
+
 	msg->getU8Fast(_PREHASH_ChatData, _PREHASH_SourceType, source_temp);
 	chat.mSourceType = (EChatSourceType)source_temp;
 
@@ -2848,9 +2848,9 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 
 	msg->getU8Fast(_PREHASH_ChatData, _PREHASH_Audible, audible_temp);
 	chat.mAudible = (EChatAudible)audible_temp;
-	
+
 	chat.mTime = LLFrameTimer::getElapsedSeconds();
-	
+
 	BOOL is_busy = gAgent.getBusy();
 
 	BOOL is_muted = FALSE;
@@ -2858,7 +2858,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 	is_muted = LLMuteList::getInstance()->isMuted(
 		from_id,
 		from_name,
-		LLMute::flagTextChat) 
+		LLMute::flagTextChat)
 		|| LLMuteList::getInstance()->isMuted(owner_id, LLMute::flagTextChat);
 	is_linden = chat.mSourceType != CHAT_SOURCE_OBJECT &&
 		LLMuteList::getInstance()->isLinden(from_name);
@@ -2868,9 +2868,9 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 	if (chatter)
 	{
 		chat.mPosAgent = chatter->getPositionAgent();
-		
+
 		// Make swirly things only for talking objects. (not script debug messages, though)
-//		if (chat.mSourceType == CHAT_SOURCE_OBJECT 
+//		if (chat.mSourceType == CHAT_SOURCE_OBJECT
 //			&& chat.mChatType != CHAT_TYPE_DEBUG_MSG)
 // [RLVa:KB] - Alternate: Snowglobe-1.2.4 | Checked: 2009-07-10 (RLVa-1.0.0g)
 		// Don't show swirly things for llOwnerSay() chat here because we handle those further down
@@ -2882,7 +2882,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 			LLPointer<LLViewerPartSourceChat> psc = new LLViewerPartSourceChat(chatter->getPositionAgent());
 			psc->setSourceObject(chatter);
 			psc->setColor(color);
-			//We set the particles to be owned by the object's owner, 
+			//We set the particles to be owned by the object's owner,
 			//just in case they should be muted by the mute list
 			psc->setOwnerUUID(owner_id);
 			LLViewerPartSim::getInstance()->addPartSource(psc);
@@ -2892,7 +2892,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 		if (is_audible
 			&& (is_linden || (!is_muted && !is_busy)))
 		{
-			if (chat.mChatType != CHAT_TYPE_START 
+			if (chat.mChatType != CHAT_TYPE_START
 				&& chat.mChatType != CHAT_TYPE_STOP)
 			{
 				gAgent.heardChat(chat.mFromID);
@@ -2902,7 +2902,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 		is_owned_by_me = chatter->permYouOwner();
 	}
 
-	if(chat.mSourceType == CHAT_SOURCE_OBJECT 
+	if(chat.mSourceType == CHAT_SOURCE_OBJECT
 		&& chat.mChatType != CHAT_TYPE_DEBUG_MSG
 		&& !owner_id.isNull()
 		&& owner_id != gAgent.getID())
@@ -2964,7 +2964,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 		msg->getStringFast(_PREHASH_ChatData, _PREHASH_Message, mesg);
 
 // [RLVa:KB] - Checked: 2009-10-06 (RLVa-1.0.4d) | Modified: RLVa-1.0.4d
-		if ( (rlv_handler_t::isEnabled()) && 
+		if ( (rlv_handler_t::isEnabled()) &&
 			 (CHAT_TYPE_START != chat.mChatType) && (CHAT_TYPE_STOP != chat.mChatType) && (CHAT_TYPE_OWNER != chat.mChatType) )
 		{
 			// NOTE: chatter can be NULL (may not have rezzed yet, or could be another avie's HUD attachment)
@@ -2973,7 +2973,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 			// Filtering "rules":
 			//   avatar  => filter all avie text (unless it's this avie or they're an exemption)
 			//   objects => filter everything except attachments this avie owns
-			if ( ( (CHAT_SOURCE_AGENT == chat.mSourceType) && (from_id != gAgent.getID()) ) || 
+			if ( ( (CHAT_SOURCE_AGENT == chat.mSourceType) && (from_id != gAgent.getID()) ) ||
 				 ( (CHAT_SOURCE_OBJECT == chat.mSourceType) && ((!is_owned_by_me) || (!is_attachment)) ) )
 			{
 				if (!rlvIsEmote(mesg))
@@ -2996,7 +2996,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 				{
 					if (chat.mFromID != gAgent.getID())
 						from_name = RlvStrings::getAnonym(from_name);
-				} 
+				}
 				else
 				{
 					if ( (!is_owned_by_me) || (!is_attachment) )
@@ -3038,7 +3038,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 			if (LLFloaterMap::getInstance())
 			{
 				PanelRadarEntry* entry = LLFloaterMap::getInstance()->getRadar()->getEntry(from_id);
-				if (entry) 
+				if (entry)
 				{
 					entry->setStatus(RADAR_STATUS_TYPING);
 				}
@@ -3059,7 +3059,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 			if (LLFloaterMap::getInstance())
 			{
 				PanelRadarEntry* entry = LLFloaterMap::getInstance()->getRadar()->getEntry(from_id);
-				if (entry) 
+				if (entry)
 				{
 					entry->setStatus(RADAR_STATUS_NONE);
 				}
@@ -3076,7 +3076,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 
 			if (!is_muted && !is_busy)
 			{
-				
+
 				BOOL sUseChatBubbles = gSavedSettings.getBOOL("UseChatBubbles");
  				if(sUseChatBubbles)
 				{
@@ -3162,7 +3162,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 						verb = " retained: @";
 						mesg = strRetained;
 					}
-					else 
+					else
 					{
 						verb = ": @";
 						if (!strExecuted.empty())
@@ -3183,7 +3183,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 					LLPointer<LLViewerPartSourceChat> psc = new LLViewerPartSourceChat(chatter->getPositionAgent());
 					psc->setSourceObject(chatter);
 					psc->setColor(color);
-					//We set the particles to be owned by the object's owner, 
+					//We set the particles to be owned by the object's owner,
 					//just in case they should be muted by the mute list
 					psc->setOwnerUUID(owner_id);
 					LLViewerPartSim::getInstance()->addPartSource(psc);
@@ -3211,7 +3211,7 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 			chat.mText += verb;
 			chat.mText += mesg;
 		}
-		
+
 		if (chatter)
 		{
 			chat.mPosAgent = chatter->getPositionAgent();
@@ -3230,9 +3230,9 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 		// T		*		*		*				F			Yes			Yes
 
 		chat.mMuted = is_muted && !is_linden;
-		
-		
-		if (!visible_in_chat_bubble 
+
+
+		if (!visible_in_chat_bubble
 			&& (is_linden || !is_busy || is_owned_by_me))
 		{
 			// show on screen and add to history
@@ -3248,10 +3248,10 @@ void process_chat_from_simulator(LLMessageSystem *msg, void **user_data)
 
 
 // Simulator we're on is informing the viewer that the agent
-// is starting to teleport (perhaps to another sim, perhaps to the 
-// same sim). If we initiated the teleport process by sending some kind 
-// of TeleportRequest, then this info is redundant, but if the sim 
-// initiated the teleport (via a script call, being killed, etc.) 
+// is starting to teleport (perhaps to another sim, perhaps to the
+// same sim). If we initiated the teleport process by sending some kind
+// of TeleportRequest, then this info is redundant, but if the sim
+// initiated the teleport (via a script call, being killed, etc.)
 // then this info is news to us.
 void process_teleport_start(LLMessageSystem *msg, void**)
 {
@@ -3278,7 +3278,7 @@ void process_teleport_start(LLMessageSystem *msg, void**)
 		gTeleportDisplay = TRUE;
 		gAgent.setTeleportState( LLAgent::TELEPORT_START );
 		make_ui_sound("UISndTeleportOut");
-		
+
 		// Don't call LLFirstUse::useTeleport here because this could be
 		// due to being killed, which would send you home, not to a Telehub
 	}
@@ -3315,7 +3315,7 @@ void process_teleport_progress(LLMessageSystem* msg, void**)
 	//if we don't find the coresponding mapping in our progress mappings
 	std::string message = buffer;
 
-	if (LLAgent::sTeleportProgressMessages.find(buffer) != 
+	if (LLAgent::sTeleportProgressMessages.find(buffer) !=
 		LLAgent::sTeleportProgressMessages.end() )
 	{
 		message = LLAgent::sTeleportProgressMessages[buffer];
@@ -3376,7 +3376,7 @@ public:
 
 
 
-class LLPostTeleportNotifiers : public LLEventTimer 
+class LLPostTeleportNotifiers : public LLEventTimer
 {
 public:
 	LLPostTeleportNotifiers();
@@ -3403,10 +3403,10 @@ BOOL LLPostTeleportNotifiers::tick()
 		LLInventoryFetchDescendentsObserver::folder_ref_t folders;
 		LLUUID folder_id;
 		folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_CALLINGCARD);
-		if(folder_id.notNull()) 
+		if(folder_id.notNull())
 			folders.push_back(folder_id);
 		folder_id = gInventory.findCategoryUUIDForType(LLAssetType::AT_LANDMARK);
-		if(folder_id.notNull()) 
+		if(folder_id.notNull())
 			folders.push_back(folder_id);
 		if(!folders.empty())
 		{
@@ -3462,7 +3462,7 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
 	msg->getU64Fast(_PREHASH_Info, _PREHASH_RegionHandle, region_handle);
 	U32 teleport_flags;
 	msg->getU32Fast(_PREHASH_Info, _PREHASH_TeleportFlags, teleport_flags);
-	
+
 	U32 region_size_x = 256;
 	msg->getU32Fast(_PREHASH_Info, _PREHASH_RegionSizeX, region_size_x);
 	U32 region_size_y = 256;
@@ -3474,17 +3474,17 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
 		region_size_x = 256;
 		region_size_y = 256;
 	}
-	
+
 	std::string seedCap;
 	msg->getStringFast(_PREHASH_Info, _PREHASH_SeedCapability, seedCap);
 
-	// update home location if we are teleporting out of prelude - specific to teleporting to welcome area 
+	// update home location if we are teleporting out of prelude - specific to teleporting to welcome area
 	if((teleport_flags & TELEPORT_FLAGS_SET_HOME_TO_TARGET)
 	   && (!gAgent.isGodlike()))
 	{
 		gAgent.setHomePosRegion(region_handle, pos);
 
-		// Create a timer that will send notices when teleporting is all finished.  Since this is 
+		// Create a timer that will send notices when teleporting is all finished.  Since this is
 		// based on the LLEventTimer class, it will be managed by that class and not orphaned or leaked.
 		new LLPostTeleportNotifiers();
 	}
@@ -3587,7 +3587,7 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
 	msg->getVector3Fast(_PREHASH_Data, _PREHASH_LookAt, look_at);
 	U64 region_handle;
 	msg->getU64Fast(_PREHASH_Data, _PREHASH_RegionHandle, region_handle);
-	
+
 	std::string version_channel;
 	msg->getString("SimData", "ChannelVersion", version_channel);
 
@@ -3609,8 +3609,8 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
 			LL_WARNS("Messaging") << "current region " << gAgent.getRegion()->getOriginGlobal() << LL_ENDL;
 		}
 
-		LL_WARNS("Messaging") << "Agent being sent to invalid home region: " 
-			<< x << ":" << y 
+		LL_WARNS("Messaging") << "Agent being sent to invalid home region: "
+			<< x << ":" << y
 			<< " current pos " << gAgent.getPositionGlobal()
 			<< LL_ENDL;
 		LLAppViewer::instance()->forceDisconnect("You were sent to an invalid region.");
@@ -3658,7 +3658,7 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
 //		if (avatarp)
 		{
 			// Chat the "back" SLURL. (DEV-4907)
-			// Show this in the console if DisableTeleportScreens is true 
+			// Show this in the console if DisableTeleportScreens is true
 			// Why? Because it's nifty, that's why -- MC
 			LLChat chat("Teleport completed from " + gAgent.getTeleportSourceSLURL());
 			chat.mSourceType = CHAT_SOURCE_SYSTEM;
@@ -3748,7 +3748,7 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
 	{
 		avatarp->mFootPlane.clearVec();
 	}
-	
+
 	// send walk-vs-run status
 	gAgent.sendWalkRun(gAgent.getRunning() || gAgent.getAlwaysRun());
 
@@ -3805,7 +3805,7 @@ void process_crossed_region(LLMessageSystem* msg, void**)
 	LLHost sim_host(sim_ip, sim_port);
 	U64 region_handle;
 	msg->getU64Fast(_PREHASH_RegionData, _PREHASH_RegionHandle, region_handle);
-	
+
 	std::string seedCap;
 	msg->getStringFast(_PREHASH_RegionData, _PREHASH_SeedCapability, seedCap);
 
@@ -3874,11 +3874,11 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
 	const U8 DUP_MSGS = 1;				//  HACK!  number of times to repeat data on motionless agent
 
 	//  Store data on last sent update so that if no changes, no send
-	static LLVector3 last_camera_pos_agent, 
-					 last_camera_at, 
+	static LLVector3 last_camera_pos_agent,
+					 last_camera_at,
 					 last_camera_left,
 					 last_camera_up;
-	
+
 	static LLVector3 cam_center_chg,
 					 cam_rot_chg;
 
@@ -3931,13 +3931,13 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
 
 	head_rot_chg = dot(last_head_rot, head_rotation);
 
-	if (force_send || 
-		(cam_center_chg.magVec() > TRANSLATE_THRESHOLD) || 
-		(head_rot_chg < THRESHOLD_HEAD_ROT_QDOT) ||	
+	if (force_send ||
+		(cam_center_chg.magVec() > TRANSLATE_THRESHOLD) ||
+		(head_rot_chg < THRESHOLD_HEAD_ROT_QDOT) ||
 		(last_render_state != render_state) ||
 		(cam_rot_chg.magVec() > ROTATION_THRESHOLD) ||
 		control_flag_change != 0 ||
-		flag_change != 0)  
+		flag_change != 0)
 	{
 /*
 		if (head_rot_chg < THRESHOLD_HEAD_ROT_QDOT)
@@ -3945,7 +3945,7 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
 			//LL_INFOS("Messaging") << "head rot " << head_rotation << LL_ENDL;
 			LL_INFOS("Messaging") << "head_rot_chg = " << head_rot_chg << LL_ENDL;
 		}
-		if (cam_rot_chg.magVec() > ROTATION_THRESHOLD) 
+		if (cam_rot_chg.magVec() > ROTATION_THRESHOLD)
 		{
 			LL_INFOS("Messaging") << "cam rot " <<  cam_rot_chg.magVec() << LL_ENDL;
 		}
@@ -3976,8 +3976,8 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
 			// some threshold from the last update, however this can break fine
 			// adjustments when trying to aim an attached gun, so what we do here
 			// (where we would normally skip sending an update when nothing has changed)
-			// is gradually reduce the threshold to allow a better update to 
-			// eventually get sent... should update to within 0.5 degrees in less 
+			// is gradually reduce the threshold to allow a better update to
+			// eventually get sent... should update to within 0.5 degrees in less
 			// than a second.
 			if (head_rot_chg < THRESHOLD_HEAD_ROT_QDOT + (MAX_HEAD_ROT_QDOT - THRESHOLD_HEAD_ROT_QDOT) * duplicate_count / AGENT_UPDATES_PER_SECOND)
 			{
@@ -4010,13 +4010,13 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
 //		{
 //			LL_INFOS("Messaging") << "Sending camera center " << camera_pos_agent << LL_ENDL;
 //		}
-		
+
 		msg->addVector3Fast(_PREHASH_CameraCenter, camera_pos_agent);
 		msg->addVector3Fast(_PREHASH_CameraAtAxis, LLViewerCamera::getInstance()->getAtAxis());
 		msg->addVector3Fast(_PREHASH_CameraLeftAxis, LLViewerCamera::getInstance()->getLeftAxis());
 		msg->addVector3Fast(_PREHASH_CameraUpAxis, LLViewerCamera::getInstance()->getUpAxis());
 		msg->addF32Fast(_PREHASH_Far, gAgent.mDrawDistance);
-		
+
 		msg->addU32Fast(_PREHASH_ControlFlags, control_flags);
 
 		if (gDebugClicks)
@@ -4045,7 +4045,7 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
 
 //		LL_DEBUGS("Messaging") << "agent " << avatar_pos_agent << " cam " << camera_pos_agent << LL_ENDL;
 
-		// Copy the old data 
+		// Copy the old data
 		last_head_rot = head_rotation;
 		last_render_state = render_state;
 		last_camera_pos_agent = camera_pos_agent;
@@ -4064,7 +4064,7 @@ void send_agent_update(BOOL force_send, BOOL send_reliable)
 extern U32 gObjectBits;
 
 void process_object_update(LLMessageSystem *mesgsys, void **user_data)
-{	
+{
 	LLMemType mt(LLMemType::MTYPE_OBJECT);
 	// Update the data counters
 	if (mesgsys->getReceiveCompressedSize())
@@ -4270,7 +4270,7 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
 
 	// Don't play sounds triggered by someone you muted.
 	if (LLMuteList::getInstance()->isMuted(owner_id, LLMute::flagObjectSounds)) return;
-	
+
 	// Don't play sounds from an object you muted
 	if (LLMuteList::getInstance()->isMuted(object_id)) return;
 
@@ -4300,7 +4300,7 @@ void process_sound_trigger(LLMessageSystem *msg, void **)
 	{
 		return;
 	}*/
-		
+
 	gAudiop->triggerSound(sound_id, owner_id, gain, LLAudioEngine::AUDIO_TYPE_SFX, pos_global);
 }
 
@@ -4324,10 +4324,10 @@ void process_preload_sound(LLMessageSystem *msg, void **user_data)
 
 	if (LLMuteList::getInstance()->isMuted(object_id)) return;
 	if (LLMuteList::getInstance()->isMuted(owner_id, LLMute::flagObjectSounds)) return;
-	
+
 	LLAudioSource *sourcep = objectp->getAudioSource(owner_id);
 	if (!sourcep) return;
-	
+
 	LLAudioData *datap = gAudiop->getAudioData(sound_id);
 
 	// Note that I don't actually do any loading of the
@@ -4341,7 +4341,7 @@ void process_preload_sound(LLMessageSystem *msg, void **user_data)
 	{
 		return;
 	}*/
-	
+
 	// Add audioData starts a transfer internally.
 	sourcep->addAudioData(datap, FALSE);
 }
@@ -4369,12 +4369,12 @@ void process_attached_sound(LLMessageSystem *msg, void **user_data)
 		// we don't know about this object, just bail
 		return;
 	}
-	
+
 	if (LLMuteList::getInstance()->isMuted(object_id)) return;
-	
+
 	if (LLMuteList::getInstance()->isMuted(owner_id, LLMute::flagObjectSounds)) return;
 
-	
+
 	// Don't play sounds from a region with maturity above current agent maturity
 	// Actually, let's -- MC
 	/*LLVector3d pos = objectp->getPositionGlobal();
@@ -4382,7 +4382,7 @@ void process_attached_sound(LLMessageSystem *msg, void **user_data)
 	{
 		return;
 	}*/
-	
+
 	objectp->setAttachedSound(sound_id, owner_id, gain, flags);
 }
 
@@ -4421,7 +4421,7 @@ void process_health_message(LLMessageSystem *mesgsys, void **user_data)
 
 
 void process_sim_stats(LLMessageSystem *msg, void **user_data)
-{	
+{
 	S32 count = msg->getNumberOfBlocks("Stat");
 	for (S32 i = 0; i < count; ++i)
 	{
@@ -4570,7 +4570,7 @@ void process_sim_stats(LLMessageSystem *msg, void **user_data)
 		BOOL was_flying = gAgent.getFlying();
 		regionp->setRegionFlags(region_flags);
 		regionp->setMaxTasks(max_tasks_per_region);
-		// HACK: This makes agents drop from the sky if the region is 
+		// HACK: This makes agents drop from the sky if the region is
 		// set to no fly while people are still in the sim.
 		if (was_flying && regionp->getBlockFly())
 		{
@@ -4587,7 +4587,7 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)
 	LLUUID	uuid;
 	S32		anim_sequence_id;
 	LLVOAvatar *avatarp;
-	
+
 	mesgsys->getUUIDFast(_PREHASH_Sender, _PREHASH_ID, uuid);
 
 	//clear animation flags
@@ -4604,7 +4604,7 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)
 	S32 num_source_blocks = mesgsys->getNumberOfBlocksFast(_PREHASH_AnimationSourceList);
 
 	avatarp->mSignaledAnimations.clear();
-	
+
 	if (avatarp->isSelf())
 	{
 		LLUUID object_id;
@@ -4614,7 +4614,7 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)
 			mesgsys->getUUIDFast(_PREHASH_AnimationList, _PREHASH_AnimID, animation_id, i);
 			mesgsys->getS32Fast(_PREHASH_AnimationList, _PREHASH_AnimSequenceID, anim_sequence_id, i);
 
-			LL_DEBUGS("Messaging") << "Animation id " << animation_id 
+			LL_DEBUGS("Messaging") << "Animation id " << animation_id
 								   << " from self using sequence id " << anim_sequence_id << LL_ENDL;
 
 			avatarp->mSignaledAnimations[animation_id] = anim_sequence_id;
@@ -4622,7 +4622,7 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)
 			if (i < num_source_blocks)
 			{
 				mesgsys->getUUIDFast(_PREHASH_AnimationSourceList, _PREHASH_ObjectID, object_id, i);
-			
+
 				LLViewerObject* object = gObjectList.findObject(object_id);
 				if (object)
 				{
@@ -4654,8 +4654,8 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data)
 			mesgsys->getUUIDFast(_PREHASH_AnimationList, _PREHASH_AnimID, animation_id, i);
 			mesgsys->getS32Fast(_PREHASH_AnimationList, _PREHASH_AnimSequenceID, anim_sequence_id, i);
 			avatarp->mSignaledAnimations[animation_id] = anim_sequence_id;
-			LL_DEBUGS("Messaging") << "Received animation id " << animation_id 
-								   << " from " << uuid 
+			LL_DEBUGS("Messaging") << "Received animation id " << animation_id
+								   << " from " << uuid
 								   << " using sequence id " << anim_sequence_id << LL_ENDL;
 		}
 	}
@@ -4730,7 +4730,7 @@ void process_avatar_sit_response(LLMessageSystem *mesgsys, void **user_data)
 	{
 		gAgent.setSitCamera(sitObjectID, camera_eye, camera_at);
 	}
-	
+
 	gAgent.mForceMouselook = force_mouselook;
 
 	LLViewerObject* object = gObjectList.findObject(sitObjectID);
@@ -4826,7 +4826,7 @@ void process_set_follow_cam_properties(LLMessageSystem *mesgsys, void **user_dat
 			LLFollowCamMgr::setFocusThreshold(source_id, value);
 			break;
 		case FOLLOWCAM_ACTIVE:
-			//if 1, set using followcam,. 
+			//if 1, set using followcam,.
 			LLFollowCamMgr::setCameraActive(source_id, value != 0.f);
 			break;
 		case FOLLOWCAM_POSITION_X:
@@ -4878,7 +4878,7 @@ void process_set_follow_cam_properties(LLMessageSystem *mesgsys, void **user_dat
 		LLFollowCamMgr::setFocusOffset(source_id, focus_offset);
 	}
 }
-//end Ventrella 
+//end Ventrella
 
 
 // Culled from newsim lltask.cpp
@@ -5070,7 +5070,7 @@ void process_money_balance_reply( LLMessageSystem* msg, void** )
 bool handle_special_notification_callback(const LLSD& notification, const LLSD& response)
 {
 	S32 option = LLNotification::getSelectedOption(notification, response);
-	
+
 	if (0 == option)
 	{
 		// set the preference to the maturity of the region we're calling
@@ -5079,7 +5079,7 @@ bool handle_special_notification_callback(const LLSD& notification, const LLSD&
 		gAgent.sendMaturityPreferenceToServer(preferredMaturity);
 
 	}
-	
+
 	return false;
 }
 
@@ -5088,10 +5088,10 @@ bool handle_special_notification(std::string notificationID, LLSD& llsdBlock)
 {
 	int regionAccess = llsdBlock["_region_access"].asInteger();
 	llsdBlock["REGIONMATURITY"] = LLViewerRegion::accessToString(regionAccess);
-	
+
 	// we're going to throw the LLSD in there in case anyone ever wants to use it
 	LLNotifications::instance().add(notificationID+"_Notify", llsdBlock);
-	
+
 	if (regionAccess == SIM_ACCESS_MATURE)
 	{
 		if (gAgent.isTeen())
@@ -5140,7 +5140,7 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem)
 				llwarns << "attempt_standard_notification: Attempted to read notification parameter data into LLSD but failed:" << llsdRaw << llendl;
 			}
 		}
-		
+
 		if (
 			(notificationID == "RegionEntryAccessBlocked") ||
 			(notificationID == "LandClaimAccessBlocked") ||
@@ -5151,32 +5151,32 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem)
 			 (Commented so a grep will find the notification strings, since
 			 we construct them on the fly; if you add additional notifications,
 			 please update the comment.)
-			 
+
 			 Could throw any of the following notifications:
-			 
+
 				RegionEntryAccessBlocked
 				RegionEntryAccessBlocked_Notify
 				RegionEntryAccessBlocked_Change
 				RegionEntryAccessBlocked_KB
-				LandClaimAccessBlocked 
-				LandClaimAccessBlocked_Notify 
-				LandClaimAccessBlocked_Change 
-				LandClaimAccessBlocked_KB 
+				LandClaimAccessBlocked
+				LandClaimAccessBlocked_Notify
+				LandClaimAccessBlocked_Change
+				LandClaimAccessBlocked_KB
 				LandBuyAccessBlocked
 				LandBuyAccessBlocked_Notify
 				LandBuyAccessBlocked_Change
 				LandBuyAccessBlocked_KB
-			 
-			-----------------------------------------------------------------------*/ 
+
+			-----------------------------------------------------------------------*/
 			if (handle_special_notification(notificationID, llsdBlock))
 			{
 				return true;
 			}
 		}
-		
+
 		LLNotifications::instance().add(notificationID, llsdBlock);
 		return true;
-	}	
+	}
 	return false;
 }
 
@@ -5186,7 +5186,7 @@ void process_agent_alert_message(LLMessageSystem* msgsystem, void** user_data)
 	// make sure the cursor is back to the usual default since the
 	// alert is probably due to some kind of error.
 	gViewerWindow->getWindow()->resetBusyCount();
-	
+
 	if (!attempt_standard_notification(msgsystem))
 	{
 		BOOL modal = FALSE;
@@ -5207,7 +5207,7 @@ void process_alert_message(LLMessageSystem *msgsystem, void **user_data)
 	// make sure the cursor is back to the usual default since the
 	// alert is probably due to some kind of error.
 	gViewerWindow->getWindow()->resetBusyCount();
-		
+
 	if (!attempt_standard_notification(msgsystem))
 	{
 		BOOL modal = FALSE;
@@ -5336,7 +5336,7 @@ void process_mean_collision_alert_message(LLMessageSystem *msgsystem, void **use
 {
 	if (gAgent.inPrelude())
 	{
-		// In prelude, bumping is OK.  This dialog is rather confusing to 
+		// In prelude, bumping is OK.  This dialog is rather confusing to
 		// newbies, so we don't show it.  Drop the packet on the floor.
 		return;
 	}
@@ -5393,7 +5393,7 @@ void process_frozen_message(LLMessageSystem *msgsystem, void **user_data)
 	// alert is probably due to some kind of error.
 	gViewerWindow->getWindow()->resetBusyCount();
 	BOOL b_frozen;
-	
+
 	msgsystem->getBOOL("FrozenData", "Data", b_frozen);
 
 	// TODO: make being frozen change view
@@ -5412,8 +5412,8 @@ void process_economy_data(LLMessageSystem *msg, void** /*user_data*/)
 
 	S32 upload_cost = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload();
 
-	LL_INFOS_ONCE("Messaging") << "EconomyData message arrived; upload cost is " 
-				<< gHippoGridManager->getConnectedGrid()->getCurrencySymbol() 
+	LL_INFOS_ONCE("Messaging") << "EconomyData message arrived; upload cost is "
+				<< gHippoGridManager->getConnectedGrid()->getCurrencySymbol()
 				<< upload_cost << LL_ENDL;
 
 	LLFloaterImagePreview::setUploadAmount(upload_cost);
@@ -5436,13 +5436,13 @@ void notify_cautioned_script_question(const LLSD& notification, const LLSD& resp
 	{
 		// check to see if the person we are asking
 
-		// "'[OBJECTNAME]', an object owned by '[OWNERNAME]', 
-		// located in [REGIONNAME] at [REGIONPOS], 
+		// "'[OBJECTNAME]', an object owned by '[OWNERNAME]',
+		// located in [REGIONNAME] at [REGIONPOS],
 		// has been <granted|denied> permission to: [PERMISSIONS]."
 
 		LLUIString notice(LLFloaterChat::getInstance()->getString(granted ? "ScriptQuestionCautionChatGranted" : "ScriptQuestionCautionChatDenied"));
 
-		// always include the object name and owner name 
+		// always include the object name and owner name
 		notice.setArg("[OBJECTNAME]", notification["payload"]["object_name"].asString());
 		notice.setArg("[OWNERNAME]", notification["payload"]["owner_name"].asString());
 
@@ -5454,7 +5454,7 @@ void notify_cautioned_script_question(const LLSD& notification, const LLSD& resp
 		{
 			// found the viewerobject, get it's position in its region
 			LLVector3 objpos(viewobj->getPosition());
-			
+
 			// try to lookup the name of the region the object is in
 			LLViewerRegion* viewregion = viewobj->getRegion();
 			if (viewregion)
@@ -5481,7 +5481,7 @@ void notify_cautioned_script_question(const LLSD& notification, const LLSD& resp
 			notice.setArg("[REGIONPOS]", "(unknown position)");
 		}
 
-		// check each permission that was requested, and list each 
+		// check each permission that was requested, and list each
 		// permission that has been flagged as a caution permission
 		BOOL caution = FALSE;
 		S32 count = 0;
@@ -5533,7 +5533,7 @@ bool script_question_cb(const LLSD& notification, const LLSD& response)
 	{
 		new_questions = 0;
 		allowed = FALSE;
-	}	
+	}
 
 	LLUUID task_id = notification["payload"]["task_id"].asUUID();
 	LLUUID item_id = notification["payload"]["item_id"].asUUID();
@@ -5625,10 +5625,10 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
 	{
 		throttle_name = taskid.getString();
 	}
-	
+
 	// don't display permission requests if this object is muted
 	if (LLMuteList::getInstance()->isMuted(taskid)) return;
-	
+
 	// throttle excessive requests from any specific user's scripts
 	typedef LLKeyThrottle<std::string> LLStringThrottle;
 	static LLStringThrottle question_throttle( LLREQUEST_PERMISSION_THROTTLE_LIMIT, LLREQUEST_PERMISSION_THROTTLE_INTERVAL );
@@ -5665,7 +5665,7 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
 			{
 				LLStringUtil::format_map_t args;
 				args["[CURRENCY]"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
-				
+
 				count++;
 				script_question += "    " + LLFloaterChat::getInstance()->getString(SCRIPT_QUESTIONS[i], args) + "\n";
 
@@ -6018,7 +6018,7 @@ void send_group_notice(const LLUUID& group_id,
 	{
 		bucket_to_send = (U8*) EMPTY_BINARY_BUCKET;
 	}
-   
+
 
 	send_improved_im(
 			group_id,
@@ -6083,7 +6083,7 @@ void handle_lure(const LLUUID& invitee)
 }
 
 // Prompt for a message to the invited user.
-void handle_lure(LLDynamicArray<LLUUID>& ids) 
+void handle_lure(LLDynamicArray<LLUUID>& ids)
 {
 	LLSD edit_args;
 // [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-04 (RLVa-1.0.0a)
@@ -6128,7 +6128,7 @@ void send_improved_im(const LLUUID& to_id,
 							U8 offline,
 							EInstantMessage dialog,
 							const LLUUID& id,
-							U32 timestamp, 
+							U32 timestamp,
 							const U8* binary_bucket,
 							S32 binary_bucket_size)
 {
@@ -6187,7 +6187,7 @@ void process_user_info_reply(LLMessageSystem* msg, void**)
 		LL_WARNS("Messaging") << "process_user_info_reply - "
 				<< "wrong agent id." << LL_ENDL;
 	}
-	
+
 	BOOL im_via_email;
 	msg->getBOOLFast(_PREHASH_UserData, _PREHASH_IMViaEMail, im_via_email);
 	std::string email;
@@ -6241,7 +6241,7 @@ void process_script_dialog(LLMessageSystem* msg, void**)
 
 	LLSD payload;
 
-	std::string message; 
+	std::string message;
 	std::string first_name;
 	std::string last_name;
 	std::string title;
@@ -6261,7 +6261,7 @@ void process_script_dialog(LLMessageSystem* msg, void**)
 	{
 		std::vector<LLMute> mutes = LLMuteList::getInstance()->getMutes();
 		for (U32 i = 0; i < mutes.size(); i++)
-		{	
+		{
 			//this is almost like saying (mutes[i].mType != LLMute::Object), but more verbose ... -Kaku
 			if (
 				((mutes[i].mType == LLMute::AGENT)
@@ -6524,7 +6524,7 @@ void process_script_teleport_request(LLMessageSystem* msg, void**)
 	// remove above two lines and replace with below line
 	// to re-enable parcel browser for llMapDestination()
 	// LLURLDispatcher::dispatch(LLURLDispatcher::buildSLURL(sim_name, (S32)pos.mV[VX], (S32)pos.mV[VY], (S32)pos.mV[VZ]), FALSE);
-	
+
 }
 
 void process_covenant_reply(LLMessageSystem* msg, void**)
@@ -6557,7 +6557,7 @@ void process_covenant_reply(LLMessageSystem* msg, void**)
 	LLFloaterBuyLand::updateLastModified(last_modified);
 
 	gCacheName->getName(estate_owner_id, callbackCacheEstateOwnerName);
-	
+
 	// load the actual covenant asset data
 	const BOOL high_priority = TRUE;
 	if (covenant_id.notNull())
@@ -6595,7 +6595,7 @@ void callbackCacheEstateOwnerName(const LLUUID& id,
 								  BOOL is_group, void*)
 {
 	std::string name;
-	
+
 	if (id.isNull())
 	{
 		name = "(none)";
@@ -6619,9 +6619,9 @@ void onCovenantLoadComplete(LLVFS *vfs,
 	if(0 == status)
 	{
 		LLVFile file(vfs, asset_uuid, type, LLVFile::READ);
-		
+
 		S32 file_length = file.getSize();
-		
+
 		char* buffer = new char[file_length+1];
 		if (buffer == NULL)
 		{
@@ -6630,10 +6630,10 @@ void onCovenantLoadComplete(LLVFS *vfs,
 		}
 
 		file.read((U8*)buffer, file_length);		/* Flawfinder: ignore */
-		
+
 		// put a EOS at the end
 		buffer[file_length] = 0;
-		
+
 		if( (file_length > 19) && !strncmp( buffer, "Linden text version", 19 ) )
 		{
 			LLViewerTextEditor* editor =
@@ -6662,7 +6662,7 @@ void onCovenantLoadComplete(LLVFS *vfs,
 	else
 	{
 		LLViewerStats::getInstance()->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
-		
+
 		if( LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE == status ||
 		    LL_ERR_FILE_EMPTY == status)
 		{
@@ -6676,7 +6676,7 @@ void onCovenantLoadComplete(LLVFS *vfs,
 		{
 			covenant_text = "Unable to load estate covenant at this time.";
 		}
-		
+
 		LL_WARNS("Messaging") << "Problem loading notecard: " << status << LL_ENDL;
 	}
 	LLPanelEstateCovenant::updateCovenantText(covenant_text, asset_uuid);
@@ -6694,7 +6694,7 @@ void process_feature_disabled_message(LLMessageSystem* msg, void**)
 	msg->getStringFast(_PREHASH_FailureInfo,_PREHASH_ErrorMessage, messageText,0);
 	msg->getUUIDFast(_PREHASH_FailureInfo,_PREHASH_AgentID,agentID);
 	msg->getUUIDFast(_PREHASH_FailureInfo,_PREHASH_TransactionID,transactionID);
-	
+
 	LL_WARNS("Messaging") << "Blacklisted Feature Response:" << messageText << LL_ENDL;
 }
 
diff --git a/linden/indra/newview/wlfloatermanager.cpp b/linden/indra/newview/wlfloatermanager.cpp
index 63abe14..0b81d7e 100644
--- a/linden/indra/newview/wlfloatermanager.cpp
+++ b/linden/indra/newview/wlfloatermanager.cpp
@@ -1,11 +1,11 @@
-/** 
+/**
 * @file wlfloaterwindlightsend.cpp
 * @brief WLFloaterWindLightSend class definition
 *
 * $LicenseInfo:firstyear=2007&license=viewergpl$
-* 
+*
 * Copyright (c) 2007-2009, Linden Research, Inc.
-* 
+*
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
 * to you under the terms of the GNU General Public License, version 2.0
@@ -13,17 +13,17 @@
 * ("Other License"), formally executed by you and Linden Lab.  Terms of
 * the GPL can be found in doc/GPL-license.txt in this distribution, or
 * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
-* 
+*
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
 * online at
 * http://secondlifegrid.net/programs/open_source/licensing/flossexception
-* 
+*
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
 * and agree to abide by those obligations.
-* 
+*
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
@@ -75,12 +75,12 @@
 
 #undef max
 WLFloaterManager* WLFloaterManager::sWindLight;
-std::map<std::string, LLWLParamSet*> WLFloaterManager::mWLParamList;	
-std::map<std::string, LLWaterParamSet*> WLFloaterManager::mWaterParamList;	
-std::map<std::string, LLUUID*> WLFloaterManager::mWaterNormalParamList;	
-std::map<std::string, LLSD> WLFloaterManager::mMinAltParamList;	
-std::map<std::string, LLSD> WLFloaterManager::mMaxAltParamList;	
-std::map<std::string, LLSD> WLFloaterManager::mFadeParamList;	
+std::map<std::string, LLWLParamSet*> WLFloaterManager::mWLParamList;
+std::map<std::string, LLWaterParamSet*> WLFloaterManager::mWaterParamList;
+std::map<std::string, LLUUID*> WLFloaterManager::mWaterNormalParamList;
+std::map<std::string, LLSD> WLFloaterManager::mMinAltParamList;
+std::map<std::string, LLSD> WLFloaterManager::mMaxAltParamList;
+std::map<std::string, LLSD> WLFloaterManager::mFadeParamList;
 
 WLFloaterManager::WLFloaterManager() : LLFloater(std::string("windlight manager floater"))
 {
@@ -233,10 +233,10 @@ void WLFloaterManager::onSetToCurrent(void* userData)
 	if(name == "(Region Settings)")
 	{
 		type = 0;
-	}	
-	
+	}
+
 	if(mSky != NULL && mWater != NULL && mWaterNormal != NULL)
-		WLFloaterWindLightSend::SendSettings(false, type, NULL, *mSky, *mWater, fade, minAlt, maxAlt, *mWaterNormal); 
+		WLFloaterWindLightSend::SendSettings(false, type, NULL, *mSky, *mWater, fade, minAlt, maxAlt, *mWaterNormal);
 }
 void WLFloaterManager::onRemove(void* userData)
 {
@@ -258,7 +258,7 @@ void WLFloaterManager::onRemove(void* userData)
 	}
 
 	if(mSky != NULL && mWater != NULL && mWaterNormal != NULL)
-		WLFloaterWindLightSend::SendSettings(true, type, false, *mSky, *mWater, fade, minAlt, maxAlt, *mWaterNormal); 
+		WLFloaterWindLightSend::SendSettings(true, type, false, *mSky, *mWater, fade, minAlt, maxAlt, *mWaterNormal);
 }
 
 
@@ -269,13 +269,12 @@ void WLFloaterManager::UpdateFloater()
 	LLComboBox* comboBox = mgr->getChild<LLComboBox>("WLSettingsCombo");
 	comboBox->clear();
 	comboBox->removeall();
-	std::map<std::string, LLWLParamSet*>::iterator mIt = 
+	std::map<std::string, LLWLParamSet*>::iterator mIt =
 		WLFloaterManager::instance()->mWLParamList.begin();
-	for(; mIt != WLFloaterManager::instance()->mWLParamList.end(); mIt++) 
+	for(; mIt != WLFloaterManager::instance()->mWLParamList.end(); mIt++)
 	{
 		comboBox->add(mIt->first);
 	}
 	//Reorder them
 	comboBox->sortByName();
 }
-
diff --git a/linden/indra/newview/wlretrievesettings.cpp b/linden/indra/newview/wlretrievesettings.cpp
index afa84f2..3fd3084 100644
--- a/linden/indra/newview/wlretrievesettings.cpp
+++ b/linden/indra/newview/wlretrievesettings.cpp
@@ -1,11 +1,11 @@
-/** 
+/**
 * @file wlfloaterwindlightsend.cpp
 * @brief WLFloaterWindLightSend class definition
 *
 * $LicenseInfo:firstyear=2007&license=viewergpl$
-* 
+*
 * Copyright (c) 2007-2009, Linden Research, Inc.
-* 
+*
 * Second Life Viewer Source Code
 * The source code in this file ("Source Code") is provided by Linden Lab
 * to you under the terms of the GNU General Public License, version 2.0
@@ -13,17 +13,17 @@
 * ("Other License"), formally executed by you and Linden Lab.  Terms of
 * the GPL can be found in doc/GPL-license.txt in this distribution, or
 * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
-* 
+*
 * There are special exceptions to the terms and conditions of the GPL as
 * it is applied to this Source Code. View the full text of the exception
 * in the file doc/FLOSS-exception.txt in this software distribution, or
 * online at
 * http://secondlifegrid.net/programs/open_source/licensing/flossexception
-* 
+*
 * By copying, modifying or distributing this software, you acknowledge
 * that you have read and understood your obligations described above,
 * and agree to abide by those obligations.
-* 
+*
 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
 * COMPLETENESS OR PERFORMANCE.
@@ -93,7 +93,7 @@ void retrieveWindlightSettings::result(const LLSD& content)
 	for(LLSD::array_const_iterator wls = content["WindLight"].beginArray();
 		wls != content["WindLight"].endArray();
 		++wls)
-	{	
+	{
 		LLSD windLightLLSD = *wls;
 		LLWaterParamSet* mWater;
 		LLWLParamSet* mSky;
@@ -235,4 +235,4 @@ void retrieveWindlightSettings::error(U32 status, const std::string& reason)
 {
 	LL_INFOS("Inventory") << "retrieveWindlightSettings::error "
 		<< status << ": " << reason << LL_ENDL;
-}
\ No newline at end of file
+}
-- 
cgit v1.1


From 121ed3da67037cd24d1928bec232b8deebf76e7f Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Mon, 2 Apr 2012 02:03:55 +1000
Subject: Merge a bunch of duplicated Windlight sharing code.

---
 linden/indra/newview/CMakeLists.txt             |   2 -
 linden/indra/newview/lightshare.cpp             | 121 +++++-------
 linden/indra/newview/lightshare.h               |  65 +++---
 linden/indra/newview/llviewergenericmessage.cpp |   4 +-
 linden/indra/newview/llviewermessage.cpp        |   7 +-
 linden/indra/newview/llwlparammanager.cpp       |  64 ++++++
 linden/indra/newview/llwlparammanager.h         |   9 +
 linden/indra/newview/wlfloatermanager.cpp       |   4 +-
 linden/indra/newview/wlretrievesettings.cpp     |   1 -
 linden/indra/newview/wlsettingsmanager.cpp      | 253 ------------------------
 linden/indra/newview/wlsettingsmanager.h        |  90 ---------
 11 files changed, 150 insertions(+), 470 deletions(-)
 delete mode 100644 linden/indra/newview/wlsettingsmanager.cpp
 delete mode 100644 linden/indra/newview/wlsettingsmanager.h

diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 1db6eab..4050d80 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -506,7 +506,6 @@ set(viewer_SOURCE_FILES
     wlfloatermanager.cpp
     wlfloaterwindlightsend.cpp
     wlretrievesettings.cpp
-    wlsettingsmanager.cpp
     )
 
 set(VIEWER_BINARY_NAME "imprudence-bin" CACHE STRING
@@ -979,7 +978,6 @@ set(viewer_HEADER_FILES
     wlfloatermanager.h
     wlfloaterwindlightsend.h
     wlretrievesettings.h
-    wlsettingsmanager.h
     )
 
 source_group("CMake Rules" FILES ViewerInstall.cmake)
diff --git a/linden/indra/newview/lightshare.cpp b/linden/indra/newview/lightshare.cpp
index b00df96..1814f4a 100644
--- a/linden/indra/newview/lightshare.cpp
+++ b/linden/indra/newview/lightshare.cpp
@@ -27,7 +27,6 @@
  */
 
 
-#include "lightshare.h"
 
 #include "linden_common.h"
 #include "llviewercontrol.h"
@@ -38,21 +37,22 @@
 #include "message.h"
 #include "meta7windlight.h"
 
+#include "lightshare.h"
+
+#include "llagent.h"
+#include "llworld.h"
 
-const std::string WindlightMessage::sWaterPresetName = "(Region settings)";
-const std::string WindlightMessage::sSkyPresetName   = "(Region settings)";
 
 
-WindlightMessage* WindlightMessage::sMostRecent = NULL;
-LLTimer* WindlightMessage::sIgnoreTimer = new LLTimer();
-bool WindlightMessage::sIgnoreRegion = false;
+LLWaterParamSet* LightShare::mWater = NULL;
+LLWLParamSet* LightShare::mSky = NULL;
+LLUUID* LightShare::mWaterNormal = NULL;
+LLTimer* LightShare::sIgnoreTimer = new LLTimer();
+bool LightShare::sIgnoreRegion = false;
 
 
-WindlightMessage::WindlightMessage( LLMessageSystem* msg ) :
+LightShare::LightShare( LLMessageSystem* msg ) :
 	mPacket(NULL),
-	mWater(NULL),
-	mSky(NULL),
-	mWaterNormal(NULL),
 	mIsValid(false)
 {
 	std::string method;
@@ -93,7 +93,7 @@ WindlightMessage::WindlightMessage( LLMessageSystem* msg ) :
 }
 
 
-WindlightMessage::~WindlightMessage()
+LightShare::~LightShare()
 {
 	delete mWater;
 //	delete mSky;
@@ -102,12 +102,12 @@ WindlightMessage::~WindlightMessage()
 
 
 // static
-void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
+void LightShare::processWindlight(LLMessageSystem* msg, void**)
 {
 	if( gSavedSettings.getU32("LightShareAllowed") <= LIGHTSHARE_NEVER )
 		return;
 
-	WindlightMessage* wl = new WindlightMessage(msg);
+	LightShare* wl = new LightShare(msg);
 
 	if (!wl)
 		return;
@@ -118,16 +118,28 @@ void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
 		return;
 	}
 
+	applyMaybe(wl->mWater, wl->mWaterNormal, wl->mSky);
+}
+
+
+//static
+void LightShare::applyMaybe(LLWaterParamSet* thisWater, LLUUID* thisWaterNormal, LLWLParamSet* thisSky)
+{
+	if( gSavedSettings.getU32("LightShareAllowed") <= LIGHTSHARE_NEVER )
+		return;
+
 	std::string water = LLWaterParamManager::instance()->mCurParams.mName;
 	std::string sky = LLWLParamManager::instance()->mCurParams.mName;
 
 	// If they are using region settings already, or LightShare is
 	// always allowed, just apply the new settings, don't bother asking.
 	if( gSavedSettings.getU32("LightShareAllowed") == LIGHTSHARE_ALWAYS ||
-	    (sky == sSkyPresetName && water == sWaterPresetName) )
+	    (sky == LLWLParamManager::sSkyPresetName && water == LLWLParamManager::sWaterPresetName) )
 	{
-		wl->apply();
-		delete wl;
+		mSky = thisSky;
+		mWater = thisWater;
+		mWaterNormal = thisWaterNormal;
+		LLWLParamManager::apply(mWater, mWaterNormal, mSky);
 		return;
 	}
 
@@ -136,41 +148,36 @@ void WindlightMessage::processWindlight(LLMessageSystem* msg, void**)
 		// The user recently ignored a windlight message, so ignore
 		// this one too, and restart the timer.
 		restartIgnoreTimer();
-		delete wl;
 		return;
 	}
 
 	if(sIgnoreRegion)
 	{
 		// We are ignoring new settings until user enters a new region.
-		delete wl;
 		return;
 	}
 
-	if( gSavedSettings.getU32("LightShareAllowed") == LIGHTSHARE_ASK &&
-	    sMostRecent == NULL )
+	if( gSavedSettings.getU32("LightShareAllowed") == LIGHTSHARE_ASK && mSky == NULL && mWater == NULL)
 	{
 		// No most recent, so store this and create notification
 		// asking the user whether to apply or not.
-		sMostRecent = wl;
-		LLNotifications::instance().add("ConfirmLightShare", LLSD(), LLSD(), 
+		mSky = thisSky;
+		mWater = thisWater;
+		mWaterNormal = thisWaterNormal;
+		LLNotifications::instance().add("ConfirmLightShare", LLSD(), LLSD(),
 		                                boost::bind(&applyCallback, _1, _2));
-		return;
 	}
 	else
 	{
-		// No new notification (to avoid spamming the user), just
-		// store this as most recent.
-		delete sMostRecent;
-		sMostRecent = wl;
-		return;
+		// No new notification (to avoid spamming the user, we do keep the saves from above)
+		mSky = thisSky;
+		mWater = thisWater;
+		mWaterNormal = thisWaterNormal;
 	}
 }
 
-
 // static
-bool WindlightMessage::applyCallback(const LLSD& notification,
-                                     const LLSD& response)
+bool LightShare::applyCallback(const LLSD& notification, const LLSD& response)
 {
 	S32 option = LLNotification::getSelectedOption(notification, response);
 
@@ -178,7 +185,8 @@ bool WindlightMessage::applyCallback(const LLSD& notification,
 	{
 		case 0:{
 			// "Apply"
-			sMostRecent->apply();
+			LLWLParamManager::apply(mWater, mWaterNormal, mSky);
+
 			break;
 		}
 		case 1:{
@@ -193,22 +201,18 @@ bool WindlightMessage::applyCallback(const LLSD& notification,
 		}
 	}
 
-	delete sMostRecent;
-	sMostRecent = NULL;
-
 	return false;
 }
 
-
 // static
-void WindlightMessage::resetRegion()
+void LightShare::resetRegion()
 {
 	sIgnoreRegion = false;
+	LLWorld::getInstance()->rebuildClouds(gAgent.getRegion());
 }
 
-
 // static
-void WindlightMessage::restartIgnoreTimer()
+void LightShare::restartIgnoreTimer()
 {
 	F32 time = gSavedSettings.getF32("LightShareIgnoreTimer");
 	sIgnoreTimer->start();
@@ -216,51 +220,24 @@ void WindlightMessage::restartIgnoreTimer()
 }
 
 // static
-bool WindlightMessage::ignoreTimerHasExpired()
+bool LightShare::ignoreTimerHasExpired()
 {
 	return sIgnoreTimer->hasExpired();
 }
 
-
-bool WindlightMessage::apply()
-{
-	LLWaterParamManager* water_mgr = LLWaterParamManager::instance();
-	LLWLParamManager* sky_mgr = LLWLParamManager::instance();
-
-	mWater->mName = sWaterPresetName;
-	water_mgr->removeParamSet( sWaterPresetName, false );
-	water_mgr->addParamSet( sWaterPresetName, *mWater );
-	water_mgr->savePreset( sWaterPresetName );
-	water_mgr->loadPreset( sWaterPresetName, true );
-	water_mgr->setNormalMapID( *mWaterNormal );
-
-	mSky->mName = sSkyPresetName;
-	sky_mgr->mAnimator.mIsRunning = false;
-	sky_mgr->mAnimator.mUseLindenTime = false;
-	sky_mgr->removeParamSet( sSkyPresetName, false );
-	sky_mgr->addParamSet( sSkyPresetName, *mSky );
-	sky_mgr->savePreset( sSkyPresetName );
-	sky_mgr->loadPreset( sSkyPresetName, true );
-
-	return true;
-}
-
-
-bool WindlightMessage::isValid()
+bool LightShare::isValid()
 {
 	return mIsValid;
 }
 
-
-void WindlightMessage::process_packet( char* buf )
+void LightShare::process_packet( char* buf )
 {
 	// *FIXME: Horrible idea, fragile, not byte-order or endian
 	//         safe, no validation, etc. etc. -Jacek
 	mPacket = (Meta7WindlightPacket*)buf;
 }
 
-
-void WindlightMessage::process_water()
+void LightShare::process_water()
 {
 	mWater->set("waterFogColor",
 							mPacket->waterColor.red   / 256.f,
@@ -316,7 +293,7 @@ void WindlightMessage::process_water()
 }
 
 
-void WindlightMessage::process_sky()
+void LightShare::process_sky()
 {
 	mSky->setSunAngle(F_TWO_PI * mPacket->sunMoonPosiiton);
 	mSky->setEastAngle(F_TWO_PI * mPacket->eastAngle);
@@ -411,5 +388,3 @@ void WindlightMessage::process_sky()
 
 	mSky->setStarBrightness(mPacket->starBrightness);
 }
-
-
diff --git a/linden/indra/newview/lightshare.h b/linden/indra/newview/lightshare.h
index e3cccf0..1df2084 100644
--- a/linden/indra/newview/lightshare.h
+++ b/linden/indra/newview/lightshare.h
@@ -30,23 +30,19 @@
 #define LIGHTSHARE_H
 
 #include <string>
+#include "llwlparamset.h"
+#include "llwaterparamset.h"
+#include "lluuid.h"
 
 struct Meta7WindlightPacket;
-class LLMessageSystem;
-class LLSD;
-class LLTimer;
-class LLUUID;
-class LLWaterParamSet;
-class LLWLParamSet;
 
 
 // Encapsulates a "Windlight" (LightShare) message sent from the
 // region, allowing the settings to be applied at a later time.
 //
-class WindlightMessage
+class LightShare
 {
-	public:
-
+public:
 	// The meanings of the LightShareAllowed user setting.
 	enum LIGHTSHARE_ALLOWED
 	{
@@ -55,61 +51,40 @@ class WindlightMessage
 		LIGHTSHARE_ALWAYS = 2,
 	};
 
-	// Constructs a new WindlightMessage instance from a GenericMessage
+	// Constructs a new LightShare instance from a GenericMessage
 	// with the "Windlight" method, such as those sent by a
 	// Lightshare-enabled OpenSim region.
-	WindlightMessage( LLMessageSystem* msg );
-
-	~WindlightMessage();
-
-	// The name of the water preset where the region settings are stored.
-	static const std::string sWaterPresetName;
+	LightShare( LLMessageSystem* msg );
 
-	// The name of the sky preset where the region settings are stored.
-	static const std::string sSkyPresetName;
+	~LightShare();
 
 	// Message handler for GenericMessage with the "Windlight" method.
-	// Creates and applies a new WindlightMessage (or prompts user).
+	// Creates and applies a new LightShare (or prompts user).
 	static void processWindlight(LLMessageSystem* msg, void**);
 
-	// Callback when the user interacts with the notification.
-	static bool applyCallback(const LLSD& notification,
-	                          const LLSD& response);
+	static void applyMaybe(LLWaterParamSet* thisWater, LLUUID* thisVaterNormal, LLWLParamSet* thisSky);
 
 	// Called after the user has entered a new region, to reset the
 	// "ignore while in this region" state.
 	static void resetRegion();
 
-	// Applies/activates the Windlight settings from the message.
-	bool apply();
-
 	// Returns true if the message contains valid Windlight settings.
 	// (But there's no real validation yet, so this is always true.)
 	bool isValid();
 
-
-	protected:
-
-	// Restart the timer for temporarily ignoring settings.
-	static void restartIgnoreTimer();
-
-	// Returns true if the ignore timer has expired (i.e. new settings
-	// should not be ignored anymore).
-	static bool ignoreTimerHasExpired();
-
-
-	private:
-
-	static WindlightMessage* sMostRecent;
+private:
 	static LLTimer* sIgnoreTimer;
 	static bool sIgnoreRegion;
 
 	Meta7WindlightPacket* mPacket;
-	LLWaterParamSet* mWater;
-	LLWLParamSet* mSky;
-	LLUUID* mWaterNormal;
+	static LLWaterParamSet* mWater;
+	static LLWLParamSet* mSky;
+	static LLUUID* mWaterNormal;
 	bool mIsValid;
 
+	// Callback when the user interacts with the notification.
+	static bool applyCallback(const LLSD& notification, const LLSD& response);
+
 	// Converts the message's raw bytes into a Meta7WindlightPacket.
 	void process_packet( char* buf );
 
@@ -119,6 +94,12 @@ class WindlightMessage
 	// Constructs a LLWLParamSet from the Meta7WindlightPacket.
 	void process_sky();
 
+ 	// Restart the timer for temporarily ignoring settings.
+	static void restartIgnoreTimer();
+
+	// Returns true if the ignore timer has expired (i.e. new settings
+	// should not be ignored anymore).
+	static bool ignoreTimerHasExpired();
 };
 
 #endif
diff --git a/linden/indra/newview/llviewergenericmessage.cpp b/linden/indra/newview/llviewergenericmessage.cpp
index 536a803..53549fc 100644
--- a/linden/indra/newview/llviewergenericmessage.cpp
+++ b/linden/indra/newview/llviewergenericmessage.cpp
@@ -87,8 +87,8 @@ void process_generic_message(LLMessageSystem* msg, void**)
 
 	// TODO: Use a proper dispatcher.
 	if(method == "Windlight")
-	{	
-		WindlightMessage::processWindlight(msg, NULL);
+	{
+		LightShare::processWindlight(msg, NULL);
 		return;
 	}
 
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index fc72147..3fdfbef 100755
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -152,7 +152,6 @@
 
 #include "hippogridmanager.h"
 #include "hippolimits.h"
-#include "wlsettingsmanager.h"
 
 #if LL_WINDOWS // For Windows specific error handler
 #include "llwindebug.h"	// For the invalid message handler
@@ -3548,8 +3547,7 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
 //	gViewerWindow->setShowProgress(TRUE);
 
 	// Tell the LightShare handler that we have changed regions.
-	WindlightMessage::resetRegion();
-	WLSettingsManager::wlresetRegion();
+	LightShare::resetRegion();
 }
 
 // stuff we have to do every time we get an AvatarInitComplete from a sim
@@ -3827,8 +3825,7 @@ void process_crossed_region(LLMessageSystem* msg, void**)
 	regionp->setSeedCapability(seedCap);
 
 	// Tell the LightShare handler that we have changed regions.
-	WindlightMessage::resetRegion();
-	WLSettingsManager::wlresetRegion();
+	LightShare::resetRegion();
 }
 
 
diff --git a/linden/indra/newview/llwlparammanager.cpp b/linden/indra/newview/llwlparammanager.cpp
index 1148576..8f1aa23 100644
--- a/linden/indra/newview/llwlparammanager.cpp
+++ b/linden/indra/newview/llwlparammanager.cpp
@@ -33,6 +33,7 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llwlparammanager.h"
+#include "llwaterparammanager.h"
 
 #include "pipeline.h"
 #include "llsky.h"
@@ -60,6 +61,7 @@
 #include "llfloaterdaycycle.h"
 #include "llfloaterenvsettings.h"
 
+#include "llworld.h"
 
 // For notecard loading
 #include "llvfile.h"
@@ -75,6 +77,9 @@
 
 #include "curl/curl.h"
 
+const std::string LLWLParamManager::sWaterPresetName = "(Region settings)";
+const std::string LLWLParamManager::sSkyPresetName   = "(Region settings)";
+
 LLWLParamManager * LLWLParamManager::sInstance = NULL;
 std::vector<LLWLPresetsObserver*> LLWLParamManager::sObservers;
 LLFrameTimer wlSmoothTransitionTimer;
@@ -854,3 +859,62 @@ bool LLWLParamManager::isSettingsNotecard(std::string name)
 {
 	return (isSkySettingsNotecard(name) || isWaterSettingsNotecard(name));
 }
+
+//static
+void LLWLParamManager::apply(LLWaterParamSet * newWater, LLUUID *newWaterNormal, LLWLParamSet *newSky)
+{
+	LLWaterParamManager* waterMgr = LLWaterParamManager::instance();
+	LLWLParamManager* skyMgr = LLWLParamManager::instance();
+
+	F32 fade = 0; //Instant
+	bool error;
+	fade = newSky->getFloat("fade", error);
+
+	newWater->mName = sWaterPresetName;
+	if(fade != 0 && waterMgr->mCurParams.mName == sWaterPresetName)//Load the settings forcefully the first time
+	{
+		LLWaterParamSet oldWset = waterMgr->mCurParams;
+		//This still needs done so that we update right, but load it to the old
+		waterMgr->removeParamSet( sWaterPresetName, false );
+		waterMgr->addParamSet( sWaterPresetName, oldWset );
+		waterMgr->savePreset( sWaterPresetName );
+		waterMgr->loadPreset( sWaterPresetName, true );
+		waterMgr->setNormalMapID( *newWaterNormal );
+		//Then mix with the new
+		waterMgr->SetMixTime(newWater, fade);
+	}
+	else
+	{
+		//Instant if fade is 0
+		waterMgr->removeParamSet( sWaterPresetName, false );
+		waterMgr->addParamSet( sWaterPresetName, *newWater );
+		waterMgr->savePreset( sWaterPresetName );
+		waterMgr->loadPreset( sWaterPresetName, true );
+		waterMgr->setNormalMapID( *newWaterNormal );
+	}
+
+	newSky->mName = sSkyPresetName;
+	if(fade != 0 && skyMgr->mCurParams.mName == sSkyPresetName)//Load the settings forcefully the first time
+	{
+		LLWLParamSet oldset = skyMgr->mCurParams;
+		//This still needs done so that we update right, but load it to the old
+		skyMgr->removeParamSet( sSkyPresetName, true );
+		skyMgr->addParamSet( sSkyPresetName, oldset );
+		skyMgr->savePreset( sSkyPresetName );
+		skyMgr->loadPreset( sSkyPresetName, true );
+		//Then mix with the new
+		skyMgr->SetMixTime(newSky, fade);
+	}
+	else
+	{
+		//Instant if fade is 0
+		skyMgr->mAnimator.mIsRunning = false;
+		skyMgr->mAnimator.mUseLindenTime = false;
+		skyMgr->removeParamSet( sSkyPresetName, false );
+		skyMgr->addParamSet( sSkyPresetName, *newSky );
+		skyMgr->savePreset( sSkyPresetName );
+		skyMgr->loadPreset( sSkyPresetName, true );
+	}
+
+	LLWorld::getInstance()->rebuildClouds(gAgent.getRegion());
+}
diff --git a/linden/indra/newview/llwlparammanager.h b/linden/indra/newview/llwlparammanager.h
index 5995b9d..66975fa 100644
--- a/linden/indra/newview/llwlparammanager.h
+++ b/linden/indra/newview/llwlparammanager.h
@@ -36,6 +36,7 @@
 #include <vector>
 #include <map>
 #include "llwlparamset.h"
+#include "llwaterparamset.h"
 #include "llwlanimator.h"
 #include "llwldaycycle.h"
 #include "llviewercamera.h"
@@ -228,6 +229,8 @@ public:
 	static bool isSkySettingsNotecard(std::string name);
 	static bool isSettingsNotecard(std::string name);
 
+	static void apply(LLWaterParamSet * newWater, LLUUID *newWaterNormal, LLWLParamSet *newSky);
+
 public:
 
 	// helper variables
@@ -284,6 +287,12 @@ public:
 	// list of all the parameters, listed by name
 	std::map<std::string, LLWLParamSet> mParamList;
 
+	// The name of the water preset where the region settings are stored.
+	static const std::string sWaterPresetName;
+
+	// The name of the sky preset where the region settings are stored.
+	static const std::string sSkyPresetName;
+
 private:
 	// our parameter manager singleton instance
 	static LLWLParamManager * sInstance;
diff --git a/linden/indra/newview/wlfloatermanager.cpp b/linden/indra/newview/wlfloatermanager.cpp
index 0b81d7e..a1b1748 100644
--- a/linden/indra/newview/wlfloatermanager.cpp
+++ b/linden/indra/newview/wlfloatermanager.cpp
@@ -70,7 +70,7 @@
 #include "llviewerparcelmgr.h"
 #include "llparcel.h"
 #include "wlretrievesettings.h"
-#include "wlsettingsmanager.h"
+#include "lightshare.h"
 #include "wlfloaterwindlightsend.h"
 
 #undef max
@@ -214,7 +214,7 @@ void WLFloaterManager::onShow(void* userData)
 	LLWaterParamSet* mWater = mgr->mWaterParamList[name];
 	LLUUID* mWaterNormal = mgr->mWaterNormalParamList[name];
 	if(mSky != NULL && mWater != NULL && mWaterNormal != NULL)
-		WLSettingsManager::Apply(mSky, mWater, mWaterNormal);
+		LightShare::applyMaybe(mWater, mWaterNormal, mSky);
 }
 void WLFloaterManager::onSetToCurrent(void* userData)
 {
diff --git a/linden/indra/newview/wlretrievesettings.cpp b/linden/indra/newview/wlretrievesettings.cpp
index 3fd3084..0fcaa03 100644
--- a/linden/indra/newview/wlretrievesettings.cpp
+++ b/linden/indra/newview/wlretrievesettings.cpp
@@ -67,7 +67,6 @@
 #include "hippolimits.h"
 #include "wlfloaterwindlightsend.h"
 #include "llviewerregion.h"
-#include "wlsettingsmanager.h"
 #include "lightshare.h"
 
 #include "linden_common.h"
diff --git a/linden/indra/newview/wlsettingsmanager.cpp b/linden/indra/newview/wlsettingsmanager.cpp
deleted file mode 100644
index c0a07e1..0000000
--- a/linden/indra/newview/wlsettingsmanager.cpp
+++ /dev/null
@@ -1,253 +0,0 @@
-/** 
-* @file wlfloaterwindlightsend.cpp
-* @brief WLFloaterWindLightSend class definition
-*
-* $LicenseInfo:firstyear=2007&license=viewergpl$
-* 
-* Copyright (c) 2007-2009, Linden Research, Inc.
-* 
-* Second Life Viewer Source Code
-* The source code in this file ("Source Code") is provided by Linden Lab
-* to you under the terms of the GNU General Public License, version 2.0
-* ("GPL"), unless you have obtained a separate licensing agreement
-* ("Other License"), formally executed by you and Linden Lab.  Terms of
-* the GPL can be found in doc/GPL-license.txt in this distribution, or
-* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
-* 
-* There are special exceptions to the terms and conditions of the GPL as
-* it is applied to this Source Code. View the full text of the exception
-* in the file doc/FLOSS-exception.txt in this software distribution, or
-* online at
-* http://secondlifegrid.net/programs/open_source/licensing/flossexception
-* 
-* By copying, modifying or distributing this software, you acknowledge
-* that you have read and understood your obligations described above,
-* and agree to abide by those obligations.
-* 
-* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
-* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
-* COMPLETENESS OR PERFORMANCE.
-* $/LicenseInfo$
-*/
-
-#include "llviewerprecompiledheaders.h"
-
-#include "llfloaterwindlight.h"
-
-#include "pipeline.h"
-#include "llsky.h"
-
-#include "llsliderctrl.h"
-#include "llmultislider.h"
-#include "llmultisliderctrl.h"
-#include "llspinctrl.h"
-#include "llcheckboxctrl.h"
-#include "lluictrlfactory.h"
-#include "llviewercamera.h"
-#include "llcombobox.h"
-#include "lllineeditor.h"
-#include "llfloaterdaycycle.h"
-#include "lltabcontainer.h"
-#include "llboost.h"
-
-#include "llagent.h"
-#include "llinventorymodel.h"
-#include "llviewerinventory.h"
-
-#include "v4math.h"
-#include "llviewerdisplay.h"
-#include "llviewercontrol.h"
-#include "llviewerwindow.h"
-#include "llsavedsettingsglue.h"
-
-#include "llwlparamset.h"
-#include "llwlparammanager.h"
-#include "llwaterparammanager.h"
-#include "llpostprocess.h"
-#include "hippolimits.h"
-#include "wlfloaterwindlightsend.h"
-#include "llviewerregion.h"
-#include "wlsettingsmanager.h"
-#include "lightshare.h"
-
-#include "linden_common.h"
-#include "llviewercontrol.h"
-#include "message.h"
-#include "meta7windlight.h"
-#include "llworld.h"
-
-#undef max
-
-const std::string WLSettingsManager::wlWaterPresetName = "(Region settings)";
-const std::string WLSettingsManager::wlSkyPresetName   = "(Region settings)";
-
-LLTimer* WLSettingsManager::wlIgnoreTimer = new LLTimer();
-bool WLSettingsManager::wlIgnoreRegion = false;
-LLWaterParamSet* WLSettingsManager::mWater = NULL;
-LLWLParamSet* WLSettingsManager::mSky = NULL;
-LLUUID* WLSettingsManager::mWaterNormal = NULL;
-
-void WLSettingsManager::Apply( LLWLParamSet* Sky, LLWaterParamSet* Water, LLUUID* WaterNormal )
-{
-	if( gSavedSettings.getU32("LightShareAllowed") <= WindlightMessage::LIGHTSHARE_NEVER )
-		return;
-
-	std::string water = LLWaterParamManager::instance()->mCurParams.mName;
-	std::string sky = LLWLParamManager::instance()->mCurParams.mName;
-
-	// If they are using region settings already, or LightShare is
-	// always allowed, just apply the new settings, don't bother asking.
-	if( gSavedSettings.getU32("LightShareAllowed") == WindlightMessage::LIGHTSHARE_ALWAYS ||
-	    (sky == wlSkyPresetName && water == wlWaterPresetName) )
-	{
-		mSky = Sky;
-		mWater = Water;
-		mWaterNormal = WaterNormal;
-		Apply();
-		return;
-	}
-
-	if( !wlignoreTimerHasExpired() )
-	{
-		// The user recently ignored a windlight message, so ignore
-		// this one too, and restart the timer.
-		wlrestartIgnoreTimer();
-		return;
-	}
-
-	if(wlIgnoreRegion)
-	{
-		// We are ignoring new settings until user enters a new region.
-		return;
-	}
-
-	if( gSavedSettings.getU32("LightShareAllowed") == WindlightMessage::LIGHTSHARE_ASK &&
-	    mSky == NULL && mWater == NULL)
-	{
-		// No most recent, so store this and create notification
-		// asking the user whether to apply or not.
-		mSky = Sky;
-		mWater = Water;
-		mWaterNormal = WaterNormal;
-		LLNotifications::instance().add("ConfirmLightShare", LLSD(), LLSD(), 
-		                                boost::bind(&wlapplyCallback, _1, _2));
-	}
-	else
-	{
-		// No new notification (to avoid spamming the user, we do keep the saves from above)
-		mSky = Sky;
-		mWater = Water;
-		mWaterNormal = WaterNormal;
-	}
-}
-
-// static
-bool WLSettingsManager::wlapplyCallback(const LLSD& notification,
-                                     const LLSD& response)
-{
-	S32 option = LLNotification::getSelectedOption(notification, response);
-
-	switch(option)
-	{
-		case 0:{
-			// "Apply"
-			Apply();
-			break;
-		}
-		case 1:{
-			// "Not Now", ignore until the region stops spamming
-			wlrestartIgnoreTimer();
-			break;
-		}
-		case 2:{
-			// "Ignore", ignore all until user leaves the region
-			wlIgnoreRegion = true;
-			break;
-		}
-	}
-	return false;
-}
-
-//static
-void WLSettingsManager::Apply()
-{
-	LLWaterParamManager* water_mgr = LLWaterParamManager::instance();
-	LLWLParamManager* sky_mgr = LLWLParamManager::instance();
-
-	F32 fade = 0; //Instant
-	bool error;
-	fade = mSky->getFloat("fade", error);
-
-	mWater->mName = wlWaterPresetName;
-	if(fade != 0 && water_mgr->mCurParams.mName == wlWaterPresetName)//Load the settings forcefully the first time
-	{
-		LLWaterParamSet oldWset = water_mgr->mCurParams;
-		//This still needs done so that we update right, but load it to the old
-		water_mgr->removeParamSet( wlWaterPresetName, false );
-		water_mgr->addParamSet( wlWaterPresetName, oldWset );
-		water_mgr->savePreset( wlWaterPresetName );
-		water_mgr->loadPreset( wlWaterPresetName, true );
-		water_mgr->setNormalMapID( *mWaterNormal );
-		//Then mix with the new
-		water_mgr->SetMixTime(mWater, fade);
-	}
-	else
-	{
-		//Instant if fade is 0
-		water_mgr->removeParamSet( wlWaterPresetName, false );
-		water_mgr->addParamSet( wlWaterPresetName, *mWater );
-		water_mgr->savePreset( wlWaterPresetName );
-		water_mgr->loadPreset( wlWaterPresetName, true );
-		water_mgr->setNormalMapID( *mWaterNormal );
-	}
-
-	mSky->mName = wlSkyPresetName;
-	if(fade != 0 && sky_mgr->mCurParams.mName == wlSkyPresetName)//Load the settings forcefully the first time
-	{
-		LLWLParamSet oldset = sky_mgr->mCurParams;
-		//This still needs done so that we update right, but load it to the old
-		sky_mgr->removeParamSet( wlSkyPresetName, true );
-		sky_mgr->addParamSet( wlSkyPresetName, oldset );
-		sky_mgr->savePreset( wlSkyPresetName );
-		sky_mgr->loadPreset( wlSkyPresetName, true );
-		//Then mix with the new
-		sky_mgr->SetMixTime(mSky, fade);
-	}
-	else
-	{
-		//Instant if fade is 0
-		sky_mgr->mAnimator.mIsRunning = false;
-		sky_mgr->mAnimator.mUseLindenTime = false;
-		sky_mgr->removeParamSet( wlSkyPresetName, false );
-		sky_mgr->addParamSet( wlSkyPresetName, *mSky );
-		sky_mgr->savePreset( wlSkyPresetName );
-		sky_mgr->loadPreset( wlSkyPresetName, true );
-	}
-
-	LLWorld::getInstance()->rebuildClouds(gAgent.getRegion());
-
-	mSky = NULL;
-	mWater = NULL;
-	mWaterNormal = NULL;
-}
-
-// static
-void WLSettingsManager::wlresetRegion()
-{
-	wlIgnoreRegion = false;
-	LLWorld::getInstance()->rebuildClouds(gAgent.getRegion());
-}
-
-// static
-void WLSettingsManager::wlrestartIgnoreTimer()
-{
-	F32 time = gSavedSettings.getF32("LightShareIgnoreTimer");
-	wlIgnoreTimer->start();
-	wlIgnoreTimer->setTimerExpirySec( (time < 0) ? 0 : time );
-}
-
-// static
-bool WLSettingsManager::wlignoreTimerHasExpired()
-{
-	return wlIgnoreTimer->hasExpired();
-}
\ No newline at end of file
diff --git a/linden/indra/newview/wlsettingsmanager.h b/linden/indra/newview/wlsettingsmanager.h
deleted file mode 100644
index 5a0e9e7..0000000
--- a/linden/indra/newview/wlsettingsmanager.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/** 
- * @file wlfloaterwindlightsend.h
- * @brief WLFloaterWindLightSend class definition
- *
- * $LicenseInfo:firstyear=2007&license=viewergpl$
- * 
- * Copyright (c) 2007-2009, Linden Research, Inc.
- * 
- * Second Life Viewer Source Code
- * The source code in this file ("Source Code") is provided by Linden Lab
- * to you under the terms of the GNU General Public License, version 2.0
- * ("GPL"), unless you have obtained a separate licensing agreement
- * ("Other License"), formally executed by you and Linden Lab.  Terms of
- * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
- * There are special exceptions to the terms and conditions of the GPL as
- * it is applied to this Source Code. View the full text of the exception
- * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at
- * http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
- * By copying, modifying or distributing this software, you acknowledge
- * that you have read and understood your obligations described above,
- * and agree to abide by those obligations.
- * 
- * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
- * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
- * COMPLETENESS OR PERFORMANCE.
- * $/LicenseInfo$
- */
-
-/*
- * Menu for adjusting the atmospheric settings of the world
- */
-
-#ifndef WINDLIGHTSETTINGSMANAGER_H
-#define WINDLIGHTSETTINGSMANAGER_H
-
-#include <string>
-#include "llwlparamset.h"
-#include "llwaterparamset.h"
-#include "lluuid.h"
-
-class LLSD;
-class LLTimer;
-class LLUUID;
-class LLWaterParamSet;
-class LLWLParamSet;
-
-
-/// Menuing system for all of windlight's functionality
-class WLSettingsManager
-{
-public:
-
-	static LLTimer* wlIgnoreTimer;
-	static bool wlIgnoreRegion;
-
-	// Called after the user has entered a new region, to reset the
-	// "ignore while in this region" state.
-	static void wlresetRegion();
-
-	static void Apply( LLWLParamSet* Sky, LLWaterParamSet* Water, LLUUID* WaterNormal );
-
-	// Callback when the user interacts with the notification.
-	static bool wlapplyCallback(const LLSD& notification,
-	                          const LLSD& response);
-
-	static LLWaterParamSet* mWater;
-	static LLWLParamSet* mSky;
-	static LLUUID* mWaterNormal;
-
-private:
-	static void Apply();
-
-	// The name of the water preset where the region settings are stored.
-	static const std::string wlWaterPresetName;
-
-	// The name of the sky preset where the region settings are stored.
-	static const std::string wlSkyPresetName;
-
-	// Restart the timer for temporarily ignoring settings.
-	static void wlrestartIgnoreTimer();
-
-	// Returns true if the ignore timer has expired (i.e. new settings
-	// should not be ignored anymore).
-	static bool wlignoreTimerHasExpired();
-};
-#endif
\ No newline at end of file
-- 
cgit v1.1


From a28736172e5adff7c68cc924d999834b2c3d348d Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Tue, 3 Apr 2012 06:40:21 +1000
Subject: Yay for automated white space fixes.

---
 linden/indra/newview/llfloaterwater.cpp | 100 ++++++++++++++++----------------
 linden/indra/newview/llwlparamset.h     |  72 +++++++++++------------
 2 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/linden/indra/newview/llfloaterwater.cpp b/linden/indra/newview/llfloaterwater.cpp
index 782c56e..1101a10 100644
--- a/linden/indra/newview/llfloaterwater.cpp
+++ b/linden/indra/newview/llfloaterwater.cpp
@@ -1,11 +1,11 @@
-/** 
+/**
  * @file llfloaterwater.cpp
  * @brief LLFloaterWater class definition
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
- * 
+ *
  * Copyright (c) 2007-2009, Linden Research, Inc.
- * 
+ *
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
@@ -13,17 +13,17 @@
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
  * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
+ *
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
  * online at
  * http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
+ *
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
  * and agree to abide by those obligations.
- * 
+ *
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
@@ -75,15 +75,15 @@ std::set<std::string> LLFloaterWater::sDefaultPresets;
 LLFloaterWater::LLFloaterWater() : LLFloater(std::string("water floater"))
 {
 	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_water.xml");
-	
+
 	// add the combo boxes
 	LLComboBox* comboBox = getChild<LLComboBox>("WaterPresetsCombo");
 
 	if(comboBox != NULL) {
-		
-		std::map<std::string, LLWaterParamSet>::iterator mIt = 
+
+		std::map<std::string, LLWaterParamSet>::iterator mIt =
 			LLWaterParamManager::instance()->mParamList.begin();
-		for(; mIt != LLWaterParamManager::instance()->mParamList.end(); mIt++) 
+		for(; mIt != LLWaterParamManager::instance()->mParamList.end(); mIt++)
 		{
 			comboBox->add(mIt->first);
 		}
@@ -117,7 +117,7 @@ void LLFloaterWater::initCallbacks(void) {
 	initHelpBtn("WaterFogColorHelp", "HelpWaterFogColor");
 	initHelpBtn("WaterFogDensityHelp", "HelpWaterFogDensity");
 	initHelpBtn("WaterUnderWaterFogModHelp", "HelpUnderWaterFogMod");
-	initHelpBtn("WaterGlowHelp", "HelpWaterGlow");	
+	initHelpBtn("WaterGlowHelp", "HelpWaterGlow");
 	initHelpBtn("WaterNormalScaleHelp", "HelpWaterNormalScale");
 	initHelpBtn("WaterFresnelScaleHelp", "HelpWaterFresnelScale");
 	initHelpBtn("WaterFresnelOffsetHelp", "HelpWaterFresnelOffset");
@@ -134,7 +134,7 @@ void LLFloaterWater::initCallbacks(void) {
 
 	childSetCommitCallback("WaterFogColor", onWaterFogColorMoved, &param_mgr->mFogColor);
 
-	// 
+	//
 	childSetCommitCallback("WaterGlow", onColorControlAMoved, &param_mgr->mFogColor);
 
 	// fog density
@@ -212,11 +212,11 @@ bool LLFloaterWater::newPromptCallback(const LLSD& notification, const LLSD& res
 
 		// add the current parameters to the list
 		// see if it's there first
-		std::map<std::string, LLWaterParamSet>::iterator mIt = 
+		std::map<std::string, LLWaterParamSet>::iterator mIt =
 			param_mgr->mParamList.find(text);
 
 		// if not there, add a new one
-		if(mIt == param_mgr->mParamList.end()) 
+		if(mIt == param_mgr->mParamList.end())
 		{
 			param_mgr->addParamSet(text, param_mgr->mCurParams);
 			comboBox->add(text);
@@ -227,8 +227,8 @@ bool LLFloaterWater::newPromptCallback(const LLSD& notification, const LLSD& res
 			param_mgr->savePreset(text);
 
 		// otherwise, send a message to the user
-		} 
-		else 
+		}
+		else
 		{
 			LLNotifications::instance().add("ExistsWaterPresetAlert");
 		}
@@ -261,13 +261,13 @@ void LLFloaterWater::syncMenu()
 	colCtrl->set(col);
 
 	// fog and wavelets
-	param_mgr->mFogDensity.mExp = 
-		log(current_params.getFloat(param_mgr->mFogDensity.mName, err)) / 
+	param_mgr->mFogDensity.mExp =
+		log(current_params.getFloat(param_mgr->mFogDensity.mName, err)) /
 		log(param_mgr->mFogDensity.mBase);
 	param_mgr->setDensitySliderValue(param_mgr->mFogDensity.mExp);
 	childSetValue("WaterFogDensity", param_mgr->mFogDensity.mExp);
-	
-	param_mgr->mUnderWaterFogMod.mX = 
+
+	param_mgr->mUnderWaterFogMod.mX =
 		current_params.getFloat(param_mgr->mUnderWaterFogMod.mName, err);
 	childSetValue("WaterUnderWaterFogMod", param_mgr->mUnderWaterFogMod.mX);
 
@@ -433,14 +433,14 @@ void LLFloaterWater::onColorControlRMoved(LLUICtrl* ctrl, void* userData)
 	colorControl->mR = sldrCtrl->getValueF32();
 
 	// move i if it's the max
-	if(colorControl->mR >= colorControl->mG 
-		&& colorControl->mR >= colorControl->mB 
+	if(colorControl->mR >= colorControl->mG
+		&& colorControl->mR >= colorControl->mB
 		&& colorControl->mHasSliderName)
 	{
 		colorControl->mI = colorControl->mR;
 		std::string name = colorControl->mSliderName;
 		name.append("I");
-		
+
 		sWaterMenu->childSetValue(name, colorControl->mR);
 	}
 
@@ -457,7 +457,7 @@ void LLFloaterWater::onColorControlGMoved(LLUICtrl* ctrl, void* userData)
 	colorControl->mG = sldrCtrl->getValueF32();
 
 	// move i if it's the max
-	if(colorControl->mG >= colorControl->mR 
+	if(colorControl->mG >= colorControl->mR
 		&& colorControl->mG >= colorControl->mB
 		&& colorControl->mHasSliderName)
 	{
@@ -517,9 +517,9 @@ void LLFloaterWater::onColorControlIMoved(LLUICtrl* ctrl, void* userData)
 	WaterColorControl * colorControl = static_cast<WaterColorControl *>(userData);
 
 	colorControl->mI = sldrCtrl->getValueF32();
-	
+
 	// only for sliders where we pass a name
-	if(colorControl->mHasSliderName) 
+	if(colorControl->mHasSliderName)
 	{
 		// set it to the top
 		F32 maxVal = std::max(std::max(colorControl->mR, colorControl->mG), colorControl->mB);
@@ -541,7 +541,7 @@ void LLFloaterWater::onColorControlIMoved(LLUICtrl* ctrl, void* userData)
 			colorControl->mR = 0;
 			colorControl->mG = 0;
 			colorControl->mB = 0;
-		
+
 		// if all at the start
 		// set them all to the intensity
 		}
@@ -597,7 +597,7 @@ void LLFloaterWater::onFloatControlMoved(LLUICtrl* ctrl, void* userData)
 void LLFloaterWater::onWaterFogColorMoved(LLUICtrl* ctrl, void* userData)
 {
 	LLColorSwatchCtrl* swatch = static_cast<LLColorSwatchCtrl*>(ctrl);
-	WaterColorControl * colorControl = static_cast<WaterColorControl *>(userData);	
+	WaterColorControl * colorControl = static_cast<WaterColorControl *>(userData);
 	*colorControl = swatch->get();
 
 	colorControl->update(LLWaterParamManager::instance()->mCurParams);
@@ -652,7 +652,7 @@ void LLFloaterWater::onSavePreset(LLUICtrl* ctrl, void* userData)
 	}
 
 	if (ctrl->getValue().asString() == "save_inventory_item")
-	{	
+	{
 		// Check if this is already a notecard.
 		if(LLWaterParamManager::instance()->mCurParams.mInventoryID.notNull())
 		{
@@ -668,7 +668,7 @@ void LLFloaterWater::onSavePreset(LLUICtrl* ctrl, void* userData)
 			}
 			LLPointer<KVFloaterWaterNotecardCreatedCallback> cb = new KVFloaterWaterNotecardCreatedCallback();
 			// Create a notecard and then save it.
-			create_inventory_item(gAgent.getID(), 
+			create_inventory_item(gAgent.getID(),
 								  gAgent.getSessionID(),
 								  LLUUID::null,
 								  LLTransactionID::tnull,
@@ -679,7 +679,7 @@ void LLFloaterWater::onSavePreset(LLUICtrl* ctrl, void* userData)
 								  NOT_WEARABLE,
 								  PERM_ITEM_UNRESTRICTED,
 								  cb);
-			
+
 		}
 	}
 	else if (ctrl->getValue().asString() == "send_to_server_item")
@@ -690,13 +690,13 @@ void LLFloaterWater::onSavePreset(LLUICtrl* ctrl, void* userData)
 	}
 	else
 	{
-		LLWaterParamManager::instance()->mCurParams.mName = 
+		LLWaterParamManager::instance()->mCurParams.mName =
 			comboBox->getSelectedItemLabel();
 
 		// check to see if it's a default and shouldn't be overwritten
 		std::set<std::string>::iterator sIt = sDefaultPresets.find(
 			comboBox->getSelectedItemLabel());
-		if(sIt != sDefaultPresets.end() && !gSavedSettings.getBOOL("WaterEditPresets")) 
+		if(sIt != sDefaultPresets.end() && !gSavedSettings.getBOOL("WaterEditPresets"))
 		{
 			LLNotifications::instance().add("WLNoEditDefault");
 			return;
@@ -710,7 +710,7 @@ bool LLFloaterWater::saveNotecardCallback(const LLSD& notification, const LLSD&
 {
 	S32 option = LLNotification::getSelectedOption(notification, response);
 	// if they choose save, do it.  Otherwise, don't do anything
-	if(option == 0) 
+	if(option == 0)
 	{
 		LLWaterParamManager * param_mgr = LLWaterParamManager::instance();
 		param_mgr->setParamSet(param_mgr->mCurParams.mName, param_mgr->mCurParams);
@@ -723,12 +723,12 @@ bool LLFloaterWater::saveAlertCallback(const LLSD& notification, const LLSD& res
 {
 	S32 option = LLNotification::getSelectedOption(notification, response);
 	// if they choose save, do it.  Otherwise, don't do anything
-	if(option == 0) 
+	if(option == 0)
 	{
 		LLWaterParamManager * param_mgr = LLWaterParamManager::instance();
 
 		param_mgr->setParamSet(
-			param_mgr->mCurParams.mName, 
+			param_mgr->mCurParams.mName,
 			param_mgr->mCurParams);
 
 		// comment this back in to save to file
@@ -755,14 +755,14 @@ bool LLFloaterWater::deleteAlertCallback(const LLSD& notification, const LLSD& r
 {
 	S32 option = LLNotification::getSelectedOption(notification, response);
 	// if they choose delete, do it.  Otherwise, don't do anything
-	if(option == 0) 
+	if(option == 0)
 	{
 		LLComboBox* combo_box = sWaterMenu->getChild<LLComboBox>("WaterPresetsCombo");
 		LLFloaterDayCycle* day_cycle = NULL;
 		LLComboBox* key_combo = NULL;
 		LLMultiSliderCtrl* mult_sldr = NULL;
 
-		if(LLFloaterDayCycle::isOpen()) 
+		if(LLFloaterDayCycle::isOpen())
 		{
 			day_cycle = LLFloaterDayCycle::instance();
 			key_combo = day_cycle->getChild<LLComboBox>("WaterKeyPresets");
@@ -773,20 +773,20 @@ bool LLFloaterWater::deleteAlertCallback(const LLSD& notification, const LLSD& r
 
 		// check to see if it's a default and shouldn't be deleted
 		std::set<std::string>::iterator sIt = sDefaultPresets.find(name);
-		if(sIt != sDefaultPresets.end()) 
+		if(sIt != sDefaultPresets.end())
 		{
 			LLNotifications::instance().add("WaterNoEditDefault");
 			return false;
 		}
 
 		LLWaterParamManager::instance()->removeParamSet(name, true);
-		
+
 		// remove and choose another
 		S32 new_index = combo_box->getCurrentIndex();
 
 		combo_box->remove(name);
 
-		if(key_combo != NULL) 
+		if(key_combo != NULL)
 		{
 			key_combo->remove(name);
 
@@ -795,12 +795,12 @@ bool LLFloaterWater::deleteAlertCallback(const LLSD& notification, const LLSD& r
 		}
 
 		// pick the previously selected index after delete
-		if(new_index > 0) 
+		if(new_index > 0)
 		{
 			new_index--;
 		}
-		
-		if(combo_box->getItemCount() > 0) 
+
+		if(combo_box->getItemCount() > 0)
 		{
 			combo_box->setCurrentByIndex(new_index);
 		}
@@ -812,12 +812,12 @@ bool LLFloaterWater::deleteAlertCallback(const LLSD& notification, const LLSD& r
 void LLFloaterWater::onChangePresetName(LLUICtrl* ctrl, void * userData)
 {
 	LLComboBox * combo_box = static_cast<LLComboBox*>(ctrl);
-	
+
 	if(combo_box->getSimple() == "")
 	{
 		return;
 	}
-	
+
 	LLWaterParamManager::instance()->loadPreset(
 		combo_box->getSelectedValue().asString());
 	sWaterMenu->syncMenu();
@@ -829,12 +829,12 @@ void LLFloaterWater::onClickNext(void* user_data)
 	LLWaterParamSet& currentParams = param_mgr->mCurParams;
 
 	// find place of current param
-	std::map<std::string, LLWaterParamSet>::iterator mIt = 
+	std::map<std::string, LLWaterParamSet>::iterator mIt =
 		param_mgr->mParamList.find(currentParams.mName);
 
 	// if at the end, loop
 	std::map<std::string, LLWaterParamSet>::iterator last = param_mgr->mParamList.end(); --last;
-	if(mIt == last) 
+	if(mIt == last)
 	{
 		mIt = param_mgr->mParamList.begin();
 	}
@@ -853,11 +853,11 @@ void LLFloaterWater::onClickPrev(void* user_data)
 	LLWaterParamSet & currentParams = param_mgr->mCurParams;
 
 	// find place of current param
-	std::map<std::string, LLWaterParamSet>::iterator mIt = 
+	std::map<std::string, LLWaterParamSet>::iterator mIt =
 		param_mgr->mParamList.find(currentParams.mName);
 
 	// if at the beginning, loop
-	if(mIt == param_mgr->mParamList.begin()) 
+	if(mIt == param_mgr->mParamList.begin())
 	{
 		std::map<std::string, LLWaterParamSet>::iterator last = param_mgr->mParamList.end(); --last;
 		mIt = last;
diff --git a/linden/indra/newview/llwlparamset.h b/linden/indra/newview/llwlparamset.h
index 038490d..3a59f6b 100644
--- a/linden/indra/newview/llwlparamset.h
+++ b/linden/indra/newview/llwlparamset.h
@@ -3,9 +3,9 @@
  * @brief Interface for the LLWLParamSet class.
  *
  * $LicenseInfo:firstyear=2005&license=viewergpl$
- * 
+ *
  * Copyright (c) 2005-2009, Linden Research, Inc.
- * 
+ *
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
@@ -13,17 +13,17 @@
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
  * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
+ *
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
  * online at
  * http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
+ *
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
  * and agree to abide by those obligations.
- * 
+ *
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
@@ -55,7 +55,7 @@ public:
 private:
 
 	LLSD mParamValues;
-	
+
 	float mCloudScrollXOffset, mCloudScrollYOffset;
 
 public:
@@ -67,10 +67,10 @@ public:
 
 	/// set the total llsd
 	void setAll(const LLSD& val);
-	
+
 	/// get the total llsd
-	const LLSD& getAll();		
-	
+	const LLSD& getAll();
+
 
 	/// Set a float parameter.
 	/// \param paramName	The name of the parameter to set.
@@ -120,61 +120,61 @@ public:
 
 	/// Get an integer parameter
 	/// \param paramName	The name of the parameter to set.
-	/// \param error		A flag to set if it's not the proper return type	
+	/// \param error		A flag to set if it's not the proper return type
 	F32 getFloat(const std::string& paramName, bool& error);
-	
-	
+
+
 	// specific getters and setters
-	
-	
+
+
 	/// set the star's brightness
 	/// \param val brightness value
 	void setStarBrightness(F32 val);
-	
+
 	/// get the star brightness value;
-	F32 getStarBrightness();	
-	
+	F32 getStarBrightness();
+
 	void setSunAngle(F32 val);
-	F32 getSunAngle();	
-	
+	F32 getSunAngle();
+
 	void setEastAngle(F32 val);
-	F32 getEastAngle();	
-	
-							
-	
+	F32 getEastAngle();
+
+
+
 	/// set the cloud scroll x enable value
-	/// \param val scroll x value	
+	/// \param val scroll x value
 	void setEnableCloudScrollX(bool val);
 
-	/// get the scroll x enable value;	
+	/// get the scroll x enable value;
 	bool getEnableCloudScrollX();
-	
+
 	/// set the star's brightness
-	/// \param val scroll y bool value		
-	void setEnableCloudScrollY(bool val);	
+	/// \param val scroll y bool value
+	void setEnableCloudScrollY(bool val);
 
 	/// get the scroll enable y value;
 	bool getEnableCloudScrollY();
-	
+
 	/// set the cloud scroll x enable value
-	/// \param val scroll x value	
+	/// \param val scroll x value
 	void setCloudScrollX(F32 val);
 
-	/// get the scroll x enable value;	
+	/// get the scroll x enable value;
 	F32 getCloudScrollX();
-	
+
 	/// set the star's brightness
-	/// \param val scroll y bool value		
-	void setCloudScrollY(F32 val);	
+	/// \param val scroll y bool value
+	void setCloudScrollY(F32 val);
 
 	/// get the scroll enable y value;
-	F32 getCloudScrollY();	
+	F32 getCloudScrollY();
 
 	/// interpolate two parameter sets
 	/// \param src			The parameter set to start with
 	/// \param dest			The parameter set to end with
 	/// \param weight		The amount to interpolate
-	void mix(LLWLParamSet& src, LLWLParamSet& dest, 
+	void mix(LLWLParamSet& src, LLWLParamSet& dest,
 		F32 weight);
 
 	void updateCloudScrolling(void);
-- 
cgit v1.1


From 2617714f3436fdd7ec81ad3ceb58416b105a7664 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Tue, 3 Apr 2012 06:41:06 +1000
Subject: One more water notecard refactor.

---
 linden/indra/newview/llfloaterwater.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/linden/indra/newview/llfloaterwater.cpp b/linden/indra/newview/llfloaterwater.cpp
index 1101a10..cbf62e1 100644
--- a/linden/indra/newview/llfloaterwater.cpp
+++ b/linden/indra/newview/llfloaterwater.cpp
@@ -62,6 +62,7 @@
 
 #include "llwaterparamset.h"
 #include "llwaterparammanager.h"
+#include "llwlparammanager.h"
 #include "llpostprocess.h"
 
 #include "wlfloaterwindlightsend.h"
@@ -662,7 +663,7 @@ void LLFloaterWater::onSavePreset(LLUICtrl* ctrl, void* userData)
 		{
 			// Make sure we have a ".ww" extension.
 			std::string name = comboBox->getSelectedItemLabel();
-			if(name.length() > 2 && name.compare(name.length() - 3, 3, ".ww") != 0)
+			if(!LLWLParamManager::isWaterSettingsNotecard(name))
 			{
 				name += ".ww";
 			}
-- 
cgit v1.1


From 35185ce25ec3384afec4cf5a8114037a96c8cb2a Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Tue, 3 Apr 2012 06:44:43 +1000
Subject: Revert the fix for http://redmine.kokuaviewer.org/issues/415 as it
 will be fixed in a more future proof way on the next commit.

---
 linden/indra/newview/lightshare.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/linden/indra/newview/lightshare.cpp b/linden/indra/newview/lightshare.cpp
index 1814f4a..378a755 100644
--- a/linden/indra/newview/lightshare.cpp
+++ b/linden/indra/newview/lightshare.cpp
@@ -77,10 +77,7 @@ LightShare::LightShare( LLMessageSystem* msg ) :
 				 buf, size, 0, 249);
 
 	mWater = new LLWaterParamSet();
-// 	mSky = new LLWLParamSet();
-	LLWLParamManager * wl_param_mgr = LLWLParamManager::instance();
-	static LLWLParamSet & sSky = wl_param_mgr->mCurParams;
-	mSky = &sSky;
+ 	mSky = new LLWLParamSet();
 
 	mWaterNormal = new LLUUID();
 
@@ -96,7 +93,7 @@ LightShare::LightShare( LLMessageSystem* msg ) :
 LightShare::~LightShare()
 {
 	delete mWater;
-//	delete mSky;
+	delete mSky;
 	delete mWaterNormal;
 }
 
-- 
cgit v1.1


From 76ca42509870ef5c6f1cb7a7204dfbc519fa63da Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Tue, 3 Apr 2012 06:46:53 +1000
Subject: The next bit of WindLight refactoring, some prep work.  Also fixes
 http://redmine.kokuaviewer.org/issues/415 in a better way.

---
 linden/indra/newview/llwaterparamset.h    |   3 +-
 linden/indra/newview/llwlparammanager.cpp | 110 ++++++++++++++++++++++--------
 linden/indra/newview/llwlparammanager.h   |   7 ++
 linden/indra/newview/llwlparamset.h       |   4 +-
 4 files changed, 91 insertions(+), 33 deletions(-)

diff --git a/linden/indra/newview/llwaterparamset.h b/linden/indra/newview/llwaterparamset.h
index efbad31..f2667ab 100644
--- a/linden/indra/newview/llwaterparamset.h
+++ b/linden/indra/newview/llwaterparamset.h
@@ -47,12 +47,13 @@ class LLWaterParamSet;
 class LLWaterParamSet 
 {
 	friend class LLWaterParamManager;
+	friend class LLWLParamManager;
 
 public:
 	std::string mName;
 	LLUUID mInventoryID;
 	
-private:
+protected:
 
 	LLSD mParamValues;
 
diff --git a/linden/indra/newview/llwlparammanager.cpp b/linden/indra/newview/llwlparammanager.cpp
index 8f1aa23..75592da 100644
--- a/linden/indra/newview/llwlparammanager.cpp
+++ b/linden/indra/newview/llwlparammanager.cpp
@@ -860,59 +860,109 @@ bool LLWLParamManager::isSettingsNotecard(std::string name)
 	return (isSkySettingsNotecard(name) || isWaterSettingsNotecard(name));
 }
 
+
+struct WLCombined userSet, regionSet, parcelSet, RLVSet;
+
 //static
 void LLWLParamManager::apply(LLWaterParamSet * newWater, LLUUID *newWaterNormal, LLWLParamSet *newSky)
+// TODO - Pass in scope and day cycle stuff.
 {
 	LLWaterParamManager* waterMgr = LLWaterParamManager::instance();
 	LLWLParamManager* skyMgr = LLWLParamManager::instance();
+	struct WLCombined* thisSet = &userSet;
+
+//	if (region == scope)
+		thisSet = &regionSet;
+//	if (parcel== scope)
+//		thisSet = &parcelSet;
+//	if (RLV == scope)
+//		thisSet = &RLVSet;
+
+	thisSet->water.setAll(newWater->getAll());
+	thisSet->water.mParamValues["normalMap"] = *newWaterNormal;
+	thisSet->sky.setAll(newSky->getAll());
+
+// TODO - if scope is region or parcel, and not using server settings
+//          return
+
+	thisSet->enabled = true;
 
 	F32 fade = 0; //Instant
 	bool error;
 	fade = newSky->getFloat("fade", error);
 
 	newWater->mName = sWaterPresetName;
-	if(fade != 0 && waterMgr->mCurParams.mName == sWaterPresetName)//Load the settings forcefully the first time
+	newSky->mName = sSkyPresetName;
+	LLWaterParamSet oldWaterSet = waterMgr->mCurParams;
+	LLWLParamSet oldWLSet = skyMgr->mCurParams;
+
+	if (fade)
 	{
-		LLWaterParamSet oldWset = waterMgr->mCurParams;
-		//This still needs done so that we update right, but load it to the old
+		// TODO - should copy the original, then set that here.
+		// The fade should delete this copy once it's done fading.
 		waterMgr->removeParamSet( sWaterPresetName, false );
-		waterMgr->addParamSet( sWaterPresetName, oldWset );
-		waterMgr->savePreset( sWaterPresetName );
+		waterMgr->addParamSet( sWaterPresetName, oldWaterSet );
 		waterMgr->loadPreset( sWaterPresetName, true );
 		waterMgr->setNormalMapID( *newWaterNormal );
-		//Then mix with the new
-		waterMgr->SetMixTime(newWater, fade);
+
+		skyMgr->removeParamSet( sSkyPresetName, true );
+		skyMgr->addParamSet( sSkyPresetName, oldWLSet );
+		skyMgr->loadPreset( sSkyPresetName, true );
+         }
+
+	for(LLSD::map_const_iterator i = thisSet->water.mParamValues.beginMap();
+		i != thisSet->water.mParamValues.endMap();
+		++i)
+	{
+		const std::string& param = i->first;
+
+		if(i->second.isArray())
+		{
+			for (int j = 0; j < i->second.size(); j++)
+			{
+				oldWaterSet.mParamValues[param][j] = i->second[j].asReal();
+			}
+		}
+		else if(i->second.isReal())
+		  oldWaterSet.mParamValues[param] = i->second.asReal();
 	}
-	else
+
+	skyMgr->mAnimator.mIsRunning = false;
+	skyMgr->mAnimator.mUseLindenTime = false;
+	for(LLSD::map_const_iterator i = thisSet->sky.mParamValues.beginMap();
+		i != thisSet->sky.mParamValues.endMap();
+		++i)
 	{
-		//Instant if fade is 0
-		waterMgr->removeParamSet( sWaterPresetName, false );
-		waterMgr->addParamSet( sWaterPresetName, *newWater );
-		waterMgr->savePreset( sWaterPresetName );
-		waterMgr->loadPreset( sWaterPresetName, true );
-		waterMgr->setNormalMapID( *newWaterNormal );
+		const std::string& param = i->first;
+
+		if(i->second.isArray())
+		{
+			for (int j = 0; j < i->second.size(); j++)
+			{
+				oldWLSet.mParamValues[param][j] = i->second[j].asReal();
+			}
+		}
+		else if(i->second.isReal())
+		  oldWLSet.mParamValues[param] = i->second.asReal();
 	}
 
-	newSky->mName = sSkyPresetName;
-	if(fade != 0 && skyMgr->mCurParams.mName == sSkyPresetName)//Load the settings forcefully the first time
+// TODO - If RLV enabled
+//          Loop through RLVSet, setting the values into the old one, but keeping old values that are not in RLVSet
+
+	if (fade)
 	{
-		LLWLParamSet oldset = skyMgr->mCurParams;
-		//This still needs done so that we update right, but load it to the old
-		skyMgr->removeParamSet( sSkyPresetName, true );
-		skyMgr->addParamSet( sSkyPresetName, oldset );
-		skyMgr->savePreset( sSkyPresetName );
-		skyMgr->loadPreset( sSkyPresetName, true );
-		//Then mix with the new
-		skyMgr->SetMixTime(newSky, fade);
+		waterMgr->SetMixTime(&oldWaterSet, fade);
+		skyMgr->SetMixTime(&oldWLSet, fade);
 	}
 	else
 	{
-		//Instant if fade is 0
-		skyMgr->mAnimator.mIsRunning = false;
-		skyMgr->mAnimator.mUseLindenTime = false;
-		skyMgr->removeParamSet( sSkyPresetName, false );
-		skyMgr->addParamSet( sSkyPresetName, *newSky );
-		skyMgr->savePreset( sSkyPresetName );
+		waterMgr->removeParamSet( sWaterPresetName, false );
+		waterMgr->addParamSet( sWaterPresetName, oldWaterSet );
+		waterMgr->loadPreset( sWaterPresetName, true );
+		waterMgr->setNormalMapID( *newWaterNormal );
+
+		skyMgr->removeParamSet( sSkyPresetName, true );
+		skyMgr->addParamSet( sSkyPresetName, oldWLSet );
 		skyMgr->loadPreset( sSkyPresetName, true );
 	}
 
diff --git a/linden/indra/newview/llwlparammanager.h b/linden/indra/newview/llwlparammanager.h
index 66975fa..4c7fdc1 100644
--- a/linden/indra/newview/llwlparammanager.h
+++ b/linden/indra/newview/llwlparammanager.h
@@ -333,4 +333,11 @@ inline LLVector4 LLWLParamManager::getRotatedLightDir(void) const
 	return mRotatedLightDir;
 }
 
+struct WLCombined
+{
+	LLWaterParamSet water;
+	LLWLParamSet sky;
+	BOOL enabled;
+};
+
 #endif
diff --git a/linden/indra/newview/llwlparamset.h b/linden/indra/newview/llwlparamset.h
index 3a59f6b..4b6f336 100644
--- a/linden/indra/newview/llwlparamset.h
+++ b/linden/indra/newview/llwlparamset.h
@@ -51,8 +51,8 @@ class LLWLParamSet {
 public:
 	std::string mName;
 	LLUUID mInventoryID;
-	
-private:
+
+protected:
 
 	LLSD mParamValues;
 
-- 
cgit v1.1


From a8ad256cc1a69f400de7f36c510e8ca3bc09e7b7 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Wed, 4 Apr 2012 19:33:30 +1000
Subject: White space fixes.  Nothing to see here, move along.

---
 linden/indra/newview/llwaterparammanager.cpp | 100 +++++++++++++--------------
 linden/indra/newview/llwlparammanager.h      |   1 +
 2 files changed, 51 insertions(+), 50 deletions(-)

diff --git a/linden/indra/newview/llwaterparammanager.cpp b/linden/indra/newview/llwaterparammanager.cpp
index 0156622..9d0fd86 100644
--- a/linden/indra/newview/llwaterparammanager.cpp
+++ b/linden/indra/newview/llwaterparammanager.cpp
@@ -3,9 +3,9 @@
  * @brief Implementation for the LLWaterParamManager class.
  *
  * $LicenseInfo:firstyear=2007&license=viewergpl$
- * 
+ *
  * Copyright (c) 2007-2009, Linden Research, Inc.
- * 
+ *
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
@@ -13,17 +13,17 @@
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
  * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
- * 
+ *
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
  * online at
  * http://secondlifegrid.net/programs/open_source/licensing/flossexception
- * 
+ *
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
  * and agree to abide by those obligations.
- * 
+ *
  * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
@@ -102,9 +102,9 @@ void LLWaterParamManager::loadAllPresets(const std::string& file_name)
 {
 	std::string path_name(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/water", ""));
 	LL_DEBUGS2("AppInit", "ShaderLoading") << "Loading Default water settings from " << path_name << LL_ENDL;
-			
-	bool found = true;			
-	while(found) 
+
+	bool found = true;
+	while(found)
 	{
 		std::string name;
 		found = gDirUtilp->getNextFileInDir(path_name, "*.xml", name, false);
@@ -128,9 +128,9 @@ void LLWaterParamManager::loadAllPresets(const std::string& file_name)
 
 	std::string path_name2(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/water", ""));
 	LL_DEBUGS2("AppInit", "Shaders") << "Loading User water settings from " << path_name2 << LL_ENDL;
-			
-	found = true;			
-	while(found) 
+
+	found = true;
+	while(found)
 	{
 		std::string name;
 		found = gDirUtilp->getNextFileInDir(path_name2, "*.xml", name, false);
@@ -174,10 +174,10 @@ void LLWaterParamManager::loadPreset(const std::string & name,bool propagate)
 
 	std::string pathName(gDirUtilp->getExpandedFilename(LL_PATH_APP_SETTINGS, "windlight/water", escaped_filename));
 	LL_DEBUGS2("AppInit", "Shaders") << "Loading water settings from " << pathName << LL_ENDL;
-	
+
 	std::ifstream presetsXML;
 	presetsXML.open(pathName.c_str());
-	
+
 	// That failed, try loading from the users area instead.
 	if(!presetsXML)
 	{
@@ -190,8 +190,8 @@ void LLWaterParamManager::loadPreset(const std::string & name,bool propagate)
 	{
 		loadPresetXML(name, presetsXML);
 		presetsXML.close();
-	} 
-	else 
+	}
+	else
 	{
 		llwarns << "Can't find " << name << llendl;
 		return;
@@ -240,17 +240,17 @@ bool LLWaterParamManager::loadPresetXML(const std::string& name, std::istream& p
 			}
 		}
 	}
-	
+
 	std::map<std::string, LLWaterParamSet>::iterator mIt = mParamList.find(name);
 	if(mIt == mParamList.end())
 	{
 		addParamSet(name, paramsData);
 	}
-	else 
+	else
 	{
 		setParamSet(name, paramsData);
 	}
-	
+
 	if(propagate)
 	{
 		getParamSet(name, mCurParams);
@@ -306,19 +306,19 @@ bool LLWaterParamManager::savePresetToNotecard(const std::string & name)
 {
 	// make an empty llsd
 	LLSD paramsData(LLSD::emptyMap());
-	
+
 	// fill it with LLSD windlight params
 	paramsData = mParamList[name].getAll();
-	
+
 	// get some XML
 	std::ostringstream presetsXML;
 	LLPointer<LLSDFormatter> formatter = new LLSDXMLFormatter();
 	formatter->format(paramsData, presetsXML, LLSDFormatter::OPTIONS_PRETTY);
-	
+
 	// Write it to a notecard
 	LLNotecard notecard;
 	notecard.setText(presetsXML.str());
-	
+
 	LLInventoryItem *item = gInventory.getItem(mParamList[name].mInventoryID);
 	if(!item)
 	{
@@ -332,13 +332,13 @@ bool LLWaterParamManager::savePresetToNotecard(const std::string & name)
 		LLAssetID asset_id;
 		tid.generate();
 		asset_id = tid.makeAssetID(gAgent.getSecureSessionID());
-		
+
 		LLVFile file(gVFS, asset_id, LLAssetType::AT_NOTECARD, LLVFile::APPEND);
-		
+
 		std::ostringstream stream;
 		notecard.exportStream(stream);
 		std::string buffer = stream.str();
-		
+
 		S32 size = buffer.length() + 1;
 		file.setMaxSize(size);
 		file.write((U8*)buffer.c_str(), size);
@@ -351,7 +351,7 @@ bool LLWaterParamManager::savePresetToNotecard(const std::string & name)
 		LL_WARNS("WindLight") << "Stuff the legacy system." << LL_ENDL;
 		return false;
 	}
-	
+
 	propagateParameters();
 	return true;
 }
@@ -374,8 +374,8 @@ void LLWaterParamManager::propagateParameters(void)
 	}
 
 	bool err;
-	F32 fog_density_slider = 
-		log(mCurParams.getFloat(mFogDensity.mName, err)) / 
+	F32 fog_density_slider =
+		log(mCurParams.getFloat(mFogDensity.mName, err)) /
 		log(mFogDensity.mBase);
 
 	setDensitySliderValue(fog_density_slider);
@@ -398,12 +398,12 @@ void LLWaterParamManager::updateShaderUniforms(LLGLSLShader * shader)
 void LLWaterParamManager::update(LLViewerCamera * cam)
 {
 	LLFastTimer ftm(LLFastTimer::FTM_UPDATE_WLPARAM);
-	
+
 	// update the shaders and the menu
 	propagateParameters();
-	
+
 	// sync menus if they exist
-	if(LLFloaterWater::isOpen()) 
+	if(LLFloaterWater::isOpen())
 	{
 		LLFloaterWater::instance()->syncMenu();
 	}
@@ -411,12 +411,12 @@ void LLWaterParamManager::update(LLViewerCamera * cam)
 	stop_glerror();
 
 	// only do this if we're dealing with shaders
-	if(gPipeline.canUseVertexShaders()) 
+	if(gPipeline.canUseVertexShaders())
 	{
 		//transform water plane to eye space
 		glh::vec3f norm(0.f, 0.f, 1.f);
 		glh::vec3f p(0.f, 0.f, gAgent.getRegion()->getWaterHeight()+0.1f);
-		
+
 		F32 modelView[16];
 		for (U32 i = 0; i < 16; i++)
 		{
@@ -434,13 +434,13 @@ void LLWaterParamManager::update(LLViewerCamera * cam)
 		mWaterPlane = LLVector4(enorm.v[0], enorm.v[1], enorm.v[2], -ep.dot(enorm));
 
 		LLVector3 sunMoonDir;
-		if (gSky.getSunDirection().mV[2] > NIGHTTIME_ELEVATION_COS) 	 
-		{ 	 
-			sunMoonDir = gSky.getSunDirection(); 	 
-		} 	 
-		else  	 
-		{ 	 
-			sunMoonDir = gSky.getMoonDirection(); 	 
+		if (gSky.getSunDirection().mV[2] > NIGHTTIME_ELEVATION_COS)
+		{
+			sunMoonDir = gSky.getSunDirection();
+		}
+		else
+		{
+			sunMoonDir = gSky.getMoonDirection();
 		}
 		sunMoonDir.normVec();
 		mWaterFogKS = 1.f/llmax(sunMoonDir.mV[2], WATER_FOG_LIGHT_CLAMP);
@@ -510,8 +510,8 @@ bool LLWaterParamManager::addParamSet(const std::string& name, LLWaterParamSet&
 {
 	// add a new one if not one there already
 	std::map<std::string, LLWaterParamSet>::iterator mIt = mParamList.find(name);
-	if(mIt == mParamList.end()) 
-	{	
+	if(mIt == mParamList.end())
+	{
 		mParamList[name] = param;
 		return true;
 	}
@@ -538,7 +538,7 @@ bool LLWaterParamManager::getParamSet(const std::string& name, LLWaterParamSet&
 {
 	// find it and set it
 	std::map<std::string, LLWaterParamSet>::iterator mIt = mParamList.find(name);
-	if(mIt != mParamList.end()) 
+	if(mIt != mParamList.end())
 	{
 		param = mParamList[name];
 		param.mName = name;
@@ -558,11 +558,11 @@ bool LLWaterParamManager::setParamSet(const std::string& name, LLWaterParamSet&
 bool LLWaterParamManager::setParamSet(const std::string& name, const LLSD & param)
 {
 	// quick, non robust (we won't be working with files, but assets) check
-	if(!param.isMap()) 
+	if(!param.isMap())
 	{
 		return false;
 	}
-	
+
 	mParamList[name].setAll(param);
 
 	return true;
@@ -572,7 +572,7 @@ bool LLWaterParamManager::removeParamSet(const std::string& name, bool delete_fr
 {
 	// remove from param list
 	std::map<std::string, LLWaterParamSet>::iterator mIt = mParamList.find(name);
-	if(mIt != mParamList.end()) 
+	if(mIt != mParamList.end())
 	{
 		mParamList.erase(mIt);
 	}
@@ -581,13 +581,13 @@ bool LLWaterParamManager::removeParamSet(const std::string& name, bool delete_fr
 	{
 
 		std::string path_name(gDirUtilp->getExpandedFilename( LL_PATH_USER_SETTINGS , "windlight/water", ""));
-		
+
 		// use full curl escaped name
 		char * curl_str = curl_escape(name.c_str(), name.size());
 		std::string escaped_name(curl_str);
 		curl_free(curl_str);
 		curl_str = NULL;
-		
+
 		gDirUtilp->deleteFilesInDir(path_name, escaped_name + ".xml");
 	}
 
@@ -599,7 +599,7 @@ F32 LLWaterParamManager::getFogDensity(void)
 	bool err;
 
 	F32 fogDensity = mCurParams.getFloat("waterFogDensity", err);
-	
+
 	// modify if we're underwater
 	const F32 water_height = gAgent.getRegion() ? gAgent.getRegion()->getWaterHeight() : 0.f;
 	F32 camera_height = gAgent.getCameraPositionAgent().mV[2];
@@ -659,7 +659,7 @@ void LLWaterParamManager::loadWaterNotecard(LLVFS *vfs, const LLUUID& asset_id,
 		}
 		else
 		{
-			// We can do this because we know mCurParams 
+			// We can do this because we know mCurParams
 			sInstance->mParamList[name].mInventoryID = inventory_id;
 		}
 	}
diff --git a/linden/indra/newview/llwlparammanager.h b/linden/indra/newview/llwlparammanager.h
index 4c7fdc1..27e7663 100644
--- a/linden/indra/newview/llwlparammanager.h
+++ b/linden/indra/newview/llwlparammanager.h
@@ -132,6 +132,7 @@ struct WLFloatControl {
 	}
 };
 
+
 /// WindLight parameter manager class - what controls all the wind light shaders
 class LLWLParamManager
 {
-- 
cgit v1.1


From 1e22c4f3610dcb2854ab6bcc0425cfbf3a820293 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Wed, 4 Apr 2012 19:37:31 +1000
Subject: More Windlight refactoring, including moving the new stuff back to
 lightshare.c.

What works seems to work fine.
Still more work to do, but I might punt some of it to 1.5.
---
 linden/indra/newview/lightshare.cpp          | 210 ++++++++++++++++++++++++++-
 linden/indra/newview/lightshare.h            |  27 ++++
 linden/indra/newview/llwaterparammanager.cpp |  11 +-
 linden/indra/newview/llwaterparamset.h       |   1 +
 linden/indra/newview/llwlparammanager.cpp    | 117 +--------------
 linden/indra/newview/llwlparammanager.h      |  16 --
 linden/indra/newview/llwlparamset.h          |   2 +-
 7 files changed, 243 insertions(+), 141 deletions(-)

diff --git a/linden/indra/newview/lightshare.cpp b/linden/indra/newview/lightshare.cpp
index 378a755..db391f5 100644
--- a/linden/indra/newview/lightshare.cpp
+++ b/linden/indra/newview/lightshare.cpp
@@ -1,9 +1,10 @@
 /**
  * @file lightshare.cpp
- * @brief Handler for Meta7 Lightshare (region-side Windlight settings).
+ * @brief Handler for Meta7 Lightshare (region-side Windlight settings), and other methods of sharing WindLight.
  *
  * Copyright (c) 2010, Tom Grimshaw (Tom Meta)
  * Copyright (c) 2010, Jacek Antonelli
+ * Copyright (c) 2012, David Seikel
  *
  * The source code in this file ("Source Code") is provided to you
  * under the terms of the GNU General Public License, version 2.0
@@ -43,6 +44,10 @@
 #include "llworld.h"
 
 
+const std::string LightShare::sRegionPresetName = "(Region settings)";
+const std::string LightShare::sParcelPresetName = "(Parcel settings)";
+const std::string LightShare::sRLVPresetName = "(RLV settings)";
+
 
 LLWaterParamSet* LightShare::mWater = NULL;
 LLWLParamSet* LightShare::mSky = NULL;
@@ -131,12 +136,12 @@ void LightShare::applyMaybe(LLWaterParamSet* thisWater, LLUUID* thisWaterNormal,
 	// If they are using region settings already, or LightShare is
 	// always allowed, just apply the new settings, don't bother asking.
 	if( gSavedSettings.getU32("LightShareAllowed") == LIGHTSHARE_ALWAYS ||
-	    (sky == LLWLParamManager::sSkyPresetName && water == LLWLParamManager::sWaterPresetName) )
+	    (sky == sRegionPresetName && water == sRegionPresetName) )
 	{
 		mSky = thisSky;
 		mWater = thisWater;
 		mWaterNormal = thisWaterNormal;
-		LLWLParamManager::apply(mWater, mWaterNormal, mSky);
+		apply(mWater, mWaterNormal, mSky, WL_SCOPE_REGION);
 		return;
 	}
 
@@ -182,7 +187,7 @@ bool LightShare::applyCallback(const LLSD& notification, const LLSD& response)
 	{
 		case 0:{
 			// "Apply"
-			LLWLParamManager::apply(mWater, mWaterNormal, mSky);
+			apply(mWater, mWaterNormal, mSky, WL_SCOPE_REGION);
 
 			break;
 		}
@@ -205,7 +210,7 @@ bool LightShare::applyCallback(const LLSD& notification, const LLSD& response)
 void LightShare::resetRegion()
 {
 	sIgnoreRegion = false;
-	LLWorld::getInstance()->rebuildClouds(gAgent.getRegion());
+	apply(NULL, NULL, NULL, WL_SCOPE_REGION);
 }
 
 // static
@@ -222,6 +227,201 @@ bool LightShare::ignoreTimerHasExpired()
 	return sIgnoreTimer->hasExpired();
 }
 
+// TODO - have regionSet and parcelSet be arrays, so we can deal with height zones.
+static struct WLCombined userSet, regionSet, parcelSet, RLVSet;
+
+// TODO - should spread this merging stuff around,
+//        so that eventually we can get rid of almost identical code for water and sky.
+//        Then one of these two methods goes away.
+
+//static
+void LightShare::mergeWaterSets(LLWaterParamSet* thisSet, LLWaterParamSet* oldSet)
+{
+	for(LLSD::map_const_iterator i = thisSet->mParamValues.beginMap();
+		i != thisSet->mParamValues.endMap();
+		++i)
+	{
+		const std::string& param = i->first;
+
+		if(i->second.isArray())
+		{
+			for (int j = 0; j < i->second.size(); j++)
+			{
+				oldSet->mParamValues[param][j] = i->second[j].asReal();
+			}
+		}
+		else if(i->second.isReal())
+		  oldSet->mParamValues[param] = i->second.asReal();
+	}
+}
+
+//static
+void LightShare::mergeWLSets(LLWLParamSet* thisSet, LLWLParamSet* oldSet)
+{
+	for(LLSD::map_const_iterator i = thisSet->mParamValues.beginMap();
+		i != thisSet->mParamValues.endMap();
+		++i)
+	{
+		const std::string& param = i->first;
+
+		if(i->second.isArray())
+		{
+			for (int j = 0; j < i->second.size(); j++)
+			{
+				oldSet->mParamValues[param][j] = i->second[j].asReal();
+			}
+		}
+		else if(i->second.isReal())
+		  oldSet->mParamValues[param] = i->second.asReal();
+	}
+}
+
+//static
+void LightShare::apply(LLWaterParamSet * newWater, LLUUID *newWaterNormal, LLWLParamSet *newSky, WLScope scope)
+// TODO - Deal with day cycle stuff.
+{
+	LLWaterParamManager* waterMgr = LLWaterParamManager::instance();
+	LLWLParamManager* skyMgr = LLWLParamManager::instance();
+	LLWaterParamSet oldWaterSet = waterMgr->mCurParams;
+	LLWLParamSet oldWLSet = skyMgr->mCurParams;
+	struct WLCombined* thisSet = &userSet;
+	bool user = true;
+
+	switch(scope)
+	{
+		case WL_SCOPE_USER :
+		{
+			thisSet = &userSet;
+			thisSet->water.mName = waterMgr->mCurParams.mName;
+			thisSet->sky.mName = skyMgr->mCurParams.mName;
+			thisSet->enabled = true;
+			// Check if user selected to show the saved region or parcel settings.
+			if (newSky && (sRegionPresetName == skyMgr->mCurParams.mName))
+			  thisSet->enabled = false;
+			if (newWater && (sParcelPresetName == skyMgr->mCurParams.mName))
+			  thisSet->enabled = false;
+			break;
+		}
+		case WL_SCOPE_REGION :
+		{
+			thisSet = &regionSet;
+			thisSet->water.mName = sRegionPresetName;
+			thisSet->sky.mName = sRegionPresetName;
+			thisSet->enabled = (gSavedSettings.getU32("LightShareAllowed") != LIGHTSHARE_NEVER);
+			break;
+		}
+		case WL_SCOPE_PARCEL :
+		{
+			thisSet = &parcelSet;
+			thisSet->water.mName = sParcelPresetName;
+			thisSet->sky.mName = sParcelPresetName;
+			thisSet->enabled = (gSavedSettings.getU32("LightShareAllowed") != LIGHTSHARE_NEVER);
+			break;
+		}
+		case WL_SCOPE_RLV :
+		{
+			thisSet = &RLVSet;
+			thisSet->water.mName = sRLVPresetName;
+			thisSet->sky.mName = sRLVPresetName;
+			// TODO set enabled properly.
+			break;
+		}
+	}
+
+	if (newWater)
+		thisSet->water.setAll(newWater->getAll());
+	if (newWaterNormal)
+		thisSet->water.mParamValues["normalMap"] = *newWaterNormal;
+	if (newSky)
+		thisSet->sky.setAll(newSky->getAll());
+
+	if ((NULL == newWater) && (NULL == newSky))
+		thisSet->enabled = false;
+
+	F32 fade = 0; //Instant
+	bool error;
+	fade = thisSet->sky.getFloat("fade", error);
+
+	if (fade)
+	{
+		// TODO - should copy the original, then set that here.
+		// The fade should delete this copy once it's done fading.
+		// Dunno if we actually need to do any of this anyway.
+		waterMgr->removeParamSet( oldWaterSet.mName, false );
+		waterMgr->addParamSet( oldWaterSet.mName, oldWaterSet );
+		waterMgr->setNormalMapID( *newWaterNormal );
+		waterMgr->getParamSet(oldWaterSet.mName, waterMgr->mCurParams);
+		waterMgr->propagateParameters();
+
+		skyMgr->removeParamSet( oldWLSet.mName, false );
+		skyMgr->addParamSet( oldWLSet.mName, oldWLSet );
+		skyMgr->getParamSet(oldWLSet.mName, skyMgr->mCurParams);
+		skyMgr->propagateParameters();
+	}
+
+	if (regionSet.enabled)
+	{
+		waterMgr->setParamSet( regionSet.water.mName, regionSet.water );
+		skyMgr->setParamSet( regionSet.sky.mName, regionSet.sky );
+		mergeWaterSets(&(regionSet.water), &oldWaterSet);
+		mergeWLSets(&(regionSet.sky), &oldWLSet);
+	}
+	else
+	{
+		waterMgr->removeParamSet( regionSet.water.mName, false );
+		skyMgr->removeParamSet( regionSet.sky.mName, false );
+	}
+	if (parcelSet.enabled)
+	{
+		waterMgr->setParamSet( parcelSet.water.mName, parcelSet.water );
+		skyMgr->setParamSet( parcelSet.sky.mName, parcelSet.sky );
+		mergeWaterSets(&(parcelSet.water), &oldWaterSet);
+		mergeWLSets(&(parcelSet.sky), &oldWLSet);
+	}
+	else
+	{
+		waterMgr->removeParamSet( parcelSet.water.mName, false );
+		skyMgr->removeParamSet( parcelSet.sky.mName, false );
+	}
+	if (userSet.enabled)
+	{
+		mergeWaterSets(&(userSet.water), &oldWaterSet);
+		mergeWLSets(&(userSet.sky), &oldWLSet);
+	}
+	if (RLVSet.enabled)
+	{
+		mergeWaterSets(&(RLVSet.water), &oldWaterSet);
+		mergeWLSets(&(RLVSet.sky), &oldWLSet);
+	}
+
+	skyMgr->mAnimator.mIsRunning = false;
+	skyMgr->mAnimator.mUseLindenTime = false;
+	if (fade)
+	{
+		waterMgr->SetMixTime(&oldWaterSet, fade);
+		skyMgr->SetMixTime(&oldWLSet, fade);
+	}
+	else
+	{
+		if (newWater)
+		{
+			waterMgr->setParamSet( thisSet->water.mName, oldWaterSet );
+			waterMgr->setNormalMapID( *newWaterNormal );
+			waterMgr->getParamSet(thisSet->water.mName, waterMgr->mCurParams);
+			waterMgr->propagateParameters();
+		}
+
+		if (newSky)
+		{
+			  skyMgr->setParamSet( thisSet->sky.mName, oldWLSet );
+			  skyMgr->getParamSet(thisSet->sky.mName, skyMgr->mCurParams);
+			  skyMgr->propagateParameters();
+		}
+	}
+
+	LLWorld::getInstance()->rebuildClouds(gAgent.getRegion());
+}
+
 bool LightShare::isValid()
 {
 	return mIsValid;
diff --git a/linden/indra/newview/lightshare.h b/linden/indra/newview/lightshare.h
index 1df2084..3561a91 100644
--- a/linden/indra/newview/lightshare.h
+++ b/linden/indra/newview/lightshare.h
@@ -37,6 +37,21 @@
 struct Meta7WindlightPacket;
 
 
+typedef enum wl_scope
+{
+	WL_SCOPE_USER,
+	WL_SCOPE_REGION,
+	WL_SCOPE_PARCEL,
+	WL_SCOPE_RLV
+} WLScope;
+
+struct WLCombined
+{
+	LLWaterParamSet water;
+	LLWLParamSet sky;
+	BOOL enabled;
+};
+
 // Encapsulates a "Windlight" (LightShare) message sent from the
 // region, allowing the settings to be applied at a later time.
 //
@@ -51,6 +66,13 @@ public:
 		LIGHTSHARE_ALWAYS = 2,
 	};
 
+	// The name of the preset where the region settings are stored.
+	static const std::string sRegionPresetName;
+	// The name of the preset where the parcel settings are stored.
+	static const std::string sParcelPresetName;
+	// The name of the preset where the RLV settings are stored.
+	static const std::string sRLVPresetName;
+
 	// Constructs a new LightShare instance from a GenericMessage
 	// with the "Windlight" method, such as those sent by a
 	// Lightshare-enabled OpenSim region.
@@ -72,6 +94,8 @@ public:
 	// (But there's no real validation yet, so this is always true.)
 	bool isValid();
 
+	static void apply(LLWaterParamSet * newWater, LLUUID *newWaterNormal, LLWLParamSet *newSky, WLScope scope);
+
 private:
 	static LLTimer* sIgnoreTimer;
 	static bool sIgnoreRegion;
@@ -100,6 +124,9 @@ private:
 	// Returns true if the ignore timer has expired (i.e. new settings
 	// should not be ignored anymore).
 	static bool ignoreTimerHasExpired();
+
+	static void mergeWaterSets(LLWaterParamSet* thisSet, LLWaterParamSet* oldSet);
+	static void mergeWLSets(LLWLParamSet* thisSet, LLWLParamSet* oldSet);
 };
 
 #endif
diff --git a/linden/indra/newview/llwaterparammanager.cpp b/linden/indra/newview/llwaterparammanager.cpp
index 9d0fd86..6e2b420 100644
--- a/linden/indra/newview/llwaterparammanager.cpp
+++ b/linden/indra/newview/llwaterparammanager.cpp
@@ -69,6 +69,7 @@
 
 #include "llwlparammanager.h"
 #include "llwaterparamset.h"
+#include "lightshare.h"
 #include "llpostprocess.h"
 #include "llfloaterwater.h"
 
@@ -159,7 +160,7 @@ void LLWaterParamManager::loadPreset(const std::string & name,bool propagate)
 		if(propagate)
 		{
 			getParamSet(name, mCurParams);
-			propagateParameters();
+			LightShare::apply(&mCurParams, NULL, NULL, WL_SCOPE_USER);
 		}
 		return;
 	}
@@ -200,21 +201,21 @@ void LLWaterParamManager::loadPreset(const std::string & name,bool propagate)
 	if(propagate)
 	{
 		getParamSet(name, mCurParams);
-		propagateParameters();
+		LightShare::apply(&mCurParams, NULL, NULL, WL_SCOPE_USER);
 	}
 }
 
 bool LLWaterParamManager::loadPresetXML(const std::string& name, std::istream& preset_stream, bool propagate /* = false */, bool check_if_real /* = false */)
 {
 	LLSD paramsData(LLSD::emptyMap());
-	
+
 	LLPointer<LLSDParser> parser = new LLSDXMLParser();
-	
+
 	if(parser->parse(preset_stream, paramsData, LLSDSerialize::SIZE_UNLIMITED) == LLSDParser::PARSE_FAILURE)
 	{
 		return false;
 	}
-	
+
 	if(check_if_real)
 	{
 		static const char* expected_windlight_settings[] = {
diff --git a/linden/indra/newview/llwaterparamset.h b/linden/indra/newview/llwaterparamset.h
index f2667ab..09da42b 100644
--- a/linden/indra/newview/llwaterparamset.h
+++ b/linden/indra/newview/llwaterparamset.h
@@ -48,6 +48,7 @@ class LLWaterParamSet
 {
 	friend class LLWaterParamManager;
 	friend class LLWLParamManager;
+	friend class LightShare;
 
 public:
 	std::string mName;
diff --git a/linden/indra/newview/llwlparammanager.cpp b/linden/indra/newview/llwlparammanager.cpp
index 75592da..b4d999c 100644
--- a/linden/indra/newview/llwlparammanager.cpp
+++ b/linden/indra/newview/llwlparammanager.cpp
@@ -34,6 +34,7 @@
 
 #include "llwlparammanager.h"
 #include "llwaterparammanager.h"
+#include "lightshare.h"
 
 #include "pipeline.h"
 #include "llsky.h"
@@ -77,9 +78,6 @@
 
 #include "curl/curl.h"
 
-const std::string LLWLParamManager::sWaterPresetName = "(Region settings)";
-const std::string LLWLParamManager::sSkyPresetName   = "(Region settings)";
-
 LLWLParamManager * LLWLParamManager::sInstance = NULL;
 std::vector<LLWLPresetsObserver*> LLWLParamManager::sObservers;
 LLFrameTimer wlSmoothTransitionTimer;
@@ -346,7 +344,7 @@ void LLWLParamManager::loadPreset(const std::string & name,bool propagate)
 		if(propagate)
 		{
 			getParamSet(name, mCurParams);
-			propagateParameters();
+			LightShare::apply(NULL, NULL, &mCurParams, WL_SCOPE_USER);
 		}
 		return;
 	}
@@ -388,7 +386,7 @@ void LLWLParamManager::loadPreset(const std::string & name,bool propagate)
 	if(propagate)
 	{
 		getParamSet(name, mCurParams);
-		propagateParameters();
+		LightShare::apply(NULL, NULL, &mCurParams, WL_SCOPE_USER);
 	}
 
 	notifyObservers();
@@ -859,112 +857,3 @@ bool LLWLParamManager::isSettingsNotecard(std::string name)
 {
 	return (isSkySettingsNotecard(name) || isWaterSettingsNotecard(name));
 }
-
-
-struct WLCombined userSet, regionSet, parcelSet, RLVSet;
-
-//static
-void LLWLParamManager::apply(LLWaterParamSet * newWater, LLUUID *newWaterNormal, LLWLParamSet *newSky)
-// TODO - Pass in scope and day cycle stuff.
-{
-	LLWaterParamManager* waterMgr = LLWaterParamManager::instance();
-	LLWLParamManager* skyMgr = LLWLParamManager::instance();
-	struct WLCombined* thisSet = &userSet;
-
-//	if (region == scope)
-		thisSet = &regionSet;
-//	if (parcel== scope)
-//		thisSet = &parcelSet;
-//	if (RLV == scope)
-//		thisSet = &RLVSet;
-
-	thisSet->water.setAll(newWater->getAll());
-	thisSet->water.mParamValues["normalMap"] = *newWaterNormal;
-	thisSet->sky.setAll(newSky->getAll());
-
-// TODO - if scope is region or parcel, and not using server settings
-//          return
-
-	thisSet->enabled = true;
-
-	F32 fade = 0; //Instant
-	bool error;
-	fade = newSky->getFloat("fade", error);
-
-	newWater->mName = sWaterPresetName;
-	newSky->mName = sSkyPresetName;
-	LLWaterParamSet oldWaterSet = waterMgr->mCurParams;
-	LLWLParamSet oldWLSet = skyMgr->mCurParams;
-
-	if (fade)
-	{
-		// TODO - should copy the original, then set that here.
-		// The fade should delete this copy once it's done fading.
-		waterMgr->removeParamSet( sWaterPresetName, false );
-		waterMgr->addParamSet( sWaterPresetName, oldWaterSet );
-		waterMgr->loadPreset( sWaterPresetName, true );
-		waterMgr->setNormalMapID( *newWaterNormal );
-
-		skyMgr->removeParamSet( sSkyPresetName, true );
-		skyMgr->addParamSet( sSkyPresetName, oldWLSet );
-		skyMgr->loadPreset( sSkyPresetName, true );
-         }
-
-	for(LLSD::map_const_iterator i = thisSet->water.mParamValues.beginMap();
-		i != thisSet->water.mParamValues.endMap();
-		++i)
-	{
-		const std::string& param = i->first;
-
-		if(i->second.isArray())
-		{
-			for (int j = 0; j < i->second.size(); j++)
-			{
-				oldWaterSet.mParamValues[param][j] = i->second[j].asReal();
-			}
-		}
-		else if(i->second.isReal())
-		  oldWaterSet.mParamValues[param] = i->second.asReal();
-	}
-
-	skyMgr->mAnimator.mIsRunning = false;
-	skyMgr->mAnimator.mUseLindenTime = false;
-	for(LLSD::map_const_iterator i = thisSet->sky.mParamValues.beginMap();
-		i != thisSet->sky.mParamValues.endMap();
-		++i)
-	{
-		const std::string& param = i->first;
-
-		if(i->second.isArray())
-		{
-			for (int j = 0; j < i->second.size(); j++)
-			{
-				oldWLSet.mParamValues[param][j] = i->second[j].asReal();
-			}
-		}
-		else if(i->second.isReal())
-		  oldWLSet.mParamValues[param] = i->second.asReal();
-	}
-
-// TODO - If RLV enabled
-//          Loop through RLVSet, setting the values into the old one, but keeping old values that are not in RLVSet
-
-	if (fade)
-	{
-		waterMgr->SetMixTime(&oldWaterSet, fade);
-		skyMgr->SetMixTime(&oldWLSet, fade);
-	}
-	else
-	{
-		waterMgr->removeParamSet( sWaterPresetName, false );
-		waterMgr->addParamSet( sWaterPresetName, oldWaterSet );
-		waterMgr->loadPreset( sWaterPresetName, true );
-		waterMgr->setNormalMapID( *newWaterNormal );
-
-		skyMgr->removeParamSet( sSkyPresetName, true );
-		skyMgr->addParamSet( sSkyPresetName, oldWLSet );
-		skyMgr->loadPreset( sSkyPresetName, true );
-	}
-
-	LLWorld::getInstance()->rebuildClouds(gAgent.getRegion());
-}
diff --git a/linden/indra/newview/llwlparammanager.h b/linden/indra/newview/llwlparammanager.h
index 27e7663..034b2e6 100644
--- a/linden/indra/newview/llwlparammanager.h
+++ b/linden/indra/newview/llwlparammanager.h
@@ -230,8 +230,6 @@ public:
 	static bool isSkySettingsNotecard(std::string name);
 	static bool isSettingsNotecard(std::string name);
 
-	static void apply(LLWaterParamSet * newWater, LLUUID *newWaterNormal, LLWLParamSet *newSky);
-
 public:
 
 	// helper variables
@@ -288,12 +286,6 @@ public:
 	// list of all the parameters, listed by name
 	std::map<std::string, LLWLParamSet> mParamList;
 
-	// The name of the water preset where the region settings are stored.
-	static const std::string sWaterPresetName;
-
-	// The name of the sky preset where the region settings are stored.
-	static const std::string sSkyPresetName;
-
 private:
 	// our parameter manager singleton instance
 	static LLWLParamManager * sInstance;
@@ -306,7 +298,6 @@ private:
 	static std::vector<LLWLPresetsObserver*> sObservers;
 
 	static void loadWindlightNotecard(LLVFS *vfs, const LLUUID& asset_id, LLAssetType::EType asset_type, void *user_data, S32 status, LLExtStat ext_status);
-
 };
 
 inline F32 LLWLParamManager::getDomeOffset(void) const
@@ -334,11 +325,4 @@ inline LLVector4 LLWLParamManager::getRotatedLightDir(void) const
 	return mRotatedLightDir;
 }
 
-struct WLCombined
-{
-	LLWaterParamSet water;
-	LLWLParamSet sky;
-	BOOL enabled;
-};
-
 #endif
diff --git a/linden/indra/newview/llwlparamset.h b/linden/indra/newview/llwlparamset.h
index 4b6f336..ce01f84 100644
--- a/linden/indra/newview/llwlparamset.h
+++ b/linden/indra/newview/llwlparamset.h
@@ -46,7 +46,7 @@ class LLWLParamSet;
 /// A class representing a set of parameter values for the WindLight shaders.
 class LLWLParamSet {
 
-	friend class LLWLParamManager;
+	friend class LightShare;
 
 public:
 	std::string mName;
-- 
cgit v1.1


From d0e3cee4c2e44b7bffd69e4138ecbfd04bf60601 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sun, 29 Apr 2012 10:18:00 +1000
Subject: It's April, onefang ate all the Easter eggs.  Burp.

---
 linden/indra/newview/llgesturemgr.cpp              | 241 +--------------------
 .../newview/skins/default/textures/cakeisalie.png  | Bin 124929 -> 0 bytes
 .../newview/skins/default/textures/ceilingcat.png  | Bin 139515 -> 0 bytes
 .../newview/skins/default/textures/easteregg.png   | Bin 395345 -> 0 bytes
 .../indra/newview/skins/default/textures/hugs.png  | Bin 204219 -> 0 bytes
 .../newview/skins/default/textures/nomnom.png      | Bin 380325 -> 0 bytes
 .../newview/skins/default/textures/octopus.png     | Bin 442610 -> 0 bytes
 .../newview/skins/default/textures/zombiecat.png   | Bin 334660 -> 0 bytes
 8 files changed, 1 insertion(+), 240 deletions(-)
 delete mode 100644 linden/indra/newview/skins/default/textures/cakeisalie.png
 delete mode 100644 linden/indra/newview/skins/default/textures/ceilingcat.png
 delete mode 100644 linden/indra/newview/skins/default/textures/easteregg.png
 delete mode 100644 linden/indra/newview/skins/default/textures/hugs.png
 delete mode 100644 linden/indra/newview/skins/default/textures/nomnom.png
 delete mode 100644 linden/indra/newview/skins/default/textures/octopus.png
 delete mode 100644 linden/indra/newview/skins/default/textures/zombiecat.png

diff --git a/linden/indra/newview/llgesturemgr.cpp b/linden/indra/newview/llgesturemgr.cpp
index bd05cb3..f806ccc 100644
--- a/linden/indra/newview/llgesturemgr.cpp
+++ b/linden/indra/newview/llgesturemgr.cpp
@@ -531,7 +531,6 @@ BOOL LLGestureManager::triggerAndReviseString(const std::string &utf8str, std::s
 				gesture = NULL;
 			}
 
-			
 			if (matching.size() > 0)
 			{
 				// choose one at random
@@ -565,246 +564,8 @@ BOOL LLGestureManager::triggerAndReviseString(const std::string &utf8str, std::s
 					found_gestures = TRUE;
 				}
 			}
-			else if (LLStringUtil::compareInsensitive("/icanhaseasteregg", cur_token) == 0 ||
-					 LLStringUtil::compareInsensitive("/icanhaseastereggs", cur_token) == 0)
-			{
-				LLViewerImage* kitteh = gImageList.getImageFromFile("easteregg.png", TRUE, TRUE);
-				if (kitteh)
-				{
-					S32 left, top;
-					gFloaterView->getNewFloaterPosition(&left, &top);
-					LLRect rect = gSavedSettings.getRect("PreviewTextureRect");
-					rect.translate(left - rect.mLeft, top - rect.mTop);
-
-					LLPreviewTexture* preview;
-					preview = new LLPreviewTexture(rect, "Easter Egg!", kitteh);
-					preview->setSourceID(LLUUID::generateNewID());
-					preview->setFocus(TRUE);
-					preview->center();
-					gFloaterView->adjustToFitScreen(preview, FALSE);
-				}
-				return TRUE;
-			}
-			else if (LLStringUtil::compareInsensitive("/icanhascookie", cur_token) == 0 ||
-					 LLStringUtil::compareInsensitive("/icanhascookies", cur_token) == 0)
-			{
-				LLChat chat;
-				chat.mText = "I made you a cookie but I eated it :(";
-				chat.mSourceType = CHAT_SOURCE_SYSTEM;
-				LLFloaterChat::addChat(chat);
-				if (revised_string)
-				{
-					revised_string->assign(LLStringUtil::null);
-				}
-				return TRUE;
-			}
-			else if (LLStringUtil::compareInsensitive("/icanhasfailbook", cur_token) == 0)
-			{
-				LLWeb::loadURLInternal("http://failbook.failblog.org/");
-				return TRUE;
-			}
-			else if (LLStringUtil::compareInsensitive("/icanhaszombie", cur_token) == 0 ||
-					 LLStringUtil::compareInsensitive("/icanhaszombies", cur_token) == 0)
-			{
-				LLViewerImage* kitteh = gImageList.getImageFromFile("zombiecat.png", TRUE, TRUE);
-				if (kitteh)
-				{
-					S32 left, top;
-					gFloaterView->getNewFloaterPosition(&left, &top);
-					LLRect rect = gSavedSettings.getRect("PreviewTextureRect");
-					rect.translate(left - rect.mLeft, top - rect.mTop);
-
-					LLPreviewTexture* preview;
-					preview = new LLPreviewTexture(rect, "Zombiecat!", kitteh);
-					preview->setSourceID(LLUUID::generateNewID());
-					preview->setFocus(TRUE);
-					preview->center();
-					gFloaterView->adjustToFitScreen(preview, FALSE);
-				}
-				return TRUE;
-			}
-			else if (LLStringUtil::compareInsensitive("/icanhassupport", cur_token) == 0 ||
-					 LLStringUtil::compareInsensitive("/icanhashelp", cur_token) == 0 ||
-					 LLStringUtil::compareInsensitive("/icanhashalp", cur_token) == 0)
-			{
-				LLWeb::loadURLInternal("http://support.kokuaviewer.org/");
-				return TRUE;
-			}
-			else if (LLStringUtil::compareInsensitive("/icanhasblog", cur_token) == 0)
-			{
-				LLWeb::loadURLInternal("http://kokuaviewer.org/");
-				return TRUE;
-			}
-			else if (LLStringUtil::compareInsensitive("/icanhascodie", cur_token) == 0)
-			{
-				LLChat chat;
-				chat.mText = "All work and no play makes Codie a dull girl. All work and no play...";
-				chat.mSourceType = CHAT_SOURCE_SYSTEM;
-				LLFloaterChat::addChat(chat);
-				if (revised_string)
-				{
-					revised_string->assign(LLStringUtil::null);
-				}
-				return TRUE;
-			}
-			else if (LLStringUtil::compareInsensitive("/icanhasfail", cur_token) == 0)
-			{
-				LLWeb::loadURLInternal("http://www.failblog.org/");
-				return TRUE;
-			}
-			else if (LLStringUtil::compareInsensitive("/icanhasdownload", cur_token) == 0 ||
-					 LLStringUtil::compareInsensitive("/icanhasdownloads", cur_token) == 0 ||
-					 LLStringUtil::compareInsensitive("/icanhasupdate", cur_token) == 0 ||
-					 LLStringUtil::compareInsensitive("/icanhasupdates", cur_token) == 0 )
-			{
-				LLWeb::loadURLInternal("http://wiki.kokuaviewer.org/wiki/Imprudence:Downloads");
-				return TRUE;
-			}
-			else if (LLStringUtil::compareInsensitive("/icanhasfeatures", cur_token) == 0)
-			{
-				LLWeb::loadURLInternal("http://wiki.kokuaviewer.org/wiki/Imprudence:Features");
-				return TRUE;
-			}
-			else if (LLStringUtil::compareInsensitive("/icanhaswiki", cur_token) == 0)
-			{
-				LLWeb::loadURLInternal("http://wiki.kokuaviewer.org/wiki/");
-				return TRUE;
-			}
-			else if (LLStringUtil::compareInsensitive("/icanhasbugs", cur_token) == 0 ||
-					 LLStringUtil::compareInsensitive("/icanhasbug", cur_token) == 0 )
-			{
-				LLWeb::loadURLInternal("http://redmine.kokuaviewer.org/");
-				return TRUE;
-			}
-			else if (LLStringUtil::compareInsensitive("/icanhasgit", cur_token) == 0)
-			{
-				LLWeb::loadURLInternal("http://github.com/imprudence/imprudence/");
-				return TRUE;
-			}
-			else if (LLStringUtil::compareInsensitive("/icanhasplurk", cur_token) == 0)
-			{
-				LLWeb::loadURLInternal("http://plurk.com/imprudence");
-				return TRUE;
-			}
-			else if (LLStringUtil::compareInsensitive("/icanhastwitter", cur_token) == 0)
-			{
-				LLWeb::loadURLInternal("http://twitter.com/ImpViewer");
-				return TRUE;
-			}
-
-			else if (LLStringUtil::compareInsensitive("/icanhasimprudence", cur_token) == 0)
-			{
-				LLChat chat;
-				chat.mText = "You are using it right now, silly!...";
-				chat.mSourceType = CHAT_SOURCE_SYSTEM;
-				LLFloaterChat::addChat(chat);
-				if (revised_string)
-				{
-					revised_string->assign(LLStringUtil::null);
-				}
-				return TRUE;
-			}
-			else if (LLStringUtil::compareInsensitive("/icanhasnoms", cur_token) == 0 ||
-					 LLStringUtil::compareInsensitive("/icanhasnom", cur_token) == 0)
-			{
-				LLViewerImage* kitteh = gImageList.getImageFromFile("nomnom.png", TRUE, TRUE);
-				if (kitteh)
-				{
-					S32 left, top;
-					gFloaterView->getNewFloaterPosition(&left, &top);
-					LLRect rect = gSavedSettings.getRect("PreviewTextureRect");
-					rect.translate(left - rect.mLeft, top - rect.mTop);
-
-					LLPreviewTexture* preview;
-					preview = new LLPreviewTexture(rect, "Om nom nom!", kitteh);
-					preview->setSourceID(LLUUID::generateNewID());
-					preview->setFocus(TRUE);
-					preview->center();
-					gFloaterView->adjustToFitScreen(preview, FALSE);
-				}
-				return TRUE;
-			}
-			else if (LLStringUtil::compareInsensitive("/icanhasceilingcat", cur_token) == 0 ||
-					 LLStringUtil::compareInsensitive("/icanhascielingcat", cur_token) == 0)
-			{
-				LLViewerImage* kitteh = gImageList.getImageFromFile("ceilingcat.png", TRUE, TRUE);
-				if (kitteh)
-				{
-					S32 left, top;
-					gFloaterView->getNewFloaterPosition(&left, &top);
-					LLRect rect = gSavedSettings.getRect("PreviewTextureRect");
-					rect.translate(left - rect.mLeft, top - rect.mTop);
-
-					LLPreviewTexture* preview;
-					preview = new LLPreviewTexture(rect, "Ceiling Cat is watching you!", kitteh);
-					preview->setSourceID(LLUUID::generateNewID());
-					preview->setFocus(TRUE);
-					preview->center();
-					gFloaterView->adjustToFitScreen(preview, FALSE);
-				}
-				return TRUE;
-			}
-			else if (LLStringUtil::compareInsensitive("/icanhascake", cur_token) == 0 )
-			{
-				LLViewerImage* kitteh = gImageList.getImageFromFile("cakeisalie.png", TRUE, TRUE);
-				if (kitteh)
-				{
-					S32 left, top;
-					gFloaterView->getNewFloaterPosition(&left, &top);
-					LLRect rect = gSavedSettings.getRect("PreviewTextureRect");
-					rect.translate(left - rect.mLeft, top - rect.mTop);
-
-					LLPreviewTexture* preview;
-					preview = new LLPreviewTexture(rect, "THE CAKE IS A LIE!", kitteh);
-					preview->setSourceID(LLUUID::generateNewID());
-					preview->setFocus(TRUE);
-					preview->center();
-					gFloaterView->adjustToFitScreen(preview, FALSE);
-				}
-				return TRUE;
-			}
-			else if (LLStringUtil::compareInsensitive("/icanhastentacles", cur_token) == 0 )
-			{
-				LLViewerImage* kitteh = gImageList.getImageFromFile("octopus.png", TRUE, TRUE);
-				if (kitteh)
-				{
-					S32 left, top;
-					gFloaterView->getNewFloaterPosition(&left, &top);
-					LLRect rect = gSavedSettings.getRect("PreviewTextureRect");
-					rect.translate(left - rect.mLeft, top - rect.mTop);
-
-					LLPreviewTexture* preview;
-					preview = new LLPreviewTexture(rect, "All hail the mighty octopus!", kitteh);
-					preview->setSourceID(LLUUID::generateNewID());
-					preview->setFocus(TRUE);
-					preview->center();
-					gFloaterView->adjustToFitScreen(preview, FALSE);
-				}
-				return TRUE;
-			}
-			else if (LLStringUtil::compareInsensitive("/icanhashugs", cur_token) == 0 ||
-					 LLStringUtil::compareInsensitive("/icanhashug", cur_token) == 0)
-			{
-				LLViewerImage* kitteh = gImageList.getImageFromFile("hugs.png", TRUE, TRUE);
-				if (kitteh)
-				{
-					S32 left, top;
-					gFloaterView->getNewFloaterPosition(&left, &top);
-					LLRect rect = gSavedSettings.getRect("PreviewTextureRect");
-					rect.translate(left - rect.mLeft, top - rect.mTop);
-
-					LLPreviewTexture* preview;
-					preview = new LLPreviewTexture(rect, "Yes, you can has hugs!", kitteh);
-					preview->setSourceID(LLUUID::generateNewID());
-					preview->setFocus(TRUE);
-					preview->center();
-					gFloaterView->adjustToFitScreen(preview, FALSE);
-				}
-				return TRUE;
-			}
-
 		}
-		
+
 		if(!gesture)
 		{
 			// This token doesn't match a gesture.  Pass it through to the output.
diff --git a/linden/indra/newview/skins/default/textures/cakeisalie.png b/linden/indra/newview/skins/default/textures/cakeisalie.png
deleted file mode 100644
index bc8af84..0000000
Binary files a/linden/indra/newview/skins/default/textures/cakeisalie.png and /dev/null differ
diff --git a/linden/indra/newview/skins/default/textures/ceilingcat.png b/linden/indra/newview/skins/default/textures/ceilingcat.png
deleted file mode 100644
index 5cf5285..0000000
Binary files a/linden/indra/newview/skins/default/textures/ceilingcat.png and /dev/null differ
diff --git a/linden/indra/newview/skins/default/textures/easteregg.png b/linden/indra/newview/skins/default/textures/easteregg.png
deleted file mode 100644
index 75eaef7..0000000
Binary files a/linden/indra/newview/skins/default/textures/easteregg.png and /dev/null differ
diff --git a/linden/indra/newview/skins/default/textures/hugs.png b/linden/indra/newview/skins/default/textures/hugs.png
deleted file mode 100644
index d612793..0000000
Binary files a/linden/indra/newview/skins/default/textures/hugs.png and /dev/null differ
diff --git a/linden/indra/newview/skins/default/textures/nomnom.png b/linden/indra/newview/skins/default/textures/nomnom.png
deleted file mode 100644
index ffc70ef..0000000
Binary files a/linden/indra/newview/skins/default/textures/nomnom.png and /dev/null differ
diff --git a/linden/indra/newview/skins/default/textures/octopus.png b/linden/indra/newview/skins/default/textures/octopus.png
deleted file mode 100644
index 91765f9..0000000
Binary files a/linden/indra/newview/skins/default/textures/octopus.png and /dev/null differ
diff --git a/linden/indra/newview/skins/default/textures/zombiecat.png b/linden/indra/newview/skins/default/textures/zombiecat.png
deleted file mode 100644
index 93392c0..0000000
Binary files a/linden/indra/newview/skins/default/textures/zombiecat.png and /dev/null differ
-- 
cgit v1.1


From 5845bcd9de3b9e22952bf798d32d1b7f9cf5fa21 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sun, 29 Apr 2012 19:15:57 +1000
Subject: For Armin and his teapot.

---
 linden/indra/newview/llvoavatar.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 11f4857..359ac74 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -3287,6 +3287,11 @@ void LLVOAvatar::resolveClient(LLColor4& avatar_name_color, std::string& client,
 		avatar_name_color += colour;
 		avatar_name_color *= 1.0/(cllsd["multiple"].asReal()+1.0f);
 	}
+	else if(idx == LLUUID("7eab0700-f000-0000-0000-546561706f74"))
+	{
+		avatar_name_color = LLColor4(0.69f,0.42f,0.84f,1.0f); // Armins V3 viewer.
+		client = "Teapot";
+	}
 	else if(idx == LLUUID("2a9a406c-f448-68f2-4e38-878f8c46c190") ||
 			idx == LLUUID("b6820989-bf42-ff59-ddde-fd3fd3a74fe4"))
 	{
-- 
cgit v1.1


From 0528bbd5ef37b7d60c639db2c450cca415b6590e Mon Sep 17 00:00:00 2001
From: Robin Cornelius
Date: Sat, 1 Oct 2011 22:16:53 +0100
Subject: MOAP Radar patch set

---
 linden/etc/message.xml                             |   6 +
 linden/indra/llmath/llsdutil_math.cpp              |  14 +-
 linden/indra/newview/CMakeLists.txt                |   4 +
 linden/indra/newview/app_settings/settings.xml     | 128 +++++++
 linden/indra/newview/llfloaterbeacons.cpp          |   3 +
 linden/indra/newview/llstartup.cpp                 |  12 +
 linden/indra/newview/llviewermenu.cpp              |  32 ++
 linden/indra/newview/llviewerobject.h              |   8 +-
 linden/indra/newview/llviewerregion.cpp            |   2 +
 linden/indra/newview/llvovolume.cpp                | 398 ++++++++++++++++++++-
 linden/indra/newview/llvovolume.h                  |  53 +++
 linden/indra/newview/pipeline.cpp                  |  61 ++++
 linden/indra/newview/pipeline.h                    |   5 +
 .../skins/default/xui/en-us/floater_beacons.xml    |   5 +-
 .../skins/default/xui/en-us/menu_viewer.xml        |   4 +
 15 files changed, 720 insertions(+), 15 deletions(-)

diff --git a/linden/etc/message.xml b/linden/etc/message.xml
index 8d34dd8..f86ca8b 100644
--- a/linden/etc/message.xml
+++ b/linden/etc/message.xml
@@ -702,6 +702,12 @@
 		
 			<key>FetchLib</key>
 			<boolean>true</boolean>
+			
+			<key>ObjectMedia</key>
+			<boolean>false</boolean>
+
+			<key>ObjectMediaNavigate</key>
+			<boolean>false</boolean>
 		</map>
 
 		<key>messageBans</key>
diff --git a/linden/indra/llmath/llsdutil_math.cpp b/linden/indra/llmath/llsdutil_math.cpp
index 073cb2e..8ec8661 100644
--- a/linden/indra/llmath/llsdutil_math.cpp
+++ b/linden/indra/llmath/llsdutil_math.cpp
@@ -6,7 +6,7 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2009, Linden Research, Inc.
+ * Copyright (c) 2006-2010, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -14,13 +14,13 @@
  * ("GPL"), unless you have obtained a separate licensing agreement
  * ("Other License"), formally executed by you and Linden Lab.  Terms of
  * the GPL can be found in doc/GPL-license.txt in this distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
+ * online at http://secondlife.com/developers/opensource/gplv2
  * 
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
  * online at
- * http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * http://secondlife.com/developers/opensource/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -30,11 +30,12 @@
  * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
  * COMPLETENESS OR PERFORMANCE.
  * $/LicenseInfo$
+ * 
  */
 
 #include "linden_common.h"
 
-#include "llsdutil.h"
+#include "llsdutil_math.h"
 
 #include "v3math.h"
 #include "v4math.h"
@@ -165,9 +166,6 @@ LLSD ll_sd_from_color4(const LLColor4& c)
 LLColor4 ll_color4_from_sd(const LLSD& sd)
 {
 	LLColor4 c;
-	c.mV[0] = (F32)sd[0].asReal();
-	c.mV[1] = (F32)sd[1].asReal();
-	c.mV[2] = (F32)sd[2].asReal();
-	c.mV[3] = (F32)sd[3].asReal();
+	c.setValue(sd);
 	return c;
 }
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 2a976ff..b9c41fc 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -274,6 +274,7 @@ set(viewer_SOURCE_FILES
     llmaniprotate.cpp
     llmanipscale.cpp
     llmaniptranslate.cpp
+	llmediadataclient.cpp
     llmapresponders.cpp
     llmediaremotectrl.cpp
     llmemoryview.cpp
@@ -508,6 +509,7 @@ set(viewer_SOURCE_FILES
     wlfloaterwindlightsend.cpp
     wlretrievesettings.cpp
     wlsettingsmanager.cpp
+    rcmoapradar.cpp
     )
 
 set(VIEWER_BINARY_NAME "imprudence-bin" CACHE STRING
@@ -737,6 +739,7 @@ set(viewer_HEADER_FILES
     llmaniprotate.h
     llmanipscale.h
     llmaniptranslate.h
+	llmediadataclient.h
     llmapresponders.h
     llmediaremotectrl.h
     llmemoryview.h
@@ -981,6 +984,7 @@ set(viewer_HEADER_FILES
     wlfloaterwindlightsend.h
     wlretrievesettings.h
     wlsettingsmanager.h
+	rcmoapradar.h
     )
 
 source_group("CMake Rules" FILES ViewerInstall.cmake)
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 2ec4832..1451aef 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -2,6 +2,123 @@
 <llsd>
 <map>
 
+  <!-- begin RC hacking -->
+   	<key>PrimMediaMasterEnabled</key>
+ 	<map>
+ 		<key>Comment</key>
+ 		<string>Whether or not Media on a Prim is enabled.</string>
+ 		<key>Persist</key>
+ 		<integer>1</integer>
+ 		<key>Type</key>
+ 		<string>Boolean</string>
+ 		<key>Value</key>
+ 		<integer>1</integer>
+ 	</map>
+ 	<key>PrimMediaMaxRetries</key>
+ 	<map>
+ 		<key>Comment</key>
+ 		<string>Maximum number of retries for media queries.</string>
+ 		<key>Persist</key>
+ 		<integer>1</integer>
+ 		<key>Type</key>
+ 		<string>U32</string>
+ 		<key>Value</key>
+ 		<integer>4</integer>
+ 	</map>
+ 	<key>PrimMediaRequestQueueDelay</key>
+ 	<map>
+ 		<key>Comment</key>
+ 		<string>Timer delay for fetching media from the queue (in seconds).</string>
+ 		<key>Persist</key>
+ 		<integer>1</integer>
+ 		<key>Type</key>
+ 		<string>F32</string>
+ 		<key>Value</key>
+ 		<real>1.0</real>
+ 	</map>
+ 	<key>PrimMediaRetryTimerDelay</key>
+ 	<map>
+ 		<key>Comment</key>
+ 		<string>Timer delay for retrying on media queries (in seconds).</string>
+ 		<key>Persist</key>
+ 		<integer>1</integer>
+ 		<key>Type</key>
+ 		<string>F32</string>
+ 		<key>Value</key>
+ 		<real>5.0</real>
+ 	</map>
+ 	<key>PrimMediaMaxSortedQueueSize</key>
+ 	<map>
+ 		<key>Comment</key>
+ 		<string>Maximum number of objects the viewer will load media for initially</string>
+ 		<key>Persist</key>
+ 		<integer>1</integer>
+ 		<key>Type</key>
+ 		<string>U32</string>
+ 		<key>Value</key>
+ 		<integer>100000</integer>
+ 	</map>
+ 	<key>PrimMediaMaxRoundRobinQueueSize</key>
+ 	<map>
+ 		<key>Comment</key>
+ 		<string>Maximum number of objects the viewer will continuously update media for</string>
+ 		<key>Persist</key>
+ 		<integer>1</integer>
+ 		<key>Type</key>
+ 		<string>U32</string>
+ 		<key>Value</key>
+ 		<integer>100000</integer>
+	</map>
+	<key>ShowMOAPRadar</key>
+ 	<map>
+ 		<key>Comment</key>
+ 		<string>Show the MOAP radar</string>
+ 		<key>Persist</key>
+ 		<integer>1</integer>
+ 		<key>Type</key>
+ 		<string>Boolean</string>
+ 		<key>Value</key>
+ 		<integer>0</integer>
+ 	</map>
+ 	<key>FloaterMOAPRadarRect</key>
+ 	<map>
+ 		<key>Comment</key>
+ 		<string>Rectangle for MOAP Radar</string>
+ 		<key>Persist</key>
+ 		<integer>1</integer>
+ 		<key>Type</key>
+ 		<string>Rect</string>
+ 		<key>Value</key>
+ 		<array>
+ 			<integer>0</integer>
+ 			<integer>400</integer>
+ 			<integer>200</integer>
+ 			<integer>0</integer>
+ 		</array>
+ 	</map>
+ 	<key>MOAPRadarKeepOpen</key>
+ 	<map>
+ 		<key>Comment</key>
+ 		<string>Keeps MOAP radar updates running in background</string>
+ 		<key>Persist</key>
+ 		<integer>1</integer>
+ 		<key>Type</key>
+ 		<string>Boolean</string>
+ 		<key>Value</key>
+ 		<integer>0</integer>
+ 	</map>
+ 	<key>MOAPRadarUpdateRate</key>
+ 	<map>
+ 		<key>Comment</key>
+ 		<string>MOAP Radar update rate (0 = high, 1 = medium, 2 = low)</string>
+ 		<key>Persist</key>
+ 		<integer>1</integer>
+ 		<key>Type</key>
+ 		<string>U32</string>
+ 		<key>Value</key>
+ 		<integer>1</integer>
+ 	</map>
+
   <!-- BEGIN IMPRUDENCE-SPECIFIC SETTINGS -->
   
   <!-- begin Aurora-specific settings -->
@@ -14645,6 +14762,17 @@
         <real>1.0</real>
       </array>
     </map>
+	<key>moapbeacon</key>
+	<map>
+		<key>Comment</key>
+		<string>Beacon / Highlight MOAP sources</string>
+		<key>Persist</key>
+		<integer>1</integer>
+		<key>Type</key>
+		<string>Boolean</string>
+		<key>Value</key>
+		<integer>0</integer>
+	</map>
     <key>particlesbeacon</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/llfloaterbeacons.cpp b/linden/indra/newview/llfloaterbeacons.cpp
index aa89780..7c40931 100644
--- a/linden/indra/newview/llfloaterbeacons.cpp
+++ b/linden/indra/newview/llfloaterbeacons.cpp
@@ -54,6 +54,7 @@ LLFloaterBeacons::LLFloaterBeacons(const LLSD& seed)
 	LLPipeline::setRenderScriptedTouchBeacons(gSavedSettings.getBOOL("scripttouchbeacon"));
 	LLPipeline::setRenderScriptedBeacons(     gSavedSettings.getBOOL("scriptsbeacon"));
 	LLPipeline::setRenderPhysicalBeacons(     gSavedSettings.getBOOL("physicalbeacon"));
+	LLPipeline::setRenderMOAPBeacons(		  gSavedSettings.getBOOL("moapbeacon"));
 	LLPipeline::setRenderSoundBeacons(        gSavedSettings.getBOOL("soundsbeacon"));
 	LLPipeline::setRenderParticleBeacons(     gSavedSettings.getBOOL("particlesbeacon"));
 	LLPipeline::setRenderHighlights(          gSavedSettings.getBOOL("renderhighlights"));
@@ -67,6 +68,7 @@ BOOL LLFloaterBeacons::postBuild()
 	childSetCommitCallback("physical",        onClickUICheck, this);
 	childSetCommitCallback("sounds",          onClickUICheck, this);
 	childSetCommitCallback("particles",       onClickUICheck, this);
+	childSetCommitCallback("moap",			  onClickUICheck, this);
 	childSetCommitCallback("highlights",      onClickUICheck, this);
 	childSetCommitCallback("beacons",         onClickUICheck, this);
 	return TRUE;
@@ -132,6 +134,7 @@ void LLFloaterBeacons::onClickUICheck(LLUICtrl *ctrl, void* data)
 	else if(name == "physical")       LLPipeline::setRenderPhysicalBeacons(check->get());
 	else if(name == "sounds")         LLPipeline::setRenderSoundBeacons(check->get());
 	else if(name == "particles")      LLPipeline::setRenderParticleBeacons(check->get());
+	else if(name == "moap")           LLPipeline::setRenderMOAPBeacons(check->get());
 	else if(name == "highlights")
 	{
 		LLPipeline::toggleRenderHighlights(NULL);
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 922de18..d853dc0 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -206,6 +206,8 @@
 #include "rlvhandler.h"
 // [/RLVa:KB]
 
+#include "rcmoapradar.h"
+
 #if LL_WINDOWS
 #include "llwindebug.h"
 #include "lldxhardware.h"
@@ -2079,6 +2081,16 @@ bool idle_startup()
 		LLRect window(0, gViewerWindow->getWindowHeight(), gViewerWindow->getWindowWidth(), 0);
 		gViewerWindow->adjustControlRectanglesForFirstUse(window);
 
+		if (gSavedSettings.getBOOL("ShowRadar"))
+		{
+			LLFloaterAvatarList::showInstance();
+		}
+
+		if (gSavedSettings.getBOOL("ShowMOAPRadar"))
+		{
+			 LLFloaterMOAPRadar::showInstance();
+		}
+
 		if(gSavedSettings.getBOOL("ShowMiniMap"))
 		{
 			LLFloaterMap::showInstance();
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index a83c11b..538adc7 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -238,6 +238,8 @@
 #include "llfloaterteleporthistory.h"
 #include "slfloatermediafilter.h"
 
+#include "rcmoapradar.h"
+
 using namespace LLVOAvatarDefines;
 void init_client_menu(LLMenuGL* menu);
 void init_server_menu(LLMenuGL* menu);
@@ -5216,6 +5218,34 @@ class LLViewEnableLastChatter : public view_listener_t
 	}
 };
 
+class LLViewToggleRadar: public view_listener_t
+{
+	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+	{
+		LLFloaterAvatarList::toggle(0);
+		bool vis = false;
+		if(LLFloaterAvatarList::getInstance())
+		{
+			vis = (bool)LLFloaterAvatarList::getInstance()->getVisible();
+		}
+		return true;
+	}
+};
+
+class LLViewToggleMOAPRadar: public view_listener_t
+{
+	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+	{
+		LLFloaterMOAPRadar::toggle(0);
+		bool vis = false;
+		if(LLFloaterMOAPRadar::getInstance())
+		{
+			vis = (bool)LLFloaterMOAPRadar::getInstance()->getVisible();
+		}
+		return true;
+	}
+};
+
 class LLEditEnableDeselect : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
@@ -11215,6 +11245,8 @@ void initialize_menus()
 	addMenu(new LLViewEnableMouselook(), "View.EnableMouselook");
 	addMenu(new LLViewEnableJoystickFlycam(), "View.EnableJoystickFlycam");
 	addMenu(new LLViewEnableLastChatter(), "View.EnableLastChatter");
+    addMenu(new LLViewToggleRadar(), "View.ToggleAvatarList");
+	addMenu(new LLViewToggleMOAPRadar(), "View.ToggleMOAPList");
 
 	addMenu(new LLViewCheckBuildMode(), "View.CheckBuildMode");
 	addMenu(new LLViewCheckJoystickFlycam(), "View.CheckJoystickFlycam");
diff --git a/linden/indra/newview/llviewerobject.h b/linden/indra/newview/llviewerobject.h
index 9b05470..98b7115 100644
--- a/linden/indra/newview/llviewerobject.h
+++ b/linden/indra/newview/llviewerobject.h
@@ -157,7 +157,13 @@ public:
 	enum { MEDIA_TYPE_NONE = 0, MEDIA_TYPE_WEB_PAGE = 1 };
 
 	// Return codes for processUpdateMessage
-	enum { MEDIA_URL_REMOVED = 0x1, MEDIA_URL_ADDED = 0x2, MEDIA_URL_UPDATED = 0x4, INVALID_UPDATE = 0x80000000 };
+	enum { 
+        MEDIA_URL_REMOVED = 0x1, 
+        MEDIA_URL_ADDED = 0x2, 
+        MEDIA_URL_UPDATED = 0x4, 
+        MEDIA_FLAGS_CHANGED = 0x8,
+        INVALID_UPDATE = 0x80000000
+    };
 
 	virtual U32		processUpdateMessage(LLMessageSystem *mesgsys,
 										void **user_data,
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index 2fafe30..42eb112 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -1436,6 +1436,8 @@ void LLViewerRegion::setSeedCapability(const std::string& url)
 	capabilityNames.append("EstateChangeInfo");
 	capabilityNames.append("EventQueueGet");
 	capabilityNames.append("FetchInventory");
+	capabilityNames.append("ObjectMedia");
+	capabilityNames.append("ObjectMediaNavigate");
 	capabilityNames.append("FetchLib");
 	capabilityNames.append("FetchLibDescendents");
 	capabilityNames.append("GetDisplayNames");
diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index d580d61..cb38c86 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -68,6 +68,9 @@
 #include "rlvhandler.h"
 // [/RLVa:KB]
 
+#include "llmediaentry.h"
+#include "llmediadataclient.h"
+
 const S32 MIN_QUIET_FRAMES_COALESCE = 30;
 const F32 FORCE_SIMPLE_RENDER_AREA = 512.f;
 const F32 FORCE_CULL_AREA = 8.f;
@@ -79,6 +82,93 @@ F32 LLVOVolume::sLODFactor = 1.f;
 F32	LLVOVolume::sLODSlopDistanceFactor = 0.5f; //Changing this to zero, effectively disables the LOD transition slop 
 F32 LLVOVolume::sDistanceFactor = 1.0f;
 S32 LLVOVolume::sNumLODChanges = 0;
+LLPointer<LLObjectMediaDataClient> LLVOVolume::sObjectMediaClient = NULL;
+LLPointer<LLObjectMediaNavigateClient> LLVOVolume::sObjectMediaNavigateClient = NULL;
+
+// Implementation class of LLMediaDataClientObject.  See llmediadataclient.h
+class LLMediaDataClientObjectImpl : public LLMediaDataClientObject
+{
+public:
+	LLMediaDataClientObjectImpl(LLVOVolume *obj, bool isNew) : mObject(obj), mNew(isNew) {}
+	LLMediaDataClientObjectImpl() { mObject = NULL; }
+	
+	virtual U8 getMediaDataCount() const 
+		{ return mObject->getNumTEs(); }
+
+	virtual LLSD getMediaDataLLSD(U8 index) const 
+		{
+			LLSD result;
+			LLTextureEntry *te = mObject->getTE(index); 
+			if (NULL != te)
+			{
+				llassert((te->getMediaData() != NULL) == te->hasMedia());
+				if (te->getMediaData() != NULL)
+				{
+					result = te->getMediaData()->asLLSD();
+					// XXX HACK: workaround bug in asLLSD() where whitelist is not set properly
+					// See DEV-41949
+					if (!result.has(LLMediaEntry::WHITELIST_KEY))
+					{
+						result[LLMediaEntry::WHITELIST_KEY] = LLSD::emptyArray();
+					}
+				}
+			}
+			return result;
+		}
+
+	virtual LLUUID getID() const
+		{ return mObject->getID(); }
+
+	virtual void mediaNavigateBounceBack(U8 index)
+		{ mObject->mediaNavigateBounceBack(index); } 
+	
+	virtual bool hasMedia() const
+		{ return mObject->hasMedia();} 
+	
+	virtual void updateObjectMediaData(LLSD const &data, const std::string &version_string) 
+		{ mObject->updateObjectMediaData(data, version_string); }
+	
+	virtual F64 getMediaInterest() const 
+		{ 
+			//F64 interest = mObject->getTotalMediaInterest();
+			//FIXME
+			F64 interest = 1024;
+			if (interest < (F64)0.0)
+			{
+				// media interest not valid yet, try pixel area
+				interest = mObject->getPixelArea();
+				// HACK: force recalculation of pixel area if interest is the "magic default" of 1024.
+				if (interest == 1024.f)
+				{
+					const_cast<LLVOVolume*>(static_cast<LLVOVolume*>(mObject))->setPixelAreaAndAngle(gAgent);
+					interest = mObject->getPixelArea();
+				}
+			}
+			return interest; 
+		}
+	
+	virtual bool isInterestingEnough() const
+		{
+			return true; //FUCKEDUP --> LLViewerMedia::isInterestingEnough(mObject, getMediaInterest());
+		}
+
+	virtual std::string getCapabilityUrl(const std::string &name) const
+		{ return mObject->getRegion()->getCapability(name); }
+	
+	virtual bool isDead() const
+		{ return mObject->isDead(); }
+	
+	virtual U32 getMediaVersion() const
+		{ return LLTextureEntry::getVersionFromMediaVersionString(mObject->getMediaURL()); }
+	
+	virtual bool isNew() const
+		{ return mNew; }
+
+private:
+	LLPointer<LLVOVolume> mObject;
+	bool mNew;
+};
+
 
 LLVOVolume::LLVOVolume(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp)
 	: LLViewerObject(id, pcode, regionp),
@@ -123,6 +213,18 @@ void LLVOVolume::markDead()
 // static
 void LLVOVolume::initClass()
 {
+	// gSavedSettings better be around
+	if (gSavedSettings.getBOOL("PrimMediaMasterEnabled"))
+	{
+		const F32 queue_timer_delay = gSavedSettings.getF32("PrimMediaRequestQueueDelay");
+		const F32 retry_timer_delay = gSavedSettings.getF32("PrimMediaRetryTimerDelay");
+		const U32 max_retries = gSavedSettings.getU32("PrimMediaMaxRetries");
+		const U32 max_sorted_queue_size = gSavedSettings.getU32("PrimMediaMaxSortedQueueSize");
+		const U32 max_round_robin_queue_size = gSavedSettings.getU32("PrimMediaMaxRoundRobinQueueSize");
+
+		sObjectMediaClient = new LLObjectMediaDataClient(queue_timer_delay, retry_timer_delay, max_retries, 
+															 max_sorted_queue_size, max_round_robin_queue_size);
+	}
 }
 
 
@@ -132,6 +234,7 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys,
 										  LLDataPacker *dp)
 {
 	LLColor4U color;
+	const S32 teDirtyBits = (TEM_CHANGE_TEXTURE|TEM_CHANGE_COLOR|TEM_CHANGE_MEDIA);
 
 	// Do base class updates...
 	U32 retval = LLViewerObject::processUpdateMessage(mesgsys, user_data, block_num, update_type, dp);
@@ -199,10 +302,15 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys,
 		//
 		// Unpack texture entry data
 		//
-		if (unpackTEMessage(mesgsys, _PREHASH_ObjectData, block_num) & (TEM_CHANGE_TEXTURE|TEM_CHANGE_COLOR))
+		S32 result =unpackTEMessage(mesgsys, _PREHASH_ObjectData, block_num);
+		if (result & teDirtyBits)
 		{
 			updateTEData();
 		}
+		if (result & TEM_CHANGE_MEDIA)
+		{
+			retval |= MEDIA_FLAGS_CHANGED;
+		}
 	}
 	else
 	{
@@ -235,9 +343,16 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys,
 // 				llerrs << "Bogus TE data in " << getID() << ", crashing!" << llendl;
 				llwarns << "Bogus TE data in " << getID() << llendl;
 			}
-			else if (res2 & (TEM_CHANGE_TEXTURE|TEM_CHANGE_COLOR))
+			else
 			{
-				updateTEData();
+				if (res2 & teDirtyBits) 
+				{
+					updateTEData();
+				}
+				if (res2 & TEM_CHANGE_MEDIA)
+				{
+					retval |= MEDIA_FLAGS_CHANGED;
+				}
 			}
 
 			U32 value = dp->getPassFlags();
@@ -275,13 +390,39 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys,
 				U8							tdpbuffer[1024];
 				LLDataPackerBinaryBuffer	tdp(tdpbuffer, 1024);
 				mesgsys->getBinaryDataFast(_PREHASH_ObjectData, _PREHASH_TextureEntry, tdpbuffer, 0, block_num);
-				if ( unpackTEMessage(tdp) & (TEM_CHANGE_TEXTURE|TEM_CHANGE_COLOR))
+				S32 result = unpackTEMessage(tdp);
+				if (result & teDirtyBits)
 				{
 					updateTEData();
 				}
+				if (result & TEM_CHANGE_MEDIA)
+				{
+					retval |= MEDIA_FLAGS_CHANGED;
+				}
 			}
 		}
 	}
+
+	if (retval & (MEDIA_URL_REMOVED | MEDIA_URL_ADDED | MEDIA_URL_UPDATED | MEDIA_FLAGS_CHANGED)) 
+	{
+		// If only the media URL changed, and it isn't a media version URL,
+		// ignore it
+		if ( ! ( retval & (MEDIA_URL_ADDED | MEDIA_URL_UPDATED) &&
+				 mMedia && ! mMedia->mMediaURL.empty() &&
+				 ! LLTextureEntry::isMediaVersionString(mMedia->mMediaURL) ) )
+		{
+			// If the media changed at all, request new media data
+			LL_DEBUGS("MediaOnAPrim") << "Media update: " << getID() << ": retval=" << retval << " Media URL: " <<
+                ((mMedia) ?  mMedia->mMediaURL : std::string("")) << LL_ENDL;
+			requestMediaDataUpdate(retval & MEDIA_FLAGS_CHANGED);
+		}
+        else {
+            LL_INFOS("MediaOnAPrim") << "Ignoring media update for: " << getID() << " Media URL: " <<
+                ((mMedia) ?  mMedia->mMediaURL : std::string("")) << LL_ENDL;
+        }
+	}
+	// ...and clean up any media impls
+	cleanUpMediaImpls();
 	
 	return retval;
 }
@@ -2894,4 +3035,253 @@ void LLHUDPartition::shift(const LLVector3 &offset)
 	//HUD objects don't shift with region crossing.  That would be silly.
 }
 
+void LLVOVolume::requestMediaDataUpdate(bool isNew)
+{
+    if (sObjectMediaClient)
+		sObjectMediaClient->fetchMedia(new LLMediaDataClientObjectImpl(this, isNew));
+}
+
+void LLVOVolume::cleanUpMediaImpls()
+{
+	// Iterate through our TEs and remove any Impls that are no longer used
+	const U8 numTEs = getNumTEs();
+	for (U8 i = 0; i < numTEs; i++)
+	{
+		const LLTextureEntry* te = getTE(i);
+		if( ! te->hasMedia())
+		{
+			// Delete the media IMPL!
+			removeMediaImpl(i) ;
+		}
+	}
+}
+
+void LLVOVolume::removeMediaImpl(S32 texture_index)
+{
+	if(mMediaImplList.size() <= (U32)texture_index || mMediaImplList[texture_index].isNull())
+	{
+		return ;
+	}
+
+	//make the face referencing to mMediaImplList[texture_index] to point back to the old texture.
+	if(mDrawable)
+	{
+		LLFace* facep = mDrawable->getFace(texture_index) ;
+		if(facep)
+		{
+			//LLViewerMediaTexture* media_tex = LLViewerTextureManager::findMediaTexture(mMediaImplList[texture_index]->getMediaTextureID()) ;
+			//if(media_tex)
+			//{
+			//	media_tex->removeMediaFromFace(facep) ;
+			//}
+		}
+	}		
+	
+	//check if some other face(s) of this object reference(s)to this media impl.
+	S32 i ;
+	S32 end = (S32)mMediaImplList.size() ;
+	for(i = 0; i < end ; i++)
+	{
+		if( i != texture_index && mMediaImplList[i] == mMediaImplList[texture_index])
+		{
+			break ;
+		}
+	}
+
+	if(i == end) //this object does not need this media impl.
+	{
+		//mMediaImplList[texture_index]->removeObject(this) ;
+	}
+
+	mMediaImplList[texture_index] = NULL ;
+	return ;
+}
+
+void LLVOVolume::addMediaImpl(LLViewerMediaImpl* media_impl, S32 texture_index)
+{
+	if((S32)mMediaImplList.size() < texture_index + 1)
+	{
+		mMediaImplList.resize(texture_index + 1) ;
+	}
+	
+	if(mMediaImplList[texture_index].notNull())
+	{
+		if(mMediaImplList[texture_index] == media_impl)
+		{
+			return ;
+		}
+
+		removeMediaImpl(texture_index) ;
+	}
+
+	mMediaImplList[texture_index] = media_impl;
+	//media_impl->addObject(this) ;	
+
+	//add the face to show the media if it is in playing
+	if(mDrawable)
+	{
+		LLFace* facep = mDrawable->getFace(texture_index) ;
+		if(facep)
+		{
+			//LLViewerMediaTexture* media_tex = LLViewerTextureManager::findMediaTexture(mMediaImplList[texture_index]->getMediaTextureID()) ;
+			//if(media_tex)
+			//{
+			//	media_tex->addMediaToFace(facep) ;
+			//}
+		}
+		else //the face is not available now, start media on this face later.
+		{
+			//media_impl->setUpdated(TRUE) ;
+		}
+	}
+	return ;
+}
+
+void LLVOVolume::sendMediaDataUpdate()
+{
+    if (sObjectMediaClient)
+		sObjectMediaClient->updateMedia(new LLMediaDataClientObjectImpl(this, false));
+}
+
+void LLVOVolume::updateObjectMediaData(const LLSD &media_data_array, const std::string &media_version)
+{
+	// media_data_array is an array of media entry maps
+	// media_version is the version string in the response.
+	U32 fetched_version = LLTextureEntry::getVersionFromMediaVersionString(media_version);
+
+	// Only update it if it is newer!
+	if ( (S32)fetched_version > mLastFetchedMediaVersion)
+	{
+		mLastFetchedMediaVersion = fetched_version;
+		//llinfos << "updating:" << this->getID() << " " << ll_pretty_print_sd(media_data_array) << llendl;
+		
+		LLSD::array_const_iterator iter = media_data_array.beginArray();
+		LLSD::array_const_iterator end = media_data_array.endArray();
+		U8 texture_index = 0;
+		for (; iter != end; ++iter, ++texture_index)
+		{
+			syncMediaData(texture_index, *iter, false/*merge*/, false/*ignore_agent*/);
+		}
+	}
+}
+
+bool LLVOVolume::hasMedia() const
+{
+	bool result = false;
+	const U8 numTEs = getNumTEs();
+	for (U8 i = 0; i < numTEs; i++)
+	{
+		const LLTextureEntry* te = getTE(i);
+		if(te->hasMedia())
+		{
+			result = true;
+			break;
+		}
+	}
+	return result;
+}
+
+void LLVOVolume::syncMediaData(S32 texture_index, const LLSD &media_data, bool merge, bool ignore_agent)
+{
+	if(mDead)
+	{
+		// If the object has been marked dead, don't process media updates.
+		return;
+	}
+	
+	LLTextureEntry *te = getTE(texture_index);
+//	LL_DEBUGS("MediaOnAPrim") << "BEFORE: texture_index = " << texture_index
+//		<< " hasMedia = " << te->hasMedia() << " : " 
+//		<< ((NULL == te->getMediaData()) ? "NULL MEDIA DATA" : ll_pretty_print_sd(te->getMediaData()->asLLSD())) << llendl;
 
+	std::string previous_url;
+	LLMediaEntry* mep = te->getMediaData();
+	if(mep)
+	{
+		// Save the "current url" from before the update so we can tell if
+		// it changes. 
+		previous_url = mep->getCurrentURL();
+	}
+
+	if (merge)
+	{
+		te->mergeIntoMediaData(media_data);
+	}
+	else {
+		// XXX Question: what if the media data is undefined LLSD, but the
+		// update we got above said that we have media flags??	Here we clobber
+		// that, assuming the data from the service is more up-to-date. 
+		te->updateMediaData(media_data);
+	}
+
+	mep = te->getMediaData();
+	if(mep)
+	{
+		bool update_from_self = false;
+		if (!ignore_agent) 
+		{
+			LLUUID updating_agent = LLTextureEntry::getAgentIDFromMediaVersionString(getMediaURL());
+			update_from_self = (updating_agent == gAgent.getID());
+		}
+		//viewer_media_t media_impl = LLViewerMedia::updateMediaImpl(mep, previous_url, update_from_self);
+			
+		//addMediaImpl(media_impl, texture_index) ;
+	}
+	else
+	{
+		//removeMediaImpl(texture_index);
+	}
+
+//	LL_DEBUGS("MediaOnAPrim") << "AFTER: texture_index = " << texture_index
+//		<< " hasMedia = " << te->hasMedia() << " : " 
+//		<< ((NULL == te->getMediaData()) ? "NULL MEDIA DATA" : ll_pretty_print_sd(te->getMediaData()->asLLSD())) << llendl;
+}
+
+
+void LLVOVolume::mediaNavigateBounceBack(U8 texture_index)
+{
+	/*
+	// Find the media entry for this navigate
+	const LLMediaEntry* mep = NULL;
+	viewer_media_t impl = getMediaImpl(texture_index);
+	LLTextureEntry *te = getTE(texture_index);
+	if(te)
+	{
+		mep = te->getMediaData();
+	}
+	
+	if (mep && impl)
+	{
+        std::string url = mep->getCurrentURL();
+		// Look for a ":", if not there, assume "http://"
+		if (!url.empty() && std::string::npos == url.find(':')) 
+		{
+			url = "http://" + url;
+		}
+		// If the url we're trying to "bounce back" to is either empty or not
+		// allowed by the whitelist, try the home url.  If *that* doesn't work,
+		// set the media as failed and unload it
+        if (url.empty() || !mep->checkCandidateUrl(url))
+        {
+            url = mep->getHomeURL();
+			// Look for a ":", if not there, assume "http://"
+			if (!url.empty() && std::string::npos == url.find(':')) 
+			{
+				url = "http://" + url;
+			}
+        }
+        if (url.empty() || !mep->checkCandidateUrl(url))
+		{
+			// The url to navigate back to is not good, and we have nowhere else
+			// to go.
+			LL_WARNS("MediaOnAPrim") << "FAILED to bounce back URL \"" << url << "\" -- unloading impl" << LL_ENDL;
+			impl->setMediaFailed(true);
+		}
+		else {
+			// Okay, navigate now
+            LL_INFOS("MediaOnAPrim") << "bouncing back to URL: " << url << LL_ENDL;
+            impl->navigateTo(url, "", false, true);
+        }
+    }
+	*/
+}
diff --git a/linden/indra/newview/llvovolume.h b/linden/indra/newview/llvovolume.h
index d09a198..39d9227 100644
--- a/linden/indra/newview/llvovolume.h
+++ b/linden/indra/newview/llvovolume.h
@@ -36,6 +36,8 @@
 #include "llviewerobject.h"
 #include "llviewerimage.h"
 #include "llframetimer.h"
+#include "llmediadataclient.h"
+#include "llviewermedia.h"
 #include "llapr.h"
 #include <map>
 
@@ -43,6 +45,8 @@ class LLViewerTextureAnim;
 class LLDrawPool;
 class LLSelectNode;
 
+typedef std::vector<viewer_media_t> media_list_t;
+
 enum LLVolumeInterfaceType
 {
 	INTERFACE_FLEXIBLE = 1,
@@ -217,6 +221,46 @@ public:
 
 	// tag: vaa emerald local_asset_browser
 	void setSculptChanged(BOOL has_changed) { mSculptChanged = has_changed; }
+	
+ 
+	   // Functions that deal with media, or media navigation
+     
+     // Update this object's media data with the given media data array
+     // (typically this is only called upon a response from a server request)
+ 	void updateObjectMediaData(const LLSD &media_data_array, const std::string &media_version);
+     
+     // Bounce back media at the given index to its current URL (or home URL, if current URL is empty)
+ 	void mediaNavigateBounceBack(U8 texture_index);
+     
+     // Returns whether or not this object has permission to navigate or control 
+ 	// the given media entry
+ 	enum MediaPermType {
+ 		MEDIA_PERM_INTERACT, MEDIA_PERM_CONTROL
+ 	};
+     bool hasMediaPermission(const LLMediaEntry* media_entry, MediaPermType perm_type);
+     
+ 	void mediaNavigated(LLViewerMediaImpl *impl, LLPluginClassMedia* plugin, std::string new_location);
+ 	void mediaEvent(LLViewerMediaImpl *impl, LLPluginClassMedia* plugin, LLViewerMediaObserver::EMediaEvent event);
+ 
+ 	// Sync the given media data with the impl and the given te
+ 	void syncMediaData(S32 te, const LLSD &media_data, bool merge, bool ignore_agent);
+ 	
+ 	// Send media data update to the simulator.
+ 	void sendMediaDataUpdate();
+ 
+ 	viewer_media_t getMediaImpl(U8 face_id) const;
+ 	S32 getFaceIndexWithMediaImpl(const LLViewerMediaImpl* media_impl, S32 start_face_id);
+ 	F64 getTotalMediaInterest() const;
+    
+ 	bool hasMedia() const;
+ 	
+ 	LLVector3 getApproximateFaceNormal(U8 face_id);
+ 	
+ 	// Returns 'true' iff the media data for this object is in flight
+ 	bool isMediaDataBeingFetched() const;
+ 	
+ 	// Returns the "last fetched" media version, or -1 if not fetched yet
+ 	S32 getLastFetchedMediaVersion() const { return mLastFetchedMediaVersion; }
 			
 protected:
 	S32	computeLODDetail(F32	distance, F32 radius);
@@ -224,6 +268,11 @@ protected:
 	LLFace* addFace(S32 face_index);
 	void updateTEData();
 
+	void requestMediaDataUpdate(bool isNew);
+	void cleanUpMediaImpls();
+	void addMediaImpl(LLViewerMediaImpl* media_impl, S32 texture_index) ;
+	void removeMediaImpl(S32 texture_index) ;
+
 public:
 	LLViewerTextureAnim *mTextureAnimp;
 	U8 mTexAnimMode;
@@ -242,12 +291,16 @@ private:
 	LLVolumeInterface *mVolumeImpl;
 	LLPointer<LLViewerImage> mSculptTexture;
 	S32 mIndexInTex;		// index of this volume in the texture's volume list
+	media_list_t mMediaImplList;
+ 	S32			mLastFetchedMediaVersion; // as fetched from the server, starts as -1
 	
 	// statics
 public:
 	static F32 sLODSlopDistanceFactor;// Changing this to zero, effectively disables the LOD transition slop 
 	static F32 sLODFactor;				// LOD scale factor
 	static F32 sDistanceFactor;			// LOD distance factor
+	static LLPointer<LLObjectMediaDataClient> sObjectMediaClient;
+ 	static LLPointer<LLObjectMediaNavigateClient> sObjectMediaNavigateClient;
 		
 protected:
 	static S32 sNumLODChanges;
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index cd9b3be..61ad8b7 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -232,6 +232,7 @@ BOOL	LLPipeline::sPickAvatar = TRUE;
 BOOL	LLPipeline::sDynamicLOD = TRUE;
 BOOL	LLPipeline::sShowHUDAttachments = TRUE;
 BOOL	LLPipeline::sRenderPhysicalBeacons = TRUE;
+BOOL	LLPipeline::sRenderMOAPBeacons = FALSE;
 BOOL	LLPipeline::sRenderScriptedBeacons = FALSE;
 BOOL	LLPipeline::sRenderScriptedTouchBeacons = TRUE;
 BOOL	LLPipeline::sRenderParticleBeacons = FALSE;
@@ -2149,6 +2150,43 @@ void renderPhysicalBeacons(LLDrawable* drawablep)
 	}
 }
 
+void renderMOAPBeacons(LLDrawable* drawablep)
+{
+	LLViewerObject *vobj = drawablep->getVObj();
+
+	if(!vobj || vobj->isAvatar())
+		return;
+
+	BOOL beacon=FALSE;
+	U8 tecount=vobj->getNumTEs();
+	for(int x=0;x<tecount;x++)
+	{
+		if(vobj->getTE(x)->hasMedia())
+		{
+			beacon=TRUE;
+			break;
+		}
+	}
+	if(beacon==TRUE)
+	{
+		if (gPipeline.sRenderBeacons)
+		{
+			gObjectList.addDebugBeacon(vobj->getPositionAgent(), "", LLColor4(0.f, 1.f, 0.f, 0.5f), LLColor4(1.f, 1.f, 1.f, 0.5f), gSavedSettings.getS32("DebugBeaconLineWidth"));
+		}
+
+		if (gPipeline.sRenderHighlight)
+		{
+			S32 face_id;
+			S32 count = drawablep->getNumFaces();
+			for (face_id = 0; face_id < count; face_id++)
+			{
+				gPipeline.mHighlightFaces.push_back(drawablep->getFace(face_id) );
+			}
+		}
+	}
+}
+
+
 void renderParticleBeacons(LLDrawable* drawablep)
 {
 	// Look for attachments, objects, etc.
@@ -2329,6 +2367,11 @@ void LLPipeline::postSort(LLCamera& camera)
 			forAllVisibleDrawables(renderPhysicalBeacons);
 		}
 
+		if(sRenderMOAPBeacons)
+		{
+			forAllVisibleDrawables(renderMOAPBeacons);
+		}
+
 		if (sRenderParticleBeacons)
 		{
 			forAllVisibleDrawables(renderParticleBeacons);
@@ -4563,6 +4606,24 @@ BOOL LLPipeline::getRenderScriptedTouchBeacons(void*)
 }
 
 // static
+void LLPipeline::setRenderMOAPBeacons(BOOL val)
+{
+	sRenderMOAPBeacons = val;
+}
+
+// static
+void LLPipeline::toggleRenderMOAPBeacons(void*)
+{
+	sRenderMOAPBeacons = !sRenderMOAPBeacons;
+}
+
+// static
+BOOL LLPipeline::getRenderMOAPBeacons(void*)
+{
+	return sRenderMOAPBeacons;
+}
+
+// static
 void LLPipeline::setRenderPhysicalBeacons(BOOL val)
 {
 	sRenderPhysicalBeacons = val;
diff --git a/linden/indra/newview/pipeline.h b/linden/indra/newview/pipeline.h
index c5ab7ab..254b3c1 100644
--- a/linden/indra/newview/pipeline.h
+++ b/linden/indra/newview/pipeline.h
@@ -271,6 +271,10 @@ public:
 	static void toggleRenderPhysicalBeacons(void* data);
 	static BOOL getRenderPhysicalBeacons(void* data);
 
+	static void setRenderMOAPBeacons(BOOL val);
+	static void toggleRenderMOAPBeacons(void * data);
+	static BOOL getRenderMOAPBeacons(void * data);
+
 	static void setRenderScriptedBeacons(BOOL val);
 	static void toggleRenderScriptedBeacons(void* data);
 	static BOOL getRenderScriptedBeacons(void* data);
@@ -572,6 +576,7 @@ protected:
 	S32						mLightingDetail;
 		
 	static BOOL				sRenderPhysicalBeacons;
+	static BOOL				sRenderMOAPBeacons;
 	static BOOL				sRenderScriptedTouchBeacons;
 	static BOOL				sRenderScriptedBeacons;
 	static BOOL				sRenderParticleBeacons;
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_beacons.xml b/linden/indra/newview/skins/default/xui/en-us/floater_beacons.xml
index e698878..2f9fc4d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_beacons.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_beacons.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="false"
-     width="250" height="225"
+     width="250" height="255"
      name="beacons" title="Beacons"
      rect_control="FloaterBeaconsRect" control_name="BeaconsEnabled">
-	<panel bottom="10" follows="left|top|right|bottom" left="10" width="230" height="200" name="beacons_panel">
+	<panel bottom="10" follows="left|top|right|bottom" left="10" width="230" height="240" name="beacons_panel">
   	<check_box bottom_delta="-33" follows="left|top" left="0" name="touch_only" label="Scripted Objects with Touch Only" control_name="scripttouchbeacon" />
     <check_box bottom_delta="-20" follows="left|top" left="0" name="scripted" label="Scripted Objects" control_name="scriptsbeacon" />
     <check_box bottom_delta="-20" follows="left|top" left="0" name="physical" label="Physical Objects" control_name="physicalbeacon" />
     <check_box bottom_delta="-20" follows="left|top" left="0" name="sounds" label="Sound Sources" control_name="soundsbeacon" />
     <check_box bottom_delta="-20" follows="left|top" left="0" name="particles" label="Particle Sources" control_name="particlesbeacon" />
     <check_box bottom_delta="-20" follows="left|top" left="0" name="highlights" label="Render Highlights" control_name="renderhighlights" />
+	<check_box bottom_delta="-20" follows="left|top" left="0" name="moap" label="MOAP Objects" control_name="moapbeacon" />
     <check_box bottom_delta="-20" follows="left|top" left="0" name="beacons" label="Render Beacons" control_name="renderbeacons" />
   	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
   	     bottom_delta="-30" drop_shadow_visible="true" enabled="true" follows="left|top"
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index efde449..c66bce0 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -385,6 +385,10 @@
       <on_click function="ShowFloater" userdata="mini map" />
       <on_check control="ShowMiniMap" />
     </menu_item_check>
+	<menu_item_check enabled="true" label="MOAP Radar" name="MOAPRadar" shortcut="">
+ 			<on_click function="View.ToggleMOAPList" userdata="moapradar" />
+ 			<on_check control="ShowMOAPRadar" />
+ 		</menu_item_check>
     <menu_item_separator />
     <menu_item_check label="Animation Overrider" name="AO" 
                      shortcut="control|shift|O">
-- 
cgit v1.1


From a0dedb8a1f050465b4e447689672ea2845f0cd5b Mon Sep 17 00:00:00 2001
From: Robin Cornelius
Date: Sat, 1 Oct 2011 22:32:42 +0100
Subject: And actually add the new files for MOAP radar

---
 linden/indra/newview/llmediadataclient.cpp         | 813 +++++++++++++++++++++
 linden/indra/newview/llmediadataclient.h           | 341 +++++++++
 linden/indra/newview/rcmoapradar.cpp               | 440 +++++++++++
 linden/indra/newview/rcmoapradar.h                 |  58 ++
 .../skins/default/xui/en-us/floater_moap_radar.xml |  54 ++
 5 files changed, 1706 insertions(+)
 create mode 100644 linden/indra/newview/llmediadataclient.cpp
 create mode 100644 linden/indra/newview/llmediadataclient.h
 create mode 100644 linden/indra/newview/rcmoapradar.cpp
 create mode 100644 linden/indra/newview/rcmoapradar.h
 create mode 100644 linden/indra/newview/skins/default/xui/en-us/floater_moap_radar.xml

diff --git a/linden/indra/newview/llmediadataclient.cpp b/linden/indra/newview/llmediadataclient.cpp
new file mode 100644
index 0000000..e2fa700
--- /dev/null
+++ b/linden/indra/newview/llmediadataclient.cpp
@@ -0,0 +1,813 @@
+/** 
+ * @file llmediadataclient.cpp
+ * @brief class for queueing up requests for media data
+ *
+ * $LicenseInfo:firstyear=2001&license=viewergpl$
+ * 
+ * Copyright (c) 2001-2010, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlife.com/developers/opensource/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlife.com/developers/opensource/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ * 
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llmediadataclient.h"
+
+#if LL_MSVC
+// disable boost::lexical_cast warning
+#pragma warning (disable:4702)
+#endif
+
+#include <boost/lexical_cast.hpp>
+
+#include "llhttpstatuscodes.h"
+#include "llsdutil.h"
+#include "llmediaentry.h"
+#include "lltextureentry.h"
+#include "llviewerregion.h"
+
+//
+// When making a request
+// - obtain the "overall interest score" of the object.	 
+//	 This would be the sum of the impls' interest scores.
+// - put the request onto a queue sorted by this score 
+//	 (highest score at the front of the queue)
+// - On a timer, once a second, pull off the head of the queue and send 
+//	 the request.
+// - Any request that gets a 503 still goes through the retry logic
+//
+
+//
+// Forward decls
+//
+const F32 LLMediaDataClient::QUEUE_TIMER_DELAY = 1.0; // seconds(s)
+const F32 LLMediaDataClient::UNAVAILABLE_RETRY_TIMER_DELAY = 10.0; // secs
+const U32 LLMediaDataClient::MAX_RETRIES = 10;
+const U32 LLMediaDataClient::MAX_SORTED_QUEUE_SIZE = 10000;
+const U32 LLMediaDataClient::MAX_ROUND_ROBIN_QUEUE_SIZE = 10000;
+
+// << operators
+std::ostream& operator<<(std::ostream &s, const LLMediaDataClient::request_queue_t &q);
+std::ostream& operator<<(std::ostream &s, const LLMediaDataClient::Request &q);
+
+//////////////////////////////////////////////////////////////////////////////////////
+//
+// LLMediaDataClient
+//
+//////////////////////////////////////////////////////////////////////////////////////
+
+LLMediaDataClient::LLMediaDataClient(F32 queue_timer_delay,
+									 F32 retry_timer_delay,
+									 U32 max_retries,
+									 U32 max_sorted_queue_size,
+									 U32 max_round_robin_queue_size)
+	: mQueueTimerDelay(queue_timer_delay),
+	  mRetryTimerDelay(retry_timer_delay),
+	  mMaxNumRetries(max_retries),
+	  mMaxSortedQueueSize(max_sorted_queue_size),
+	  mMaxRoundRobinQueueSize(max_round_robin_queue_size),
+	  mQueueTimerIsRunning(false),
+	  mCurrentQueueIsTheSortedQueue(true)
+{
+}
+
+LLMediaDataClient::~LLMediaDataClient()
+{
+	stopQueueTimer();
+
+	// This should clear the queue, and hopefully call all the destructors.
+	LL_DEBUGS("LLMediaDataClient") << "~LLMediaDataClient destructor: queue: " << 
+		(isEmpty() ? "<empty> " : "<not empty> ") << LL_ENDL;
+	
+	mSortedQueue.clear();
+	mRoundRobinQueue.clear();
+}
+
+bool LLMediaDataClient::isEmpty() const
+{
+	return mSortedQueue.empty() && mRoundRobinQueue.empty();
+}
+
+bool LLMediaDataClient::isInQueue(const LLMediaDataClientObject::ptr_t &object)
+{
+	return (LLMediaDataClient::findOrRemove(mSortedQueue, object, false/*remove*/, LLMediaDataClient::Request::ANY).notNull()
+		|| (LLMediaDataClient::findOrRemove(mRoundRobinQueue, object, false/*remove*/, LLMediaDataClient::Request::ANY).notNull()));
+}
+
+bool LLMediaDataClient::removeFromQueue(const LLMediaDataClientObject::ptr_t &object)
+{
+	bool removedFromSortedQueue = LLMediaDataClient::findOrRemove(mSortedQueue, object, true/*remove*/, LLMediaDataClient::Request::ANY).notNull();
+	bool removedFromRoundRobinQueue = LLMediaDataClient::findOrRemove(mRoundRobinQueue, object, true/*remove*/, LLMediaDataClient::Request::ANY).notNull();
+	return removedFromSortedQueue || removedFromRoundRobinQueue;
+}
+
+//static
+LLMediaDataClient::request_ptr_t LLMediaDataClient::findOrRemove(request_queue_t &queue, const LLMediaDataClientObject::ptr_t &obj, bool remove, LLMediaDataClient::Request::Type type)
+{
+	request_ptr_t result;
+	request_queue_t::iterator iter = queue.begin();
+	request_queue_t::iterator end = queue.end();
+	while (iter != end)
+	{
+		if (obj->getID() == (*iter)->getObject()->getID() && (type == LLMediaDataClient::Request::ANY || type == (*iter)->getType()))
+		{
+			result = *iter;
+			if (remove) queue.erase(iter);
+			break;
+		}
+		iter++;
+	}
+	return result;
+}
+
+void LLMediaDataClient::request(const LLMediaDataClientObject::ptr_t &object, const LLSD &payload)
+{
+	if (object.isNull() || ! object->hasMedia()) return; 
+	
+	// Push the object on the queue
+	enqueue(new Request(getCapabilityName(), payload, object, this));
+}
+
+void LLMediaDataClient::enqueue(const Request *request)
+{
+	if (request->isNew())
+	{		
+		// Add to sorted queue
+		if (LLMediaDataClient::findOrRemove(mSortedQueue, request->getObject(), true/*remove*/, request->getType()).notNull())
+		{
+			LL_DEBUGS("LLMediaDataClient") << "REMOVING OLD request for " << *request << " ALREADY THERE!" << LL_ENDL;
+		}
+		
+		LL_DEBUGS("LLMediaDataClient") << "Queuing SORTED request for " << *request << LL_ENDL;
+		
+		// Sadly, we have to const-cast because items put into the queue are not const
+		mSortedQueue.push_back(const_cast<LLMediaDataClient::Request*>(request));
+		
+		LL_DEBUGS("LLMediaDataClientQueue") << "SORTED queue:" << mSortedQueue << LL_ENDL;
+	}
+	else {
+		if (mRoundRobinQueue.size() > mMaxRoundRobinQueueSize) 
+		{
+			LL_INFOS_ONCE("LLMediaDataClient") << "RR QUEUE MAXED OUT!!!" << LL_ENDL;
+			LL_DEBUGS("LLMediaDataClient") << "Not queuing " << *request << LL_ENDL;
+			return;
+		}
+				
+		// ROUND ROBIN: if it is there, and it is a GET request, leave it.  If not, put at front!		
+		request_ptr_t existing_request;
+		if (request->getType() == Request::GET)
+		{
+			existing_request = LLMediaDataClient::findOrRemove(mRoundRobinQueue, request->getObject(), false/*remove*/, request->getType());
+		}
+		if (existing_request.isNull())
+		{
+			LL_DEBUGS("LLMediaDataClient") << "Queuing RR request for " << *request << LL_ENDL;
+			// Push the request on the pending queue
+			// Sadly, we have to const-cast because items put into the queue are not const
+			mRoundRobinQueue.push_front(const_cast<LLMediaDataClient::Request*>(request));
+			
+			LL_DEBUGS("LLMediaDataClientQueue") << "RR queue:" << mRoundRobinQueue << LL_ENDL;			
+		}
+		else
+		{
+			LL_DEBUGS("LLMediaDataClient") << "ALREADY THERE: NOT Queuing request for " << *request << LL_ENDL;
+						
+			existing_request->markSent(false);
+		}
+	}	
+	// Start the timer if not already running
+	startQueueTimer();
+}
+
+void LLMediaDataClient::startQueueTimer() 
+{
+	if (! mQueueTimerIsRunning)
+	{
+		LL_DEBUGS("LLMediaDataClient") << "starting queue timer (delay=" << mQueueTimerDelay << " seconds)" << LL_ENDL;
+		// LLEventTimer automagically takes care of the lifetime of this object
+		new QueueTimer(mQueueTimerDelay, this);
+	}
+	else { 
+		LL_DEBUGS("LLMediaDataClient") << "not starting queue timer (it's already running, right???)" << LL_ENDL;
+	}
+}
+
+void LLMediaDataClient::stopQueueTimer()
+{
+	mQueueTimerIsRunning = false;
+}
+
+bool LLMediaDataClient::processQueueTimer()
+{
+	sortQueue();
+	
+	if(!isEmpty())
+	{
+		LL_DEBUGS("LLMediaDataClient") << "QueueTimer::tick() started, SORTED queue size is:	  " << mSortedQueue.size() 
+			<< ", RR queue size is:	  " << mRoundRobinQueue.size() << LL_ENDL;
+		LL_DEBUGS("LLMediaDataClientQueue") << "QueueTimer::tick() started, SORTED queue is:	  " << mSortedQueue << LL_ENDL;
+		LL_DEBUGS("LLMediaDataClientQueue") << "QueueTimer::tick() started, RR queue is:	  " << mRoundRobinQueue << LL_ENDL;
+	}
+	
+	serviceQueue();
+	
+	LL_DEBUGS("LLMediaDataClient") << "QueueTimer::tick() finished, SORTED queue size is:	  " << mSortedQueue.size() 
+		<< ", RR queue size is:	  " << mRoundRobinQueue.size() << LL_ENDL;
+	LL_DEBUGS("LLMediaDataClientQueue") << "QueueTimer::tick() finished, SORTED queue is:	  " << mSortedQueue << LL_ENDL;
+	LL_DEBUGS("LLMediaDataClientQueue") << "QueueTimer::tick() finished, RR queue is:	  " << mRoundRobinQueue << LL_ENDL;
+	
+	return isEmpty();
+}
+
+void LLMediaDataClient::sortQueue()
+{
+	if(!mSortedQueue.empty())
+	{
+		// Score all items first
+		request_queue_t::iterator iter = mSortedQueue.begin();
+		request_queue_t::iterator end = mSortedQueue.end();
+		while (iter != end)
+		{
+			(*iter)->updateScore();
+			iter++;
+		}
+		
+		// Re-sort the list...
+		// NOTE: should this be a stable_sort?  If so we need to change to using a vector.
+		mSortedQueue.sort(LLMediaDataClient::compareRequests);
+		
+		// ...then cull items over the max
+		U32 size = mSortedQueue.size();
+		if (size > mMaxSortedQueueSize) 
+		{
+			U32 num_to_cull = (size - mMaxSortedQueueSize);
+			LL_INFOS_ONCE("LLMediaDataClient") << "sorted queue MAXED OUT!  Culling " 
+				<< num_to_cull << " items" << LL_ENDL;
+			while (num_to_cull-- > 0)
+			{
+				mSortedQueue.pop_back();
+			}
+		}
+	}
+}
+
+// static
+bool LLMediaDataClient::compareRequests(const request_ptr_t &o1, const request_ptr_t &o2)
+{
+	if (o2.isNull()) return true;
+	if (o1.isNull()) return false;
+	return ( o1->getScore() > o2->getScore() );
+}
+
+void LLMediaDataClient::serviceQueue()
+{	
+	request_queue_t *queue_p = getCurrentQueue();
+	
+	// quick retry loop for cases where we shouldn't wait for the next timer tick
+	while(true)
+	{
+		if (queue_p->empty())
+		{
+			LL_DEBUGS("LLMediaDataClient") << "queue empty: " << (*queue_p) << LL_ENDL;
+			break;
+		}
+		
+		// Peel one off of the items from the queue, and execute request
+		request_ptr_t request = queue_p->front();
+		llassert(!request.isNull());
+		const LLMediaDataClientObject *object = (request.isNull()) ? NULL : request->getObject();
+		llassert(NULL != object);
+		
+		// Check for conditions that would make us just pop and rapidly loop through
+		// the queue.
+		if(request.isNull() ||
+		   request->isMarkedSent() ||
+		   NULL == object ||
+		   object->isDead() ||
+		   !object->hasMedia())
+		{
+			if (request.isNull()) 
+			{
+				LL_WARNS("LLMediaDataClient") << "Skipping NULL request" << LL_ENDL;
+			}
+			else {
+				LL_INFOS("LLMediaDataClient") << "Skipping : " << *request << " " 
+				<< ((request->isMarkedSent()) ? " request is marked sent" :
+					((NULL == object) ? " object is NULL " :
+					 ((object->isDead()) ? "object is dead" : 
+					  ((!object->hasMedia()) ? "object has no media!" : "BADNESS!")))) << LL_ENDL;
+			}
+			queue_p->pop_front();
+			continue;	// jump back to the start of the quick retry loop
+		}
+		
+		// Next, ask if this is "interesting enough" to fetch.  If not, just stop
+		// and wait for the next timer go-round.  Only do this for the sorted 
+		// queue.
+		if (mCurrentQueueIsTheSortedQueue && !object->isInterestingEnough())
+		{
+			LL_DEBUGS("LLMediaDataClient") << "Not fetching " << *request << ": not interesting enough" << LL_ENDL;
+			break;
+		}
+		
+		// Finally, try to send the HTTP message to the cap url
+		std::string url = request->getCapability();
+		bool maybe_retry = false;
+		if (!url.empty())
+		{
+			const LLSD &sd_payload = request->getPayload();
+			LL_INFOS("LLMediaDataClient") << "Sending request for " << *request << LL_ENDL;
+			
+			// Call the subclass for creating the responder
+			LLHTTPClient::post(url, sd_payload, createResponder(request));
+		}
+		else {
+			LL_INFOS("LLMediaDataClient") << "NOT Sending request for " << *request << ": empty cap url!" << LL_ENDL;
+			maybe_retry = true;
+		}
+
+		bool exceeded_retries = request->getRetryCount() > mMaxNumRetries;
+		if (maybe_retry && ! exceeded_retries) // Try N times before giving up 
+		{
+			// We got an empty cap, but in that case we will retry again next
+			// timer fire.
+			request->incRetryCount();
+		}
+		else {
+			if (exceeded_retries)
+			{
+				LL_WARNS("LLMediaDataClient") << "Could not send request " << *request << " for " 
+					<< mMaxNumRetries << " tries...popping object id " << object->getID() << LL_ENDL; 
+				// XXX Should we bring up a warning dialog??
+			}
+			
+			queue_p->pop_front();
+			
+			if (! mCurrentQueueIsTheSortedQueue) {
+				// Round robin
+				request->markSent(true);
+				mRoundRobinQueue.push_back(request);				
+			}
+		}
+		
+ 		// end of quick loop -- any cases where we want to loop will use 'continue' to jump back to the start.
+ 		break;
+	}
+	
+	swapCurrentQueue();
+}
+
+void LLMediaDataClient::swapCurrentQueue()
+{
+	// Swap
+	mCurrentQueueIsTheSortedQueue = !mCurrentQueueIsTheSortedQueue;
+	// If its empty, swap back
+	if (getCurrentQueue()->empty()) 
+	{
+		mCurrentQueueIsTheSortedQueue = !mCurrentQueueIsTheSortedQueue;
+	}
+}
+
+LLMediaDataClient::request_queue_t *LLMediaDataClient::getCurrentQueue()
+{
+	return (mCurrentQueueIsTheSortedQueue) ? &mSortedQueue : &mRoundRobinQueue;
+}
+
+// dump the queue
+std::ostream& operator<<(std::ostream &s, const LLMediaDataClient::request_queue_t &q)
+{
+	int i = 0;
+	LLMediaDataClient::request_queue_t::const_iterator iter = q.begin();
+	LLMediaDataClient::request_queue_t::const_iterator end = q.end();
+	while (iter != end)
+	{
+		s << "\t" << i << "]: " << (*iter)->getObject()->getID().asString() << "(" << (*iter)->getObject()->getMediaInterest() << ")";
+		iter++;
+		i++;
+	}
+	return s;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////
+//
+// LLMediaDataClient::QueueTimer
+// Queue of LLMediaDataClientObject smart pointers to request media for.
+//
+//////////////////////////////////////////////////////////////////////////////////////
+
+LLMediaDataClient::QueueTimer::QueueTimer(F32 time, LLMediaDataClient *mdc)
+: LLEventTimer(time), mMDC(mdc)
+{
+	mMDC->setIsRunning(true);
+}
+
+LLMediaDataClient::QueueTimer::~QueueTimer()
+{
+	LL_DEBUGS("LLMediaDataClient") << "~QueueTimer" << LL_ENDL;
+	mMDC->setIsRunning(false);
+	mMDC = NULL;
+}
+
+// virtual
+BOOL LLMediaDataClient::QueueTimer::tick()
+{
+	if (mMDC.isNull()) return TRUE;
+	return mMDC->processQueueTimer();
+}
+
+
+//////////////////////////////////////////////////////////////////////////////////////
+//
+// LLMediaDataClient::Responder::RetryTimer
+//
+//////////////////////////////////////////////////////////////////////////////////////
+
+LLMediaDataClient::Responder::RetryTimer::RetryTimer(F32 time, Responder *mdr)
+: LLEventTimer(time), mResponder(mdr)
+{
+}
+
+// virtual 
+LLMediaDataClient::Responder::RetryTimer::~RetryTimer() 
+{
+	LL_DEBUGS("LLMediaDataClient") << "~RetryTimer" << *(mResponder->getRequest()) << LL_ENDL;
+	
+	// XXX This is weird: Instead of doing the work in tick()  (which re-schedules
+	// a timer, which might be risky), do it here, in the destructor.  Yes, it is very odd.
+	// Instead of retrying, we just put the request back onto the queue
+	LL_INFOS("LLMediaDataClient") << "RetryTimer fired for: " << *(mResponder->getRequest()) << " retrying" << LL_ENDL;
+	mResponder->getRequest()->reEnqueue();
+	
+	// Release the ref to the responder.
+	mResponder = NULL;
+}
+
+// virtual
+BOOL LLMediaDataClient::Responder::RetryTimer::tick()
+{
+	// Don't fire again
+	return TRUE;
+}
+
+
+//////////////////////////////////////////////////////////////////////////////////////
+//
+// LLMediaDataClient::Request
+//
+//////////////////////////////////////////////////////////////////////////////////////
+/*static*/U32 LLMediaDataClient::Request::sNum = 0;
+
+LLMediaDataClient::Request::Request(const char *cap_name, 
+									const LLSD& sd_payload,
+									LLMediaDataClientObject *obj, 
+									LLMediaDataClient *mdc)
+: mCapName(cap_name), 
+  mPayload(sd_payload), 
+  mObject(obj),
+  mNum(++sNum), 
+  mRetryCount(0),
+  mMDC(mdc),
+  mMarkedSent(false),
+  mScore((F64)0.0)
+{
+}
+
+LLMediaDataClient::Request::~Request()
+{
+	LL_DEBUGS("LLMediaDataClient") << "~Request" << (*this) << LL_ENDL;
+	mMDC = NULL;
+	mObject = NULL;
+}
+
+
+std::string LLMediaDataClient::Request::getCapability() const
+{
+	return getObject()->getCapabilityUrl(getCapName());
+}
+
+// Helper function to get the "type" of request, which just pokes around to
+// discover it.
+LLMediaDataClient::Request::Type LLMediaDataClient::Request::getType() const
+{
+	if (0 == strcmp(mCapName, "ObjectMediaNavigate"))
+	{
+		return NAVIGATE;
+	}
+	else if (0 == strcmp(mCapName, "ObjectMedia"))
+	{
+		const std::string &verb = mPayload["verb"];
+		if (verb == "GET")
+		{
+			return GET;
+		}
+		else if (verb == "UPDATE")
+		{
+			return UPDATE;
+		}
+	}
+	llassert(false);
+	return GET;
+}
+
+const char *LLMediaDataClient::Request::getTypeAsString() const
+{
+	Type t = getType();
+	switch (t)
+	{
+		case GET:
+			return "GET";
+			break;
+		case UPDATE:
+			return "UPDATE";
+			break;
+		case NAVIGATE:
+			return "NAVIGATE";
+			break;
+		case ANY:
+			return "ANY";
+			break;
+	}
+	return "";
+}
+
+
+void LLMediaDataClient::Request::reEnqueue() const
+{
+	// I sure hope this doesn't deref a bad pointer:
+	mMDC->enqueue(this);
+}
+
+F32 LLMediaDataClient::Request::getRetryTimerDelay() const
+{
+	return (mMDC == NULL) ? LLMediaDataClient::UNAVAILABLE_RETRY_TIMER_DELAY :
+	mMDC->mRetryTimerDelay; 
+}
+
+U32 LLMediaDataClient::Request::getMaxNumRetries() const
+{
+	return (mMDC == NULL) ? LLMediaDataClient::MAX_RETRIES : mMDC->mMaxNumRetries;
+}
+
+void LLMediaDataClient::Request::markSent(bool flag)
+{
+	 if (mMarkedSent != flag)
+	 {
+		 mMarkedSent = flag;
+		 if (!mMarkedSent)
+		 {
+			 mNum = ++sNum;
+		 }
+	 }
+}
+		   
+void LLMediaDataClient::Request::updateScore()
+{				
+	F64 tmp = mObject->getMediaInterest();
+	if (tmp != mScore)
+	{
+		LL_DEBUGS("LLMediaDataClient") << "Score for " << mObject->getID() << " changed from " << mScore << " to " << tmp << LL_ENDL; 
+		mScore = tmp;
+	}
+}
+		   
+std::ostream& operator<<(std::ostream &s, const LLMediaDataClient::Request &r)
+{
+	s << "request: num=" << r.getNum() 
+	<< " type=" << r.getTypeAsString() 
+	<< " ID=" << r.getObject()->getID() 
+	<< " #retries=" << r.getRetryCount();
+	return s;
+}
+
+			
+//////////////////////////////////////////////////////////////////////////////////////
+//
+// LLMediaDataClient::Responder
+//
+//////////////////////////////////////////////////////////////////////////////////////
+
+LLMediaDataClient::Responder::Responder(const request_ptr_t &request)
+: mRequest(request)
+{
+}
+
+LLMediaDataClient::Responder::~Responder()
+{
+	LL_DEBUGS("LLMediaDataClient") << "~Responder" << *(getRequest()) << LL_ENDL;
+	mRequest = NULL;
+}
+
+/*virtual*/
+void LLMediaDataClient::Responder::error(U32 status, const std::string& reason)
+{
+	if (status == HTTP_SERVICE_UNAVAILABLE)
+	{
+		F32 retry_timeout = mRequest->getRetryTimerDelay();
+		
+		mRequest->incRetryCount();
+		
+		if (mRequest->getRetryCount() < mRequest->getMaxNumRetries()) 
+		{
+			LL_INFOS("LLMediaDataClient") << *mRequest << " got SERVICE_UNAVAILABLE...retrying in " << retry_timeout << " seconds" << LL_ENDL;
+			
+			// Start timer (instances are automagically tracked by
+			// InstanceTracker<> and LLEventTimer)
+			new RetryTimer(F32(retry_timeout/*secs*/), this);
+		}
+		else {
+			LL_INFOS("LLMediaDataClient") << *mRequest << " got SERVICE_UNAVAILABLE...retry count " 
+				<< mRequest->getRetryCount() << " exceeds " << mRequest->getMaxNumRetries() << ", not retrying" << LL_ENDL;
+		}
+	}
+	else {
+		std::string msg = boost::lexical_cast<std::string>(status) + ": " + reason;
+		LL_WARNS("LLMediaDataClient") << *mRequest << " http error(" << msg << ")" << LL_ENDL;
+	}
+}
+
+/*virtual*/
+void LLMediaDataClient::Responder::result(const LLSD& content)
+{
+	LL_DEBUGS("LLMediaDataClientResponse") << *mRequest << " result : " << ll_print_sd(content) << LL_ENDL;
+}
+
+//////////////////////////////////////////////////////////////////////////////////////
+//
+// LLObjectMediaDataClient
+// Subclass of LLMediaDataClient for the ObjectMedia cap
+//
+//////////////////////////////////////////////////////////////////////////////////////
+
+LLMediaDataClient::Responder *LLObjectMediaDataClient::createResponder(const request_ptr_t &request) const
+{
+	return new LLObjectMediaDataClient::Responder(request);
+}
+
+const char *LLObjectMediaDataClient::getCapabilityName() const 
+{
+	return "ObjectMedia";
+}
+
+void LLObjectMediaDataClient::fetchMedia(LLMediaDataClientObject *object)
+{
+	LLSD sd_payload;
+	sd_payload["verb"] = "GET";
+	sd_payload[LLTextureEntry::OBJECT_ID_KEY] = object->getID();
+	request(object, sd_payload);
+}
+
+void LLObjectMediaDataClient::updateMedia(LLMediaDataClientObject *object)
+{
+	LLSD sd_payload;
+	sd_payload["verb"] = "UPDATE";
+	sd_payload[LLTextureEntry::OBJECT_ID_KEY] = object->getID();
+	LLSD object_media_data;
+	int i = 0;
+	int end = object->getMediaDataCount();
+	for ( ; i < end ; ++i) 
+	{
+		object_media_data.append(object->getMediaDataLLSD(i));
+	}
+	sd_payload[LLTextureEntry::OBJECT_MEDIA_DATA_KEY] = object_media_data;
+		
+	LL_DEBUGS("LLMediaDataClient") << "update media data: " << object->getID() << " " << ll_print_sd(sd_payload) << LL_ENDL;
+	
+	request(object, sd_payload);
+}
+
+/*virtual*/
+void LLObjectMediaDataClient::Responder::result(const LLSD& content)
+{
+	const LLMediaDataClient::Request::Type type = getRequest()->getType();
+	llassert(type == LLMediaDataClient::Request::GET || type == LLMediaDataClient::Request::UPDATE)
+	if (type == LLMediaDataClient::Request::GET)
+	{
+		LL_DEBUGS("LLMediaDataClientResponse") << *(getRequest()) << " GET returned: " << ll_print_sd(content) << LL_ENDL;
+		
+		// Look for an error
+		if (content.has("error"))
+		{
+			const LLSD &error = content["error"];
+			LL_WARNS("LLMediaDataClient") << *(getRequest()) << " Error getting media data for object: code=" << 
+				error["code"].asString() << ": " << error["message"].asString() << LL_ENDL;
+			
+			// XXX Warn user?
+		}
+		else {
+			// Check the data
+			const LLUUID &object_id = content[LLTextureEntry::OBJECT_ID_KEY];
+			if (object_id != getRequest()->getObject()->getID()) 
+			{
+				// NOT good, wrong object id!!
+				LL_WARNS("LLMediaDataClient") << *(getRequest()) << " DROPPING response with wrong object id (" << object_id << ")" << LL_ENDL;
+				return;
+			}
+			
+			// Otherwise, update with object media data
+			getRequest()->getObject()->updateObjectMediaData(content[LLTextureEntry::OBJECT_MEDIA_DATA_KEY],
+															 content[LLTextureEntry::MEDIA_VERSION_KEY]);
+		}
+	}
+	else if (type == LLMediaDataClient::Request::UPDATE)
+	{
+		// just do what our superclass does
+		LLMediaDataClient::Responder::result(content);
+	}
+}
+
+//////////////////////////////////////////////////////////////////////////////////////
+//
+// LLObjectMediaNavigateClient
+// Subclass of LLMediaDataClient for the ObjectMediaNavigate cap
+//
+//////////////////////////////////////////////////////////////////////////////////////
+LLMediaDataClient::Responder *LLObjectMediaNavigateClient::createResponder(const request_ptr_t &request) const
+{
+	return new LLObjectMediaNavigateClient::Responder(request);
+}
+
+const char *LLObjectMediaNavigateClient::getCapabilityName() const 
+{
+	return "ObjectMediaNavigate";
+}
+
+void LLObjectMediaNavigateClient::navigate(LLMediaDataClientObject *object, U8 texture_index, const std::string &url)
+{
+	LLSD sd_payload;
+	sd_payload[LLTextureEntry::OBJECT_ID_KEY] = object->getID();
+	sd_payload[LLMediaEntry::CURRENT_URL_KEY] = url;
+	sd_payload[LLTextureEntry::TEXTURE_INDEX_KEY] = (LLSD::Integer)texture_index;
+	
+	LL_INFOS("LLMediaDataClient") << "navigate() initiated: " << ll_print_sd(sd_payload) << LL_ENDL;
+	
+	request(object, sd_payload);
+}
+
+/*virtual*/
+void LLObjectMediaNavigateClient::Responder::error(U32 status, const std::string& reason)
+{
+	// Bounce back (unless HTTP_SERVICE_UNAVAILABLE, in which case call base
+	// class
+	if (status == HTTP_SERVICE_UNAVAILABLE)
+	{
+		LLMediaDataClient::Responder::error(status, reason);
+	}
+	else {
+		// bounce the face back
+		LL_WARNS("LLMediaDataClient") << *(getRequest()) << " Error navigating: http code=" << status << LL_ENDL;
+		const LLSD &payload = getRequest()->getPayload();
+		// bounce the face back
+		getRequest()->getObject()->mediaNavigateBounceBack((LLSD::Integer)payload[LLTextureEntry::TEXTURE_INDEX_KEY]);
+	}
+}
+
+/*virtual*/
+void LLObjectMediaNavigateClient::Responder::result(const LLSD& content)
+{
+	LL_INFOS("LLMediaDataClient") << *(getRequest()) << " NAVIGATE returned " << ll_print_sd(content) << LL_ENDL;
+	
+	if (content.has("error"))
+	{
+		const LLSD &error = content["error"];
+		int error_code = error["code"];
+		
+		if (ERROR_PERMISSION_DENIED_CODE == error_code)
+		{
+			LL_WARNS("LLMediaDataClient") << *(getRequest()) << " Navigation denied: bounce back" << LL_ENDL;
+			const LLSD &payload = getRequest()->getPayload();
+			// bounce the face back
+			getRequest()->getObject()->mediaNavigateBounceBack((LLSD::Integer)payload[LLTextureEntry::TEXTURE_INDEX_KEY]);
+		}
+		else {
+			LL_WARNS("LLMediaDataClient") << *(getRequest()) << " Error navigating: code=" << 
+				error["code"].asString() << ": " << error["message"].asString() << LL_ENDL;
+		}			 
+		// XXX Warn user?
+	}
+	else {
+		// just do what our superclass does
+		LLMediaDataClient::Responder::result(content);
+	}
+}
diff --git a/linden/indra/newview/llmediadataclient.h b/linden/indra/newview/llmediadataclient.h
new file mode 100644
index 0000000..0ed7c57
--- /dev/null
+++ b/linden/indra/newview/llmediadataclient.h
@@ -0,0 +1,341 @@
+/** 
+ * @file llmediadataclient.h
+ * @brief class for queueing up requests to the media service
+ *
+ * $LicenseInfo:firstyear=2007&license=viewergpl$
+ * 
+ * Copyright (c) 2007-2010, Linden Research, Inc.
+ * 
+ * Second Life Viewer Source Code
+ * The source code in this file ("Source Code") is provided by Linden Lab
+ * to you under the terms of the GNU General Public License, version 2.0
+ * ("GPL"), unless you have obtained a separate licensing agreement
+ * ("Other License"), formally executed by you and Linden Lab.  Terms of
+ * the GPL can be found in doc/GPL-license.txt in this distribution, or
+ * online at http://secondlife.com/developers/opensource/gplv2
+ * 
+ * There are special exceptions to the terms and conditions of the GPL as
+ * it is applied to this Source Code. View the full text of the exception
+ * in the file doc/FLOSS-exception.txt in this software distribution, or
+ * online at
+ * http://secondlife.com/developers/opensource/flossexception
+ * 
+ * By copying, modifying or distributing this software, you acknowledge
+ * that you have read and understood your obligations described above,
+ * and agree to abide by those obligations.
+ * 
+ * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
+ * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
+ * COMPLETENESS OR PERFORMANCE.
+ * $/LicenseInfo$
+ * 
+ */
+
+#ifndef LL_LLMEDIADATACLIENT_H
+#define LL_LLMEDIADATACLIENT_H
+
+#include "llhttpclient.h"
+#include <queue>
+//#include "llrefcount.h"
+//#include "llpointer.h"
+//#include "lleventtimer.h"
+
+
+// Link seam for LLVOVolume
+class LLMediaDataClientObject : public LLRefCount
+{
+public:
+	// Get the number of media data items
+	virtual U8 getMediaDataCount() const = 0;
+	// Get the media data at index, as an LLSD
+	virtual LLSD getMediaDataLLSD(U8 index) const = 0;
+	// Get this object's UUID
+	virtual LLUUID getID() const = 0;
+	// Navigate back to previous URL
+	virtual void mediaNavigateBounceBack(U8 index) = 0;
+	// Does this object have media?
+	virtual bool hasMedia() const = 0;
+	// Update the object's media data to the given array
+	virtual void updateObjectMediaData(LLSD const &media_data_array, const std::string &version_string) = 0;
+	// Return the total "interest" of the media (on-screen area)
+	virtual F64 getMediaInterest() const = 0;
+	// Return the given cap url
+	virtual std::string getCapabilityUrl(const std::string &name) const = 0;
+	// Return whether the object has been marked dead
+	virtual bool isDead() const = 0;
+	// Returns a media version number for the object
+	virtual U32 getMediaVersion() const = 0;
+	// Returns whether the object is "interesting enough" to fetch
+	virtual bool isInterestingEnough() const = 0;
+	// Returns whether we've seen this object yet or not
+	virtual bool isNew() const = 0;
+
+	// smart pointer
+	typedef LLPointer<LLMediaDataClientObject> ptr_t;
+};
+
+// This object creates a priority queue for requests.
+// Abstracts the Cap URL, the request, and the responder
+class LLMediaDataClient : public LLRefCount
+{
+public:
+    LOG_CLASS(LLMediaDataClient);
+    
+    const static F32 QUEUE_TIMER_DELAY;// = 1.0; // seconds(s)
+	const static F32 UNAVAILABLE_RETRY_TIMER_DELAY;// = 5.0; // secs
+	const static U32 MAX_RETRIES;// = 4;
+	const static U32 MAX_SORTED_QUEUE_SIZE;// = 10000;
+	const static U32 MAX_ROUND_ROBIN_QUEUE_SIZE;// = 10000;
+
+	// Constructor
+	LLMediaDataClient(F32 queue_timer_delay = QUEUE_TIMER_DELAY,
+					  F32 retry_timer_delay = UNAVAILABLE_RETRY_TIMER_DELAY,
+		              U32 max_retries = MAX_RETRIES,
+					  U32 max_sorted_queue_size = MAX_SORTED_QUEUE_SIZE,
+					  U32 max_round_robin_queue_size = MAX_ROUND_ROBIN_QUEUE_SIZE);
+	
+	// Make the request
+	void request(const LLMediaDataClientObject::ptr_t &object, const LLSD &payload);
+
+	F32 getRetryTimerDelay() const { return mRetryTimerDelay; }
+	
+	// Returns true iff the queue is empty
+	bool isEmpty() const;
+	
+	// Returns true iff the given object is in the queue
+	bool isInQueue(const LLMediaDataClientObject::ptr_t &object);
+	
+	// Remove the given object from the queue. Returns true iff the given object is removed.
+	bool removeFromQueue(const LLMediaDataClientObject::ptr_t &object);
+	
+	// Called only by the Queue timer and tests (potentially)
+	bool processQueueTimer();
+	
+protected:
+	// Destructor
+	virtual ~LLMediaDataClient(); // use unref
+    
+	// Request
+	class Request : public LLRefCount
+	{
+	public:
+        enum Type {
+            GET,
+            UPDATE,
+            NAVIGATE,
+			ANY
+        };
+        
+		Request(const char *cap_name, const LLSD& sd_payload, LLMediaDataClientObject *obj, LLMediaDataClient *mdc);
+		const char *getCapName() const { return mCapName; }
+		const LLSD &getPayload() const { return mPayload; }
+		LLMediaDataClientObject *getObject() const { return mObject; }
+
+        U32 getNum() const { return mNum; }
+
+		U32 getRetryCount() const { return mRetryCount; }
+		void incRetryCount() { mRetryCount++; }
+		
+		// Note: may return empty string!
+		std::string getCapability() const;
+        
+        Type getType() const;
+		const char *getTypeAsString() const;
+		
+		// Re-enqueue thyself
+		void reEnqueue() const;
+		
+		F32 getRetryTimerDelay() const;
+		U32 getMaxNumRetries() const;
+		
+		bool isNew() const { return mObject.notNull() ? mObject->isNew() : false; }
+		void markSent(bool flag);
+		bool isMarkedSent() const { return mMarkedSent; }
+		void updateScore();
+		F64 getScore() const { return mScore; }
+		
+	public:
+		friend std::ostream& operator<<(std::ostream &s, const Request &q);
+		
+    protected:
+        virtual ~Request(); // use unref();
+        
+	private:
+		const char *mCapName;
+		LLSD mPayload;
+		LLMediaDataClientObject::ptr_t mObject;
+		// Simple tracking
+		U32 mNum;
+		static U32 sNum;
+        U32 mRetryCount;
+		F64 mScore;
+		bool mMarkedSent;
+
+		// Back pointer to the MDC...not a ref!
+		LLMediaDataClient *mMDC;
+	};
+	typedef LLPointer<Request> request_ptr_t;
+
+	// Responder
+	class Responder : public LLHTTPClient::Responder
+	{
+	public:
+		Responder(const request_ptr_t &request);
+		//If we get back an error (not found, etc...), handle it here
+		virtual void error(U32 status, const std::string& reason);
+		//If we get back a normal response, handle it here.	 Default just logs it.
+		virtual void result(const LLSD& content);
+
+		const request_ptr_t &getRequest() const { return mRequest; }
+
+    protected:
+		virtual ~Responder();
+        
+	private:
+
+		class RetryTimer : public LLEventTimer
+		{
+		public:
+			RetryTimer(F32 time, Responder *);
+			virtual ~RetryTimer();
+			virtual BOOL tick();
+		private:
+			// back-pointer
+			boost::intrusive_ptr<Responder> mResponder;
+		};
+		
+		request_ptr_t mRequest;
+	};
+	
+protected:
+
+	// Subclasses must override this factory method to return a new responder
+	virtual Responder *createResponder(const request_ptr_t &request) const = 0;
+	
+	// Subclasses must override to return a cap name
+	virtual const char *getCapabilityName() const = 0;
+	
+	virtual void sortQueue();
+	virtual void serviceQueue();
+	
+private:
+	typedef std::list<request_ptr_t> request_queue_t;
+		
+	void enqueue(const Request*);
+	
+	// Return whether the given object is/was in the queue
+	static LLMediaDataClient::request_ptr_t findOrRemove(request_queue_t &queue, const LLMediaDataClientObject::ptr_t &obj, bool remove, Request::Type type);
+	
+	// Comparator for sorting
+	static bool compareRequests(const request_ptr_t &o1, const request_ptr_t &o2);
+	static F64 getObjectScore(const LLMediaDataClientObject::ptr_t &obj);
+    
+	friend std::ostream& operator<<(std::ostream &s, const Request &q);
+	friend std::ostream& operator<<(std::ostream &s, const request_queue_t &q);
+
+	class QueueTimer : public LLEventTimer
+	{
+	public:
+		QueueTimer(F32 time, LLMediaDataClient *mdc);
+		virtual BOOL tick();
+    protected:
+		virtual ~QueueTimer();
+	private:
+		// back-pointer
+		LLPointer<LLMediaDataClient> mMDC;
+	};
+	
+	void startQueueTimer();
+	void stopQueueTimer();
+	void setIsRunning(bool val) { mQueueTimerIsRunning = val; }
+	
+	void swapCurrentQueue();
+	request_queue_t *getCurrentQueue();
+	
+	const F32 mQueueTimerDelay;
+	const F32 mRetryTimerDelay;
+	const U32 mMaxNumRetries;
+	const U32 mMaxSortedQueueSize;
+	const U32 mMaxRoundRobinQueueSize;
+	
+	bool mQueueTimerIsRunning;
+	
+	request_queue_t mSortedQueue;
+	request_queue_t mRoundRobinQueue;
+	bool mCurrentQueueIsTheSortedQueue;
+};
+
+
+// MediaDataClient specific for the ObjectMedia cap
+class LLObjectMediaDataClient : public LLMediaDataClient
+{
+public:
+    LLObjectMediaDataClient(F32 queue_timer_delay = QUEUE_TIMER_DELAY,
+							F32 retry_timer_delay = UNAVAILABLE_RETRY_TIMER_DELAY,
+							U32 max_retries = MAX_RETRIES,
+							U32 max_sorted_queue_size = MAX_SORTED_QUEUE_SIZE,
+							U32 max_round_robin_queue_size = MAX_ROUND_ROBIN_QUEUE_SIZE)
+		: LLMediaDataClient(queue_timer_delay, retry_timer_delay, max_retries)
+		{}
+    virtual ~LLObjectMediaDataClient() {}
+    
+	void fetchMedia(LLMediaDataClientObject *object); 
+    void updateMedia(LLMediaDataClientObject *object);
+    
+protected:
+	// Subclasses must override this factory method to return a new responder
+	virtual Responder *createResponder(const request_ptr_t &request) const;
+	
+	// Subclasses must override to return a cap name
+	virtual const char *getCapabilityName() const;
+    
+    class Responder : public LLMediaDataClient::Responder
+    {
+    public:
+        Responder(const request_ptr_t &request)
+            : LLMediaDataClient::Responder(request) {}
+        virtual void result(const LLSD &content);
+    };
+};
+
+
+// MediaDataClient specific for the ObjectMediaNavigate cap
+class LLObjectMediaNavigateClient : public LLMediaDataClient
+{
+public:
+	// NOTE: from llmediaservice.h
+	static const int ERROR_PERMISSION_DENIED_CODE = 8002;
+	
+    LLObjectMediaNavigateClient(F32 queue_timer_delay = QUEUE_TIMER_DELAY,
+								F32 retry_timer_delay = UNAVAILABLE_RETRY_TIMER_DELAY,
+								U32 max_retries = MAX_RETRIES,
+								U32 max_sorted_queue_size = MAX_SORTED_QUEUE_SIZE,
+								U32 max_round_robin_queue_size = MAX_ROUND_ROBIN_QUEUE_SIZE)
+		: LLMediaDataClient(queue_timer_delay, retry_timer_delay, max_retries)
+		{}
+    virtual ~LLObjectMediaNavigateClient() {}
+    
+    void navigate(LLMediaDataClientObject *object, U8 texture_index, const std::string &url);
+    
+protected:
+	// Subclasses must override this factory method to return a new responder
+	virtual Responder *createResponder(const request_ptr_t &request) const;
+	
+	// Subclasses must override to return a cap name
+	virtual const char *getCapabilityName() const;
+
+    class Responder : public LLMediaDataClient::Responder
+    {
+    public:
+        Responder(const request_ptr_t &request)
+            : LLMediaDataClient::Responder(request) {}
+		virtual void error(U32 status, const std::string& reason);
+        virtual void result(const LLSD &content);
+    private:
+        void mediaNavigateBounceBack();
+    };
+
+};
+
+
+#endif // LL_LLMEDIADATACLIENT_H
diff --git a/linden/indra/newview/rcmoapradar.cpp b/linden/indra/newview/rcmoapradar.cpp
new file mode 100644
index 0000000..f0593ef
--- /dev/null
+++ b/linden/indra/newview/rcmoapradar.cpp
@@ -0,0 +1,440 @@
+// MOAP Radar
+// Robin Cornelius
+
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llavatarconstants.h"
+#include "llfloateravatarlist.h"
+
+#include "lluictrlfactory.h"
+#include "llviewerwindow.h"
+#include "llscrolllistctrl.h"
+#include "llradiogroup.h"
+#include "llviewercontrol.h"
+#include "llbutton.h"
+
+#include "llvoavatar.h"
+#include "llimview.h"
+#include "rcmoapradar.h"
+#include "llregionflags.h"
+#include "llfloaterreporter.h"
+#include "llagent.h"
+#include "llviewerregion.h"
+#include "lltracker.h"
+#include "llviewerstats.h"
+#include "llerror.h"
+#include "llchat.h"
+#include "llfloaterchat.h"
+#include "llviewermessage.h"
+#include "llweb.h"
+#include "llviewerobjectlist.h"
+#include "llmutelist.h"
+#include "llcallbacklist.h"
+#include "llmediaentry.h"
+
+#include <time.h>
+#include <string.h>
+
+#include <map>
+
+#include "llworld.h"
+
+#include "llsdutil.h"
+
+LLFloaterMOAPRadar* LLFloaterMOAPRadar::sInstance = NULL;
+
+LLFloaterMOAPRadar::LLFloaterMOAPRadar() :  LLFloater(std::string("MOAPradar"))
+{
+	llassert_always(sInstance == NULL);
+	sInstance = this;
+	mUpdateRate = gSavedSettings.getU32("MOAPRadarUpdateRate") * 3 + 3;
+	mTrackingRunning=false;
+}
+
+LLFloaterMOAPRadar::~LLFloaterMOAPRadar()
+{
+	gIdleCallbacks.deleteFunction(LLFloaterMOAPRadar::callbackIdle);
+	sInstance = NULL;
+}
+
+//static
+void LLFloaterMOAPRadar::toggle(void*)
+{
+	if (sInstance)
+	{
+		if (sInstance->getVisible())
+		{
+			sInstance->close(false);
+		}
+		else
+		{
+			sInstance->open();
+		}
+	}
+	else
+	{
+		showInstance();
+	}
+}
+
+//static
+void LLFloaterMOAPRadar::showInstance()
+{
+	if (sInstance)
+	{
+		if (!sInstance->getVisible())
+		{
+			sInstance->open();
+		}
+	}
+	else
+	{
+		sInstance = new LLFloaterMOAPRadar();
+		LLUICtrlFactory::getInstance()->buildFloater(sInstance, "floater_moap_radar.xml");
+	}
+}
+
+void LLFloaterMOAPRadar::draw()
+{
+	LLFloater::draw();
+}
+
+void LLFloaterMOAPRadar::onOpen()
+{
+	gSavedSettings.setBOOL("ShowMOAPRadar", TRUE);
+	sInstance->setVisible(TRUE);
+}
+
+void LLFloaterMOAPRadar::onClose(bool app_quitting)
+{
+	sInstance->setVisible(FALSE);
+	if (!app_quitting)
+	{
+		gSavedSettings.setBOOL("ShowMOAPRadar", FALSE);
+	}
+	if (!gSavedSettings.getBOOL("MOAPRadarKeepOpen") || app_quitting)
+	{
+		destroy();
+	}
+}
+
+
+BOOL LLFloaterMOAPRadar::postBuild()
+{
+
+	mMOAPList = getChild<LLScrollListCtrl>("moap_list");
+	mMOAPList->sortByColumn("distance", TRUE);
+
+	mTrackBtn = getChild<LLButton>("track_btn");
+	mTrackBtn->setLabel(LLStringExplicit("Track"));
+
+	childSetAction("open_btn", onClickOpen, this);
+	childSetAction("track_btn", onClickTrack, this);
+	childSetAction("copy_btn", onClickCopy, this);
+
+	mMOAPList->setCommitOnSelectionChange(TRUE);
+	childSetCommitCallback("moap_list", onSelectMOAP, this);
+
+	gIdleCallbacks.addFunction(LLFloaterMOAPRadar::callbackIdle);
+
+	return TRUE;
+}
+
+//static
+void LLFloaterMOAPRadar::callbackIdle(void *userdata) {
+	if (LLFloaterMOAPRadar::sInstance != NULL)
+	{
+		// Do not update at every frame: this would be insane !
+		if (gFrameCount % LLFloaterMOAPRadar::sInstance->mUpdateRate == 0)
+		{
+			LLFloaterMOAPRadar::sInstance->updateMOAPList();
+		}
+	}
+}
+
+
+void LLFloaterMOAPRadar::updateMOAPList()
+{
+	if (sInstance != this) return;
+	
+	mMOAPList->deleteAllItems();
+
+	S32 obj_count=gObjectList.getNumObjects();
+
+	int count=0;
+
+	for(int objnum=0;objnum<obj_count;objnum++)
+	{
+		LLPointer<LLViewerObject> obj = gObjectList.getObject(objnum);
+
+		if(obj.isNull())
+			continue;
+
+		if(obj->isDead() || obj->isOrphaned())
+			continue;
+
+		if(obj->getMediaType() == LLViewerObject::MEDIA_TYPE_NONE)
+			continue;
+
+		LLSD element;
+		
+		element["id"] = obj->getID();
+
+		for(int face=0;face<obj->getNumTEs();face++)
+		{
+			const LLTextureEntry * te=obj->getTE(face);
+			if(te==NULL)
+				continue;
+
+			if(te->hasMedia())
+			{
+				LLMediaEntry* media=te->getMediaData();
+				
+				if(media==NULL)
+					continue;
+
+				LLSD media_details;
+				media->asLLSD(media_details);
+
+				element["columns"][LIST_URL]["column"] = "URL";
+				element["columns"][LIST_URL]["type"] = "text";
+				std::string URL=media->getCurrentURL();
+				if(URL=="")
+					URL="(Waiting....)";
+
+				element["columns"][LIST_URL]["value"] = URL;
+
+				if(mTrackingRunning && mTrackedID==obj->getID() && mTrackedFace==face)
+				{
+					element["columns"][LIST_URL]["font-style"] = "BOLD";
+				}
+				else
+				{
+					element["columns"][LIST_URL]["font-style"] = "NORMAL";
+				}
+
+				element["columns"][LIST_FACE]["column"] = "face";
+				element["columns"][LIST_FACE]["type"] = "text";
+				std::stringstream face_buf;
+				face_buf << face;
+				element["columns"][LIST_FACE]["value"] = face_buf.str();
+
+				LLVector3d offset = gAgent.getPositionGlobal()-obj->getPositionGlobal();
+				S32 dist= offset.length();
+
+				element["columns"][LIST_DISTANCE]["column"] = "distance";
+				element["columns"][LIST_DISTANCE]["type"] = "text";
+				std::stringstream dist_buf;
+				dist_buf << std::fixed << std::setprecision(2) << dist<<"m";
+				element["columns"][LIST_DISTANCE]["value"] = dist_buf.str();
+				
+				if(dist<25)
+					element["columns"][LIST_DISTANCE]["color"] = LLColor4::green.getValue();
+				else if(dist<50)
+					element["columns"][LIST_DISTANCE]["color"] = LLColor4::blue1.getValue();
+				else if(dist<100)
+					element["columns"][LIST_DISTANCE]["color"] = LLColor4::black.getValue();
+				else if(dist<256)
+					element["columns"][LIST_DISTANCE]["color"] = LLColor4::yellow.getValue();
+				else
+					element["columns"][LIST_DISTANCE]["color"] = LLColor4::red.getValue();
+
+
+				element["columns"][LIST_POSITION]["column"] = "position";
+				element["columns"][LIST_POSITION]["type"] = "text";
+				element["columns"][LIST_POSITION]["value"] = "";
+ 
+				element["columns"][LIST_ALTITUDE]["column"] = "altitude";
+				element["columns"][LIST_ALTITUDE]["type"] = "text";
+				std::stringstream alt_buf;
+				alt_buf << std::fixed << std::setprecision(2) << obj->getPositionGlobal().mdV[2]<<"m";
+				element["columns"][LIST_ALTITUDE]["value"] = alt_buf.str();
+
+				element["columns"][LIST_POSITION]["column"]="position";
+				element["columns"][LIST_POSITION]["type"] = "text";
+				std::stringstream pos_buf;
+
+				S32 moap_x = (S32)offset.mdV[VX];
+				S32 moap_y = (S32)offset.mdV[VY];
+				if (moap_x >= -256 && moap_x <= 256 && moap_y >= -256 && moap_y <= 256)
+				{
+					pos_buf<< std::fixed << std::setprecision(2)<<obj->getPositionRegion().mV[VX]<<","<<obj->getPositionRegion().mV[VY];
+				}
+				else
+				{
+					if (moap_y < 0)
+						pos_buf<<"S";
+					else if (moap_y > 256)
+						pos_buf<<"N";
+
+					if (moap_x < 0)
+						pos_buf<<"W";
+					else if (moap_x > 256)
+						pos_buf<<"E";
+				}
+				
+
+				element["columns"][LIST_POSITION]["value"] = pos_buf.str();
+
+				mMOAPList->addElement(element, ADD_BOTTOM);
+
+				if(mSelectedObjID==obj->getID() && mSelectedFace==face)
+				{
+					mMOAPList->selectNthItem(count);
+				}
+
+				count++;
+			}
+		}
+	}
+
+		updatetrackbtn();
+}
+
+// static
+void LLFloaterMOAPRadar::onClickOpen(void* userdata)
+{
+	LLFloaterMOAPRadar *self = (LLFloaterMOAPRadar*)userdata;
+
+	LLDynamicArray<LLUUID> ids = self->mMOAPList->getSelectedIDs();
+
+	if(ids.empty())
+	{
+		return;
+	}
+
+	LLUUID id=ids.front();
+
+	LLPointer<LLViewerObject> obj = gObjectList.findObject(id);
+	if(obj.notNull())
+	{
+
+		const LLTextureEntry * te=obj->getTE(self->mSelectedFace);
+		if(te==NULL)
+			return;
+
+		if(te->hasMedia())
+		{
+			LLMediaEntry* media=te->getMediaData();
+			if(media)
+			{
+				//gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(media->getCurrentURL()));
+				LLWeb::loadURL(media->getCurrentURL());
+			}
+		}			
+	}
+
+}
+
+// static
+void LLFloaterMOAPRadar::onClickTrack(void* userdata)
+{
+	LLFloaterMOAPRadar *self = (LLFloaterMOAPRadar*)userdata;
+	
+	LLDynamicArray<LLUUID> ids = self->mMOAPList->getSelectedIDs();
+
+	if(self->mTrackingRunning)
+	{
+		LLTracker::stopTracking(NULL);
+		self->mTrackingRunning=false;
+	}
+
+	if(ids.empty())
+	{
+		self->mTrackedID=LLUUID::null;
+		self->mTrackingRunning=false;
+		return;
+	}
+
+	LLUUID id=ids.front();
+
+	if(id==self->mTrackedID && self->mSelectedFace==self->mTrackedFace)
+	{
+		self->mTrackedID=LLUUID::null;
+		self->mTrackingRunning=false;
+		return;
+	}
+
+	self->mTrackedID=LLUUID::null;
+
+	LLPointer<LLViewerObject> obj = gObjectList.findObject(id);
+	if(obj.notNull())
+	{
+		LLTracker::trackLocation(obj->getPositionGlobal(),"MOAP Tracking","",LLTracker::LOCATION_ITEM);
+		self->mTrackingRunning=true;
+		self->mTrackedID=id;
+		self->mTrackedFace=self->mSelectedFace;
+	}
+}
+
+// static
+void LLFloaterMOAPRadar::onClickCopy(void* userdata)
+{
+	LLFloaterMOAPRadar *self = (LLFloaterMOAPRadar*)userdata;
+
+	LLDynamicArray<LLUUID> ids = self->mMOAPList->getSelectedIDs();
+
+	if(ids.empty())
+	{
+		LLTracker::stopTracking(NULL);
+		return;
+	}
+
+	LLUUID id=ids.front();
+
+	LLPointer<LLViewerObject> obj = gObjectList.findObject(id);
+
+	if(obj.notNull())
+	{
+
+		const LLTextureEntry * te=obj->getTE(self->mSelectedFace);
+		if(te==NULL)
+			return;
+
+		if(te->hasMedia())
+		{
+			LLMediaEntry* media=te->getMediaData();
+			if(media)
+			{
+				gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(media->getCurrentURL()));
+			}
+		}			
+	}
+
+}
+
+//static
+void LLFloaterMOAPRadar::onSelectMOAP(LLUICtrl*, void* userdata)
+{
+	LLFloaterMOAPRadar *self = (LLFloaterMOAPRadar*)userdata;
+
+ 	LLScrollListItem *item = self->mMOAPList->getFirstSelected();
+	if (item)
+	{
+		self->mSelectedObjID = item->getUUID();
+		self->mSelectedFace = item->getColumn(LIST_FACE)->getValue().asInteger();
+	}
+
+	self->updatetrackbtn();
+}
+
+void LLFloaterMOAPRadar::updatetrackbtn()
+{
+	if( mTrackingRunning)
+	{
+		if( mTrackedID==mSelectedObjID && mTrackedFace==mSelectedFace)
+		{
+			mTrackBtn->setLabel(LLStringExplicit("Untrack"));
+		}
+		else
+		{
+			mTrackBtn->setLabel(LLStringExplicit("New Track"));
+		}
+	}
+	else
+	{
+		mTrackBtn->setLabel(LLStringExplicit("Track"));
+	}
+
+}
\ No newline at end of file
diff --git a/linden/indra/newview/rcmoapradar.h b/linden/indra/newview/rcmoapradar.h
new file mode 100644
index 0000000..1d01546
--- /dev/null
+++ b/linden/indra/newview/rcmoapradar.h
@@ -0,0 +1,58 @@
+
+
+class LLFloaterMOAPRadar : public LLFloater
+{
+
+private:
+	LLFloaterMOAPRadar();
+public:
+	~LLFloaterMOAPRadar();
+
+	enum AVATARS_COLUMN_ORDER
+	{
+		LIST_URL,
+		LIST_FACE,
+		LIST_DISTANCE,
+		LIST_POSITION,
+		LIST_ALTITUDE
+	};
+
+	/*virtual*/ void onClose(bool app_quitting);
+	/*virtual*/ void onOpen();
+	/*virtual*/ BOOL postBuild();
+	/*virtual*/ void draw();
+
+	static void toggle(void*);
+
+	static void showInstance();
+
+	static void callbackIdle(void *userdata);
+
+	void updateMOAPList();
+
+	static void onClickOpen(void* userdata);
+	static void onClickCopy(void* userdata);
+	static void onClickTrack(void* userdata);
+	static void onSelectMOAP(LLUICtrl*, void* userdata);
+
+
+private:
+	static LLFloaterMOAPRadar* sInstance;
+	LLScrollListCtrl*			mMOAPList;
+	LLButton *				mTrackBtn;
+
+	U32 mUpdateRate;
+
+	LLUUID mSelectedObjID;
+	U8 mSelectedFace;
+	bool mTrackingRunning;
+
+	LLUUID mTrackedID;
+	U8 mTrackedFace;
+
+	void updatetrackbtn(); 
+
+public:
+	static LLFloaterMOAPRadar* getInstance() { return sInstance; }
+
+};
\ No newline at end of file
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_moap_radar.xml b/linden/indra/newview/skins/default/xui/en-us/floater_moap_radar.xml
new file mode 100644
index 0000000..b9e3f99
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_moap_radar.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<floater name="MOAP" title="MOAP Radar"
+	can_resize="true" can_minimize="true" can_close="true" can_drag_on_left="false"
+	rect_control="FloaterRadarRect" min_width="700"	min_height="150">
+
+	<scroll_list name="moap_list"
+		    left="10" right="-10" top="-20" bottom="40" can_resize="true"
+		    column_padding="0" follows="left|top|bottom|right"
+		    draw_heading="true" multi_select="true" search_column="1"
+		    tool_tip="MOAP List">
+		<column name="URL" label="URL" width="450" tool_tip="URL of MOAP"/>
+		<column name="face" label="Face" width="48" tool_tip="URL of MOAP"/>
+		<column name="distance" label="Dist." width="48" tool_tip="Distance from your avatar"/>
+		<column name="position" label="Pos." width="90" tool_tip="Position (X, Y) within this sim, or general direction (cardinal point) for outside sims"/>
+		<column name="altitude" label="Alt." width="48" tool_tip="Altitude"/>
+	</scroll_list>
+
+
+		<button
+			   name="open_btn"
+			   label="Open"
+			   tool_tip="Open Current URL"
+			   left="10"
+			   bottom_delta="-30"
+			   width="80"
+			   height="20"
+			   font="SansSerifSmall"
+			   follows="bottom|left"
+			       />
+		<button
+			   name="track_btn"
+			   label="(Un)Track"
+			   tool_tip="Toggle tracking of this MOAPs position"
+			   left_delta="90"
+			   bottom_delta="0"
+			   width="80"
+			   height="20"
+			   font="SansSerifSmall"
+			   follows="bottom|left"
+			       />
+		<button
+			   name="copy_btn"
+			   label="Get URL"
+			   tool_tip="Copies URL to the clipboard"
+			   left_delta="90"
+			   bottom_delta="0"
+			   width="80"
+			   height="20"
+			   font="SansSerifSmall"
+			   follows="bottom|left"
+			       />
+		<!-- upper middle row -->
+	
+</floater>
-- 
cgit v1.1


From ba982c0575515a8524d5044f928cd336303f807c Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 6 Apr 2013 21:47:13 +1000
Subject: Clean up some compiler warnings.  More to come.

---
 linden/indra/llcommon/llsdserialize.cpp                  |  5 ++++-
 linden/indra/llmath/llvolume.cpp                         |  5 -----
 linden/indra/llmessage/llhttpassetstorage.cpp            |  3 ++-
 linden/indra/llrender/llfont.cpp                         |  2 ++
 linden/indra/llrender/llgl.cpp                           | 13 ++++++-------
 linden/indra/llrender/llimagegl.cpp                      |  4 +++-
 linden/indra/llui/llfunctorregistry.h                    |  2 --
 linden/indra/llwindow/GL/glh_extensions.h                |  4 +++-
 linden/indra/lscript/lscript_execute/lscript_execute.cpp | 11 +----------
 linden/indra/lscript/lscript_execute/lscript_readlso.cpp |  6 ++++--
 10 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/linden/indra/llcommon/llsdserialize.cpp b/linden/indra/llcommon/llsdserialize.cpp
index e2be922..f648c5c 100644
--- a/linden/indra/llcommon/llsdserialize.cpp
+++ b/linden/indra/llcommon/llsdserialize.cpp
@@ -1447,9 +1447,12 @@ S32 LLSDBinaryFormatter::format(const LLSD& data, std::ostream& ostr, U32 option
 	}
 
 	case LLSD::TypeUUID:
+	{
 		ostr.put('u');
-		ostr.write((const char*)(&(data.asUUID().mData)), UUID_BYTES);
+		U8 *value = data.asUUID().mData;
+		ostr.write((const char*)(&value), UUID_BYTES);
 		break;
+	}
 
 	case LLSD::TypeString:
 		ostr.put('s');
diff --git a/linden/indra/llmath/llvolume.cpp b/linden/indra/llmath/llvolume.cpp
index 618048c..63869ea 100644
--- a/linden/indra/llmath/llvolume.cpp
+++ b/linden/indra/llmath/llvolume.cpp
@@ -4438,14 +4438,9 @@ BOOL LLVolumeFace::createUnCutCubeCap(LLVolume* volume, BOOL partial_build)
 	S32 max_s = volume->getProfile().getTotal();
 	S32 max_t = volume->getPath().mPath.size();
 
-	// S32 i;
-	S32 num_vertices = 0, num_indices = 0;
 	S32	grid_size = (profile.size()-1)/4;
 	S32	quad_count = (grid_size * grid_size);
 
-	num_vertices = (grid_size+1)*(grid_size+1);
-	num_indices = quad_count * 4;
-
 	LLVector3& min = mExtents[0];
 	LLVector3& max = mExtents[1];
 
diff --git a/linden/indra/llmessage/llhttpassetstorage.cpp b/linden/indra/llmessage/llhttpassetstorage.cpp
index 49dbdbd..fcdb354 100644
--- a/linden/indra/llmessage/llhttpassetstorage.cpp
+++ b/linden/indra/llmessage/llhttpassetstorage.cpp
@@ -743,7 +743,8 @@ LLAssetRequest* LLHTTPAssetStorage::findNextRequest(LLAssetStorage::request_list
 	request_list_t::iterator running_end   = running.end();
 
 	request_list_t::iterator pending_iter = pending.begin();
-	request_list_t::iterator pending_end  = pending.end();
+	// FIXME onefang - I assume this was being used to speed up the for(), but this is just a quick pass to get rid of warnings.  Try to understand it later.
+	//request_list_t::iterator pending_end  = pending.end();
 	// Loop over all pending requests until we miss finding it in the running list.
 	for (; pending_iter != pending.end(); ++pending_iter)
 	{
diff --git a/linden/indra/llrender/llfont.cpp b/linden/indra/llrender/llfont.cpp
index 5ee3929..1cad593 100644
--- a/linden/indra/llrender/llfont.cpp
+++ b/linden/indra/llrender/llfont.cpp
@@ -535,6 +535,8 @@ void LLFont::renderGlyph(const U32 glyph_index) const
 	int error = FT_Load_Glyph(mFTFace, glyph_index, FT_LOAD_DEFAULT );
 	llassert(!error);
 
+	// Work around the compiler warning about error not being used when llassert() is compiled out.
+	error = error + 0;
 	error = FT_Render_Glyph(mFTFace->glyph, gFontRenderMode);
 
 	mRenderGlyphCount++;
diff --git a/linden/indra/llrender/llgl.cpp b/linden/indra/llrender/llgl.cpp
index 4a4ff1b..b57a562 100644
--- a/linden/indra/llrender/llgl.cpp
+++ b/linden/indra/llrender/llgl.cpp
@@ -383,11 +383,10 @@ bool LLGLManager::initGL()
 	if (mGLVendor.substr(0,4) == "ATI ")
 	{
 		mGLVendorShort = "ATI";
-		BOOL mobile = FALSE;
-		if (mGLRenderer.find("MOBILITY") != std::string::npos)
-		{
-			mobile = TRUE;
-		}
+		// This is not used anywhere.
+		//BOOL mobile = FALSE;
+		//if (mGLRenderer.find("MOBILITY") != std::string::npos)
+		//	mobile = TRUE;
 		mIsATI = TRUE;
 
 #if LL_WINDOWS && !LL_MESA_HEADLESS
@@ -1014,8 +1013,8 @@ void assert_glerror()
 void clear_glerror()
 {
 	//  Create or update texture to be used with this data 
-	GLenum error;
-	error = glGetError();
+	//GLenum error;
+	/*error =*/ glGetError();
 }
 
 ///////////////////////////////////////////////////////////////
diff --git a/linden/indra/llrender/llimagegl.cpp b/linden/indra/llrender/llimagegl.cpp
index c63d7ad..f99d4a9 100644
--- a/linden/indra/llrender/llimagegl.cpp
+++ b/linden/indra/llrender/llimagegl.cpp
@@ -711,7 +711,9 @@ void LLImageGL::setImage(const U8* data_in, BOOL data_hasmips)
 					{
 						S32 bytes = w * h * mComponents;
 						llassert(prev_mip_data);
-						llassert(prev_mip_size == bytes*4);
+						llassert(prev_mip_size == (bytes*4));
+						// Work around llassert() being compiled out and prev_mip_size not otherwise being used.
+						prev_mip_size = prev_mip_size + 0;
 						U8* new_data = new U8[bytes];
 						llassert_always(new_data);
 						LLImageBase::generateMip(prev_mip_data, new_data, w, h, mComponents);
diff --git a/linden/indra/llui/llfunctorregistry.h b/linden/indra/llui/llfunctorregistry.h
index 8864f7a..7c03f2f 100644
--- a/linden/indra/llui/llfunctorregistry.h
+++ b/linden/indra/llui/llfunctorregistry.h
@@ -75,7 +75,6 @@ public:
 	bool registerFunctor(const std::string& name, ResponseFunctor f)
 	{
 		bool retval = true;
-		typename FunctorMap::iterator it = mMap.find(name);
 		if (mMap.count(name) == 0)
 		{
 			mMap[name] = f;
@@ -102,7 +101,6 @@ public:
 
 	FUNCTOR_TYPE getFunctor(const std::string& name)
 	{
-		typename FunctorMap::iterator it = mMap.find(name);
 		if (mMap.count(name) != 0)
 		{
 			return mMap[name];
diff --git a/linden/indra/llwindow/GL/glh_extensions.h b/linden/indra/llwindow/GL/glh_extensions.h
index 5b149c9..ce2865b 100644
--- a/linden/indra/llwindow/GL/glh_extensions.h
+++ b/linden/indra/llwindow/GL/glh_extensions.h
@@ -111,7 +111,9 @@ static const char* EatNonWhiteSpace(const char *str)
 int glh_init_extensions(const char *origReqExts)
 {
 	// Length of requested extensions string
+	/*
 	unsigned reqExtsLen;
+	*/
 	char *reqExts;
 	// Ptr for individual extensions within reqExts
 	char *reqExt;
@@ -153,8 +155,8 @@ int glh_init_extensions(const char *origReqExts)
 		return TRUE;
 	}
 	reqExts = strdup(origReqExts);
-	reqExtsLen = (S32)strlen(reqExts);
 	/*
+	reqExtsLen = (S32)strlen(reqExts);
 	if (NULL == gGLHExts.mUnsupportedExts)
 	{
 		gGLHExts.mUnsupportedExts = (char*)malloc(reqExtsLen + 1);
diff --git a/linden/indra/lscript/lscript_execute/lscript_execute.cpp b/linden/indra/lscript/lscript_execute/lscript_execute.cpp
index b2b54cd..7af407f 100644
--- a/linden/indra/lscript/lscript_execute/lscript_execute.cpp
+++ b/linden/indra/lscript/lscript_execute/lscript_execute.cpp
@@ -809,16 +809,7 @@ void LLScriptExecute::runInstructions(BOOL b_print, const LLUUID &id,
 	//  is there a fault?
 	//	if yes, print out message and exit
 	S32 value = getVersion();
-	S32 major_version = 0;
-	if (value == LSL2_VERSION1_END_NUMBER)
-	{
-		major_version = 1;
-	}
-	else if (value == LSL2_VERSION_NUMBER)
-	{
-		major_version = 2;
-	}
-	else
+	if ((value != LSL2_VERSION1_END_NUMBER) && (value != LSL2_VERSION_NUMBER))
 	{
 		setFault(LSRF_VERSION_MISMATCH);
 	}
diff --git a/linden/indra/lscript/lscript_execute/lscript_readlso.cpp b/linden/indra/lscript/lscript_execute/lscript_readlso.cpp
index 3b10cc6..05eb826 100644
--- a/linden/indra/lscript/lscript_execute/lscript_readlso.cpp
+++ b/linden/indra/lscript/lscript_execute/lscript_readlso.cpp
@@ -150,7 +150,9 @@ void LLScriptLSOParse::printGlobals(LLFILE *fp)
 
 		// get offset to skip past name
 		varoffset = global_v_offset;
+		// FIXME: Not actually used, perhaps there's a skip function?  Or perhaps we really do need to skip past a name as the above comment suggests?
 		offset = bytestream2integer(mRawData, global_v_offset);
+		offset = offset + 0;
 		
 		// get typeexport
 		type = *(mRawData + global_v_offset++);
@@ -268,8 +270,6 @@ void LLScriptLSOParse::printGlobalFunctions(LLFILE *fp)
 		fprintf(fp, "[Function #%d] [0x%X] %s\n", function_number, orig_function_offset, name);
 		fprintf(fp, "\tReturn Type: %s\n", LSCRIPTTypeNames[type]);
 		type = *(mRawData + function_offset++);
-		S32 params;
-		params = 0;
 		S32 pcount = 0;
 		while (type)
 		{
@@ -362,7 +362,9 @@ void LLScriptLSOParse::printStates(LLFILE *fp)
 					if (event_handlers & LSCRIPTStateBitField[k])
 					{
 						temp_end = bytestream2integer(mRawData, read_ahead);
+						// FIXME onefang: Dummy is not actually used, but perhaps this is here to stop a warning?  We need to stop another warning now.  Some sort of skip might be better.
 						dummy = bytestream2integer(mRawData, read_ahead);
+						dummy = dummy + 0;
 						if (  (temp_end < opcode_end)
 							&&(temp_end > event_offset))
 						{
-- 
cgit v1.1


From 7d2499f10a100d16a1043a59ba914b17e3bfbaf3 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sun, 7 Apr 2013 02:38:10 +1000
Subject: One more variable clean out, so Windows can compile.

---
 linden/indra/llmath/llvolume.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/linden/indra/llmath/llvolume.cpp b/linden/indra/llmath/llvolume.cpp
index 63869ea..9dc3746 100644
--- a/linden/indra/llmath/llvolume.cpp
+++ b/linden/indra/llmath/llvolume.cpp
@@ -4437,9 +4437,7 @@ BOOL LLVolumeFace::createUnCutCubeCap(LLVolume* volume, BOOL partial_build)
 	const std::vector<LLVector3>& profile = volume->getProfile().mProfile;
 	S32 max_s = volume->getProfile().getTotal();
 	S32 max_t = volume->getPath().mPath.size();
-
-	S32	grid_size = (profile.size()-1)/4;
-	S32	quad_count = (grid_size * grid_size);
+	S32 grid_size = (profile.size() - 1) / 4;
 
 	LLVector3& min = mExtents[0];
 	LLVector3& max = mExtents[1];
-- 
cgit v1.1


From 4e2336b007e123395bbaa9028432e5175c371d19 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Mon, 8 Apr 2013 04:22:24 +1000
Subject: Update grid list to match Kokua, and sort them.

---
 .../indra/newview/app_settings/default_grids.xml   | 398 +++++++++++++--------
 1 file changed, 242 insertions(+), 156 deletions(-)

diff --git a/linden/indra/newview/app_settings/default_grids.xml b/linden/indra/newview/app_settings/default_grids.xml
index c5ef948..180a76f 100644
--- a/linden/indra/newview/app_settings/default_grids.xml
+++ b/linden/indra/newview/app_settings/default_grids.xml
@@ -1,199 +1,285 @@
 <llsd>
   <array>
     <map>
-      <key>default_grids_version</key><string>38</string>
+      <key>default_grids_version</key><string>39</string>
     </map>
 
-    <!-- Second Life -->
+    <!-- 3rd Rock Grid -->
     <map>
-      <key>gridnick</key><string>secondlife</string>
-      <key>gridname</key><string>Second Life</string>
-      <key>platform</key><string>SecondLife</string>
-      <key>loginuri</key><string>https://login.agni.lindenlab.com/cgi-bin/login.cgi</string>
-      <key>loginpage</key><string>http://imprudenceviewer.org/app/splash/</string>
-      <key>helperuri</key><string>https://secondlife.com/helpers/</string>
-      <key>website</key><string>http://secondlife.com/</string>
-      <key>support</key><string>http://secondlife.com/support/</string>
-      <key>register</key><string>http://secondlife.com/registration/</string>
-      <key>password</key><string>http://secondlife.com/account/request.php</string>
-      <key>version</key><string>2</string>
+        <key>gridname</key><string>3rd Rock Grid</string>
+        <key>gridnick</key><string>3rdRock</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>about</key><string>http://3rdrockgrid.com/</string>
+        <key>help</key><string>http://3rdrockgrid.com/</string>
+        <key>helperuri</key><string>http://grid.3rdrockgrid.com/3rg_money/</string>
+        <key>loginuri</key><string>http://grid.3rdrockgrid.com:8002/</string>
+        <key>loginpage</key><string>http://3rdrockgrid.com/startpage.php</string>
+        <key>website</key><string>http://3rdrockgrid.com/</string>
+        <key>register</key><string>http://3rdrockgrid.com/</string>
+        <key>password</key><string>http://3rdrockgrid.com/</string>
+        <key>support</key><string>http://3rdrockgrid.com/</string>
+        <key>version</key><string>1</string>
     </map>
 
-    <!-- Second Life Beta -->
+    <!-- Avination -->
     <map>
-      <key>gridnick</key><string>secondlifebeta</string>
-      <key>gridname</key><string>Second Life Beta Grid</string>
-      <key>platform</key><string>SecondLife</string>
-      <key>loginuri</key><string>https://login.aditi.lindenlab.com/cgi-bin/login.cgi</string>
-      <key>loginpage</key><string>http://imprudenceviewer.org/app/splash/</string>
-      <key>helperuri</key><string>http://aditi-secondlife.webdev.lindenlab.com/helpers/</string>
-      <key>website</key><string>http://secondlife.com/</string>
-      <key>support</key><string>http://secondlife.com/support/</string>
-      <key>register</key><string>http://secondlife.com/registration/</string>
-      <key>password</key><string>http://secondlife.com/account/request.php</string>
-      <key>version</key><string>3</string>
+        <key>gridname</key><string>Avination</string>
+        <key>gridnick</key><string>Avination</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>about</key><string>http://login.avination.net</string>
+        <key>helperuri</key><string>https://secure.3dhosting.de/</string>
+        <key>loginpage</key><string>https://www.avination.com/welcome.php</string>
+        <key>loginuri</key><string>https://login.avination.com</string>
+        <key>name</key><string>login.avination.net</string>
+        <key>password</key><string>https://www.avination.com/pwrecover.php</string>
+        <key>register</key><string>https://www.avination.com/join.php</string>
     </map>
 
-    <!-- Local Host -->
+    <!-- Craft (offspring of Cyberlandia) -->
     <map>
-      <key>gridnick</key><string>localhost</string>
-      <key>gridname</key><string>Local Host</string>
-      <key>platform</key><string>OpenSim</string>
-      <key>loginuri</key><string>http://127.0.0.1:9000/</string>
-      <key>loginpage</key><string />
-      <key>helperuri</key><string>http://127.0.0.1:9000/</string>
-      <key>version</key><string>1</string>
+        <key>gridname</key><string>Craft - The Friendly World</string>
+        <key>gridnick</key><string>Craft</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>about</key><string>http://www.craft-world.org/</string>
+        <key>loginuri</key><string>http://craft-world.org:8002/</string>
+        <key>loginpage</key><string>http://www.craft-world.org/loginscreen.php</string>
+        <key>helperuri</key><string>http://webapp.craft-world.org/economy/</string>
+        <key>website</key><string>http://www.craft-world.org/</string>
+        <key>register</key><string>http://craft-world.org:8002/wifi/user/account/</string>
+        <key>password</key><string>http://craft-world.org:8002/wifi/forgotpassword</string>
+        <key>version</key><string>0</string>
     </map>
 
-    <!-- OSGrid -->
+    <!-- FrancoGrid -->
     <map>
-      <key>gridnick</key><string>osgrid</string>
-      <key>gridname</key><string>OSGrid</string>
-      <key>platform</key><string>OpenSim</string>
-      <key>loginuri</key><string>http://login.osgrid.org/</string>
-      <key>loginpage</key><string>http://www.osgrid.org/splash/</string>
-      <key>helperuri</key><string>http://helper.osgrid.org/</string>
-      <key>website</key><string>http://www.osgrid.org/</string>
-      <key>support</key><string>http://www.osgrid.org/</string>
-      <key>register</key>
-        <string>http://www.osgrid.org/index.php/auth/register</string>
-      <key>password</key>
-        <string>http://www.osgrid.org/index.php/auth/forgot_password</string>
-      <key>version</key><string>3</string>
+        <key>gridname</key><string>Metavers Francophone FrancoGrid</string>
+        <key>gridnick</key><string>francogrid</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>about</key><string>http://francogrid.org/</string>
+        <key>help</key><string>http://francogrid.org/aide</string>
+        <key>helperuri</key><string>http://helper.main.francogrid.org/</string>
+        <key>loginpage</key><string>http://viewer.francogrid.org/</string>
+        <key>loginuri</key><string>http://login.francogrid.org/</string>
+        <key>name</key><string>login.francogrid.org</string>
+        <key>password</key><string>http://francogrid.org/user/password</string>
+        <key>register</key><string>http://francogrid.org/user/register</string>
     </map>
 
-    <!-- Your Alternative Life -->
+    <!-- GiantGrid -->
     <map>
-      <key>gridnick</key><string>youralternativelife</string>
-      <key>gridname</key><string>Your Alternative Life</string>
-      <key>platform</key><string>OpenSim</string>
-      <key>loginuri</key><string>http://grid01.from-ne.com:8002/</string>
-      <key>loginpage</key><string>http://grid01.from-ne.com/tios/loginscreen3.php</string>
-      <key>helperuri</key><string>http://grid01.from-ne.com/tios/services/</string>
-      <key>website</key><string>http://www.youralternativelife.com</string>
-      <key>support</key><string>http://www.youralternativelife.com</string>
-      <key>register</key><string>http://www.youralternativelife.com</string>
-      <key>password</key><string>http://www.youralternativelife.com</string>
-      <key>version</key><string>0</string>
+        <key>gridname</key><string>GiantGrid</string>
+        <key>gridnick</key><string>GiantGrid</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>loginuri</key><string>http://giantgrid.no-ip.biz:8002/</string>
+        <key>loginpage</key><string>http://www.giantgrid.nl</string>
+        <key>helperuri</key><string>http://giantgrid.no-ip.biz/XoopCube/html/modules/xoopensim/helper/</string>
+        <key>website</key><string>http://www.giantgrid.nl</string>
+        <key>register</key><string>http://giantgrid.no-ip.biz:8002/wifi/user/account/</string>
+        <key>password</key><string>http://giantgrid.no-ip.biz:8002/wifi/forgotpassword</string>
+        <key>support</key><string>http://gianttest.no-ip.biz/ticket/</string>
+        <key>version</key><string>1</string>
+    </map>
 
+    <!-- InWorldz -->
+    <map>
+        <key>gridname</key><string>InWorldz</string>
+        <key>gridnick</key><string>InWorldz</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>about</key><string>http://inworldz.com/</string>
+        <key>help</key><string>http://inworldz.com/faq.php</string>
+        <key>loginuri</key><string>http://inworldz.com:8002/</string>
+        <key>loginpage</key><string>http://inworldz.com/loginscreen.php</string>
+        <key>helperuri</key><string>http://inworldz.com/</string>
+        <key>password</key><string>http://inworldz.com/</string>
+        <key>register</key><string>http://inworldz.com/register.php</string>
+        <key>support</key><string>http://inworldz.com/support.php</string>
+        <key>website</key><string>http://inworldz.com/</string>
+        <key>version</key><string>2</string>
     </map>
 
-    <!-- The New World Grid -->
+    <!-- Island Oasis -->
     <map>
-      <key>gridnick</key><string>thenewworldgrid</string>
-      <key>gridname</key><string>The New World Grid</string>
-      <key>platform</key><string>OpenSim</string>
-      <key>loginuri</key><string>http://grid.newworldgrid.com:8002/</string>
-      <key>loginpage</key><string>http://account.newworldgrid.com/loginscreen.php</string>
-      <key>helperuri</key><string>http://account.newworldgrid.com/</string>
-      <key>website</key><string>http://www.newworldgrid.com/</string>
-      <key>support</key><string>http://www.newworldgrid.com/</string>
-      <key>register</key><string>http://www.newworldgrid.com/register</string>
-      <key>password</key><string>http://account.newworldgrid.com/</string>
-      <key>version</key><string>0</string>
+        <key>gridname</key><string>Island Oasis</string>
+        <key>gridnick</key><string>IslandOasis</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>about</key><string>http://www.islandoasis.biz/GridStats.aspx</string>
+        <key>help</key><string>http://www.islandoasis.biz/Support.aspx</string>
+        <key>helperuri</key><string>http://islandoasisgrid.biz:8020/OsCurrency/</string>
+        <key>loginpage</key><string>http://www.islandoasis.biz/welcome.aspx</string>
+        <key>loginuri</key><string>http://islandoasisgrid.biz:8002/</string>
+        <key>name</key><string>islandoasisgrid.biz:8002</string>
+        <key>password</key><string>http://www.islandoasis.biz/Login.aspx</string>
+        <key>register</key><string>http://www.islandoasis.biz/verification.aspx</string>
     </map>
 
-    <!-- ReactionGrid -->
+    <!-- Local Host -->
     <map>
-      <key>gridnick</key><string>reactiongrid</string>
-      <key>gridname</key><string>ReactionGrid</string>
-      <key>platform</key><string>OpenSim</string>
-      <key>loginuri</key><string>http://reactiongrid.com:8008/</string>
-      <key>loginpage</key><string>http://gsquared.info/portal</string>
-      <key>website</key><string>http://reactiongrid.com/Default.aspx</string>
-      <key>support</key><string>http://reactiongrid.com/Support.aspx</string>
-      <key>register</key><string>http://reactiongrid.com/Register.aspx</string>
-      <key>password</key><string>http://reactiongrid.com/Support/ResetPassword.aspx</string>
-      <key>version</key><string>0</string>
+        <key>gridname</key><string>Localhost</string>
+        <key>gridnick</key><string>LocalHost</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>loginuri</key><string>http://127.0.0.1:9000/</string>
+        <key>loginpage</key><string />
+        <key>helperuri</key><string>http://127.0.0.1:9000/</string>
+        <key>version</key><string>1</string>
     </map>
 
-    <!-- Craft (offspring of Cyberlandia) -->
+    <!-- local Sim-on-a-stick -->
     <map>
-      <key>gridnick</key><string>craft</string>
-      <key>gridname</key><string>Craft</string>
-      <key>platform</key><string>OpenSim</string>
-      <key>loginuri</key><string>http://craft-world.org:8002/</string>
-      <key>loginpage</key><string>http://www.craft-world.org/loginscreen.php</string>
-      <key>helperuri</key><string>http://webapp.craft-world.org/</string>
-      <key>website</key><string>http://www.craft-world.org/</string>
-      <key>register</key><string>http://craft-world.org:8002/wifi/user/account/</string>
-      <key>password</key><string>http://craft-world.org:8002/wifi/forgotpassword</string>
-      <key>version</key><string>0</string>
-    </map>
-
-    <!-- Role Play Worlds -->
-    <map>
-      <key>gridnick</key><string>roleplayworlds</string>
-      <key>gridname</key><string>Role Play Worlds</string>
-      <key>platform</key><string>OpenSim</string>
-      <key>loginuri</key><string>http://grid.roleplayworlds.net:8002/</string>
-      <key>loginpage</key><string>http://roleplayworlds.net/loginscreen</string>
-      <key>helperuri</key><string>http://grid.roleplayworlds.net/</string>
-      <key>website</key><string>http://roleplayworlds.net/</string>
-      <key>support</key><string>http://roleplayworlds.net/help</string>
-      <key>register</key><string>http://roleplayworlds.net/register</string>
-      <key>password</key><string>http://roleplayworlds.net/password</string>
-      <key>version</key><string>1</string>
+        <key>gridname</key><string>Sim-on-a-Stick</string>
+        <key>gridnick</key><string>SimOnAStick</string>
+        <key>loginpage</key><string>http://127.0.0.1:9100/wifi/welcome.html</string>
+        <key>loginuri</key><string>http://localhost:9100</string>
     </map>
 
-    <!-- GiantGrid -->
+    <!-- Metropolis Metaversum -->
     <map>
-      <key>gridnick</key><string>giantgrid</string>
-      <key>gridname</key><string>GiantGrid</string>
-      <key>platform</key><string>OpenSim</string>
-      <key>loginuri</key><string>http://giantgrid.no-ip.biz:8002/</string>
-      <key>loginpage</key><string>http://www.giantgrid.nl</string>
-      <key>helperuri</key><string>http://giantgrid.no-ip.biz/XoopCube/html/modules/xoopensim/helper/</string>
-      <key>website</key><string>http://www.giantgrid.nl</string>
-      <key>register</key><string>http://giantgrid.no-ip.biz:8002/wifi/user/account/</string>
-      <key>password</key><string>http://giantgrid.no-ip.biz:8002/wifi/forgotpassword</string>
-      <key>support</key><string>http://gianttest.no-ip.biz/ticket/</string>
-      <key>version</key><string>1</string>
+        <key>gridname</key><string>Metropolis Metaversum</string>
+        <key>gridnick</key><string>Metropolis</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>about</key><string>http://www.hypergrid.org/metropolis/wiki</string>
+        <key>help</key><string>http://metropolis.hypergrid.org</string>
+        <key>helperuri</key><string>http://metropolis.hypergrid.org/currency/helper/</string>
+        <key>loginpage</key><string>http://metropolis.hypergrid.org</string>
+        <key>loginuri</key><string>http://hypergrid.org:8002/</string>
+        <key>name</key><string>hypergrid.org:8002</string>
+        <key>password</key><string>http://metropolis.hypergrid.org/oswi.php</string>
+        <key>register</key><string>http://www.hypergrid.org/metropolis/metro_rg.php</string>
     </map>
 
-    <!-- 3rd Rock Grid -->
+    <!-- OSGrid -->
     <map>
-      <key>gridnick</key><string>3rdrock</string>
-      <key>gridname</key><string>3rd Rock Grid</string>
-      <key>platform</key><string>OpenSim</string>
-      <key>loginuri</key><string>http://grid.3rdrockgrid.com:8002/</string>
-      <key>loginpage</key><string>http://3rdrockgrid.com/startpage.php</string>
-      <key>helperuri</key><string>http://grid.3rdrockgrid.com/money/</string>
-      <key>website</key><string>http://3rdrockgrid.com/</string>
-      <key>register</key><string>http://3rdrockgrid.com/</string>
-      <key>password</key><string>http://3rdrockgrid.com/</string>
-      <key>support</key><string>http://3rdrockgrid.com/</string>
-      <key>version</key><string>1</string>
+        <key>gridname</key><string>OSGrid</string>
+        <key>gridnick</key><string>OSGrid</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>about</key><string>http://www.osgrid.org/</string>
+        <key>help</key><string>http://www.osgrid.org/</string>
+        <key>loginuri</key><string>http://login.osgrid.org/</string>
+        <key>loginpage</key><string>http://www.osgrid.org/splash/</string>
+        <key>helperuri</key><string>http://helper.osgrid.org/</string>
+        <key>website</key><string>http://www.osgrid.org/</string>
+        <key>support</key><string>http://www.osgrid.org/</string>
+        <key>register</key><string>http://www.osgrid.org/</string>
+        <key>password</key><string>http://www.osgrid.org/</string>
+        <key>version</key><string>3</string>
     </map>
 
-    <!-- InWorldz -->
+    <!-- ReactionGrid -->
     <map>
-      <key>gridname</key>  <string>InWorldz</string>
-      <key>gridnick</key>  <string>inworldz</string>
-      <key>platform</key>  <string>OpenSim</string>
-      <key>loginuri</key>  <string>http://inworldz.com:8002/</string>
-      <key>loginpage</key> <string>http://inworldz.com/loginscreen.php</string>
-      <key>helperuri</key> <string>http://inworldz.com/</string>
-      <key>password</key>  <string>http://inworldz.com/loginerror.php?error=2</string>
-      <key>register</key>  <string>http://inworldz.com/register.php</string>
-      <key>support</key>   <string>http://inworldz.com/support.php</string>
-      <key>website</key>   <string>http://inworldz.com/</string>
-      <key>version</key>   <string>2</string>
-    </map> 
+        <key>gridname</key><string>ReactionGrid</string>
+        <key>gridnick</key><string>ReactionGrid</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>about</key><string>http://reactiongrid.com/Default.aspx</string>
+        <key>help</key><string>http://reactiongrid.com/Support.aspx</string>
+        <key>loginuri</key><string>http://reactiongrid.com:8008/</string>
+        <key>loginpage</key><string>http://gsquared.info/portal</string>
+        <key>helperuri</key><string>http://reactiongrid.com:9000/</string>
+        <key>website</key><string>http://reactiongrid.com/Default.aspx</string>
+        <key>support</key><string>http://reactiongrid.com/Support.aspx</string>
+        <key>register</key><string>http://reactiongrid.com/Register.aspx</string>
+        <key>password</key><string>http://www.reactiongrid.com/Support/PasswordReset.aspx</string>
+        <key>version</key><string>0</string>
+    </map>
 
     <!-- ScienceSim -->
     <map>
-      <key>gridname</key>  <string>IEEE/ACM ScienceSim Virtual World</string>
-      <key>gridnick</key>  <string>sciencesim</string>
-      <key>platform</key>  <string>OpenSim</string>
-      <key>loginuri</key>  <string>http://grid.sciencesim.com/</string>
-      <key>loginpage</key> <string>http://island.sciencesim.com/scisim/loginscreen.php</string>
-      <key>helperuri</key> <string></string>
-      <key>password</key>  <string>http://island.sciencesim.com/scisim</string>
-      <key>register</key>  <string>http://island.sciencesim.com/scisim</string>
-      <key>support</key>   <string>http://island.sciencesim.com/wiki</string>
-      <key>website</key>   <string>http://island.sciencesim.com/about/</string>
-      <key>version</key>   <string>0</string>
+        <key>gridname</key><string>IEEE/ACM ScienceSim Virtual World</string>
+        <key>gridnick</key><string>ScienceSim</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>loginuri</key><string>http://grid.sciencesim.com/</string>
+        <key>loginpage</key><string>http://island.sciencesim.com/scisim/loginscreen.php</string>
+        <key>helperuri</key><string></string>
+        <key>password</key><string>http://island.sciencesim.com/scisim</string>
+        <key>register</key><string>http://island.sciencesim.com/scisim</string>
+        <key>support</key><string>http://island.sciencesim.com/wiki</string>
+        <key>website</key><string>http://island.sciencesim.com/about/</string>
+        <key>version</key><string>0</string>
+    </map>
+
+    <!-- Second Life -->
+    <map>
+        <key>gridname</key><string>Second Life</string>
+        <key>gridnick</key><string>SL</string>
+        <key>platform</key><string>SecondLife</string>
+        <key>loginuri</key><string>https://login.agni.lindenlab.com/cgi-bin/login.cgi</string>
+        <key>loginpage</key><string>http://viewer-login.agni.lindenlab.com/</string>
+        <key>helperuri</key><string>https://secondlife.com/helpers/</string>
+        <key>website</key><string>http://secondlife.com/</string>
+        <key>support</key><string>http://secondlife.com/support/</string>
+        <key>register</key><string>http://secondlife.com/registration/</string>
+        <key>password</key><string>http://secondlife.com/account/request.php</string>
+        <key>version</key><string>2</string>
+    </map>
+
+    <!-- Second Life Beta -->
+    <map>
+        <key>gridname</key><string>Second Life Beta Grid</string>
+        <key>gridnick</key><string>SLBeta</string>
+        <key>platform</key><string>SecondLife</string>
+        <key>loginuri</key><string>https://login.aditi.lindenlab.com/cgi-bin/login.cgi</string>
+        <key>loginpage</key><string>http://viewer-login.agni.lindenlab.com</string>
+        <key>helperuri</key><string>http://aditi-secondlife.webdev.lindenlab.com/helpers/</string>
+        <key>website</key><string>http://secondlife.com/</string>
+        <key>support</key><string>http://secondlife.com/support/</string>
+        <key>register</key><string>http://secondlife.com/registration/</string>
+        <key>password</key><string>http://secondlife.com/account/request.php</string>
+        <key>version</key><string>3</string>
+    </map>
+
+    <!-- The New World Grid -->
+    <map>
+        <key>gridname</key><string>The New World Grid</string>
+        <key>gridnick</key><string>thenewworldgrid</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>loginuri</key><string>http://grid.newworldgrid.com:8002/</string>
+        <key>loginpage</key><string>http://account.newworldgrid.com/loginscreen.php</string>
+        <key>helperuri</key><string>http://account.newworldgrid.com/</string>
+        <key>website</key><string>http://www.newworldgrid.com/</string>
+        <key>support</key><string>http://www.newworldgrid.com/</string>
+        <key>register</key><string>http://www.newworldgrid.com/register</string>
+        <key>password</key><string>http://account.newworldgrid.com/</string>
+        <key>version</key><string>0</string>
+    </map>
+
+    <!-- Virtual Highway -->
+    <map>
+        <key>gridname</key><string>Virtual Highway</string>
+        <key>gridnick</key><string>VirtualHighway</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>about</key><string>http://www.virtualhighway.us/about.php</string>
+        <key>helperuri</key><string>http://www.virtualhighway.us/griddal/</string>
+        <key>loginpage</key><string>http://www.virtualhighway.us/welcome.php</string>
+        <key>loginuri</key><string>http://login.virtualhighway.us:8002/</string>
+        <key>name</key><string>login.virtualhighway.us:8002</string>
+        <key>password</key><string>http://www.virtualhighway.us/users/lostPassword</string>
+        <key>register</key><string>http://www.virtualhighway.us/users/register</string>
+    </map>
+
+    <!-- virtyou -->
+    <map>
+        <key>gridname</key><string>virtyou MainGrid</string>
+        <key>gridnick</key><string>virtyou</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>help</key><string>http://virtyou.com/q/howto/</string>
+        <key>loginpage</key><string>http://virtyou.com/welcome/</string>
+        <key>loginuri</key><string>http://go.virtyou.com</string>
+        <key>password</key><string>http://virtyou.com/user/forgotten.html</string>
+        <key>register</key><string>http://virtyou.com/user/</string>
+    </map>
+
+    <!-- Your Alternative Life -->
+    <map>
+        <key>gridname</key><string>Your Alternative Life</string>
+        <key>gridnick</key><string>YourAlternativeLife</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>about</key><string>http://www.youralternativelife.com</string>
+        <key>loginuri</key><string>http://grid01.from-ne.com:8002/</string>
+        <key>loginpage</key><string>http://grid01.from-ne.com/tios/loginscreen3.php</string>
+        <key>helperuri</key><string>http://grid01.from-ne.com/tios/services/</string>
+        <key>website</key><string>http://www.youralternativelife.com</string>
+        <key>support</key><string>http://www.youralternativelife.com</string>
+        <key>register</key><string>http://www.youralternativelife.com</string>
+        <key>password</key><string>http://www.youralternativelife.com</string>
+        <key>version</key><string>0</string>
     </map>
 
   </array>
-- 
cgit v1.1


From f2869c821a0bfef53000ba1116f64198ead4297e Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Mon, 8 Apr 2013 04:23:24 +1000
Subject: Material UUIDs are defined in two places, deleted one.

---
 linden/indra/llprimitive/llmaterialtable.cpp | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/linden/indra/llprimitive/llmaterialtable.cpp b/linden/indra/llprimitive/llmaterialtable.cpp
index 7dd764e..f06bfe8 100755
--- a/linden/indra/llprimitive/llmaterialtable.cpp
+++ b/linden/indra/llprimitive/llmaterialtable.cpp
@@ -40,16 +40,6 @@
 
 LLMaterialTable LLMaterialTable::basic(1);
 
-// Material UUIDs.
-LLUUID const LL_DEFAULT_STONE_UUID("87c5765b-aa26-43eb-b8c6-c09a1ca6208e");
-LLUUID const LL_DEFAULT_METAL_UUID("6f3c53e9-ba60-4010-8f3e-30f51a762476");
-LLUUID const LL_DEFAULT_GLASS_UUID("b4ba225c-373f-446d-9f7e-6cb7b5cf9b3d");
-LLUUID const LL_DEFAULT_WOOD_UUID("89556747-24cb-43ed-920b-47caed15465f");
-LLUUID const LL_DEFAULT_FLESH_UUID("80736669-e4b9-450e-8890-d5169f988a50");
-LLUUID const LL_DEFAULT_PLASTIC_UUID("304fcb4e-7d33-4339-ba80-76d3d22dc11a");
-LLUUID const LL_DEFAULT_RUBBER_UUID("9fae0bc5-666d-477e-9f70-84e8556ec867");
-LLUUID const LL_DEFAULT_LIGHT_UUID("00000000-0000-0000-0000-000000000000");
-
 /* 
 	Old Havok 1 constants
 
-- 
cgit v1.1


From 81eb6f3925577cd46f1e9b16e5691dea62618703 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Mon, 8 Apr 2013 04:27:27 +1000
Subject: A little more 64 bit clean now.

---
 linden/indra/newview/llviewermenu.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 538adc7..f10910c 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -9088,7 +9088,7 @@ class LLAdvancedToggleRenderType : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		U32 render_type = render_type_from_string( userdata.asString() );
+		intptr_t render_type = render_type_from_string( userdata.asString() );
 		if ( render_type != 0 )
 		{
 			LLPipeline::toggleRenderTypeControl( (void*)render_type );
@@ -9102,7 +9102,7 @@ class LLAdvancedCheckRenderType : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		U32 render_type = render_type_from_string( userdata["data"].asString() );
+		intptr_t render_type = render_type_from_string( userdata["data"].asString() );
 		bool new_value = false;
 
 		if ( render_type != 0 )
@@ -9168,7 +9168,7 @@ class LLAdvancedToggleFeature : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		U32 feature = feature_from_string( userdata.asString() );
+		intptr_t feature = feature_from_string( userdata.asString() );
 
 		if ( feature != 0 )
 		{
@@ -9184,7 +9184,7 @@ class LLAdvancedCheckFeature : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		U32 feature = feature_from_string( userdata["data"].asString() );
+		intptr_t feature = feature_from_string( userdata["data"].asString() );
 		bool new_value = false;
 
 		if ( feature != 0 )
@@ -9290,7 +9290,7 @@ class LLAdvancedToggleInfoDisplay : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		U32 info_display = info_display_from_string( userdata.asString() );
+		intptr_t info_display = info_display_from_string( userdata.asString() );
 
 		if ( info_display != 0 )
 		{
@@ -9306,7 +9306,7 @@ class LLAdvancedCheckInfoDisplay : public view_listener_t
 {
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
-		U32 info_display = info_display_from_string( userdata["data"].asString() );
+		intptr_t info_display = info_display_from_string( userdata["data"].asString() );
 		bool new_value = false;
 
 		if ( info_display != 0 )
-- 
cgit v1.1


From 0f7ca330c308a5edb51ee325faf26e5498b38af9 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Mon, 8 Apr 2013 04:47:32 +1000
Subject: Delete a big bunch of unused variables.

---
 linden/indra/llui/llfloater.cpp                  | 16 ----------------
 linden/indra/llui/llkeywords.cpp                 |  2 --
 linden/indra/llui/llmenugl.cpp                   |  2 --
 linden/indra/llui/llslider.cpp                   |  1 -
 linden/indra/llui/lltexteditor.cpp               |  4 ----
 linden/indra/newview/llagent.cpp                 | 17 -----------------
 linden/indra/newview/lldrawable.cpp              |  2 --
 linden/indra/newview/llflexibleobject.cpp        |  3 ---
 linden/indra/newview/llfloateractivespeakers.cpp |  2 +-
 linden/indra/newview/llfloaterjoystick.cpp       |  1 -
 linden/indra/newview/llfloaterwater.cpp          |  2 --
 linden/indra/newview/llfloaterwindlight.cpp      |  2 --
 linden/indra/newview/llhoverview.cpp             |  9 +++++----
 linden/indra/newview/llinventorybridge.cpp       |  1 -
 linden/indra/newview/llinventorymodel.cpp        | 10 ----------
 linden/indra/newview/llmanipscale.cpp            |  5 -----
 linden/indra/newview/llmaniptranslate.cpp        | 21 +++------------------
 linden/indra/newview/llpanelavatar.cpp           | 10 +++++-----
 linden/indra/newview/llpanelcontents.cpp         |  2 --
 linden/indra/newview/llpanelface.cpp             |  1 -
 linden/indra/newview/llpanelgrouplandmoney.cpp   |  5 -----
 linden/indra/newview/llpanellogin.cpp            |  5 ++---
 linden/indra/newview/llpanelmediahud.cpp         |  1 -
 linden/indra/newview/llspatialpartition.cpp      |  3 ---
 linden/indra/newview/llstartup.cpp               | 24 ++++++------------------
 linden/indra/newview/lltoolcomp.cpp              |  4 +---
 linden/indra/newview/lltoolfocus.cpp             | 10 ----------
 linden/indra/newview/llurlhistory.cpp            |  2 --
 linden/indra/newview/llviewercamera.cpp          |  3 +--
 linden/indra/newview/llviewermessage.cpp         |  3 ---
 linden/indra/newview/llviewerobject.cpp          |  3 ---
 linden/indra/newview/llvlcomposition.cpp         |  8 --------
 linden/indra/newview/llvoavatar.cpp              |  7 -------
 linden/indra/newview/llvoiceclient.cpp           | 10 +---------
 linden/indra/newview/llvosurfacepatch.cpp        | 10 ++--------
 linden/indra/newview/llvovolume.cpp              |  4 ++--
 linden/indra/newview/llwaterparamset.cpp         |  2 --
 linden/indra/newview/llworldmapview.cpp          |  3 ---
 linden/indra/newview/panelradar.cpp              |  3 ---
 linden/indra/newview/pipeline.cpp                |  8 --------
 40 files changed, 29 insertions(+), 202 deletions(-)
 mode change 100755 => 100644 linden/indra/newview/llviewermessage.cpp

diff --git a/linden/indra/llui/llfloater.cpp b/linden/indra/llui/llfloater.cpp
index 58c717a..4c4aeaf 100644
--- a/linden/indra/llui/llfloater.cpp
+++ b/linden/indra/llui/llfloater.cpp
@@ -277,30 +277,14 @@ void LLFloater::initFloater(const std::string& title,
 	mMinimized = FALSE;
 	mExpandedRect.set(0,0,0,0);
 	
-	S32 close_pad;			// space to the right of close box
 	S32 close_box_size;		// For layout purposes, how big is the close box?
 	if (close_btn)
 	{
 		close_box_size = LLFLOATER_CLOSE_BOX_SIZE;
-		close_pad = 0;
 	}
 	else
 	{
 		close_box_size = 0;
-		close_pad = 0;
-	}
-
-	S32 minimize_box_size;
-	S32 minimize_pad;
-	if (minimizable && !drag_on_left)
-	{
-		minimize_box_size = LLFLOATER_CLOSE_BOX_SIZE;
-		minimize_pad = 0;
-	}
-	else
-	{
-		minimize_box_size = 0;
-		minimize_pad = 0;
 	}
 
 	// Drag Handle
diff --git a/linden/indra/llui/llkeywords.cpp b/linden/indra/llui/llkeywords.cpp
index 93da44c..a50dbff 100644
--- a/linden/indra/llui/llkeywords.cpp
+++ b/linden/indra/llui/llkeywords.cpp
@@ -288,7 +288,6 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS
 
 	const llwchar* base = wtext.c_str();
 	const llwchar* cur = base;
-	const llwchar* line = NULL;
 
 	while( *cur )
 	{
@@ -304,7 +303,6 @@ void LLKeywords::findSegments(std::vector<LLTextSegment *>* seg_list, const LLWS
 			}
 
 			// Start of a new line
-			line = cur;
 
 			// Skip white space
 			while( *cur && isspace(*cur) && (*cur != '\n')  )
diff --git a/linden/indra/llui/llmenugl.cpp b/linden/indra/llui/llmenugl.cpp
index 2d4a2f1..6850891 100644
--- a/linden/indra/llui/llmenugl.cpp
+++ b/linden/indra/llui/llmenugl.cpp
@@ -3095,8 +3095,6 @@ void LLMenuGL::draw( void )
 			LLUI::sConfigGroup->getS32("DropShadowFloater") );
 	}
 
-	LLColor4 bg_color = mBackgroundColor;
-
 	if( mBgVisible )
 	{
 		gl_rect_2d(  0, getRect().getHeight(),   getRect().getWidth(),    0, mBackgroundColor );
diff --git a/linden/indra/llui/llslider.cpp b/linden/indra/llui/llslider.cpp
index 5c17baa..c8f5935 100644
--- a/linden/indra/llui/llslider.cpp
+++ b/linden/indra/llui/llslider.cpp
@@ -283,7 +283,6 @@ void LLSlider::draw()
 
 	F32 opacity = getEnabled() ? 1.f : 0.3f;
 	LLColor4 center_color = (mThumbCenterColor % opacity);
-	LLColor4 track_color = (mTrackColor % opacity);
 
 	// Track
 	LLRect track_rect(mThumbImage->getWidth() / 2, 
diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index c8ca5bf..1c12ff3 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -3077,7 +3077,6 @@ void LLTextEditor::drawSelectionBackground()
 		S32 selection_right_x	= mTextRect.mRight;
 		S32 selection_right_y	= mTextRect.mBottom;
 
-		BOOL selection_left_visible = FALSE;
 		BOOL selection_right_visible = FALSE;
 
 		// Skip through the lines we aren't drawing.
@@ -3085,7 +3084,6 @@ void LLTextEditor::drawSelectionBackground()
 
 		S32 left_line_num = cur_line;
 		S32 num_lines = getLineCount();
-		S32 right_line_num = num_lines - 1;
 
 		S32 line_start = -1;
 		if (cur_line >= num_lines)
@@ -3119,13 +3117,11 @@ void LLTextEditor::drawSelectionBackground()
 			if( line_start <= selection_left && selection_left <= line_end )
 			{
 				left_line_num = cur_line;
-				selection_left_visible = TRUE;
 				selection_left_x = mTextRect.mLeft + mGLFont->getWidth(line, 0, selection_left - line_start, mAllowEmbeddedItems);
 				selection_left_y = text_y;
 			}
 			if( line_start <= selection_right && selection_right <= line_end )
 			{
-				right_line_num = cur_line;
 				selection_right_visible = TRUE;
 				selection_right_x = mTextRect.mLeft + mGLFont->getWidth(line, 0, selection_right - line_start, mAllowEmbeddedItems);
 				if (selection_right == line_end)
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 09d65d1..c61f7a6 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -1613,8 +1613,6 @@ BOOL LLAgent::calcCameraMinDistance(F32 &obj_min_distance)
 	abs_target_offset.abs();
 
 	LLVector3 target_offset_dir = target_offset_origin;
-	F32 object_radius = mFocusObject->getVObjRadius();
-
 	BOOL target_outside_object_extents = FALSE;
 
 	for (U32 i = VX; i <= VZ; i++)
@@ -1708,18 +1706,6 @@ BOOL LLAgent::calcCameraMinDistance(F32 &obj_min_distance)
 
 	LLVector3 camera_offset_object(getCameraPositionAgent() - mFocusObject->getPositionAgent());
 
-	// length projected orthogonal to target offset
-	F32 camera_offset_dist = (camera_offset_object - target_offset_dir * (camera_offset_object * target_offset_dir)).magVec();
-
-	// calculate whether the target point would be "visible" if it were outside the bounding box
-	// on the opposite of the splitting plane defined by object_split_axis;
-	BOOL exterior_target_visible = FALSE;
-	if (camera_offset_dist > object_radius)
-	{
-		// target is visible from camera, so turn off fov zoom
-		exterior_target_visible = TRUE;
-	}
-
 	F32 camera_offset_clip = camera_offset_object * object_split_axis;
 	F32 target_offset_clip = target_offset_dir * object_split_axis;
 
@@ -2538,12 +2524,10 @@ void LLAgent::autoPilot(F32 *delta_yaw)
 		*delta_yaw = yaw;
 
 		// Compute when to start slowing down and when to stop
-		F32 stop_distance = mAutoPilotStopDistance;
 		F32 slow_distance;
 		if (getFlying())
 		{
 			slow_distance = llmax(6.f, mAutoPilotStopDistance + 5.f);
-			stop_distance = llmax(2.f, mAutoPilotStopDistance);
 		}
 		else
 		{
@@ -3719,7 +3703,6 @@ F32	LLAgent::calcCameraFOVZoomFactor()
 	else if (mFocusObject.notNull() && !mFocusObject->isAvatar())
 	{
 		// don't FOV zoom on mostly transparent objects
-		LLVector3 focus_offset = mFocusObjectOffset;
 		F32 obj_min_dist = 0.f;
 		if (!gSavedSettings.getBOOL("DisableMinZoomDist"))
 			calcCameraMinDistance(obj_min_dist);
diff --git a/linden/indra/newview/lldrawable.cpp b/linden/indra/newview/lldrawable.cpp
index 5a383bc..f808f89 100644
--- a/linden/indra/newview/lldrawable.cpp
+++ b/linden/indra/newview/lldrawable.cpp
@@ -494,7 +494,6 @@ F32 LLDrawable::updateXform(BOOL undamped)
 	//scaling
 	LLVector3 target_scale = mVObjp->getScale();
 	LLVector3 old_scale = mCurrentScale;
-	LLVector3 dest_scale = target_scale;
 	
 	// Damping
 	F32 dist_squared = 0.f;
@@ -834,7 +833,6 @@ const LLVector3* LLDrawable::getSpatialExtents() const
 
 void LLDrawable::setSpatialExtents(LLVector3 min, LLVector3 max)
 { 
-	LLVector3 size = max - min;
 	mExtents[0] = min; 
 	mExtents[1] = max; 
 }
diff --git a/linden/indra/newview/llflexibleobject.cpp b/linden/indra/newview/llflexibleobject.cpp
index 8f2c6d5..ad4341c 100644
--- a/linden/indra/newview/llflexibleobject.cpp
+++ b/linden/indra/newview/llflexibleobject.cpp
@@ -233,9 +233,6 @@ void LLVolumeImplFlexible::setAttributesOfAllSections(LLVector3* inScale)
 	mSection[0].mVelocity.setVec(0,0,0);
 	mSection[0].mAxisRotation.setQuat(begin_rot,0,0,1);
 
-	LLVector3 parentSectionPosition = mSection[0].mPosition;
-	LLVector3 last_direction = mSection[0].mDirection;
-
 	remapSections(mSection, mInitializedRes, mSection, mSimulateRes);
 	mInitializedRes = mSimulateRes;
 
diff --git a/linden/indra/newview/llfloateractivespeakers.cpp b/linden/indra/newview/llfloateractivespeakers.cpp
index 75cf176..c1ba5da 100644
--- a/linden/indra/newview/llfloateractivespeakers.cpp
+++ b/linden/indra/newview/llfloateractivespeakers.cpp
@@ -1010,7 +1010,7 @@ void LLSpeakerMgr::update(BOOL resort_ok)
 		LLUUID speaker_id = speaker_it->first;
 		LLSpeaker* speakerp = speaker_it->second;
 		
-		speaker_map_t::iterator  cur_speaker_it = speaker_it++;
+		speaker_it++;
 
 		if (voice_channel_active && gVoiceClient->getVoiceEnabled(speaker_id))
 		{
diff --git a/linden/indra/newview/llfloaterjoystick.cpp b/linden/indra/newview/llfloaterjoystick.cpp
index 960eebb..4584abc 100644
--- a/linden/indra/newview/llfloaterjoystick.cpp
+++ b/linden/indra/newview/llfloaterjoystick.cpp
@@ -100,7 +100,6 @@ BOOL LLFloaterJoystick::postBuild()
 	if (child)
 	{
 		LLRect r = child->getRect();
-		LLRect f = getRect();
 		rect = LLRect(350, r.mTop, r.mRight + 200, 0);
 	}
 
diff --git a/linden/indra/newview/llfloaterwater.cpp b/linden/indra/newview/llfloaterwater.cpp
index 782c56e..3530f54 100644
--- a/linden/indra/newview/llfloaterwater.cpp
+++ b/linden/indra/newview/llfloaterwater.cpp
@@ -760,13 +760,11 @@ bool LLFloaterWater::deleteAlertCallback(const LLSD& notification, const LLSD& r
 		LLComboBox* combo_box = sWaterMenu->getChild<LLComboBox>("WaterPresetsCombo");
 		LLFloaterDayCycle* day_cycle = NULL;
 		LLComboBox* key_combo = NULL;
-		LLMultiSliderCtrl* mult_sldr = NULL;
 
 		if(LLFloaterDayCycle::isOpen()) 
 		{
 			day_cycle = LLFloaterDayCycle::instance();
 			key_combo = day_cycle->getChild<LLComboBox>("WaterKeyPresets");
-			mult_sldr = day_cycle->getChild<LLMultiSliderCtrl>("WaterDayCycleKeys");
 		}
 
 		std::string name = combo_box->getSelectedValue().asString();
diff --git a/linden/indra/newview/llfloaterwindlight.cpp b/linden/indra/newview/llfloaterwindlight.cpp
index 4937232..8f2eafb 100644
--- a/linden/indra/newview/llfloaterwindlight.cpp
+++ b/linden/indra/newview/llfloaterwindlight.cpp
@@ -973,14 +973,12 @@ bool LLFloaterWindLight::deleteAlertCallback(const LLSD& notification, const LLS
 			"WLPresetsCombo");
 		LLFloaterDayCycle* day_cycle = NULL;
 		LLComboBox* key_combo = NULL;
-		LLMultiSliderCtrl* mult_sldr = NULL;
 
 		if(LLFloaterDayCycle::isOpen()) 
 		{
 			day_cycle = LLFloaterDayCycle::instance();
 			key_combo = day_cycle->getChild<LLComboBox>( 
 				"WLKeyPresets");
-			mult_sldr = day_cycle->getChild<LLMultiSliderCtrl>("WLDayCycleKeys");
 		}
 
 		std::string name(combo_box->getSelectedValue().asString());
diff --git a/linden/indra/newview/llhoverview.cpp b/linden/indra/newview/llhoverview.cpp
index 4f248e4..91cb8a5 100644
--- a/linden/indra/newview/llhoverview.cpp
+++ b/linden/indra/newview/llhoverview.cpp
@@ -546,14 +546,15 @@ void LLHoverView::updateText()
 
 		LLParcel* hover_parcel = LLViewerParcelMgr::getInstance()->getHoverParcel();
 		LLUUID owner;
-		S32 width = 0;
-		S32 height = 0;
+		// Their use is commented out below.  No doubt both will get deleted on a later clean up pass.
+		//S32 width = 0;
+		//S32 height = 0;
 
 		if ( hover_parcel )
 		{
 			owner = hover_parcel->getOwnerID();
-			width = S32(LLViewerParcelMgr::getInstance()->getHoverParcelWidth());
-			height = S32(LLViewerParcelMgr::getInstance()->getHoverParcelHeight());
+		//	width = S32(LLViewerParcelMgr::getInstance()->getHoverParcelWidth());
+		//	height = S32(LLViewerParcelMgr::getInstance()->getHoverParcelHeight());
 		}
 
 		// Line: "Land"
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index eb2170a..df32eab 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -1439,7 +1439,6 @@ BOOL move_inv_category_world_to_agent(const LLUUID& object_id,
 	if(drop && accept)
 	{
 		it = inventory_objects.begin();
-		InventoryObjectList::iterator first_it = inventory_objects.begin();
 		LLMoveInv* move_inv = new LLMoveInv;
 		move_inv->mObjectID = object_id;
 		move_inv->mCategoryID = category_id;
diff --git a/linden/indra/newview/llinventorymodel.cpp b/linden/indra/newview/llinventorymodel.cpp
index 3f74965..40cbc43 100644
--- a/linden/indra/newview/llinventorymodel.cpp
+++ b/linden/indra/newview/llinventorymodel.cpp
@@ -1211,7 +1211,6 @@ void  LLInventoryModel::fetchInventoryResponder::result(const LLSD& content)
 	item_array_t items;
 	update_map_t update;
 	S32 count = content["items"].size();
-	bool all_one_folder = true;
 	LLUUID folder_id;
 	// Does this loop ever execute more than once?
 	for(S32 i = 0; i < count; ++i)
@@ -1244,10 +1243,6 @@ void  LLInventoryModel::fetchInventoryResponder::result(const LLSD& content)
 		{
 			folder_id = titem->getParentUUID();
 		}
-		else
-		{
-			all_one_folder = false;
-		}
 	}
 
 	U32 changes = 0x0;
@@ -2960,7 +2955,6 @@ bool LLInventoryModel::messageUpdateCore(LLMessageSystem* msg, bool account)
 	item_array_t items;
 	update_map_t update;
 	S32 count = msg->getNumberOfBlocksFast(_PREHASH_InventoryData);
-	bool all_one_folder = true;
 	LLUUID folder_id;
 	// Does this loop ever execute more than once?
 	for(S32 i = 0; i < count; ++i)
@@ -2992,10 +2986,6 @@ bool LLInventoryModel::messageUpdateCore(LLMessageSystem* msg, bool account)
 		{
 			folder_id = titem->getParentUUID();
 		}
-		else
-		{
-			all_one_folder = false;
-		}
 	}
 	if(account)
 	{
diff --git a/linden/indra/newview/llmanipscale.cpp b/linden/indra/newview/llmanipscale.cpp
index 33ee1b9..593f765 100644
--- a/linden/indra/newview/llmanipscale.cpp
+++ b/linden/indra/newview/llmanipscale.cpp
@@ -1172,9 +1172,6 @@ void LLManipScale::dragFace( S32 x, S32 y )
 		mInSnapRegime = FALSE;
 	}
 
-	BOOL send_scale_update = FALSE;
-	BOOL send_position_update = FALSE;
-
 	LLVector3 dir_agent;
 	if( part_dir_local.mV[VX] )
 	{
@@ -1191,8 +1188,6 @@ void LLManipScale::dragFace( S32 x, S32 y )
 	stretchFace( 
 		projected_vec(drag_start_dir_f, dir_agent) + drag_start_center_agent,
 		projected_vec(drag_delta, dir_agent));
-	send_position_update = TRUE;
-	send_scale_update = TRUE;
 
 	mDragPointGlobal = drag_point_global;
 }
diff --git a/linden/indra/newview/llmaniptranslate.cpp b/linden/indra/newview/llmaniptranslate.cpp
index 53578ca..4816eac 100644
--- a/linden/indra/newview/llmaniptranslate.cpp
+++ b/linden/indra/newview/llmaniptranslate.cpp
@@ -487,9 +487,6 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
 		}
 	}
 
-	// Throttle updates to 10 per second.
-	BOOL send_update = FALSE;
-
 	LLVector3		axis_f;
 	LLVector3d		axis_d;
 
@@ -701,10 +698,7 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
 				LLVector3 new_position_local = selectNode->mSavedPositionLocal + (clamped_relative_move_f * objWorldRotation);
 
 				// move and clamp root object first, before adjusting children
-				if (new_position_local != old_position_local)
-				{
-					send_update = TRUE;
-				}
+
 				//RN: I forget, but we need to do this because of snapping which doesn't often result
 				// in position changes even when the mouse moves
 				object->setPosition(new_position_local);
@@ -714,8 +708,6 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
 
 				if (selectNode->mIndividualSelection)
 				{
-					send_update = FALSE;
-		
 					// counter-translate child objects if we are moving the root as an individual
 					object->resetChildrenPosition(old_position_local - new_position_local, TRUE) ;					
 				}
@@ -752,7 +744,6 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
 				}
 
 				// PR: Only update if changed
-				LLVector3d old_position_global = object->getPositionGlobal();
 				LLVector3 old_position_agent = object->getPositionAgent();
 				LLVector3 new_position_agent = gAgent.getPosAgentFromGlobal(new_position_global);
 				if (object->isRootEdit())
@@ -774,11 +765,6 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
 				{
 					// counter-translate child objects if we are moving the root as an individual
 					object->resetChildrenPosition(old_position_agent - new_position_agent, TRUE) ;					
-					send_update = FALSE;
-				}
-				else if (old_position_global != new_position_global)
-				{
-					send_update = TRUE;
 				}
 			}
 			selectNode->mLastPositionLocal  = object->getPosition();
@@ -1302,7 +1288,7 @@ void LLManipTranslate::renderSnapGuides()
 					// add in off-axis offset
 					tick_start += (mSnapOffsetAxis * mSnapOffsetMeters);
 
-					BOOL is_sub_tick = FALSE;
+//					BOOL is_sub_tick = FALSE;
 					F32 tick_scale = 1.f;
 					for (F32 division_level = max_subdivisions; division_level >= sGridMinSubdivisionLevel; division_level /= 2.f)
 					{
@@ -1311,7 +1297,7 @@ void LLManipTranslate::renderSnapGuides()
 							break;
 						}
 						tick_scale *= 0.7f;
-						is_sub_tick = TRUE;
+//						is_sub_tick = TRUE;
 					}
 
 // 					S32 num_ticks_to_fade = is_sub_tick ? num_ticks_per_side / 2 : num_ticks_per_side;
@@ -1533,7 +1519,6 @@ void LLManipTranslate::renderSnapGuides()
 		
 		float a = line_alpha;
 
-		LLColor4 col = gColors.getColor("SilhouetteChildColor");
 		{
 			//draw grid behind objects
 			LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
diff --git a/linden/indra/newview/llpanelavatar.cpp b/linden/indra/newview/llpanelavatar.cpp
index dc0db8b..f249d2a 100644
--- a/linden/indra/newview/llpanelavatar.cpp
+++ b/linden/indra/newview/llpanelavatar.cpp
@@ -1321,11 +1321,11 @@ void LLPanelAvatar::setAvatarID(const LLUUID &avatar_id, const std::string &name
 {
 	if (avatar_id.isNull()) return;
 
-	BOOL avatar_changed = FALSE;
-	if (avatar_id != mAvatarID)
-	{
-		avatar_changed = TRUE;
-	}
+//	BOOL avatar_changed = FALSE;
+//	if (avatar_id != mAvatarID)
+//	{
+//		avatar_changed = TRUE;
+//	}
 	mAvatarID = avatar_id;
 
 	// Determine if we have their calling card.
diff --git a/linden/indra/newview/llpanelcontents.cpp b/linden/indra/newview/llpanelcontents.cpp
index 02befea..c5df81c 100644
--- a/linden/indra/newview/llpanelcontents.cpp
+++ b/linden/indra/newview/llpanelcontents.cpp
@@ -83,8 +83,6 @@
 
 BOOL LLPanelContents::postBuild()
 {
-	LLRect rect = this->getRect();
-
 	setMouseOpaque(FALSE);
 
 	childSetAction("button new script",&LLPanelContents::onClickNewScript, this);
diff --git a/linden/indra/newview/llpanelface.cpp b/linden/indra/newview/llpanelface.cpp
index b9a40da..d8401de 100644
--- a/linden/indra/newview/llpanelface.cpp
+++ b/linden/indra/newview/llpanelface.cpp
@@ -74,7 +74,6 @@
 
 BOOL	LLPanelFace::postBuild()
 {
-	LLRect	rect = this->getRect();
 	LLTextureCtrl*	mTextureCtrl;
 	LLColorSwatchCtrl*	mColorSwatch;
 
diff --git a/linden/indra/newview/llpanelgrouplandmoney.cpp b/linden/indra/newview/llpanelgrouplandmoney.cpp
index 3f128fe..e15f585 100644
--- a/linden/indra/newview/llpanelgrouplandmoney.cpp
+++ b/linden/indra/newview/llpanelgrouplandmoney.cpp
@@ -1390,13 +1390,11 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg,
 	S32 cur_land_tax;
 	S32 cur_group_tax;
 	S32 cur_parcel_dir_fee;
-	S32 cur_total_tax;
 	S32 proj_object_tax;
 	S32 proj_light_tax;
 	S32 proj_land_tax;
 	S32 proj_group_tax;
 	S32 proj_parcel_dir_fee;
-	S32 proj_total_tax;
 	S32	non_exempt_members;
 
 	msg->getS32Fast(_PREHASH_MoneyData, _PREHASH_IntervalDays, interval_days );
@@ -1420,9 +1418,6 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg,
 	msg->getStringFast(_PREHASH_MoneyData, _PREHASH_LastTaxDate, last_stipend_date);
 	msg->getStringFast(_PREHASH_MoneyData, _PREHASH_TaxDate, next_stipend_date);
 
-	cur_total_tax = cur_object_tax + cur_light_tax + cur_land_tax + cur_group_tax +  cur_parcel_dir_fee;
-	proj_total_tax = proj_object_tax + proj_light_tax + proj_land_tax + proj_group_tax + proj_parcel_dir_fee;
-
 	if (interval_days != mImplementationp->mIntervalLength || 
 		current_interval != mImplementationp->mCurrentInterval)
 	{
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 824c5b0..524ecf6 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -602,18 +602,17 @@ void LLPanelLogin::addServer(const std::string& server)
 	const std::string &defaultGrid = gHippoGridManager->getDefaultGridNick();
 
 	LLComboBox *grids = sInstance->getChild<LLComboBox>("server_combo");
-	S32 selectIndex = -1, i = 0;
+	S32 i = 0;
 	grids->removeall();
 	if (defaultGrid != "") {
 		grids->add(defaultGrid);
-		selectIndex = i++;
+		i++;
 	}
 	HippoGridManager::GridIterator it, end = gHippoGridManager->endGrid();
 	for (it = gHippoGridManager->beginGrid(); it != end; ++it) {
 		const std::string &grid = it->second->getGridNick();
 		if (grid != defaultGrid) {
 			grids->add(grid);
-			//if (grid == mCurGrid) selectIndex = i;
 			i++;
 		}
 	}
diff --git a/linden/indra/newview/llpanelmediahud.cpp b/linden/indra/newview/llpanelmediahud.cpp
index 39c4b63..c4afe27 100644
--- a/linden/indra/newview/llpanelmediahud.cpp
+++ b/linden/indra/newview/llpanelmediahud.cpp
@@ -356,7 +356,6 @@ void LLPanelMediaHUD::updateShape()
 		media_hud_rect.mRight += getRect().getWidth() - media_region->getRect().mRight;
 
 
-		LLRect old_hud_rect = media_hud_rect;
 		// keep all parts of HUD on-screen
 		media_hud_rect.intersectWith(getParent()->getLocalRect());
 
diff --git a/linden/indra/newview/llspatialpartition.cpp b/linden/indra/newview/llspatialpartition.cpp
index d9fa5b5..30f7c0b 100644
--- a/linden/indra/newview/llspatialpartition.cpp
+++ b/linden/indra/newview/llspatialpartition.cpp
@@ -2860,9 +2860,6 @@ public:
 
 	virtual bool check(LLDrawable* drawable)
 	{	
-		LLVector3 local_start = mStart;
-		LLVector3 local_end = mEnd;
-
 		if (!gPipeline.hasRenderType(drawable->getRenderType()) || !drawable->isVisible())
 		{
 			return false;
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index d853dc0..2fd96df 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -348,7 +348,6 @@ bool idle_startup()
 	const F32 TIMEOUT_SECONDS = 10.f; // changed from 5 to 10 seconds for OpenSim lag -- MC
 	const S32 MAX_TIMEOUT_COUNT = 3;
 	static LLTimer timeout;
-	static S32 timeout_count = 0;
 
 	static LLTimer login_time;
 	static LLTimer connecting_region_timer;
@@ -380,11 +379,10 @@ bool idle_startup()
 
 	// last location by default
 	static S32  agent_location_id = START_LOCATION_ID_LAST;
-	static S32  location_which = START_LOCATION_ID_LAST;
 
 	static bool show_connect_box = true;
 
-	static bool stipend_since_login = false;
+	//static bool stipend_since_login = false;
 
 	static bool samename = false;
 
@@ -799,8 +797,6 @@ bool idle_startup()
 		
 		gViewerWindow->getWindow()->setCursor(UI_CURSOR_ARROW);
 
-		timeout_count = 0;
-		
 		if (LLStartUp::shouldAutoLogin())
 		{
 			show_connect_box = false;
@@ -1113,7 +1109,6 @@ bool idle_startup()
 		{
 			// Force login at the last location
 			agent_location_id = START_LOCATION_ID_LAST;
-			location_which = START_LOCATION_ID_LAST;
 			gSavedSettings.setBOOL("LoginLastLocation", FALSE);
 			
 			// Clear some things that would cause us to divert to a user-specified location
@@ -1125,21 +1120,14 @@ bool idle_startup()
 		{
 			// a startup URL was specified
 			agent_location_id = START_LOCATION_ID_URL;
-
-			// doesn't really matter what location_which is, since
-			// agent_start_look_at will be overwritten when the
-			// UserLoginLocationReply arrives
-			location_which = START_LOCATION_ID_LAST;
 		}
 		else if (gSavedSettings.getBOOL("LoginLastLocation"))
 		{
 			agent_location_id = START_LOCATION_ID_LAST;	// last location
-			location_which = START_LOCATION_ID_LAST;
 		}
 		else
 		{
 			agent_location_id = START_LOCATION_ID_HOME;	// home
-			location_which = START_LOCATION_ID_HOME;
 		}
 
 		gViewerWindow->getWindow()->setCursor(UI_CURSOR_WAIT);
@@ -1785,11 +1773,11 @@ bool idle_startup()
 					if((*it).second == "N") gAgent.setFirstLogin(TRUE);
 					else gAgent.setFirstLogin(FALSE);
 				}
-				it = options[0].find("stipend_since_login");
-				if(it != no_flag)
-				{
-					if((*it).second == "Y") stipend_since_login = true;
-				}
+				//it = options[0].find("stipend_since_login");
+				//if(it != no_flag)
+				//{
+				//	if((*it).second == "Y") stipend_since_login = true;
+				//}
 				it = options[0].find("gendered");
 				if(it != no_flag)
 				{
diff --git a/linden/indra/newview/lltoolcomp.cpp b/linden/indra/newview/lltoolcomp.cpp
index 7bf99f0..172f71d 100644
--- a/linden/indra/newview/lltoolcomp.cpp
+++ b/linden/indra/newview/lltoolcomp.cpp
@@ -471,18 +471,16 @@ LLToolCompCreate::~LLToolCompCreate()
 
 BOOL LLToolCompCreate::handleMouseDown(S32 x, S32 y, MASK mask)
 {
-	BOOL handled = FALSE;
 	mMouseDown = TRUE;
 
 	if ( (mask == MASK_SHIFT) || (mask == MASK_CONTROL) )
 	{
 		gViewerWindow->pickAsync(x, y, mask, pickCallback);
-		handled = TRUE;
 	}
 	else
 	{
 		setCurrentTool( mPlacer );
-		handled = mPlacer->placeObject( x, y, mask );
+		mPlacer->placeObject( x, y, mask );
 	}
 	
 	mObjectPlacedOnMouseDown = TRUE;
diff --git a/linden/indra/newview/lltoolfocus.cpp b/linden/indra/newview/lltoolfocus.cpp
index ae0cd1e..c0dedb6 100644
--- a/linden/indra/newview/lltoolfocus.cpp
+++ b/linden/indra/newview/lltoolfocus.cpp
@@ -318,8 +318,6 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
 	S32 dx = gViewerWindow->getCurrentMouseDX();
 	S32 dy = gViewerWindow->getCurrentMouseDY();
 	
-	BOOL moved_outside_slop = FALSE;
-	
 	if (hasMouseCapture() && mValidClickPoint)
 	{
 		mAccumX += llabs(dx);
@@ -327,19 +325,11 @@ BOOL LLToolCamera::handleHover(S32 x, S32 y, MASK mask)
 
 		if (mAccumX >= SLOP_RANGE)
 		{
-			if (!mOutsideSlopX)
-			{
-				moved_outside_slop = TRUE;
-			}
 			mOutsideSlopX = TRUE;
 		}
 
 		if (mAccumY >= SLOP_RANGE)
 		{
-			if (!mOutsideSlopY)
-			{
-				moved_outside_slop = TRUE;
-			}
 			mOutsideSlopY = TRUE;
 		}
 	}
diff --git a/linden/indra/newview/llurlhistory.cpp b/linden/indra/newview/llurlhistory.cpp
index b187f3b..1d6c87f 100644
--- a/linden/indra/newview/llurlhistory.cpp
+++ b/linden/indra/newview/llurlhistory.cpp
@@ -119,8 +119,6 @@ void LLURLHistory::addURL(const std::string& collection, const std::string& url)
 // static
 void LLURLHistory::removeURL(const std::string& collection, const std::string& url)
 {
-	LLSD::array_iterator iter = sHistorySD[collection].beginArray();
-	LLSD::array_iterator end = sHistorySD[collection].endArray();
 	for(int index = 0; index < sHistorySD[collection].size(); index++)
 	{
 		if(sHistorySD[collection].get(index).asString() == url)
diff --git a/linden/indra/newview/llviewercamera.cpp b/linden/indra/newview/llviewercamera.cpp
index fecab65..5a09433 100644
--- a/linden/indra/newview/llviewercamera.cpp
+++ b/linden/indra/newview/llviewercamera.cpp
@@ -306,7 +306,7 @@ void LLViewerCamera::setPerspective(BOOL for_selection,
 {
 	F32 fov_y, aspect;
 	fov_y = RAD_TO_DEG * getView();
-	BOOL z_default_near, z_default_far = FALSE;
+	BOOL z_default_far = FALSE;
 	if (z_far <= 0)
 	{
 		z_default_far = TRUE;
@@ -314,7 +314,6 @@ void LLViewerCamera::setPerspective(BOOL for_selection,
 	}
 	if (z_near <= 0)
 	{
-		z_default_near = TRUE;
 		z_near = getNear();
 	}
 	aspect = getAspect();
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
old mode 100755
new mode 100644
index f0c7c0c..9dd02eb
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -653,7 +653,6 @@ void send_sound_trigger(const LLUUID& sound_id, F32 gain)
 bool join_group_response(const LLSD& notification, const LLSD& response)
 {
 	S32 option = LLNotification::getSelectedOption(notification, response);
-	BOOL delete_context_data = TRUE;
 	bool accept_invite = false;
 
 	LLUUID group_id = notification["payload"]["group_id"].asUUID();
@@ -682,7 +681,6 @@ bool join_group_response(const LLSD& notification, const LLSD& response)
 		}
 		else
 		{
-			delete_context_data = FALSE;
 			LLSD args;
 			args["NAME"] = name;
 			args["INVITE"] = message;
@@ -696,7 +694,6 @@ bool join_group_response(const LLSD& notification, const LLSD& response)
 		// sure the user is sure they want to join.
 		if (fee > 0)
 		{
-			delete_context_data = FALSE;
 			LLSD args;
 			args["COST"] = llformat("%d", fee);
 			args["CURRENCY"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index 576f312..880e1bb 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -2046,9 +2046,6 @@ BOOL LLViewerObject::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
 				if (HJT_HINGE == mJointInfo->mJointType)
 				{
 					// hinge = uniform circular motion
-					LLVector3 parent_pivot = getVelocity();
-					LLVector3 parent_axis = getAcceleration();
-	
 					angle = dt * (ang_vel * mJointInfo->mAxisOrAnchor);	// AxisOrAnchor = axis
 					dQ.setQuat(angle, mJointInfo->mAxisOrAnchor);		// AxisOrAnchor = axis
 					LLVector3 pivot_offset = pos - mJointInfo->mPivot;	// pos in pivot-frame
diff --git a/linden/indra/newview/llvlcomposition.cpp b/linden/indra/newview/llvlcomposition.cpp
index afd9b95..beec1f1 100644
--- a/linden/indra/newview/llvlcomposition.cpp
+++ b/linden/indra/newview/llvlcomposition.cpp
@@ -384,9 +384,6 @@ BOOL LLVLComposition::generateTexture(const F32 x, const F32 y,
 	LLPointer<LLImageRaw> raw = new LLImageRaw(tex_width, tex_height, tex_comps);
 	U8 *rawp = raw->getData();
 
-	F32 tex_width_inv = 1.f/tex_width;
-	F32 tex_height_inv = 1.f/tex_height;
-
 	F32 st_x_stride, st_y_stride;
 	st_x_stride = ((F32)st_width / (F32)mTexScaleX)*((F32)mWidth / (F32)tex_width);
 	st_y_stride = ((F32)st_height / (F32)mTexScaleY)*((F32)mWidth / (F32)tex_height);
@@ -421,11 +418,6 @@ BOOL LLVLComposition::generateTexture(const F32 x, const F32 y,
 			tex1 = tex0 + 1;
 			tex1 = llclamp(tex1, 0, 3);
 
-			F32 xy_int_i, xy_int_j;
-
-			xy_int_i = i * tex_width_inv;
-			xy_int_j = j * tex_height_inv;
-
 			st_offset = (lltrunc(sti) + lltrunc(stj)*st_width) * st_comps;
 			for (U32 k = 0; k < tex_comps; k++)
 			{
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 359ac74..aac4e41 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -2500,7 +2500,6 @@ void LLVOAvatar::computeBodySize()
 
 	// some of the joints have not been cached
 	LLVector3 skull = mSkullp->getPosition();
-	LLVector3 skull_scale = mSkullp->getScale();
 
 	LLVector3 neck = mNeckp->getPosition();
 	LLVector3 neck_scale = mNeckp->getScale();
@@ -2580,7 +2579,6 @@ U32 LLVOAvatar::processUpdateMessage(LLMessageSystem *mesgsys,
 {
 	LLMemType mt(LLMemType::MTYPE_AVATAR);
 
-	LLVector3 old_vel = getVelocity();
 	// Do base class updates...
 	U32 retval = LLViewerObject::processUpdateMessage(mesgsys, user_data, block_num, update_type, dp);
 
@@ -3823,8 +3821,6 @@ void LLVOAvatar::idleUpdateNameTag(const LLVector3& root_pos_last)
 					mNameText->setLabel(mNameString);
 				}
 
-				char line[MAX_STRING];		/* Flawfinder: ignore */
-				line[0] = '\0';
 				std::deque<LLChat>::iterator chat_iter = mChats.begin();
 				mNameText->clearString();
 
@@ -4287,8 +4283,6 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
 	xyVel.mV[VZ] = 0.0f;
 	speed = xyVel.length();
 
-	BOOL throttle = TRUE;
-
 	if (!(mIsSitting && getParent()))
 	{
 		//--------------------------------------------------------------------
@@ -4299,7 +4293,6 @@ BOOL LLVOAvatar::updateCharacter(LLAgent &agent)
 		if (mTimeLast == 0.0f)
 		{
 			mTimeLast = animation_time;
-			throttle = FALSE;
 
 			// put the pelvis at slaved position/mRotation
 			mRoot.setWorldPosition( getPositionAgent() ); // first frame
diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index 2035b62..703bcc2 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -3160,7 +3160,7 @@ void LLVoiceClient::giveUp()
 
 static void oldSDKTransform (LLVector3 &left, LLVector3 &up, LLVector3 &at, LLVector3d &pos, LLVector3 &vel)
 {
-	F32 nat[3], nup[3], nl[3], nvel[3]; // the new at, up, left vectors and the  new position and velocity
+	F32 nat[3], nup[3], nl[3]; // the new at, up, left vectors and the  new position and velocity (velocity was not used, so I deleted it)
 	F64 npos[3];
 	
 	// The original XML command was sent like this:
@@ -3210,10 +3210,6 @@ static void oldSDKTransform (LLVector3 &left, LLVector3 &up, LLVector3 &at, LLVe
 	npos[1] = pos.mdV[VZ];
 	npos[2] = pos.mdV[VY];
 
-	nvel[0] = vel.mV[VX];
-	nvel[1] = vel.mV[VZ];
-	nvel[2] = vel.mV[VY];
-
 	for(int i=0;i<3;++i) {
 		at.mV[i] = nat[i];
 		up.mV[i] = nup[i];
@@ -3264,10 +3260,6 @@ static void oldSDKTransform (LLVector3 &left, LLVector3 &up, LLVector3 &at, LLVe
 	npos[1] = pos.mdV[VZ];
 	npos[2] = pos.mdV[VY] * -1.0;
 
-	nvel[0] = vel.mV[VX];
-	nvel[1] = vel.mV[VZ];
-	nvel[2] = vel.mV[VY];
-
 	for(int i=0;i<3;++i) {
 		at.mV[i] = nat[i];
 		up.mV[i] = nup[i];
diff --git a/linden/indra/newview/llvosurfacepatch.cpp b/linden/indra/newview/llvosurfacepatch.cpp
index 1671880..380eff5 100644
--- a/linden/indra/newview/llvosurfacepatch.cpp
+++ b/linden/indra/newview/llvosurfacepatch.cpp
@@ -423,7 +423,7 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
 	S32 vertex_count = 0;
 	S32 i, x, y;
 
-	S32 num_vertices, num_indices;
+	S32 num_vertices;
 
 	U32 render_stride = mLastStride;
 	S32 patch_size = mPatchp->getSurface()->getGridsPerPatchEdge();
@@ -441,7 +441,6 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
 	if (north_stride == render_stride)
 	{
 		num_vertices = 2 * length + 1;
-		num_indices = length * 6 - 3;
 
 		facep->mCenterAgent = (mPatchp->getPointAgent(8, 15) + mPatchp->getPointAgent(8, 16))*0.5f;
 
@@ -494,7 +493,6 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
 	{
 		// North stride is longer (has less vertices)
 		num_vertices = length + length/2 + 1;
-		num_indices = half_length*9 - 3;
 
 		facep->mCenterAgent = (mPatchp->getPointAgent(7, 15) + mPatchp->getPointAgent(8, 16))*0.5f;
 
@@ -555,7 +553,6 @@ void LLVOSurfacePatch::updateNorthGeometry(LLFace *facep,
 		length = patch_size / north_stride;
 		half_length = length / 2;
 		num_vertices = length + half_length + 1;
-		num_indices = 9*half_length - 3;
 
 		facep->mCenterAgent = (mPatchp->getPointAgent(15, 7) + mPatchp->getPointAgent(16, 8))*0.5f;
 
@@ -629,7 +626,7 @@ void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
 {
 	S32 i, x, y;
 
-	S32 num_vertices, num_indices;
+	S32 num_vertices;
 
 	U32 render_stride = mLastStride;
 	S32 patch_size = mPatchp->getSurface()->getGridsPerPatchEdge();
@@ -642,7 +639,6 @@ void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
 	if (east_stride == render_stride)
 	{
 		num_vertices = 2 * length + 1;
-		num_indices = length * 6 - 3;
 
 		facep->mCenterAgent = (mPatchp->getPointAgent(8, 15) + mPatchp->getPointAgent(8, 16))*0.5f;
 
@@ -693,7 +689,6 @@ void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
 	{
 		// East stride is longer (has less vertices)
 		num_vertices = length + half_length + 1;
-		num_indices = half_length*9 - 3;
 
 		facep->mCenterAgent = (mPatchp->getPointAgent(7, 15) + mPatchp->getPointAgent(8, 16))*0.5f;
 
@@ -750,7 +745,6 @@ void LLVOSurfacePatch::updateEastGeometry(LLFace *facep,
 		length = patch_size / east_stride;
 		half_length = length / 2;
 		num_vertices = length + length/2 + 1;
-		num_indices = 9*(length/2) - 3;
 
 		facep->mCenterAgent = (mPatchp->getPointAgent(15, 7) + mPatchp->getPointAgent(16, 8))*0.5f;
 
diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index cb38c86..2b9f94c 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -3217,11 +3217,11 @@ void LLVOVolume::syncMediaData(S32 texture_index, const LLSD &media_data, bool m
 	mep = te->getMediaData();
 	if(mep)
 	{
-		bool update_from_self = false;
+		//bool update_from_self = false;
 		if (!ignore_agent) 
 		{
 			LLUUID updating_agent = LLTextureEntry::getAgentIDFromMediaVersionString(getMediaURL());
-			update_from_self = (updating_agent == gAgent.getID());
+			//update_from_self = (updating_agent == gAgent.getID());
 		}
 		//viewer_media_t media_impl = LLViewerMedia::updateMediaImpl(mep, previous_url, update_from_self);
 			
diff --git a/linden/indra/newview/llwaterparamset.cpp b/linden/indra/newview/llwaterparamset.cpp
index 4b2e426..5825a23 100644
--- a/linden/indra/newview/llwaterparamset.cpp
+++ b/linden/indra/newview/llwaterparamset.cpp
@@ -192,8 +192,6 @@ LLVector3 LLWaterParamSet::getVector3(const std::string& paramName, bool& error)
 LLVector2 LLWaterParamSet::getVector2(const std::string& paramName, bool& error) 
 {
 	// test to see if right type
-	int ttest;
-	ttest = mParamValues.size();
 	LLSD cur_val = mParamValues.get(paramName);
 	if (!cur_val.isArray() || cur_val.size() != 2) 
 	{
diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index d7a6838..b2cab52 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -1192,8 +1192,6 @@ void LLWorldMapView::drawTracking(const LLVector3d& pos_global, const LLColor4&
 	S32 text_x = x;
 	S32 text_y = (S32)(y - sTrackCircleImage->getHeight()/2 - font->getLineHeight());
 
-	BOOL is_in_window = true;
-
 	if(    x < 0 
 		|| y < 0 
 		|| x >= getRect().getWidth() 
@@ -1206,7 +1204,6 @@ void LLWorldMapView::drawTracking(const LLVector3d& pos_global, const LLColor4&
 			text_x = sTrackingArrowX;
 			text_y = sTrackingArrowY;
 		}
-		is_in_window = false;
 	}
 	else if (LLTracker::getTrackingStatus() == LLTracker::TRACKING_LOCATION &&
 		LLTracker::getTrackedLocationType() != LLTracker::LOCATION_NOTHING)
diff --git a/linden/indra/newview/panelradar.cpp b/linden/indra/newview/panelradar.cpp
index c94c0d1..ad6efc2 100644
--- a/linden/indra/newview/panelradar.cpp
+++ b/linden/indra/newview/panelradar.cpp
@@ -408,7 +408,6 @@ void PanelRadar::updateButtonStates()
 	static bool enable_unmute = false;
 	static bool enable_track = false;
 	static bool enable_estate = false;
-	static bool enable_friend = false;
 	static bool enable_cam = false;
 
 	if (mRadarTabs->getCurrentPanelIndex() == 0) // Avatar tab
@@ -426,7 +425,6 @@ void PanelRadar::updateButtonStates()
 		enable_estate = isKickable(mSelectedAvatar);
 		enable_unmute = LLMuteList::getInstance()->isMuted(mSelectedAvatar);
 		enable_track = gAgent.isGodlike() || is_agent_mappable(mSelectedAvatar);
-		enable_friend = !is_agent_friend(mSelectedAvatar);
 		enable_cam = mSelectedDistance >= 0 && mSelectedDistance <= gSavedSettings.getF32("NearMeRange");
 	}
 	else
@@ -436,7 +434,6 @@ void PanelRadar::updateButtonStates()
 		enable_estate = false;
 		enable_unmute = false;
 		enable_track = false;
-		enable_friend = false;
 		enable_cam = false;
 	}
 
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index 61ad8b7..ae7461c 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -2269,18 +2269,12 @@ void LLPipeline::postSort(LLCamera& camera)
 	const S32 bin_count = 1024*8;
 		
 	static LLCullResult::drawinfo_list_t alpha_bins[bin_count];
-	static U32 bin_size[bin_count];
 
 	//clear one bin per frame to avoid memory bloat
 	static S32 clear_idx = 0;
 	clear_idx = (1+clear_idx)%bin_count;
 	alpha_bins[clear_idx].clear();
 
-	for (U32 j = 0; j < bin_count; j++)
-	{
-		bin_size[j] = 0;
-	}
-
 	//build render map
 	for (LLCullResult::sg_list_t::iterator i = sCull->beginVisibleGroups(); i != sCull->endVisibleGroups(); ++i)
 	{
@@ -5956,8 +5950,6 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in)
 
 			stop_glerror();
 
-			LLVector3 origin = camera.getOrigin();
-
 			glPushMatrix();
 
 			mat.set_scale(glh::vec3f(1,1,-1));
-- 
cgit v1.1


From e6734283dee37ee41ea82d190aa64d84f04215e9 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Mon, 8 Apr 2013 04:53:41 +1000
Subject: More unused variable deletion.

---
 linden/indra/llui/llpanel.cpp                | 1 -
 linden/indra/llui/llprogressbar.cpp          | 3 ---
 linden/indra/newview/chatbar_as_cmdline.cpp  | 1 -
 linden/indra/newview/llmaniprotate.cpp       | 1 -
 linden/indra/newview/llpanelpermissions.cpp  | 5 +++--
 linden/indra/newview/llselectmgr.cpp         | 2 --
 linden/indra/newview/llspatialpartition.cpp  | 3 ---
 linden/indra/newview/llsurface.cpp           | 2 --
 linden/indra/newview/llviewercamera.cpp      | 3 ---
 linden/indra/newview/llviewerdisplay.cpp     | 1 -
 linden/indra/newview/llviewerparcelmedia.cpp | 6 ++----
 11 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/linden/indra/llui/llpanel.cpp b/linden/indra/llui/llpanel.cpp
index 07e78ed..361e4f3 100644
--- a/linden/indra/llui/llpanel.cpp
+++ b/linden/indra/llui/llpanel.cpp
@@ -1078,7 +1078,6 @@ struct LLLayoutStack::LLEmbeddedPanel
 			mVisibleAmt(1.f) // default to fully visible
 	{
 		LLResizeBar::Side side = (orientation == HORIZONTAL) ? LLResizeBar::RIGHT : LLResizeBar::BOTTOM;
-		LLRect resize_bar_rect = panelp->getRect();
 
 		S32 min_dim;
 		if (orientation == HORIZONTAL)
diff --git a/linden/indra/llui/llprogressbar.cpp b/linden/indra/llui/llprogressbar.cpp
index d148733..0000d77 100644
--- a/linden/indra/llui/llprogressbar.cpp
+++ b/linden/indra/llui/llprogressbar.cpp
@@ -83,9 +83,6 @@ void LLProgressBar::draw()
 	bar_bg_imagep->draw(getLocalRect(),
 		background_color);
 
-	F32 alpha = 0.5f + 0.5f*0.5f*(1.f + (F32)sin(3.f*timer.getElapsedTimeF32()));
-	LLColor4 bar_color = LLUI::sColorsGroup->getColor("LoginProgressBarFgColor");
-	bar_color.mV[3] = alpha;
 	LLRect progress_rect = getLocalRect();
 	progress_rect.mRight = llround(getRect().getWidth() * (mPercentDone / 100.f));
 	bar_fg_imagep->draw(progress_rect);
diff --git a/linden/indra/newview/chatbar_as_cmdline.cpp b/linden/indra/newview/chatbar_as_cmdline.cpp
index 9777114..e1314f7 100644
--- a/linden/indra/newview/chatbar_as_cmdline.cpp
+++ b/linden/indra/newview/chatbar_as_cmdline.cpp
@@ -302,7 +302,6 @@ bool cmd_line_chat(std::string revised_text, EChatType type)
 					{
 						if (i >> z)
 						{
-							LLVector3 agentPos = gAgent.getPositionAgent();
 							LLViewerRegion* agentRegionp = gAgent.getRegion();
 							if(agentRegionp)
 							{
diff --git a/linden/indra/newview/llmaniprotate.cpp b/linden/indra/newview/llmaniprotate.cpp
index 77c8bd5..fa5ab56 100644
--- a/linden/indra/newview/llmaniprotate.cpp
+++ b/linden/indra/newview/llmaniprotate.cpp
@@ -1652,7 +1652,6 @@ void LLManipRotate::highlightManipulators( S32 x, S32 y )
 		return;
 	}
 	
-	LLQuaternion object_rot = first_object->getRenderRotation();
 	LLVector3 rotation_center = gAgent.getPosAgentFromGlobal(mRotationCenter);
 	LLVector3 mouse_dir_x;
 	LLVector3 mouse_dir_y;
diff --git a/linden/indra/newview/llpanelpermissions.cpp b/linden/indra/newview/llpanelpermissions.cpp
index 6b7bc1b..9799de7 100644
--- a/linden/indra/newview/llpanelpermissions.cpp
+++ b/linden/indra/newview/llpanelpermissions.cpp
@@ -541,7 +541,7 @@ void LLPanelPermissions::refresh()
 	// TODO: Creator permissions
 
 	BOOL valid_base_perms		= FALSE;
-	BOOL valid_owner_perms		= FALSE;
+	//BOOL valid_owner_perms		= FALSE;
 	BOOL valid_group_perms		= FALSE;
 	BOOL valid_everyone_perms	= FALSE;
 	BOOL valid_next_perms		= FALSE;
@@ -561,7 +561,8 @@ void LLPanelPermissions::refresh()
 									  &base_mask_on,
 									  &base_mask_off);
 
-	valid_owner_perms = LLSelectMgr::getInstance()->selectGetPerm(PERM_OWNER,
+	// TODO - seems odd, but this is not actually used, except to set owner_mask_*.
+	/*valid_owner_perms =*/ LLSelectMgr::getInstance()->selectGetPerm(PERM_OWNER,
 									  &owner_mask_on,
 									  &owner_mask_off);
 
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 4a6c8ed..bfe0e9c 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -1072,7 +1072,6 @@ void LLSelectMgr::getGrid(LLVector3& origin, LLQuaternion &rotation, LLVector3 &
 	if (mGridMode == GRID_MODE_LOCAL && mSelectedObjects->getObjectCount())
 	{
 		//LLViewerObject* root = getSelectedParentObject(mSelectedObjects->getFirstObject());
-		LLBBox bbox = mSavedSelectionBBox;
 		mGridOrigin = mSavedSelectionBBox.getCenterAgent();
 		mGridScale = mSavedSelectionBBox.getExtentLocal() * 0.5f;
 
@@ -1090,7 +1089,6 @@ void LLSelectMgr::getGrid(LLVector3& origin, LLQuaternion &rotation, LLVector3 &
 	else if (mGridMode == GRID_MODE_REF_OBJECT && first_grid_object && first_grid_object->mDrawable.notNull())
 	{
 		mGridRotation = first_grid_object->getRenderRotation();
-		LLVector3 first_grid_obj_pos = first_grid_object->getRenderPosition();
 
 		LLVector3 min_extents(F32_MAX, F32_MAX, F32_MAX);
 		LLVector3 max_extents(-F32_MAX, -F32_MAX, -F32_MAX);
diff --git a/linden/indra/newview/llspatialpartition.cpp b/linden/indra/newview/llspatialpartition.cpp
index 30f7c0b..a9255b3 100644
--- a/linden/indra/newview/llspatialpartition.cpp
+++ b/linden/indra/newview/llspatialpartition.cpp
@@ -2617,9 +2617,6 @@ public:
 			return;
 		}
 
-		LLVector3 nodeCenter = group->mBounds[0];
-		LLVector3 octCenter = LLVector3(group->mOctreeNode->getCenter());
-
 		for (LLSpatialGroup::OctreeNode::const_element_iter i = branch->getData().begin(); i != branch->getData().end(); ++i)
 		{
 			LLDrawable* drawable = *i;
diff --git a/linden/indra/newview/llsurface.cpp b/linden/indra/newview/llsurface.cpp
index 5a99e66..8692c80 100644
--- a/linden/indra/newview/llsurface.cpp
+++ b/linden/indra/newview/llsurface.cpp
@@ -1262,8 +1262,6 @@ BOOL LLSurface::generateWaterTexture(const F32 x, const F32 y,
 		y_end = tex_width;
 	}
 
-	LLVector3d origin_global = from_region_handle(getRegion()->getHandle());
-
 	// OK, for now, just have the composition value equal the height at the point.
 	LLVector3 location;
 	LLColor4U coloru;
diff --git a/linden/indra/newview/llviewercamera.cpp b/linden/indra/newview/llviewercamera.cpp
index 5a09433..69a5621 100644
--- a/linden/indra/newview/llviewercamera.cpp
+++ b/linden/indra/newview/llviewercamera.cpp
@@ -131,9 +131,6 @@ void LLViewerCamera::updateCameraLocation(const LLVector3 &center,
 
 	mLastPointOfInterest = point_of_interest;
 
-	// constrain to max distance from avatar
-	LLVector3 camera_offset = center - gAgent.getPositionAgent();
-
 	LLViewerRegion * regp = gAgent.getRegion();
 	F32 water_height = (NULL != regp) ? regp->getWaterHeight() : 0.f;
 
diff --git a/linden/indra/newview/llviewerdisplay.cpp b/linden/indra/newview/llviewerdisplay.cpp
index 59a87d5..22c17d9 100644
--- a/linden/indra/newview/llviewerdisplay.cpp
+++ b/linden/indra/newview/llviewerdisplay.cpp
@@ -977,7 +977,6 @@ void render_hud_attachments()
 	if (LLPipeline::sShowHUDAttachments && !gDisconnected && setup_hud_matrices())
 	{
 		LLCamera hud_cam = *LLViewerCamera::getInstance();
-		LLVector3 origin = hud_cam.getOrigin();
 		hud_cam.setOrigin(-1.f,0,0);
 		hud_cam.setAxes(LLVector3(1,0,0), LLVector3(0,1,0), LLVector3(0,0,1));
 		LLViewerCamera::updateFrustumPlanes(hud_cam, TRUE);
diff --git a/linden/indra/newview/llviewerparcelmedia.cpp b/linden/indra/newview/llviewerparcelmedia.cpp
index 386a86e..a9ea1e6 100644
--- a/linden/indra/newview/llviewerparcelmedia.cpp
+++ b/linden/indra/newview/llviewerparcelmedia.cpp
@@ -101,12 +101,11 @@ void LLViewerParcelMedia::update(LLParcel* parcel)
 				sMediaRegionID = LLUUID() ;
 				stop() ;
 				LL_DEBUGS("Media") << "no agent region, bailing out." << LL_ENDL;
-				return ;				
+				return ;
 			}
 
 			// we're in a parcel
-			bool new_parcel = false;
-			S32 parcelid = parcel->getLocalID();						
+			S32 parcelid = parcel->getLocalID();
 
 			LLUUID regionid = gAgent.getRegion()->getRegionID();
 			if (parcelid != sMediaParcelLocalID || regionid != sMediaRegionID)
@@ -114,7 +113,6 @@ void LLViewerParcelMedia::update(LLParcel* parcel)
 				LL_DEBUGS("Media") << "New parcel, parcel id = " << parcelid << ", region id = " << regionid << LL_ENDL;
 				sMediaParcelLocalID = parcelid;
 				sMediaRegionID = regionid;
-				new_parcel = true;
 			}
 
 			std::string mediaUrl = std::string ( parcel->getMediaURL () );
-- 
cgit v1.1


From e5cc2e99e6295aabe401f9c229a39574e0d9bf38 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Mon, 8 Apr 2013 04:55:18 +1000
Subject: Clean out a couple of compiler warnings.

---
 linden/indra/llui/llui.h                                           | 2 ++
 .../media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp     | 7 ++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/linden/indra/llui/llui.h b/linden/indra/llui/llui.h
index ebcc730..466d2c7 100644
--- a/linden/indra/llui/llui.h
+++ b/linden/indra/llui/llui.h
@@ -706,10 +706,12 @@ public:
 
 	// this avoids a MSVC bug where non-referenced static members are "optimized" away
 	// even if their constructors have side effects
+	// Then we avoid a compiler warning that dummy is never used.  lol
 	void reference()
 	{
 		S32 dummy;
 		dummy = 0;
+		dummy = dummy + 0;
 	}
 };
 
diff --git a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
index e194bf7..49bf6f9 100755
--- a/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
+++ b/linden/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
@@ -312,12 +312,9 @@ gst_slvideo_set_caps (GstBaseSink * bsink, GstCaps * caps)
 static gboolean
 gst_slvideo_start (GstBaseSink * bsink)
 {
-	GstSLVideo *slvideo;
-	gboolean ret = TRUE;
-	
-	slvideo = GST_SLVIDEO(bsink);
+	GST_SLVIDEO(bsink);
 
-	return ret;
+	return TRUE;
 }
 
 static gboolean
-- 
cgit v1.1


From 80891912b540ca43601c2cc16942a01c2e0bd68b Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Mon, 8 Apr 2013 05:28:20 +1000
Subject: Even more useless variable deletions.

---
 linden/indra/newview/llagent.cpp            |  6 ++---
 linden/indra/newview/lldrawable.cpp         |  1 -
 linden/indra/newview/llfolderview.cpp       |  6 -----
 linden/indra/newview/llviewermenu.cpp       | 16 -------------
 linden/indra/newview/llviewerobjectlist.cpp | 37 ++++++++++++++---------------
 5 files changed, 20 insertions(+), 46 deletions(-)

diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index c61f7a6..54b71eb 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -3729,9 +3729,8 @@ LLVector3d LLAgent::calcCameraPositionTargetGlobal(BOOL *hit_limit)
 	// Compute base camera position and look-at points.
 	F32			camera_land_height;
 	LLVector3d	frame_center_global = mAvatarObject.isNull() ? getPositionGlobal() 
-															 : getPosGlobalFromAgent(mAvatarObject->mRoot.getWorldPosition());
-		
-	LLVector3   upAxis = getUpAxis();
+		          : getPosGlobalFromAgent(mAvatarObject->mRoot.getWorldPosition());
+
 	BOOL		isConstrained = FALSE;
 	LLVector3d	head_offset;
 	head_offset.setVec(mThirdPersonHeadOffset);
@@ -3866,7 +3865,6 @@ LLVector3d LLAgent::calcCameraPositionTargetGlobal(BOOL *hit_limit)
 			// set the global camera position
 			LLVector3d camera_offset;
 			
-			LLVector3 av_pos = mAvatarObject.isNull() ? LLVector3::zero : mAvatarObject->getRenderPosition();
 			camera_offset.setVec( local_camera_offset );
 			camera_position_global = frame_center_global + head_offset + camera_offset;
 
diff --git a/linden/indra/newview/lldrawable.cpp b/linden/indra/newview/lldrawable.cpp
index f808f89..ee49752 100644
--- a/linden/indra/newview/lldrawable.cpp
+++ b/linden/indra/newview/lldrawable.cpp
@@ -1096,7 +1096,6 @@ LLCamera LLSpatialBridge::transformCamera(LLCamera& camera)
 	LLCamera ret = camera;
 	LLXformMatrix* mat = mDrawable->getXform();
 	LLVector3 center = LLVector3(0,0,0) * mat->getWorldMatrix();
-	LLQuaternion rotation = LLQuaternion(mat->getWorldMatrix());
 
 	LLVector3 delta = ret.getOrigin() - center;
 	LLQuaternion rot = ~mat->getRotation();
diff --git a/linden/indra/newview/llfolderview.cpp b/linden/indra/newview/llfolderview.cpp
index ce2b2b4..489a5d5 100644
--- a/linden/indra/newview/llfolderview.cpp
+++ b/linden/indra/newview/llfolderview.cpp
@@ -3767,12 +3767,6 @@ BOOL LLFolderView::handleKeyHere( KEY key, MASK mask )
 		LLMenuGL::sMenuContainer->hideMenus();
 	}
 
-	LLView *item = NULL;
-	if (getChildCount() > 0)
-	{
-		item = *(getChildList()->begin());
-	}
-
 	switch( key )
 	{
 	case KEY_F2:
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index f10910c..7fd58db 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -5223,11 +5223,6 @@ class LLViewToggleRadar: public view_listener_t
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
 		LLFloaterAvatarList::toggle(0);
-		bool vis = false;
-		if(LLFloaterAvatarList::getInstance())
-		{
-			vis = (bool)LLFloaterAvatarList::getInstance()->getVisible();
-		}
 		return true;
 	}
 };
@@ -5237,11 +5232,6 @@ class LLViewToggleMOAPRadar: public view_listener_t
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
 		LLFloaterMOAPRadar::toggle(0);
-		bool vis = false;
-		if(LLFloaterMOAPRadar::getInstance())
-		{
-			vis = (bool)LLFloaterMOAPRadar::getInstance()->getVisible();
-		}
 		return true;
 	}
 };
@@ -8976,12 +8966,6 @@ class LLAdvancedToggleAssetBrowser: public view_listener_t
 	{
 		//open the floater
 		LLFloaterAssetBrowser::show(0);
-		
-		bool vis = false;
-		if(LLFloaterAssetBrowser::getInstance())
-		{
-			vis = (bool)LLFloaterAssetBrowser::getInstance()->getVisible();
-		}
 		return true;
 	}
 };
diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp
index d0aa4b1..c82b1ae 100644
--- a/linden/indra/newview/llviewerobjectlist.cpp
+++ b/linden/indra/newview/llviewerobjectlist.cpp
@@ -288,7 +288,6 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 {
 	LLFastTimer t(LLFastTimer::FTM_PROCESS_OBJECTS);	
 	
-	LLVector3d camera_global = gAgent.getCameraPositionGlobal();
 	LLViewerObject *objectp;
 	S32			num_objects;
 	U32			local_id;
@@ -305,28 +304,28 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys,
 	if (!cached && !compressed && update_type != OUT_FULL)
 	{
 		gTerseObjectUpdates += num_objects;
-		S32 size;
-		if (mesgsys->getReceiveCompressedSize())
-		{
-			size = mesgsys->getReceiveCompressedSize();
-		}
-		else
-		{
-			size = mesgsys->getReceiveSize();
-		}
+//		S32 size;
+//		if (mesgsys->getReceiveCompressedSize())
+//		{
+//			size = mesgsys->getReceiveCompressedSize();
+//		}
+//		else
+//		{
+//			size = mesgsys->getReceiveSize();
+//		}
 //		llinfos << "Received terse " << num_objects << " in " << size << " byte (" << size/num_objects << ")" << llendl;
 	}
 	else
 	{
-		S32 size;
-		if (mesgsys->getReceiveCompressedSize())
-		{
-			size = mesgsys->getReceiveCompressedSize();
-		}
-		else
-		{
-			size = mesgsys->getReceiveSize();
-		}
+//		S32 size;
+//		if (mesgsys->getReceiveCompressedSize())
+//		{
+//			size = mesgsys->getReceiveCompressedSize();
+//		}
+//		else
+//		{
+//			size = mesgsys->getReceiveSize();
+//		}
 
 //		llinfos << "Received " << num_objects << " in " << size << " byte (" << size/num_objects << ")" << llendl;
 		gFullObjectUpdates += num_objects;
-- 
cgit v1.1


From 57ab98a6448db9824f8634e4450ee16a8645065c Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Mon, 8 Apr 2013 05:29:05 +1000
Subject: Comment out extra star rendering stuff, to get rid of unused variable
 warnings, but leave the code around in case it turns out to be a good idea.

---
 linden/indra/newview/llvowlsky.cpp | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/linden/indra/newview/llvowlsky.cpp b/linden/indra/newview/llvowlsky.cpp
index 96bd62e..2f77c7f 100644
--- a/linden/indra/newview/llvowlsky.cpp
+++ b/linden/indra/newview/llvowlsky.cpp
@@ -719,12 +719,13 @@ void LLVOWLSky::updateStarColors()
 {
 	std::vector<LLColor4>::iterator v_c = mStarColors.begin();
 	std::vector<F32>::iterator v_i = mStarIntensities.begin();
-	std::vector<LLVector3>::iterator v_p = mStarVertices.begin();
+	// A bunch of stuff here is not used, but looks like it might be useful later, so I'll leave it, but commented out.
+	//std::vector<LLVector3>::iterator v_p = mStarVertices.begin();
 
 	const F32 var = 0.15f;
 	const F32 min = 0.5f; //0.75f;
-	const F32 sunclose_max = 0.6f;
-	const F32 sunclose_range = 1 - sunclose_max;
+	//const F32 sunclose_max = 0.6f;
+	//const F32 sunclose_range = 1 - sunclose_max;
 
 	//F32 below_horizon = - llmin(0.0f, gSky.mVOSkyp->getToSunLast().mV[2]);
 	//F32 brightness_factor = llmin(1.0f, below_horizon * 20);
@@ -738,14 +739,14 @@ void LLVOWLSky::updateStarColors()
 		U32 x;
 		for (x = 0; x < getStarsNumVerts(); ++x)
 		{
-			F32 sundir_factor = 1;
-			LLVector3 tostar = *v_p;
-			tostar.normVec();
-			const F32 how_close_to_sun = tostar * gSky.mVOSkyp->getToSunLast();
-			if (how_close_to_sun > sunclose_max)
-			{
-				sundir_factor = (1 - how_close_to_sun) / sunclose_range;
-			}
+			//F32 sundir_factor = 1;
+			//LLVector3 tostar = *v_p;
+			//tostar.normVec();
+			//const F32 how_close_to_sun = tostar * gSky.mVOSkyp->getToSunLast();
+			//if (how_close_to_sun > sunclose_max)
+			//{
+			//	sundir_factor = (1 - how_close_to_sun) / sunclose_range;
+			//}
 			intensity = *(v_i);
 			F32 alpha = v_c->mV[VALPHA] + (ll_frand() - 0.5f) * var * intensity;
 			if (alpha < min * intensity)
@@ -762,7 +763,7 @@ void LLVOWLSky::updateStarColors()
 			v_c->mV[VALPHA] = alpha;
 			v_c++;
 			v_i++;
-			v_p++;
+			//v_p++;
 		}
 	}
 }
-- 
cgit v1.1


From 11225add0521a6f0f5ffbb3cfbd7571c6dd98167 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Mon, 8 Apr 2013 05:29:27 +1000
Subject: Actually mute the colour of muted text.

---
 linden/indra/newview/llfloaterchat.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index 2cca8ce..2efdf18 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -364,7 +364,7 @@ void LLFloaterChat::addChatHistory(const LLChat& chat, bool log_to_file)
 	{
 		// desaturate muted chat
 		LLColor4 muted_color = lerp(color, LLColor4::grey, 0.5f);
-		add_timestamped_line(history_editor_with_mute, chat, color);
+		add_timestamped_line(history_editor_with_mute, chat, muted_color);
 	}
 	
 	// add objects as transient speakers that can be muted
-- 
cgit v1.1


From 20988fe1a26a44fb619ce690e7b9e20b3242e815 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Tue, 9 Apr 2013 12:53:51 +1000
Subject: Delete unused structure.

---
 linden/indra/newview/lltooldraganddrop.cpp | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/linden/indra/newview/lltooldraganddrop.cpp b/linden/indra/newview/lltooldraganddrop.cpp
index 18c4917..2adcf14 100644
--- a/linden/indra/newview/lltooldraganddrop.cpp
+++ b/linden/indra/newview/lltooldraganddrop.cpp
@@ -1521,18 +1521,6 @@ void LLToolDragAndDrop::dropInventory(LLViewerObject* hit_obj,
 	gFloaterTools->dirty();
 }
 
-struct LLGiveInventoryInfo
-{
-	LLUUID mToAgentID;
-	LLUUID mInventoryObjectID;
-	LLUUID mIMSessionID;
-	LLGiveInventoryInfo(const LLUUID& to_agent, const LLUUID& obj_id, const LLUUID &im_session_id = LLUUID::null) :
-		mToAgentID(to_agent), 
-		mInventoryObjectID(obj_id),
-		mIMSessionID(im_session_id)
-	{}
-};
-
 void LLToolDragAndDrop::giveInventory(const LLUUID& to_agent,
 									  LLInventoryItem* item,
 									  const LLUUID& im_session_id)
@@ -1701,8 +1689,6 @@ void LLToolDragAndDrop::giveInventoryCategory(const LLUUID& to_agent,
 		}
 		else 
 		{
-			LLGiveInventoryInfo* info = NULL;
-			info = new LLGiveInventoryInfo(to_agent, cat->getUUID(), im_session_id);
 			LLSD args;
 			args["COUNT"] = llformat("%d",giveable.countNoCopy());
 			LLSD payload;
-- 
cgit v1.1


From 8ff6be96703388d4391ad1b62e45d21cf391cf38 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Tue, 9 Apr 2013 12:54:23 +1000
Subject: Last of the unused variables goes bye.

---
 linden/indra/newview/llpanelobject.cpp | 4 ++--
 linden/indra/newview/llpanelvolume.cpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/linden/indra/newview/llpanelobject.cpp b/linden/indra/newview/llpanelobject.cpp
index cc89e24..bff365d 100644
--- a/linden/indra/newview/llpanelobject.cpp
+++ b/linden/indra/newview/llpanelobject.cpp
@@ -520,10 +520,10 @@ void LLPanelObject::getState( )
 	mBtnPasteRot->setEnabled( enable_rotate );
 	mBtnPasteRotClip->setEnabled( enable_rotate );
 
-	BOOL owners_identical;
 	LLUUID owner_id;
 	std::string owner_name;
-	owners_identical = LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name);
+	// This is still needed for the side effects, though the result is not.
+	LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name);
 
 	// BUG? Check for all objects being editable?
 	S32 roots_selected = LLSelectMgr::getInstance()->getSelection()->getRootObjectCount();
diff --git a/linden/indra/newview/llpanelvolume.cpp b/linden/indra/newview/llpanelvolume.cpp
index 6d014a2..e4e30c0 100644
--- a/linden/indra/newview/llpanelvolume.cpp
+++ b/linden/indra/newview/llpanelvolume.cpp
@@ -181,10 +181,10 @@ void LLPanelVolume::getState( )
 		return;
 	}
 
-	BOOL owners_identical;
 	LLUUID owner_id;
 	std::string owner_name;
-	owners_identical = LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name);
+	// This is still needed for the side effects, though the result is not.
+	LLSelectMgr::getInstance()->selectGetOwner(owner_id, owner_name);
 
 	// BUG? Check for all objects being editable?
 	BOOL editable = root_objectp->permModify();
-- 
cgit v1.1


From 78d49f51549a7f23b36e61ac09e6c9dfccfeb395 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Thu, 11 Apr 2013 07:11:58 +1000
Subject: Add release number to version strings.

---
 linden/scripts/viewer_info.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/linden/scripts/viewer_info.py b/linden/scripts/viewer_info.py
index 53ea432..bd0f436 100755
--- a/linden/scripts/viewer_info.py
+++ b/linden/scripts/viewer_info.py
@@ -54,10 +54,11 @@ class ViewerInfo:
         self.major = re.search('MAJOR\s*=\s*(\d+)',     data).group(1)
         self.minor = re.search('MINOR\s*=\s*(\d+)',     data).group(1)
         self.patch = re.search('PATCH\s*=\s*(\d+)',     data).group(1)
+        self.release = re.search('RLEAS\s*=\s*(\d+)',     data).group(1)
         self.extra = re.search('EXTRA\s*=\s*"([^"]*)"', data).group(1)
         self.bundle_id = re.search('BUNDLE_ID\s*=\s*"([^"]*)"', data).group(1)
 
-        self.version = "%s.%s.%s"%(self.major, self.minor, self.patch)
+        self.version = "%s.%s.%s.%s"%(self.major, self.minor, self.patch, self.release)
         if len(self.extra) > 0:
             # Replace spaces and some puncuation with '-' in extra
             extra = re.sub('[- \t:;,!+/\\"\'`]+', '-', self.extra)
-- 
cgit v1.1


From 3f993f695c25e39088d037dd6c49cf6d4d0bda0f Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Thu, 11 Apr 2013 07:14:34 +1000
Subject: Bump version number to 1.4.0.3 exp 0.

TODO - still too much hard coding going on, need to fix that using viewer_info.py more.
---
 .../windows/imprudence_installer_script_experimental.iss     | 12 ++++++------
 .../newview/packaging/mac/English.lproj/InfoPlist.strings    |  4 ++--
 linden/indra/newview/res/viewerRes.rc                        |  4 ++--
 linden/indra/newview/viewerinfo.cpp                          |  3 ++-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss b/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss
index c551919..d50957d 100644
--- a/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss
+++ b/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss
@@ -9,15 +9,15 @@
 ; These will change
 AppId={{1B3E68BC-13EB-4277-9439-CB5FF9259460}
 AppName=Imprudence Viewer Experimental
-AppVerName=Imprudence Viewer 1.4.0 beta 1.5 windows test release
+AppVerName=Imprudence Viewer 1.4.0.3 exp 0 windows test release
 DefaultDirName={pf}\ImprudenceExperimental
 DefaultGroupName=Imprudence Viewer Experimental
 VersionInfoProductName=Imprudence Viewer Experimental
-OutputBaseFilename=Imprudence-1.4.0-beta-1.5-windows-test
-VersionInfoVersion=1.4.0
-VersionInfoTextVersion=1.4.0
-VersionInfoProductVersion=1.4.0
-AppVersion=1.4.0
+OutputBaseFilename=Imprudence-1.4.0.3-exp-0-windows-test
+VersionInfoVersion=1.4.0.3
+VersionInfoTextVersion=1.4.0.3
+VersionInfoProductVersion=1.4.0.3
+AppVersion=1.4.0.3
 VersionInfoCopyright=2011
 
 ; These won't change
diff --git a/linden/indra/newview/packaging/mac/English.lproj/InfoPlist.strings b/linden/indra/newview/packaging/mac/English.lproj/InfoPlist.strings
index 1ebe727..91eae98 100644
--- a/linden/indra/newview/packaging/mac/English.lproj/InfoPlist.strings
+++ b/linden/indra/newview/packaging/mac/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Imprudence";
-CFBundleShortVersionString = "Imprudence 1.4.0 beta 1";
-CFBundleGetInfoString = "Imprudence 1.4.0 beta 1";
+CFBundleShortVersionString = "Imprudence 1.4.0.3 exp 0";
+CFBundleGetInfoString = "Imprudence 1.4.0.3 exp 0";
diff --git a/linden/indra/newview/res/viewerRes.rc b/linden/indra/newview/res/viewerRes.rc
index 951d0cc..4144e47 100644
--- a/linden/indra/newview/res/viewerRes.rc
+++ b/linden/indra/newview/res/viewerRes.rc
@@ -156,11 +156,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Imprudence Viewer Project"
             VALUE "FileDescription", "Imprudence"
-            VALUE "FileVersion", "1.4.0 beta 2"
+            VALUE "FileVersion", "1.4.0.3 exp 0"
             VALUE "InternalName", "Imprudence"
             VALUE "OriginalFilename", "imprudence.exe"
             VALUE "ProductName", "Imprudence"
-            VALUE "ProductVersion", "1.4.0 beta 2"
+            VALUE "ProductVersion", "1.4.0.3 exp 0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/linden/indra/newview/viewerinfo.cpp b/linden/indra/newview/viewerinfo.cpp
index fc463c8..d1ed1a0 100644
--- a/linden/indra/newview/viewerinfo.cpp
+++ b/linden/indra/newview/viewerinfo.cpp
@@ -30,13 +30,14 @@ namespace ViewerInfo
 
 	// These are intentionally defined here instead of in the header,
 	// because they should NOT be read directly. Use the functions.
+	// NOTE: Some parts of the build system scan this file looking for version numbers and such, commenting out sections confuses that.
 	const std::string NAME  = "Imprudence";
 	const std::string VARNT = "";
 	const S32         MAJOR = 1;
 	const S32         MINOR = 4;
 	const S32         PATCH = 0;
 	const S32         RLEAS = 3; // increment for each beta/RC/release
-	const std::string EXTRA = "beta 2";
+	const std::string EXTRA = "exp 0";
 
 	// Mac OS X bundle identifier. Should match the one in Info.plist.
 	const std::string BUNDLE_ID = "org.imprudenceviewer.viewer";
-- 
cgit v1.1


From 7d87f4eb8737215323bfb9f7991e4d6519a310b0 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Wed, 17 Apr 2013 18:53:49 +1000
Subject: Better cache directory code for pre built libraries.

---
 linden/scripts/install.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/linden/scripts/install.py b/linden/scripts/install.py
index a7c0a48..99e8b73 100755
--- a/linden/scripts/install.py
+++ b/linden/scripts/install.py
@@ -830,10 +830,10 @@ def _default_installable_cache():
     """In general, the installable files do not change much, so find a 
     host/user specific location to cache files."""
     user = _getuser()
-    cache_dir = "/var/tmp/%s/install.cache" % user
-    if _get_platform() == 'windows':
-        cache_dir = os.path.join(tempfile.gettempdir(), \
-                                 'install.cache.%s' % user)
+    if sys.platform != 'cygwin' and _get_platform() == 'windows':
+        cache_dir = os.path.join(tempfile.gettempdir(), 'install.cache.%s' % user)
+    else:
+       cache_dir = "/var/tmp/%s/install.cache" % user
     return cache_dir
 
 def parse_args():
-- 
cgit v1.1


From eb0aae28a1d96e509b72ff3e3e64239a928447d7 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Wed, 17 Apr 2013 18:55:40 +1000
Subject: Random white space clean ups.  In Python!  Yes, be scared.  B-)

---
 linden/indra/newview/viewer_manifest.py | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index c13cf1a..fd5af9d 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -260,21 +260,17 @@ class WindowsManifest(ViewerManifest):
             except:
                 print "Can't save symbol file %s, skipping" % (symbol_path)
                 pass
-        
+
         self.gather_documents()
 
         if self.prefix("../..", dst="doc"):
             self.path("LICENSE-libraries.txt")
             self.end_prefix("../..")
 
-
         self.path("imprudence.url")
 
         # Plugin host application
-        self.path(os.path.join(os.pardir,
-                               'llplugin', 'slplugin', self.args['configuration'], "SLPlugin.exe"),
-                  "SLPlugin.exe")
-
+        self.path(os.path.join(os.pardir, 'llplugin', 'slplugin', self.args['configuration'], "SLPlugin.exe"), "SLPlugin.exe")
 
         self.path("featuretable.txt")
 
@@ -283,13 +279,13 @@ class WindowsManifest(ViewerManifest):
 
         # For using FMOD for sound... DJS
         #self.path("fmod.dll")
-        
+
         # For spellchecking
         if self.prefix(src=self.args['configuration'], dst=""):
             self.path("libhunspell.dll")
             self.end_prefix()
 
-	# Copy the llkdu DSO .config
+        # Copy the llkdu DSO .config
         self.path("llkdu.dll.2.config")
 
         # Get llcommon and deps.
@@ -309,7 +305,7 @@ class WindowsManifest(ViewerManifest):
         if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
             self.path("openal32.dll")
             self.path("alut.dll")
-            self.end_prefix()           
+            self.end_prefix()
 
         # Media plugins - QuickTime
         if self.prefix(src='../media_plugins/quicktime/%s' % self.args['configuration'], dst="llplugin"):
-- 
cgit v1.1


From 36d8bf7016074981ba0efc5ab4767840cc96e8b1 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Wed, 17 Apr 2013 18:59:49 +1000
Subject: Fix up Windows installer, and make it more consistant with other
 OSes.

---
 .../windows/imprudence_installer_template.iss        | 20 ++++++++++----------
 linden/indra/newview/viewer_manifest.py              |  4 +++-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/linden/indra/newview/installers/windows/imprudence_installer_template.iss b/linden/indra/newview/installers/windows/imprudence_installer_template.iss
index 558b7ec..7113368 100644
--- a/linden/indra/newview/installers/windows/imprudence_installer_template.iss
+++ b/linden/indra/newview/installers/windows/imprudence_installer_template.iss
@@ -15,9 +15,9 @@ DefaultDirName={pf}\Imprudence
 DefaultGroupName=Imprudence Viewer
 VersionInfoProductName=%%APPNAME%%
 OutputBaseFilename=%%INSTALLERFILENAME%%
-VersionInfoVersion=%%VERSION%%
+VersionInfoVersion=%%VERSIONNUMBER%%
 VersionInfoTextVersion=%%VERSION%%
-VersionInfoProductVersion=%%VERSION%%
+VersionInfoProductVersion=%%VERSIONNUMBER%%
 AppVersion=%%VERSION%%
 VersionInfoCopyright=2011
 
@@ -27,16 +27,16 @@ AppPublisher=The Imprudence Project
 AppPublisherURL=http://kokuaviewer.org
 AppSupportURL=http://kokuaviewer.org
 AllowNoIcons=true
-InfoAfterFile=..\..\..\..\..\..\README.txt
+InfoAfterFile=..\..\..\..\..\README.txt
 OutputDir=.
-SetupIconFile=..\..\..\..\newview\installers\windows\imp_icon.ico
+SetupIconFile=..\..\..\newview\installers\windows\imp_icon.ico
 Compression=lzma2/ultra64
 InternalCompressLevel=ultra64
 SolidCompression=true
 PrivilegesRequired=poweruser
 AllowRootDirectory=true
-WizardImageFile=..\..\..\..\newview\installers\windows\imprudence_installer_icon_left.bmp
-WizardSmallImageFile=..\..\..\..\newview\installers\windows\imprudence_installer_icon_right.bmp
+WizardImageFile=..\..\..\newview\installers\windows\imprudence_installer_icon_left.bmp
+WizardSmallImageFile=..\..\..\newview\installers\windows\imprudence_installer_icon_right.bmp
 SetupLogging=true
 RestartIfNeededByRun=false
 AlwaysRestart=false
@@ -145,9 +145,9 @@ Source: %%PACKAGEFILES%%\vivoxsdk.dll; DestDir: {app}; Flags: ignoreversion
 Source: %%PACKAGEFILES%%\wrap_oal.dll; DestDir: {app}; Flags: ignoreversion
 
 ; VC++ 2005 SP1 x86, VC++ 2008 SP1 x86, and VC++ 2010 SP1 x86 redist
-Source: ..\..\..\..\newview\installers\windows\vcredist_x86_VS2005_SP1_MFC_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2005_SP1_MFC_SEC.exe
-;Source: ..\..\..\..\newview\installers\windows\vcredist_x86_VS2008_SP1_ATL_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2008_SP1_ATL_SEC.exe
-Source: ..\..\..\..\newview\installers\windows\vcredist_x86_VS2010_SP1.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2010_SP1.exe
+Source: ..\..\..\newview\installers\windows\vcredist_x86_VS2005_SP1_MFC_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2005_SP1_MFC_SEC.exe
+;Source: ..\..\..\newview\installers\windows\vcredist_x86_VS2008_SP1_ATL_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2008_SP1_ATL_SEC.exe
+Source: ..\..\..\newview\installers\windows\vcredist_x86_VS2010_SP1.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2010_SP1.exe
 
 ; Old files we don't use anymore:
 ; Source: %%PACKAGEFILES%%\dronesettings.xml; DestDir: {app}; Flags: ignoreversion
@@ -307,7 +307,7 @@ begin
     Success := RegQueryDWordValue(HKLM64, 'SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86', 'Installed', V);
   end else begin
     Success := RegQueryDWordValue(HKLM, 'SOFTWARE\Microsoft\VisualStudio\10.0\VC\VCRedist\x86', 'Installed', V);
-  end
+  end;
 
   if Success = TRUE then begin
     if V = 1 then begin
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index fd5af9d..bcdf4a9 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -472,13 +472,15 @@ class WindowsManifest(ViewerManifest):
             sse_string = "-(SSE2-optimized)"
 
         version = '.'.join(self.args['version'])
-        base_filename = self.installer_prefix() + version + sse_string
+        version_number = version.split('-', 1)[0]
+        base_filename = self.installer_prefix() + version + "-Windows-x86" + sse_string
         app_name = self.channel()
         app_ver_name="%s %s" % (app_name, version)
 
         new_script = base_filename + ".iss"
         self.replace_in("installers/windows/imprudence_installer_template.iss", new_script, {
                 "%%VERSION%%":version,
+                "%%VERSIONNUMBER%%":version_number,
                 "%%INSTALLERFILENAME%%":base_filename,
                 "%%PACKAGEFILES%%":self.args['dest'],
                 "%%APPNAME%%":app_name,
-- 
cgit v1.1


From d277b4e8984ba3d99a9a5d546a1d57ded4062400 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Wed, 17 Apr 2013 19:03:42 +1000
Subject: Use unix style bison build for cygwin.

---
 linden/indra/lscript/lscript_compile/CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/linden/indra/lscript/lscript_compile/CMakeLists.txt b/linden/indra/lscript/lscript_compile/CMakeLists.txt
index 252085b..f6d5212 100644
--- a/linden/indra/lscript/lscript_compile/CMakeLists.txt
+++ b/linden/indra/lscript/lscript_compile/CMakeLists.txt
@@ -103,7 +103,7 @@ if (WINDOWS)
                               PROPERTIES COMPILE_FLAGS /DYY_NO_UNISTD_H)
 endif (WINDOWS)
 
-if (WINDOWS)
+if (WINDOWS AND NOT CYGWIN)
   get_filename_component(M4_PATH ${M4} PATH)
   add_custom_command(
       OUTPUT
@@ -118,7 +118,7 @@ if (WINDOWS)
         ${CMAKE_CURRENT_SOURCE_DIR}/indra.y
       )
   include_directories(${CMAKE_CURRENT_SOURCE_DIR}/windows)
-else (WINDOWS)
+else (WINDOWS AND NOT CYGWIN)
   add_custom_command(
       OUTPUT
         ${CMAKE_CURRENT_BINARY_DIR}/indra.y.cpp
@@ -131,7 +131,7 @@ else (WINDOWS)
       DEPENDS
         ${CMAKE_CURRENT_SOURCE_DIR}/indra.y
       )
-endif (WINDOWS)
+endif (WINDOWS AND NOT CYGWIN)
 
 if (DARWIN)
   # Mac OS X 10.4 compatibility
-- 
cgit v1.1


From fd0115db1ebfce67d121a8ea750ec115ca70df85 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Wed, 17 Apr 2013 19:05:23 +1000
Subject: Attempt to fix up Windows yyparse issue, but ultimately fail, then
 notice it's possibly not being used anyway, so just commit it.

---
 linden/indra/lscript/lscript_compile/indra.l | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/linden/indra/lscript/lscript_compile/indra.l b/linden/indra/lscript/lscript_compile/indra.l
index 584087e..7f4cdc5 100644
--- a/linden/indra/lscript/lscript_compile/indra.l
+++ b/linden/indra/lscript/lscript_compile/indra.l
@@ -53,9 +53,16 @@ void parse_string();
 #define ECHO do { } while (0)
 
 #if defined(__cplusplus)
-extern "C" { int yylex( void ); }
-extern "C" { int yyparse( void ); }
-extern "C" { int yyerror(const char *fmt, ...); }
+extern "C" {
+#endif
+int yyerror(const char *fmt, ...);
+int yylex( void );
+// Windows defines this in indra.y.hpp, which is included above, and defines it differently.
+#ifndef LL_WINDOWS
+int yyparse( void );
+#endif
+#if defined(__cplusplus)
+}
 #endif
 
 %}
@@ -722,9 +729,6 @@ L?\"(\\.|[^\\"])*\"	{ parse_string(); count(); return(STRING_CONSTANT); }
 LLScriptAllocationManager	*gAllocationManager;
 LLScriptScript				*gScriptp;
 
-// Prototype for the yacc parser entry point
-int yyparse(void);
-
 int yyerror(const char *fmt, ...)
 {
 	gErrorToText.writeError(yyout, gLine, gColumn, LSERROR_SYNTAX_ERROR);
@@ -760,7 +764,13 @@ BOOL lscript_compile(const char* src_filename, const char* dst_filename,
 
 	    yyrestart(yyin);
 
-		b_parse_ok = !yyparse();
+// TODO - Try to fix this, but for now, no compiling LSL for Windows in SL.
+// Actually, this seems to not actually be needed anymore?
+// I thought it was needed to support ancient pre Mono LSL scripts, which only work in SL anyway, but they still work fine.  Perhaps SL fixed it server side?
+// If that's the case, we don't need any of this stuff.
+#ifndef LL_WINDOWS
+//		b_parse_ok = !yyparse();
+#endif
 
 		if (b_parse_ok)
 		{
-- 
cgit v1.1


From c16929159920e75aa44cb72350ca37890dbd0f31 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Wed, 17 Apr 2013 19:07:44 +1000
Subject: Potential fix for http://redmine.kokuaviewer.org/issues/1215 but
 needs testing.

---
 linden/indra/llwindow/llwindowsdl.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index 2f9de6b..69ec3b3 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -2521,9 +2521,10 @@ std::vector<std::string> LLWindowSDL::getDynamicFallbackFontList()
 	sortpat = FcNameParse((FcChar8*) sort_order.c_str());
 	if (sortpat)
 	{
+		FcResult dummyResult;
 		// Sort the list of system fonts from most-to-least-desirable.
 		fs = FcFontSort(NULL, sortpat, elide_unicode_coverage,
-				NULL, NULL);
+				NULL, &dummyResult);
 		FcPatternDestroy(sortpat);
 	}
 
-- 
cgit v1.1


From 8fa60cf0f49c872402aa72d486e1f900a166d951 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Thu, 18 Apr 2013 14:03:24 +1000
Subject: New branch for building with nmake.

This is a branch, coz it's still crap.
---
 linden/indra/develop.py                      | 83 ++++++++++++++++++----------
 linden/indra/newview/CMakeLists.txt          |  4 +-
 linden/indra/newview/viewer_manifest.py      |  8 +--
 linden/scripts/linux/0-patch-SL-source       |  2 +-
 linden/scripts/linux/1-get-libraries-from-SL | 11 ++--
 linden/scripts/linux/3-compile-SL-source     | 27 +--------
 linden/scripts/linux/4-package-viewer        | 11 +++-
 linden/scripts/linux/config-SL-source        | 16 +++++-
 8 files changed, 90 insertions(+), 72 deletions(-)

diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index 3760609..3344288 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -485,6 +485,10 @@ class WindowsSetup(PlatformSetup):
         'vc100' : {
             'gen' : r'Visual Studio 10',
             'ver' : r'10.0'
+            },
+        'nmake' : {
+            'gen' : r'NMake Makefiles',
+            'ver' : r''
             }
         }
     gens['vs2003'] = gens['vc71']
@@ -510,7 +514,7 @@ class WindowsSetup(PlatformSetup):
             else:
                 print >> sys.stderr, 'Cannot find a Visual Studio installation, testing for express editions'
                 for version in 'vc80 vc90 vc100 vc71'.split():
-                    if self.find_visual_studio_express(version):
+                    if self.find_visual_studio_express(version) != '':
                         self._generator = version
                         self.using_express = True
                         print 'Building with ', self.gens[version]['gen'] , "Express edition"
@@ -534,19 +538,33 @@ class WindowsSetup(PlatformSetup):
     def cmake_commandline(self, src_dir, build_dir, opts, simple):
         args = dict(
             dir=src_dir,
-            generator=self.gens[self.generator.lower()]['gen'],
             opts=quote(opts),
             standalone=self.standalone,
             unattended=self.unattended,
-            project_name=self.project_name
+            project_name=self.project_name,
+            type=self.build_type,
+            use_vstool='ON'
             )
+        if self.generator == 'nmake':
+           args['generator'] = r'NMake Makefiles'
+           args['use_vstool'] = 'OFF'
+        else:
+           args['generator'] = self.gens[self.generator.lower()]['gen']
+        if self.using_express:
+           args['using_express'] = 'ON'
+           args['use_vstool'] = 'OFF'
+        else:
+           args['using_express'] = 'OFF'
         # default to packaging disabled
         # if simple:
         #    return 'cmake %(opts)s "%(dir)s"' % args
         return ('cmake -G "%(generator)s" '
+                '-DCMAKE_BUILD_TYPE:STRING=%(type)s '
                 '-DSTANDALONE:BOOL=%(standalone)s '
                 '-DUNATTENDED:BOOL=%(unattended)s '
                 '-DROOT_PROJECT_NAME:STRING=%(project_name)s '
+                '-DUSING_EXPRESS:BOOL=%(using_express)s '
+                '-DUSE_VSTOOL:BOOL=%(use_vstool)s '
                 #'-DPACKAGE:BOOL=ON '
                 '%(opts)s "%(dir)s"' % args)
 
@@ -602,7 +620,7 @@ class WindowsSetup(PlatformSetup):
                 config = '\"%s|Win32\"' % config
 
             return "buildconsole %s.sln /build %s" % (self.project_name, config)
-           
+
         environment = self.find_visual_studio()
         if environment == '':
             environment = self.find_visual_studio_express()
@@ -614,7 +632,17 @@ class WindowsSetup(PlatformSetup):
                  print >> sys.stderr, "Solution can now be found in:", build_dirs[0]
                  print >> sys.stderr, "Set %s as startup project" % self.project_name
                  print >> sys.stderr, "Set build target is Release or RelWithDbgInfo"
-                 exit(0)   
+                 exit(0)
+
+        if self.generator == 'nmake':
+           '''Hack around a bug in cmake that I'm surprised did not hit GUI controlled builds.'''
+           self.run(r'sed -i "s|\(^RC_FLAGS .* \) /GS .*$|\1|" build-nmake/win_crash_logger/CMakeFiles/windows-crash-logger.dir/flags.make')
+           self.run(r'sed -i "s|\(^RC_FLAGS .* \) /GS .*$|\1|" build-nmake/newview/CMakeFiles/imprudence-bin.dir/flags.make')
+           self.run(r'sed -i "s|\(^RC_FLAGS .* \) /EHsc .*/Zm1000 \($\)|\1\2|" build-nmake/win_crash_logger/CMakeFiles/windows-crash-logger.dir/flags.make')
+           self.run(r'sed -i "s|\(^RC_FLAGS .* \) /EHsc .*/Zm1000 \($\)|\1\2|" build-nmake/newview/CMakeFiles/imprudence-bin.dir/flags.make')
+           '''Evil hack.'''
+           self.run(r'touch newview/touched.bat')
+           return "nmake"
 
         # devenv.com is CLI friendly, devenv.exe... not so much.
         return ('"%sdevenv.com" %s.sln /build %s' % 
@@ -634,13 +662,6 @@ class WindowsSetup(PlatformSetup):
             raise CommandError('the command %r %s' %
                                (name, ret))
 
-    def run_cmake(self, args=[]):
-        '''Override to add the vstool.exe call after running cmake.'''
-        PlatformSetup.run_cmake(self, args)
-        if self.unattended == 'OFF':
-            if self.using_express == False:
-                self.run_vstool()
-
     def run_vstool(self):
         for build_dir in self.build_dirs():
             stamp = os.path.join(build_dir, 'vstool.txt')
@@ -659,30 +680,30 @@ class WindowsSetup(PlatformSetup):
             print 'Running %r in %r' % (vstool_cmd, getcwd())
             self.run(vstool_cmd)        
             print >> open(stamp, 'w'), self.build_type
-        
+
     def run_build(self, opts, targets):
         cwd = getcwd()
         build_cmd = self.get_build_cmd()
-
-        for d in self.build_dirs():
-            try:
-                os.chdir(d)
-                if targets:
-                    for t in targets:
-                        cmd = '%s /project %s %s' % (build_cmd, t, ' '.join(opts))
+        if build_cmd != "":
+            for d in self.build_dirs():
+                try:
+                    os.chdir(d)
+                    if targets:
+                        for t in targets:
+                            cmd = '%s /project %s %s' % (build_cmd, t, ' '.join(opts))
+                            print 'Running %r in %r' % (cmd, d)
+                            self.run(cmd)
+                    else:
+                        cmd = '%s %s' % (build_cmd, ' '.join(opts))
                         print 'Running %r in %r' % (cmd, d)
                         self.run(cmd)
-                else:
-                    cmd = '%s %s' % (build_cmd, ' '.join(opts))
-                    print 'Running %r in %r' % (cmd, d)
-                    self.run(cmd)
-            finally:
-                os.chdir(cwd)
-                
+                finally:
+                    os.chdir(cwd)
+
 class CygwinSetup(WindowsSetup):
     def __init__(self):
         super(CygwinSetup, self).__init__()
-        self.generator = 'vc80'
+        self.generator = 'nmake'
 
     def cmake_commandline(self, src_dir, build_dir, opts, simple):
         dos_dir = commands.getoutput("cygpath -w %s" % src_dir)
@@ -692,11 +713,13 @@ class CygwinSetup(WindowsSetup):
             opts=quote(opts),
             standalone=self.standalone,
             unattended=self.unattended,
-            project_name=self.project_name
+            project_name=self.project_name,
+            type=self.build_type
             )
         #if simple:
         #    return 'cmake %(opts)s "%(dir)s"' % args
         return ('cmake -G "%(generator)s" '
+                '-DCMAKE_BUILD_TYPE:STRING=%(type)s '
                 '-DUNATTENDED:BOOl=%(unattended)s '
                 '-DSTANDALONE:BOOL=%(standalone)s '
                 '-DROOT_PROJECT_NAME:STRING=%(project_name)s '
@@ -723,7 +746,7 @@ Options:
   -m32 | -m64           build architecture (32-bit or 64-bit)
   -N | --no-distcc      disable use of distcc
   -G | --generator=NAME generator name
-                        Windows: VC80 (VS2005--default), VC71 (VS2003), 
+                        Windows: NMake, VC80 (VS2005--default), VC71 (VS2003), 
                           VC90 (VS2008), or VC100 (VS2010)
                         Mac OS X: Xcode (default), Unix Makefiles
                         Linux: Unix Makefiles (default), KDevelop3
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index b9c41fc..9172aa0 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -1326,7 +1326,7 @@ if (WINDOWS)
 
     # sets the 'working directory' for debugging from visual studio.
     if (NOT UNATTENDED)
-		if (NOT self.using_express)
+		if (USE_VSTOOL)
 			add_custom_command(
 				TARGET ${VIEWER_BINARY_NAME} PRE_BUILD
 				COMMAND ${CMAKE_SOURCE_DIR}/tools/vstool/vstool.exe
@@ -1338,7 +1338,7 @@ if (WINDOWS)
 				  ${CMAKE_CURRENT_SOURCE_DIR}
 				COMMENT "Setting the ${VIEWER_BINARY_NAME} working directory for debugging."
 				)
-		endif (NOT self.using_express)
+		endif (USE_VSTOOL)
     endif (NOT UNATTENDED)
 
     add_custom_command(
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index bcdf4a9..718c3d2 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -244,7 +244,7 @@ class WindowsManifest(ViewerManifest):
         elif self.configuration().lower() == "debug":
             self.path(self.find_existing_file('debug/imprudence-bin.exe'), dst=self.final_exe())
         else:
-            self.path(self.find_existing_file('release/imprudence-bin.exe', 'releasesse2/imprudence-bin.exe', 'relwithdebinfo/imprudence-bin.exe', 'debug/imprudence-bin.exe'), dst=self.final_exe())
+            self.path(self.find_existing_file('release/imprudence-bin.exe', 'releasesse2/imprudence-bin.exe', 'relwithdebinfo/imprudence-bin.exe', 'debug/imprudence-bin.exe', 'imprudence-bin.exe'), dst=self.final_exe())
 
         # copy over the the pdb file for the regular or SSE2 versions if we don't already have one copied
         symbol_ver = '.'.join(self.args['version'])
@@ -281,7 +281,7 @@ class WindowsManifest(ViewerManifest):
         #self.path("fmod.dll")
 
         # For spellchecking
-        if self.prefix(src=self.args['configuration'], dst=""):
+        if self.prefix(src=os.path.join(self.args['configuration'], "Release"), dst=""):
             self.path("libhunspell.dll")
             self.end_prefix()
 
@@ -289,12 +289,12 @@ class WindowsManifest(ViewerManifest):
         self.path("llkdu.dll.2.config")
 
         # Get llcommon and deps.
-        if self.prefix(src=self.args['configuration'], dst=""):
+        if self.prefix(src=os.path.join(self.args['configuration'], "Release"), dst=""):
             self.path('libapr-1.dll')
             self.path('libaprutil-1.dll')
             self.path('libapriconv-1.dll')
-            self.path('llcommon.dll')
             self.end_prefix()
+            self.path('llcommon.dll')
 
         # For textures
         if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
diff --git a/linden/scripts/linux/0-patch-SL-source b/linden/scripts/linux/0-patch-SL-source
index 4885d5d..ce0dabe 100755
--- a/linden/scripts/linux/0-patch-SL-source
+++ b/linden/scripts/linux/0-patch-SL-source
@@ -22,7 +22,7 @@ if [ "$PATCHES" != "" ] ; then
         elif echo $i | grep ".bz2" &>/dev/null ; then
             bzcat $i | patch -p1 -s
         elif echo $i | grep ".zip" &>/dev/null ; then
-    	    unzip -o $i >/dev/null
+           unzip -o $i >/dev/null
         else
             patch -p1 -s <$i
         fi
diff --git a/linden/scripts/linux/1-get-libraries-from-SL b/linden/scripts/linux/1-get-libraries-from-SL
index 9ba61f4..87ad39c 100755
--- a/linden/scripts/linux/1-get-libraries-from-SL
+++ b/linden/scripts/linux/1-get-libraries-from-SL
@@ -53,7 +53,7 @@ source config-SL-source
 cd $PATH_TO_SOURCES/indra
 
 # Do a clean build
-./develop.py clean
+#./develop.py $os_extra clean
 
 # Force the vectorization use if we chose so.
 if [ "$FORCE_VECTORIZE" == "yes" ] ; then
@@ -65,7 +65,8 @@ else
     FATAL_WARNINGS=""
 fi
 # Configure the sources and download the LL provided libraries:
-./develop.py --type=Release  configure "$FATAL_WARNINGS" \
-    -DCMAKE_C_FLAGS:STRING="-O2 $TUNE_FLAGS" -DCMAKE_CXX_FLAGS:STRING="-O2 $TUNE_FLAGS" \
-    -DCMAKE_C_FLAGS_RELEASE:STRING="-O2 $TUNE_FLAGS" -DCMAKE_CXX_FLAGS_RELEASE:STRING="-O2 $TUNE_FLAGS" \
-    -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="-g -O2 $TUNE_FLAGS" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="-g -O2 $TUNE_FLAGS"
+./develop.py $os_extra --type=Release  configure "$FATAL_WARNINGS" \
+    -DCMAKE_C_FLAGS:STRING="$TUNE_FLAGS" -DCMAKE_CXX_FLAGS:STRING="$TUNE_FLAGS" \
+    -DCMAKE_C_FLAGS_DEBUG:STRING="-g $TUNE_FLAGS" -DCMAKE_CXX_FLAGS_DEBUG:STRING="-g $TUNE_FLAGS" \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$TUNE_FLAGS" -DCMAKE_CXX_FLAGS_RELEASE:STRING="$TUNE_FLAGS" \
+    -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING="-g $TUNE_FLAGS" -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING="-g $TUNE_FLAGS" -DPACKAGE:BOOL=ON
diff --git a/linden/scripts/linux/3-compile-SL-source b/linden/scripts/linux/3-compile-SL-source
index 34395bb..c932340 100755
--- a/linden/scripts/linux/3-compile-SL-source
+++ b/linden/scripts/linux/3-compile-SL-source
@@ -54,10 +54,7 @@ source config-SL-source
 function compile() {
     cd $PATH_TO_SOURCES/indra
     echo "Compiling the client into $TEMP_DIR..."
-    nice -n 19 ionice -c 3 ./develop.py --type=Release build
-#    if (($? == 0)) ; then
-#        mv -f $PATH_TO_SOURCES/indra/viewer-linux-i686*/newview/SecondLife*.tar.bz2 $HOME/
-#    fi
+    nice -n 19 $ionice ./develop.py $os_extra --type=Release build
 }
 
 ########### end of functions ###########
@@ -66,14 +63,7 @@ if [ "$TEMP_DIR" == "" ] ; then
     export TEMP_DIR="/usr/tmp/$USER"
 fi
 
-# Check to see if we simply want to retry a compilation:
-if [ "$1" == "--retry" ] ; then
-    compile
-    exit $?
-fi
-
 # Use the parameter (if any) as the path to the archives:
-
 PATH_TO_ARCHIVES=`pwd`
 if [ "$1" != "" ] && [ "$1" != "--prep" ] ; then
     if [ -d $1 ] ; then
@@ -83,19 +73,4 @@ if [ "$1" != "" ] && [ "$1" != "--prep" ] ; then
 fi
 
 cd $PATH_TO_SOURCES/indra
-
-# Do a clean build
-#./develop.py clean
-
-# Force the vectorization use if we chose so.
-if [ "$FORCE_VECTORIZE" == "yes" ] ; then
-    TUNE_FLAGS="$TUNE_FLAGS -DLL_VECTORIZE=1"
-fi
-if [ "$ALLOW_WARNINGS" == "yes" ] ; then
-    FATAL_WARNINGS="-DGCC_DISABLE_FATAL_WARNINGS:BOOL=TRUE"
-else
-    FATAL_WARNINGS=""
-fi
-
 time compile
-
diff --git a/linden/scripts/linux/4-package-viewer b/linden/scripts/linux/4-package-viewer
index b2bff7f..19d2456 100755
--- a/linden/scripts/linux/4-package-viewer
+++ b/linden/scripts/linux/4-package-viewer
@@ -1,5 +1,10 @@
 #!/bin/bash
 
-cd ../../indra/viewer-linux-*
-make package
-
+if [ "$OSTYPE" == "cygwin" ] ; then
+    # Assumes version has been passed in from outside, coz Windows insists on adding crap to python output.
+    cd ../../indra/build-nmake/
+    iscc newview/package/${version}-Windows-x86.iss
+else
+    cd ../../indra/viewer-linux-*
+    make package
+fi
diff --git a/linden/scripts/linux/config-SL-source b/linden/scripts/linux/config-SL-source
index 174d7d4..200f957 100644
--- a/linden/scripts/linux/config-SL-source
+++ b/linden/scripts/linux/config-SL-source
@@ -9,6 +9,9 @@
 # accordingly, so that you (should) end up with a properly packaged client.
 
 PWD=`pwd`
+os_extra=''
+ionice='ionice -c 3'
+
 
 # Where the sources of the client will be held (defaults to "./linden"):
 PATH_TO_SOURCES="$PWD/../.."
@@ -53,7 +56,7 @@ USE_SYSTEM_BOOST="no"
 # You may add tune flags here, to optimize the code for your processor.
 # Example, for an Athlon XP:
 # TUNE_FLAGS="-march=athlon-xp"
-TUNE_FLAGS="-fomit-frame-pointer -frename-registers -ftree-vectorize -fweb -fexpensive-optimizations -msse -mfpmath=sse"
+TUNE_FLAGS="-O2 -fomit-frame-pointer -frename-registers -ftree-vectorize -fweb -fexpensive-optimizations -msse -mfpmath=sse"
 # Set this to "yes" to force vectorization use in the viewer code (only for
 # processors with SSE or Altivec units, and only if you did enable them via
 # the TUNE_FLAGS.
@@ -61,3 +64,14 @@ FORCE_VECTORIZE="yes"
 
 # When using gcc v4.3 or later, you might have to set this to yes...
 ALLOW_WARNINGS="yes"
+
+
+# Change it all for cygwin.
+if [ "$OSTYPE" == "cygwin" ] ; then
+    os_extra='-G nmake'
+    ionice=''
+    USE_SYSTEM_LIBSTDC="no"
+    TUNE_FLAGS="/EHsc /GR /Zm1000 /DWIN32 /D_WINDOWS "
+    FORCE_VECTORIZE="no"
+    ALLOW_WARNINGS="no"
+fi
-- 
cgit v1.1


From 51b5df7ebb0aa5a426e98082e76fc31796dcbb4d Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Fri, 19 Apr 2013 04:01:13 +1000
Subject: Bump experimental version number.

---
 .../installers/windows/imprudence_installer_script_experimental.iss   | 4 ++--
 linden/indra/newview/packaging/mac/English.lproj/InfoPlist.strings    | 4 ++--
 linden/indra/newview/res/viewerRes.rc                                 | 4 ++--
 linden/indra/newview/viewerinfo.cpp                                   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss b/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss
index d50957d..a396381 100644
--- a/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss
+++ b/linden/indra/newview/installers/windows/imprudence_installer_script_experimental.iss
@@ -9,11 +9,11 @@
 ; These will change
 AppId={{1B3E68BC-13EB-4277-9439-CB5FF9259460}
 AppName=Imprudence Viewer Experimental
-AppVerName=Imprudence Viewer 1.4.0.3 exp 0 windows test release
+AppVerName=Imprudence Viewer 1.4.0.3 exp 1 windows test release
 DefaultDirName={pf}\ImprudenceExperimental
 DefaultGroupName=Imprudence Viewer Experimental
 VersionInfoProductName=Imprudence Viewer Experimental
-OutputBaseFilename=Imprudence-1.4.0.3-exp-0-windows-test
+OutputBaseFilename=Imprudence-1.4.0.3-exp-1-windows-test
 VersionInfoVersion=1.4.0.3
 VersionInfoTextVersion=1.4.0.3
 VersionInfoProductVersion=1.4.0.3
diff --git a/linden/indra/newview/packaging/mac/English.lproj/InfoPlist.strings b/linden/indra/newview/packaging/mac/English.lproj/InfoPlist.strings
index 91eae98..e0014d3 100644
--- a/linden/indra/newview/packaging/mac/English.lproj/InfoPlist.strings
+++ b/linden/indra/newview/packaging/mac/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Imprudence";
-CFBundleShortVersionString = "Imprudence 1.4.0.3 exp 0";
-CFBundleGetInfoString = "Imprudence 1.4.0.3 exp 0";
+CFBundleShortVersionString = "Imprudence 1.4.0.3 exp 1";
+CFBundleGetInfoString = "Imprudence 1.4.0.3 exp 1";
diff --git a/linden/indra/newview/res/viewerRes.rc b/linden/indra/newview/res/viewerRes.rc
index 4144e47..edeee92 100644
--- a/linden/indra/newview/res/viewerRes.rc
+++ b/linden/indra/newview/res/viewerRes.rc
@@ -156,11 +156,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Imprudence Viewer Project"
             VALUE "FileDescription", "Imprudence"
-            VALUE "FileVersion", "1.4.0.3 exp 0"
+            VALUE "FileVersion", "1.4.0.3 exp 1"
             VALUE "InternalName", "Imprudence"
             VALUE "OriginalFilename", "imprudence.exe"
             VALUE "ProductName", "Imprudence"
-            VALUE "ProductVersion", "1.4.0.3 exp 0"
+            VALUE "ProductVersion", "1.4.0.3 exp 1"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/linden/indra/newview/viewerinfo.cpp b/linden/indra/newview/viewerinfo.cpp
index d1ed1a0..7237c16 100644
--- a/linden/indra/newview/viewerinfo.cpp
+++ b/linden/indra/newview/viewerinfo.cpp
@@ -37,7 +37,7 @@ namespace ViewerInfo
 	const S32         MINOR = 4;
 	const S32         PATCH = 0;
 	const S32         RLEAS = 3; // increment for each beta/RC/release
-	const std::string EXTRA = "exp 0";
+	const std::string EXTRA = "exp 1";
 
 	// Mac OS X bundle identifier. Should match the one in Info.plist.
 	const std::string BUNDLE_ID = "org.imprudenceviewer.viewer";
-- 
cgit v1.1


From 37301a51d2d2f3731ada3ad2170cb9ec91945b62 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Fri, 19 Apr 2013 17:12:36 +1000
Subject: Allow the build scripts to build a configurable type, and make that
 type RelWithDebInfo.

---
 linden/scripts/linux/1-get-libraries-from-SL | 2 +-
 linden/scripts/linux/3-compile-SL-source     | 2 +-
 linden/scripts/linux/config-SL-source        | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/linden/scripts/linux/1-get-libraries-from-SL b/linden/scripts/linux/1-get-libraries-from-SL
index 87ad39c..99a4367 100755
--- a/linden/scripts/linux/1-get-libraries-from-SL
+++ b/linden/scripts/linux/1-get-libraries-from-SL
@@ -65,7 +65,7 @@ else
     FATAL_WARNINGS=""
 fi
 # Configure the sources and download the LL provided libraries:
-./develop.py $os_extra --type=Release  configure "$FATAL_WARNINGS" \
+./develop.py $os_extra --type=$TYPE  configure "$FATAL_WARNINGS" \
     -DCMAKE_C_FLAGS:STRING="$TUNE_FLAGS" -DCMAKE_CXX_FLAGS:STRING="$TUNE_FLAGS" \
     -DCMAKE_C_FLAGS_DEBUG:STRING="-g $TUNE_FLAGS" -DCMAKE_CXX_FLAGS_DEBUG:STRING="-g $TUNE_FLAGS" \
     -DCMAKE_C_FLAGS_RELEASE:STRING="$TUNE_FLAGS" -DCMAKE_CXX_FLAGS_RELEASE:STRING="$TUNE_FLAGS" \
diff --git a/linden/scripts/linux/3-compile-SL-source b/linden/scripts/linux/3-compile-SL-source
index c932340..4ac80a7 100755
--- a/linden/scripts/linux/3-compile-SL-source
+++ b/linden/scripts/linux/3-compile-SL-source
@@ -54,7 +54,7 @@ source config-SL-source
 function compile() {
     cd $PATH_TO_SOURCES/indra
     echo "Compiling the client into $TEMP_DIR..."
-    nice -n 19 $ionice ./develop.py $os_extra --type=Release build
+    nice -n 19 $ionice ./develop.py $os_extra --type=$TYPE build
 }
 
 ########### end of functions ###########
diff --git a/linden/scripts/linux/config-SL-source b/linden/scripts/linux/config-SL-source
index 200f957..80ae27a 100644
--- a/linden/scripts/linux/config-SL-source
+++ b/linden/scripts/linux/config-SL-source
@@ -21,6 +21,8 @@ PATH_TO_PATCHES="$PWD/../../patches"
 TEMP_DIR="/tmp/SL-$USER"
 mkdir -p $TEMP_DIR
 
+TYPE="RelWithDebInfo"
+
 USE_SYSTEM_GTK="no"
 USE_SYSTEM_SDL="no"
 USE_SYSTEM_SSL="no"
-- 
cgit v1.1


From 976874914ea9f8cda148c02bfed1cdc4f3c47442 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 20 Apr 2013 22:53:07 +1000
Subject: Make python output stuff in the proper order.

---
 linden/scripts/linux/config-SL-source | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/linden/scripts/linux/config-SL-source b/linden/scripts/linux/config-SL-source
index 80ae27a..f60fd92 100644
--- a/linden/scripts/linux/config-SL-source
+++ b/linden/scripts/linux/config-SL-source
@@ -77,3 +77,7 @@ if [ "$OSTYPE" == "cygwin" ] ; then
     FORCE_VECTORIZE="no"
     ALLOW_WARNINGS="no"
 fi
+
+
+# Work around python problems.
+export PYTHONUNBUFFERED='True'
-- 
cgit v1.1


From 4e1c12f728f102f37f7e38b2ed12040dc3be42aa Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 20 Apr 2013 22:53:55 +1000
Subject: No need to run cmake twice, the user gets warned if they screw up.

---
 linden/indra/develop.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index 3344288..7d57973 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -829,7 +829,6 @@ For example: develop.py configure -DSERVER:BOOL=OFF"""
             for d in setup.build_dirs():
                 if not os.path.exists(d):
                     raise CommandError('run "develop.py cmake" first')
-            setup.run_cmake()
             opts, targets = setup.parse_build_opts(args)
             setup.run_build(opts, targets)
         elif cmd == 'clean':
-- 
cgit v1.1


From e3e59e2244b98b78175fecad22053a8edae1b365 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 20 Apr 2013 22:54:58 +1000
Subject: Cmake now puts the running of vstool into the make files for us, so
 no need to do it in python.

---
 linden/indra/develop.py | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index 7d57973..ba22202 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -662,25 +662,6 @@ class WindowsSetup(PlatformSetup):
             raise CommandError('the command %r %s' %
                                (name, ret))
 
-    def run_vstool(self):
-        for build_dir in self.build_dirs():
-            stamp = os.path.join(build_dir, 'vstool.txt')
-            try:
-                prev_build = open(stamp).read().strip()
-            except IOError:
-                prev_build = ''
-            if prev_build == self.build_type:
-                # Only run vstool if the build type has changed.
-                continue
-            vstool_cmd = (os.path.join('tools','vstool','VSTool.exe') +
-                          ' --solution ' +
-                          os.path.join(build_dir,'Imprudence.sln') +
-                          ' --config ' + self.build_type +
-                          ' --startup imprudence-bin')
-            print 'Running %r in %r' % (vstool_cmd, getcwd())
-            self.run(vstool_cmd)        
-            print >> open(stamp, 'w'), self.build_type
-
     def run_build(self, opts, targets):
         cwd = getcwd()
         build_cmd = self.get_build_cmd()
-- 
cgit v1.1


From 45b52f8fa880afb3826f446f6b211b45873b29e5 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 20 Apr 2013 22:56:23 +1000
Subject: Remove excess output from the vs finding code, and move it up in the
 file.

---
 linden/indra/develop.py | 80 ++++++++++++++++++++++---------------------------
 1 file changed, 35 insertions(+), 45 deletions(-)

diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index ba22202..b2c600e 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -504,6 +504,41 @@ class WindowsSetup(PlatformSetup):
         self._generator = None
         self.incredibuild = False
 
+    def find_visual_studio(self, gen=None):
+        if gen is None:
+            gen = self._generator
+        gen = gen.lower()
+        try:
+            import _winreg
+            key_str = (r'SOFTWARE\Microsoft\VisualStudio\%s\Setup\VS' %
+                       self.gens[gen]['ver'])
+            value_str = (r'EnvironmentDirectory')
+            reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE)
+            key = _winreg.OpenKey(reg, key_str)
+            value = _winreg.QueryValueEx(key, value_str)[0]
+            print 'Found: %s' % value
+            return value
+        except WindowsError, err:
+            return ''
+
+    def find_visual_studio_express(self, gen=None):
+        if gen is None:
+            gen = self._generator
+        gen = gen.lower()
+        try:
+            import _winreg
+            key_str = (r'SOFTWARE\Microsoft\VCExpress\%s\Setup\VC' %
+                       self.gens[gen]['ver'])
+            value_str = (r'ProductDir')
+            reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE)
+            key = _winreg.OpenKey(reg, key_str)
+            value = _winreg.QueryValueEx(key, value_str)[0]+"IDE"
+            print 'Found: %s' % value
+            self.using_express = True
+            return value
+        except WindowsError, err:
+            return ''
+
     def _get_generator(self):
         if self._generator is None:
             for version in 'vc80 vc90 vc100 vc71'.split():
@@ -568,51 +603,6 @@ class WindowsSetup(PlatformSetup):
                 #'-DPACKAGE:BOOL=ON '
                 '%(opts)s "%(dir)s"' % args)
 
-    def find_visual_studio(self, gen=None):
-        if gen is None:
-            gen = self._generator
-        gen = gen.lower()
-        try:
-            import _winreg
-            key_str = (r'SOFTWARE\Microsoft\VisualStudio\%s\Setup\VS' %
-                       self.gens[gen]['ver'])
-            value_str = (r'EnvironmentDirectory')
-            print ('Reading VS environment from HKEY_LOCAL_MACHINE\%s\%s' %
-                   (key_str, value_str))
-            print key_str
-
-            reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE)
-            key = _winreg.OpenKey(reg, key_str)
-            value = _winreg.QueryValueEx(key, value_str)[0]
-            print 'Found: %s' % value
-            return value
-        except WindowsError, err:
-            print >> sys.stderr, "Didn't find ", self.gens[gen]['gen']
-            return ''
-
-    def find_visual_studio_express(self, gen=None):
-        if gen is None:
-            gen = self._generator
-        gen = gen.lower()
-        try:
-            import _winreg
-            key_str = (r'SOFTWARE\Microsoft\VCExpress\%s\Setup\VC' %
-                       self.gens[gen]['ver'])
-            value_str = (r'ProductDir')
-            print ('Reading VS environment from HKEY_LOCAL_MACHINE\%s\%s' %
-                   (key_str, value_str))
-            print key_str
-
-            reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE)
-            key = _winreg.OpenKey(reg, key_str)
-            value = _winreg.QueryValueEx(key, value_str)[0]+"IDE"
-            print 'Found: %s' % value
-            self.using_express = True
-            return value
-        except WindowsError, err:
-            print >> sys.stderr, "Didn't find ", self.gens[gen]['gen']
-            return ''
-
     def get_build_cmd(self):
         if self.incredibuild:
             config = self.build_type
-- 
cgit v1.1


From 3705e5468154c9682a4f38e646761a219cb53476 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 20 Apr 2013 22:57:10 +1000
Subject: Remove more excess vs finding output.

---
 linden/indra/develop.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index b2c600e..2c974f6 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -547,7 +547,6 @@ class WindowsSetup(PlatformSetup):
                     print 'Building with ', self.gens[version]['gen']
                     break
             else:
-                print >> sys.stderr, 'Cannot find a Visual Studio installation, testing for express editions'
                 for version in 'vc80 vc90 vc100 vc71'.split():
                     if self.find_visual_studio_express(version) != '':
                         self._generator = version
-- 
cgit v1.1


From d00b8c8ea63479d4c2b917142912e4bbd5f5d4d2 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 20 Apr 2013 22:58:51 +1000
Subject: Revert part of an earlier commit, no need to treat nmake differently
 for this bit.

---
 linden/indra/develop.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index 2c974f6..c3e1341 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -572,6 +572,7 @@ class WindowsSetup(PlatformSetup):
     def cmake_commandline(self, src_dir, build_dir, opts, simple):
         args = dict(
             dir=src_dir,
+            generator=self.gens[self.generator.lower()]['gen'],
             opts=quote(opts),
             standalone=self.standalone,
             unattended=self.unattended,
@@ -580,10 +581,7 @@ class WindowsSetup(PlatformSetup):
             use_vstool='ON'
             )
         if self.generator == 'nmake':
-           args['generator'] = r'NMake Makefiles'
            args['use_vstool'] = 'OFF'
-        else:
-           args['generator'] = self.gens[self.generator.lower()]['gen']
         if self.using_express:
            args['using_express'] = 'ON'
            args['use_vstool'] = 'OFF'
-- 
cgit v1.1


From ccc8c7cbe905b1762e0a70201f1389c844f0db5d Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 20 Apr 2013 22:59:42 +1000
Subject: Do the right vs finding thing even if it's an nmake build.

---
 linden/indra/develop.py | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index c3e1341..470f66a 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -559,6 +559,8 @@ class WindowsSetup(PlatformSetup):
         return self._generator
 
     def _set_generator(self, gen):
+        if gen == 'nmake':
+            self._get_generator()
         self._generator = gen
 
     generator = property(_get_generator, _set_generator)
@@ -608,18 +610,19 @@ class WindowsSetup(PlatformSetup):
 
             return "buildconsole %s.sln /build %s" % (self.project_name, config)
 
-        environment = self.find_visual_studio()
+        environment = self.find_visual_studio(self.generator)
         if environment == '':
-            environment = self.find_visual_studio_express()
-            if environment == '':
-                 print >> sys.stderr, "Something went very wrong during build stage, could not find a Visual Studio?"
-            else:
-                 print >> sys.stderr, "\nSolution generation complete, as you are using an express edition the final\n stages will need to be completed by hand"
-                 build_dirs=self.build_dirs();
-                 print >> sys.stderr, "Solution can now be found in:", build_dirs[0]
-                 print >> sys.stderr, "Set %s as startup project" % self.project_name
-                 print >> sys.stderr, "Set build target is Release or RelWithDbgInfo"
-                 exit(0)
+            environment = self.find_visual_studio_express(self.generator)
+            if self.generator != 'nmake':
+                if environment == '':
+                    print >> sys.stderr, "Something went very wrong during build stage, could not find a Visual Studio?"
+                else:
+                    print >> sys.stderr, "\nSolution generation complete, as you are using an express edition the final\n stages will need to be completed by hand"
+                    build_dirs=self.build_dirs();
+                    print >> sys.stderr, "Solution can now be found in:", build_dirs[0]
+                    print >> sys.stderr, "Set %s as startup project" % self.project_name
+                    print >> sys.stderr, "Set build target is Release or RelWithDbgInfo"
+                    exit(0)
 
         if self.generator == 'nmake':
            '''Hack around a bug in cmake that I'm surprised did not hit GUI controlled builds.'''
-- 
cgit v1.1


From 52fbc90af39ed076c039ea5b4f69bb4fb8d6518d Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 20 Apr 2013 23:00:01 +1000
Subject: Small clean ups.

---
 linden/indra/develop.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index 470f66a..eb071bd 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -408,7 +408,7 @@ class LinuxSetup(UnixSetup):
             print 'Running %r' % cmd
             self.run(cmd)
 
-        
+
 class DarwinSetup(UnixSetup):
     def __init__(self):
         super(DarwinSetup, self).__init__()
@@ -599,7 +599,6 @@ class WindowsSetup(PlatformSetup):
                 '-DROOT_PROJECT_NAME:STRING=%(project_name)s '
                 '-DUSING_EXPRESS:BOOL=%(using_express)s '
                 '-DUSE_VSTOOL:BOOL=%(use_vstool)s '
-                #'-DPACKAGE:BOOL=ON '
                 '%(opts)s "%(dir)s"' % args)
 
     def get_build_cmd(self):
@@ -607,7 +606,6 @@ class WindowsSetup(PlatformSetup):
             config = self.build_type
             if self.gens[self.generator]['ver'] in [ r'8.0', r'9.0', r'10.0', r'7.1' ]:
                 config = '\"%s|Win32\"' % config
-
             return "buildconsole %s.sln /build %s" % (self.project_name, config)
 
         environment = self.find_visual_studio(self.generator)
@@ -625,14 +623,14 @@ class WindowsSetup(PlatformSetup):
                     exit(0)
 
         if self.generator == 'nmake':
-           '''Hack around a bug in cmake that I'm surprised did not hit GUI controlled builds.'''
+           # Hack around a bug in cmake that I'm surprised did not hit GUI controlled builds.
            self.run(r'sed -i "s|\(^RC_FLAGS .* \) /GS .*$|\1|" build-nmake/win_crash_logger/CMakeFiles/windows-crash-logger.dir/flags.make')
            self.run(r'sed -i "s|\(^RC_FLAGS .* \) /GS .*$|\1|" build-nmake/newview/CMakeFiles/imprudence-bin.dir/flags.make')
            self.run(r'sed -i "s|\(^RC_FLAGS .* \) /EHsc .*/Zm1000 \($\)|\1\2|" build-nmake/win_crash_logger/CMakeFiles/windows-crash-logger.dir/flags.make')
            self.run(r'sed -i "s|\(^RC_FLAGS .* \) /EHsc .*/Zm1000 \($\)|\1\2|" build-nmake/newview/CMakeFiles/imprudence-bin.dir/flags.make')
-           '''Evil hack.'''
+           # Evil hack.
            self.run(r'touch newview/touched.bat')
-           return "nmake"
+           return 'nmake'
 
         # devenv.com is CLI friendly, devenv.exe... not so much.
         return ('"%sdevenv.com" %s.sln /build %s' % 
-- 
cgit v1.1


From 305f086cdd84249f16602f775e87979ce3c66a4d Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sun, 21 Apr 2013 19:43:57 +1000
Subject: Fix http://redmine.kokuaviewer.org/issues/1139 and provide better
 protection against NULL callbacks.

---
 linden/indra/newview/llinventorymodel.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/linden/indra/newview/llinventorymodel.cpp b/linden/indra/newview/llinventorymodel.cpp
index 40cbc43..8b98782 100644
--- a/linden/indra/newview/llinventorymodel.cpp
+++ b/linden/indra/newview/llinventorymodel.cpp
@@ -455,8 +455,6 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
 										   void (*callback)(const LLSD&, void*),
 										   void* user_data)
 {
-	llassert_always(NULL != callback);
-
 	LLUUID id;
 
 	if(!isInventoryUsable())
@@ -464,7 +462,8 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
 		llwarns << "Inventory is broken." << llendl;
 		LLSD result;
 		result["failure"] = true;
-		callback(result, user_data);
+		if (callback)
+		    callback(result, user_data);
  	}
 
 
@@ -473,7 +472,8 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
 		LL_DEBUGS("Inventory") << "Attempt to create simstate category." << LL_ENDL;
 		LLSD result;
 		result["failure"] = true;
-		callback(result, user_data);
+		if (callback)
+		    callback(result, user_data);
 	}
 
 	id.generate();
@@ -492,10 +492,8 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
 		name.assign(NEW_CATEGORY_NAME);
 	}
 
-	if (user_data)  // callback required for acked message.
+	if ((NULL != callback) && (NULL != user_data))  // callback required for acked message.
 	{
-
-
 		LLViewerRegion* viewer_region = gAgent.getRegion();
 
 		if (!viewer_region->capabilitiesReceived())
@@ -537,7 +535,10 @@ LLUUID LLInventoryModel::createNewCategory(const LLUUID& parent_id,
 	{
 		// user_data is a LLCategoryCreate object instantiated in the calling
 		// function - bug (or low memory - any leaks?).
-		llwarns << "NULL user_data" << llendl;
+		// Or, it might just be no problem, since passing the callback in the first place is optional.
+		// It's really up to the calling function to know what it passed to pass back to the callback.
+		if (callback)
+		    llwarns << "NULL user_data" << llendl;
 	}
 
 	// Add the category to the internal representation
-- 
cgit v1.1


From 85444c4aff8cc51da35468df62aa70ed87339622 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Wed, 24 Apr 2013 13:04:14 +1000
Subject: Add compatibility with autobuild pre built libraries.

Now Imprudence can share them with Kokua.
---
 linden/scripts/install.py | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/linden/scripts/install.py b/linden/scripts/install.py
index 99e8b73..b39dd5a 100755
--- a/linden/scripts/install.py
+++ b/linden/scripts/install.py
@@ -565,6 +565,7 @@ windows/i686/vs/2003 -- specify a windows visual studio 2003 package"""
                     tar.extractall(path=install_dir)
                 except AttributeError:
                     _extractall(tar, path=install_dir)
+
             symlinks = []
             if _get_platform() == 'linux' or _get_platform() == 'linux64':
                 first = 1
@@ -591,6 +592,43 @@ windows/i686/vs/2003 -- specify a windows visual studio 2003 package"""
                                 os.symlink(target, link_name)
                             symlinks += [LINK]
                             print "    %s --> %s" % (LINK, target)
+
+	    # Reroute autobuilds
+	    auto_name = install_dir + "/include"
+            if os.path.exists(auto_name):
+        	print "Moving autobuilt include files to legacy locations."
+        	for entry in os.listdir(auto_name):
+            	    os.rename(auto_name + "/" + entry, install_dir + "/libraries/include/" + entry)
+            	os.rmdir(auto_name)
+
+	    auto_name = install_dir + "/lib"
+	    dest_name = ''
+            if _get_platform() == 'darwin':
+		dest_name = 'universal-darwin/'
+            if _get_platform() == 'linux64':
+		dest_name = 'x86_64-linux/'
+            if _get_platform() == 'linux':
+		dest_name = 'i686-linux/'
+            if _get_platform() == 'windows':
+		dest_name = 'i686-win32/'
+            if os.path.exists(auto_name):
+        	print "Moving autobuilt lib files to legacy locations."
+        	for entry in os.listdir(auto_name):
+    		    if os.path.isdir(auto_name + "/" + entry):
+        		path = install_dir + "/libraries/" + dest_name + "lib_" + entry
+        		if entry == 'release':
+        		    # Linux is special, coz it's got server code.
+        		    if _get_platform() == 'linux' or _get_platform() == 'linux64':
+        			path = install_dir + "/libraries/" + dest_name + "lib_" + entry + "_client"
+        		if not os.path.exists(path):
+        		    os.makedirs(path)
+        		for filename in os.listdir(auto_name + "/" + entry):
+            		    os.rename(auto_name + "/" + entry + "/" + filename, path + "/" + filename)
+            		os.rmdir(auto_name + "/" + entry)
+            	    else:
+            		os.rename(auto_name + "/" + entry, install_dir + "/libraries/" + dest_name + "lib/" + entry)
+            	os.rmdir(auto_name)
+
             if ifile.pkgname in self._installed:
                 self._installed[ifile.pkgname].add_files(
                     ifile.url,
-- 
cgit v1.1


From af09cc274b50c9d9c41af0ff9f2e66b4c81a1fa4 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Wed, 24 Apr 2013 13:05:44 +1000
Subject: Update boost library for Linux 64 bit to 1.48 from Kokua.

Also added icu from there, but not sure it's needed anymore?
---
 linden/indra/newview/viewer_manifest.py | 19 +++++++++++++++++++
 linden/install.xml                      | 25 +++++++++++++++++++++++--
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index bcdf4a9..6380b39 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -1121,6 +1121,25 @@ class Linux_x86_64Manifest(LinuxManifest):
             #self.path("libgsttag-0.10.so.0")
             #self.path("libgstvideo-0.10.so.0")
 
+            # Wish I could kill it with fire.  lol
+            self.path("libboost_date_time-mt.so")
+            self.path("libboost_date_time-mt.so.1.48.0")
+            self.path("libboost_filesystem-mt.so")
+            self.path("libboost_filesystem-mt.so.1.48.0")
+            self.path("libboost_iostreams-mt.so")
+            self.path("libboost_iostreams-mt.so.1.48.0")
+            self.path("libboost_program_options-mt.so")
+            self.path("libboost_program_options-mt.so.1.48.0")
+            self.path("libboost_regex-mt.so")
+            self.path("libboost_regex-mt.so.1.48.0")
+            self.path("libboost_signals-mt.so")
+            self.path("libboost_signals-mt.so.1.48.0")
+            self.path("libboost_system-mt.so")
+            self.path("libboost_system-mt.so.1.48.0")
+            self.path("libboost_thread-mt.so")
+            self.path("libboost_thread-mt.so.1.48.0")
+            self.path("libboost_wave-mt.so")
+            self.path("libboost_wave-mt.so.1.48.0")
 
             self.end_prefix("lib64")
 
diff --git a/linden/install.xml b/linden/install.xml
index 3e5810a..c18e55a 100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -202,9 +202,9 @@
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>ebfaa439a8a78db7d99a26a73a70994a</string>
+            <string>fb26c88983b6bf9b5042d00bfdd3ade4</string>
             <key>url</key>
-            <uri>http://imprudenceviewer.org/download/libs/boost-1.39.0-linux64-20100901.tar.bz2</uri>
+            <uri>https://bitbucket.org/kokua/3p-boost/downloads/boost-1.48.0-linux64-20130103.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
@@ -701,6 +701,27 @@ cairo: Copyright © 2002 University of Southern California, Copyright © 2005 Re
 				  </map>
 			  </map>
 		  </map>
+      <key>icu</key>
+      <map>
+        <key>copyright</key>
+        <string>various</string>
+        <key>description</key>
+        <string>Unicode and globalization support for software applications.</string>
+        <key>license</key>
+        <string>icu</string>
+        <key>license</key>
+        <string>unicode-license</string>
+        <key>packages</key>
+        <map>
+          <key>linux64</key>
+          <map>
+            <key>md5sum</key>
+            <string>bc3226223f0d14881a84c2e836c4a81a</string>
+            <key>url</key>
+            <uri>https://bitbucket.org/kokua/3p-icu4c-64/downloads/icu4c-48.1-linux64-20121227.tar.bz2</uri>
+          </map>
+        </map>
+      </map>
       <key>jpeglib</key>
       <map>
         <key>copyright</key>
-- 
cgit v1.1


From 044d7575eab98ff26ed7d48a461b613db52bed04 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Fri, 26 Apr 2013 13:09:45 +1000
Subject: Make nmake builds more like VS builds.

Still some tweaking to go, therefore, still some rough bits in this.
---
 linden/indra/cmake/00-Common.cmake                 |  5 +++
 linden/indra/develop.py                            |  5 ++-
 linden/indra/llplugin/slplugin/CMakeLists.txt      |  2 +-
 linden/indra/mac_crash_logger/CMakeLists.txt       |  2 +-
 linden/indra/mac_updater/CMakeLists.txt            |  2 +-
 linden/indra/media_plugins/webkit/CMakeLists.txt   |  4 +-
 linden/indra/newview/CMakeLists.txt                | 42 +++++++++---------
 .../windows/imprudence_installer_template.iss      | 14 +++---
 linden/indra/newview/viewer_manifest.py            | 51 ++++++++++++----------
 linden/indra/test_apps/llplugintest/CMakeLists.txt |  4 +-
 linden/scripts/linux/4-package-viewer              |  2 +-
 11 files changed, 73 insertions(+), 60 deletions(-)

diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 81bfbdf..ea21ba0 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -24,6 +24,11 @@ list(REMOVE_DUPLICATES TYPES)
 set(CMAKE_CONFIGURATION_TYPES ${TYPES} CACHE STRING "Supported build types." FORCE)
 unset(TYPES)
 
+# Work around nmake / VS difference.
+set(VIEWER_CFG_INTDIR ${CMAKE_CFG_INTDIR})
+if (NMAKE)
+    set(VIEWER_CFG_INTDIR ${CMAKE_BUILD_TYPE})
+endif(NMAKE)
 
 # Determine the number of bits of this processor
 
diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index eb071bd..76ba0d9 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -580,10 +580,12 @@ class WindowsSetup(PlatformSetup):
             unattended=self.unattended,
             project_name=self.project_name,
             type=self.build_type,
-            use_vstool='ON'
+            use_vstool='ON',
+            nmake=''
             )
         if self.generator == 'nmake':
            args['use_vstool'] = 'OFF'
+           args['nmake'] = '-DNMAKE:BOOL=ON'
         if self.using_express:
            args['using_express'] = 'ON'
            args['use_vstool'] = 'OFF'
@@ -599,6 +601,7 @@ class WindowsSetup(PlatformSetup):
                 '-DROOT_PROJECT_NAME:STRING=%(project_name)s '
                 '-DUSING_EXPRESS:BOOL=%(using_express)s '
                 '-DUSE_VSTOOL:BOOL=%(use_vstool)s '
+                '%(nmake)s '
                 '%(opts)s "%(dir)s"' % args)
 
     def get_build_cmd(self):
diff --git a/linden/indra/llplugin/slplugin/CMakeLists.txt b/linden/indra/llplugin/slplugin/CMakeLists.txt
index 81d9299..f794dae 100755
--- a/linden/indra/llplugin/slplugin/CMakeLists.txt
+++ b/linden/indra/llplugin/slplugin/CMakeLists.txt
@@ -75,7 +75,7 @@ if (DARWIN)
     COMMAND mkdir
     ARGS
       -p
-      ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/SLPlugin.app/Contents/Resources
+      ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/SLPlugin.app/Contents/Resources
   )
 endif (DARWIN)
 
diff --git a/linden/indra/mac_crash_logger/CMakeLists.txt b/linden/indra/mac_crash_logger/CMakeLists.txt
index daf3e10..ee1dc93 100644
--- a/linden/indra/mac_crash_logger/CMakeLists.txt
+++ b/linden/indra/mac_crash_logger/CMakeLists.txt
@@ -71,6 +71,6 @@ add_custom_command(
     -E
     copy_directory
     ${CMAKE_CURRENT_SOURCE_DIR}/CrashReporter.nib
-    ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/mac-crash-logger.app/Contents/Resources/CrashReporter.nib
+    ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/mac-crash-logger.app/Contents/Resources/CrashReporter.nib
   )
 
diff --git a/linden/indra/mac_updater/CMakeLists.txt b/linden/indra/mac_updater/CMakeLists.txt
index 0eac76f..5ae7dd8 100644
--- a/linden/indra/mac_updater/CMakeLists.txt
+++ b/linden/indra/mac_updater/CMakeLists.txt
@@ -74,6 +74,6 @@ add_custom_command(
     -E
     copy_directory
     ${CMAKE_CURRENT_SOURCE_DIR}/AutoUpdater.nib
-    ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/mac-updater.app/Contents/Resources/AutoUpdater.nib
+    ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/mac-updater.app/Contents/Resources/AutoUpdater.nib
   )
 
diff --git a/linden/indra/media_plugins/webkit/CMakeLists.txt b/linden/indra/media_plugins/webkit/CMakeLists.txt
index 303a774..f589c61 100644
--- a/linden/indra/media_plugins/webkit/CMakeLists.txt
+++ b/linden/indra/media_plugins/webkit/CMakeLists.txt
@@ -112,8 +112,8 @@ if (DARWIN)
   # copy the webkit dylib to the build directory
   add_custom_command(
     TARGET media_plugin_webkit POST_BUILD
-#    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libllqtwebkit.dylib
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/
+#    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/libllqtwebkit.dylib
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/
     DEPENDS media_plugin_webkit ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib
     )
     
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 9172aa0..907fa5c 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -1348,7 +1348,7 @@ if (WINDOWS)
           -E
           copy_if_different
           ${CMAKE_CURRENT_SOURCE_DIR}/../../scripts/messages/message_template.msg
-          ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/app_settings/message_template.msg
+          ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/app_settings/message_template.msg
         COMMENT "Copying message_template.msg to the runtime folder."
         )
 
@@ -1359,7 +1359,7 @@ if (WINDOWS)
           -E
           copy_if_different
           ${CMAKE_CURRENT_SOURCE_DIR}/../../etc/message.xml
-          ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/app_settings/message.xml
+          ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/app_settings/message.xml
         COMMENT "Copying message.xml to the runtime folder."
         )
        
@@ -1370,11 +1370,11 @@ if (WINDOWS)
     endif (EXISTS ${CMAKE_SOURCE_DIR}/copy_win_scripts)
         
     add_custom_command(
-        OUTPUT ${CMAKE_CFG_INTDIR}/touched.bat
+        OUTPUT ${VIEWER_CFG_INTDIR}/touched.bat
         COMMAND ${PYTHON_EXECUTABLE}
         ARGS
           ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
-          --configuration=${CMAKE_CFG_INTDIR}
+          --configuration=${VIEWER_CFG_INTDIR}
           --channel=${VIEWER_CHANNEL}
           --login_channel=${VIEWER_LOGIN_CHANNEL}
           --standalone=${STANDALONE}
@@ -1383,15 +1383,15 @@ if (WINDOWS)
           --source=${CMAKE_CURRENT_SOURCE_DIR}
               --artwork=${ARTWORK_DIR}
               --build=${CMAKE_CURRENT_BINARY_DIR}
-              --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/package
-              --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/touched.bat
+              --dest=${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/package
+              --touch=${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/touched.bat
         DEPENDS ${VIEWER_BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
         )
 
     add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_quicktime media_plugin_webkit media_plugin_gstreamer010)
 
     if (PACKAGE)
-      add_custom_target(package ALL DEPENDS ${CMAKE_CFG_INTDIR}/touched.bat)
+      add_custom_target(package ALL DEPENDS ${VIEWER_CFG_INTDIR}/touched.bat)
       add_dependencies(package windows-updater windows-crash-logger)
     endif (PACKAGE)
 endif (WINDOWS)
@@ -1526,8 +1526,8 @@ if (DARWIN)
       --artwork=${ARTWORK_DIR}
       --build=${CMAKE_CURRENT_BINARY_DIR}
       --buildtype=${CMAKE_BUILD_TYPE}
-      --configuration=${CMAKE_CFG_INTDIR}
-      --dest=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${product}.app
+      --configuration=${VIEWER_CFG_INTDIR}
+      --dest=${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/${product}.app
       --grid=${GRID}
       --source=${CMAKE_CURRENT_SOURCE_DIR}
       --standalone=${STANDALONE}
@@ -1558,8 +1558,8 @@ if (WINDOWS)
       -E
       copy_if_different
       ${BUILT_LLCOMMON}
-      ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
-      COMMENT "Copying llcommon.dll to the runtime folder."
+      ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}
+      COMMENT "Copying llcommon.dll to the runtime folder ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}."
       )
 
   get_target_property(BUILT_SLPLUGIN SLPlugin LOCATION)
@@ -1570,8 +1570,8 @@ if (WINDOWS)
         -E
         copy_if_different
         ${BUILT_SLPLUGIN}
-        ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}
-      COMMENT "Copying SLPlugin executable to the runtime folder."
+        ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}
+      COMMENT "Copying SLPlugin executable to the runtime folder ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}."
       )
 
   get_target_property(BUILT_WEBKIT_PLUGIN media_plugin_webkit LOCATION)
@@ -1582,8 +1582,8 @@ if (WINDOWS)
           -E
           copy_if_different
           ${BUILT_WEBKIT_PLUGIN}
-          ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin
-        COMMENT "Copying WebKit Plugin to the runtime folder."
+          ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/llplugin
+        COMMENT "Copying WebKit Plugin to the runtime folder ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/llplugin."
         )
         
    get_target_property(BUILT_GSTREAMER_PLUGIN media_plugin_gstreamer010 LOCATION)
@@ -1594,8 +1594,8 @@ if (WINDOWS)
           -E
           copy_if_different
           ${BUILT_GSTREAMER_PLUGIN}
-          ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin
-        COMMENT "Copying Gstreamer Plugin to the runtime folder."
+          ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/llplugin
+        COMMENT "Copying Gstreamer Plugin to the runtime folder ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/llplugin."
         )
         
   get_target_property(BUILT_QUICKTIME_PLUGIN media_plugin_quicktime LOCATION)
@@ -1606,13 +1606,13 @@ if (WINDOWS)
           -E
           copy_if_different
           ${BUILT_QUICKTIME_PLUGIN}
-          ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin
-        COMMENT "Copying Quicktime Plugin to the runtime folder."
+          ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/llplugin
+        COMMENT "Copying Quicktime Plugin to the runtime folder ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/llplugin."
         )
 
   # Copying the mime_types.xml file to app_settings
   set(mime_types_source "${CMAKE_SOURCE_DIR}/newview/skins/default/xui/en-us")
-  set(mime_types_dest "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/app_settings")
+  set(mime_types_dest "${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/app_settings")
   add_custom_command(
       TARGET ${VIEWER_BINARY_NAME} POST_BUILD
       COMMAND ${CMAKE_COMMAND}
@@ -1629,7 +1629,7 @@ endif (WINDOWS)
 if (DARWIN)
 # Don't do this here -- it's taken care of by viewer_manifest.py
 #  add_custom_command(TARGET ${VIEWER_BINARY_NAME} POST_BUILD
-#    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llplugin/
+#    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/llplugin/
 #    DEPENDS ${CMAKE_SOURCE_DIR}/../libraries/universal-darwin/lib_release/libllqtwebkit.dylib
 #  )
 endif (DARWIN)
diff --git a/linden/indra/newview/installers/windows/imprudence_installer_template.iss b/linden/indra/newview/installers/windows/imprudence_installer_template.iss
index 7113368..7d02b0c 100644
--- a/linden/indra/newview/installers/windows/imprudence_installer_template.iss
+++ b/linden/indra/newview/installers/windows/imprudence_installer_template.iss
@@ -27,16 +27,16 @@ AppPublisher=The Imprudence Project
 AppPublisherURL=http://kokuaviewer.org
 AppSupportURL=http://kokuaviewer.org
 AllowNoIcons=true
-InfoAfterFile=..\..\..\..\..\README.txt
+InfoAfterFile=..\..\..\..\..\..\README.txt
 OutputDir=.
-SetupIconFile=..\..\..\newview\installers\windows\imp_icon.ico
+SetupIconFile=..\..\..\..\newview\installers\windows\imp_icon.ico
 Compression=lzma2/ultra64
 InternalCompressLevel=ultra64
 SolidCompression=true
 PrivilegesRequired=poweruser
 AllowRootDirectory=true
-WizardImageFile=..\..\..\newview\installers\windows\imprudence_installer_icon_left.bmp
-WizardSmallImageFile=..\..\..\newview\installers\windows\imprudence_installer_icon_right.bmp
+WizardImageFile=..\..\..\..\newview\installers\windows\imprudence_installer_icon_left.bmp
+WizardSmallImageFile=..\..\..\..\newview\installers\windows\imprudence_installer_icon_right.bmp
 SetupLogging=true
 RestartIfNeededByRun=false
 AlwaysRestart=false
@@ -145,9 +145,9 @@ Source: %%PACKAGEFILES%%\vivoxsdk.dll; DestDir: {app}; Flags: ignoreversion
 Source: %%PACKAGEFILES%%\wrap_oal.dll; DestDir: {app}; Flags: ignoreversion
 
 ; VC++ 2005 SP1 x86, VC++ 2008 SP1 x86, and VC++ 2010 SP1 x86 redist
-Source: ..\..\..\newview\installers\windows\vcredist_x86_VS2005_SP1_MFC_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2005_SP1_MFC_SEC.exe
-;Source: ..\..\..\newview\installers\windows\vcredist_x86_VS2008_SP1_ATL_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2008_SP1_ATL_SEC.exe
-Source: ..\..\..\newview\installers\windows\vcredist_x86_VS2010_SP1.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2010_SP1.exe
+Source: ..\..\..\..\newview\installers\windows\vcredist_x86_VS2005_SP1_MFC_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2005_SP1_MFC_SEC.exe
+;Source: ..\..\..\..\newview\installers\windows\vcredist_x86_VS2008_SP1_ATL_SEC.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2008_SP1_ATL_SEC.exe
+Source: ..\..\..\..\newview\installers\windows\vcredist_x86_VS2010_SP1.exe; DestDir: {app}\redist; DestName: vcredist_x86_VS2010_SP1.exe
 
 ; Old files we don't use anymore:
 ; Source: %%PACKAGEFILES%%\dronesettings.xml; DestDir: {app}; Flags: ignoreversion
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 718c3d2..84e75b8 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -232,21 +232,15 @@ class WindowsManifest(ViewerManifest):
 
     def construct(self):
         super(WindowsManifest, self).construct()
-        # the final exe is complicated because we're not sure where it's coming from,
-        # nor do we have a fixed name for the executable
-        # Actually, we know on both counts -- MC
-        if self.configuration().lower() == "release":
-            self.path(self.find_existing_file('release/imprudence-bin.exe'), dst=self.final_exe())
-        elif self.configuration().lower() == "releasesse2":
-            self.path(self.find_existing_file('releasesse2/imprudence-bin.exe'), dst=self.final_exe())
-        elif self.configuration().lower() == "relwithdebinfo":
-            self.path(self.find_existing_file('relwithdebinfo/imprudence-bin.exe'), dst=self.final_exe())
-        elif self.configuration().lower() == "debug":
-            self.path(self.find_existing_file('debug/imprudence-bin.exe'), dst=self.final_exe())
-        else:
-            self.path(self.find_existing_file('release/imprudence-bin.exe', 'releasesse2/imprudence-bin.exe', 'relwithdebinfo/imprudence-bin.exe', 'debug/imprudence-bin.exe', 'imprudence-bin.exe'), dst=self.final_exe())
+        # Come out, come out, where ever you are.
+        executable = self.find_existing_file('release/imprudence-bin.exe', 'releasesse2/imprudence-bin.exe', 'relwithdebinfo/imprudence-bin.exe', 'debug/imprudence-bin.exe', './imprudence-bin.exe')
+        nmake = False
+        self.path(executable, dst=self.final_exe())
 
         # copy over the the pdb file for the regular or SSE2 versions if we don't already have one copied
+        # Don't think this ever worked, the destination seems bogus.
+        # It's trying to copy a built file outside of the source tree, a file we have anyway.
+        # TODO - do we even need this?
         symbol_ver = '.'.join(self.args['version'])
         symbol_file = 'imprudence-%s.%s.pdb' % (symbol_ver, self.args['configuration'])
         symbol_path = '../../../../../pdb_files/%s' % (symbol_file)
@@ -255,7 +249,7 @@ class WindowsManifest(ViewerManifest):
         else:
             #print "%s doesn't exist yet" % (os.getcwd() + symbol_path)
             try:
-                self.path(self.find_existing_file('release/imprudence-bin.pdb'), dst="../%s" % (symbol_path))
+                self.path(self.find_existing_file(executable.split('/', 1)[0] % '/imprudence-bin.pdb'), dst="../%s" % (symbol_path))
                 pass
             except:
                 print "Can't save symbol file %s, skipping" % (symbol_path)
@@ -270,7 +264,13 @@ class WindowsManifest(ViewerManifest):
         self.path("imprudence.url")
 
         # Plugin host application
-        self.path(os.path.join(os.pardir, 'llplugin', 'slplugin', self.args['configuration'], "SLPlugin.exe"), "SLPlugin.exe")
+        try:
+            self.path(os.path.join(os.pardir, 'llplugin', 'slplugin', self.args['configuration'], "SLPlugin.exe"), "SLPlugin.exe")
+        except:
+            # Probably an nmake build, which is not putting exe's into the configuration folders.
+            self.path(os.path.join(os.pardir, 'llplugin', 'slplugin', "SLPlugin.exe"), "SLPlugin.exe")
+            # Propogate our wild guess.
+            nmake = True
 
         self.path("featuretable.txt")
 
@@ -281,7 +281,7 @@ class WindowsManifest(ViewerManifest):
         #self.path("fmod.dll")
 
         # For spellchecking
-        if self.prefix(src=os.path.join(self.args['configuration'], "Release"), dst=""):
+        if self.prefix(self.args['configuration'], dst=""):
             self.path("libhunspell.dll")
             self.end_prefix()
 
@@ -289,12 +289,12 @@ class WindowsManifest(ViewerManifest):
         self.path("llkdu.dll.2.config")
 
         # Get llcommon and deps.
-        if self.prefix(src=os.path.join(self.args['configuration'], "Release"), dst=""):
+        if self.prefix(self.args['configuration'], dst=""):
             self.path('libapr-1.dll')
             self.path('libaprutil-1.dll')
             self.path('libapriconv-1.dll')
-            self.end_prefix()
             self.path('llcommon.dll')
+            self.end_prefix()
 
         # For textures
         if self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
@@ -307,21 +307,26 @@ class WindowsManifest(ViewerManifest):
             self.path("alut.dll")
             self.end_prefix()
 
+        # TODO - Yes, I know, would be better if nmake builds put stuff in the right place, track that down and fix it later.
+        if nmake:
+            config = ''
+        else:
+            config = self.args['configuration']
         # Media plugins - QuickTime
-        if self.prefix(src='../media_plugins/quicktime/%s' % self.args['configuration'], dst="llplugin"):
+        if self.prefix(src='../media_plugins/quicktime/%s' % config, dst="llplugin"):
             self.path("media_plugin_quicktime.dll")
             self.end_prefix()
 
         # Media plugins - WebKit/Qt
-        if self.prefix(src='../media_plugins/webkit/%s' % self.args['configuration'], dst="llplugin"):
+        if self.prefix(src='../media_plugins/webkit/%s' % config, dst="llplugin"):
             self.path("media_plugin_webkit.dll")
             self.end_prefix()
 
         # Media plugins - GStreamer
-        if self.prefix(src='../media_plugins/gstreamer010/%s' % self.args['configuration'], dst="llplugin"):
+        if self.prefix(src='../media_plugins/gstreamer010/%s' % config, dst="llplugin"):
             self.path("media_plugin_gstreamer010.dll")
-            self.end_prefix()            
- 
+            self.end_prefix()
+
         # For WebKit/Qt plugin runtimes
         if self.prefix(src="../../libraries/i686-win32/lib/release", dst="llplugin"):
             self.path("libeay32.dll")
diff --git a/linden/indra/test_apps/llplugintest/CMakeLists.txt b/linden/indra/test_apps/llplugintest/CMakeLists.txt
index a6cb740..91ba2db 100644
--- a/linden/indra/test_apps/llplugintest/CMakeLists.txt
+++ b/linden/indra/test_apps/llplugintest/CMakeLists.txt
@@ -311,7 +311,7 @@ endif (DARWIN OR LINUX)
 if (DARWIN)
   # path inside the app bundle where we'll need to copy plugins and other related files
   set(PLUGINS_DESTINATION_DIR
-    ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/llmediaplugintest.app/Contents/Resources
+    ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/llmediaplugintest.app/Contents/Resources
   )
   
   # create the Contents/Resources directory
@@ -326,7 +326,7 @@ if (DARWIN)
   ) 
 else (DARWIN)
   set(PLUGINS_DESTINATION_DIR
-    ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/
+    ${CMAKE_CURRENT_BINARY_DIR}/${VIEWER_CFG_INTDIR}/
   )
 endif (DARWIN)
 
diff --git a/linden/scripts/linux/4-package-viewer b/linden/scripts/linux/4-package-viewer
index 19d2456..d954f02 100755
--- a/linden/scripts/linux/4-package-viewer
+++ b/linden/scripts/linux/4-package-viewer
@@ -3,7 +3,7 @@
 if [ "$OSTYPE" == "cygwin" ] ; then
     # Assumes version has been passed in from outside, coz Windows insists on adding crap to python output.
     cd ../../indra/build-nmake/
-    iscc newview/package/${version}-Windows-x86.iss
+    iscc newview/$TYPE/package/${version}-Windows-x86.iss
 else
     cd ../../indra/viewer-linux-*
     make package
-- 
cgit v1.1


From 35078867283f1e9302e0a507629e384fd8c86be6 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Fri, 26 Apr 2013 13:10:25 +1000
Subject: Ah, iss has different UUIDs for release and experimentals.

---
 .../indra/newview/installers/windows/imprudence_installer_template.iss  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linden/indra/newview/installers/windows/imprudence_installer_template.iss b/linden/indra/newview/installers/windows/imprudence_installer_template.iss
index 7d02b0c..6ae437e 100644
--- a/linden/indra/newview/installers/windows/imprudence_installer_template.iss
+++ b/linden/indra/newview/installers/windows/imprudence_installer_template.iss
@@ -8,7 +8,7 @@
 ; Imp Experimental ID: 	1B3E68BC-13EB-4277-9439-CB5FF9259460
 
 ; These will change
-AppId={{D7736EE8-AFCE-4735-BBE3-652CDFBBFCA8}
+AppId={{1B3E68BC-13EB-4277-9439-CB5FF9259460}
 AppName=%%APPNAME%%
 AppVerName=%%APPVERNAME%%
 DefaultDirName={pf}\Imprudence
-- 
cgit v1.1


From a4dd5745326f4477b49e2331c45e549e821ffbee Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Fri, 26 Apr 2013 17:26:38 +1000
Subject: Make sure the TYPE variable is actually defined for nmake builds.

---
 linden/scripts/linux/4-package-viewer | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/linden/scripts/linux/4-package-viewer b/linden/scripts/linux/4-package-viewer
index d954f02..a1a74f2 100755
--- a/linden/scripts/linux/4-package-viewer
+++ b/linden/scripts/linux/4-package-viewer
@@ -1,9 +1,11 @@
 #!/bin/bash
 
+source config-SL-source
+
 if [ "$OSTYPE" == "cygwin" ] ; then
     # Assumes version has been passed in from outside, coz Windows insists on adding crap to python output.
     cd ../../indra/build-nmake/
-    iscc newview/$TYPE/package/${version}-Windows-x86.iss
+    iscc newview/${TYPE}/package/${version}-Windows-x86.iss
 else
     cd ../../indra/viewer-linux-*
     make package
-- 
cgit v1.1


From 3932afd085f2bc480f7ba5c664972a616d1b6939 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 27 Apr 2013 09:41:06 +1000
Subject: Fix Windows autobuild support, coz it's different from the others. 
 sigh

---
 linden/scripts/install.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/linden/scripts/install.py b/linden/scripts/install.py
index b39dd5a..1e2bccb 100755
--- a/linden/scripts/install.py
+++ b/linden/scripts/install.py
@@ -620,6 +620,9 @@ windows/i686/vs/2003 -- specify a windows visual studio 2003 package"""
         		    # Linux is special, coz it's got server code.
         		    if _get_platform() == 'linux' or _get_platform() == 'linux64':
         			path = install_dir + "/libraries/" + dest_name + "lib_" + entry + "_client"
+        		# Windows is also special.
+        		if _get_platform() == 'windows':
+        		    path = install_dir + "/libraries/" + dest_name + "lib/" + entry
         		if not os.path.exists(path):
         		    os.makedirs(path)
         		for filename in os.listdir(auto_name + "/" + entry):
-- 
cgit v1.1


From f3ae21b2222de34bc213fb5754e67860b1761b8a Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Thu, 2 May 2013 17:23:58 +1000
Subject: Add more credits, including my own.

---
 linden/indra/newview/skins/default/xui/en-us/floater_about.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
index 91a63eb..fa8251c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml
@@ -35,17 +35,17 @@
            max_length="65536" mouse_opaque="true" name="credits_editor" width="423"
            word_wrap="true">
         The Imprudence Viewer was rocked hard by:
-        Jacek Antonelli, McCabe Maxsted, Armin Weatherwax, Elektra Hesse, CodeBastard Redgrave and Boroondas Gupte.
+        Armin Weatherwax, Boroondas Gupte, CodeBastard Redgrave, Elektra Hesse, Jacek Antonelli, McCabe Maxsted, and onefang rejected.
 
         http://kokuaviewer.org/
 
         Imprudence is so awesome thanks to contributions from many generous people:
 
-        For their patches and code contributions, we thank Admiral Admiral, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Angus Boyd, Ansariel Hiller, Archimedies Plutonian, Ardy Lay, Asuka Neely, Balp Allen,  Carjay McGinnis, Chalice Yao, Dale Glass, Damian Delacrois, Danny Nolan, Eryn, Felix Duesenburg, Frederick Martian, Geneko Nemeth,  Grandma Bates, Hazim Gazov, Henri Beauchamp, Hg Beeks, Hiroshi Kumaki, Kakurady Drakenar, Katharine Berry, KirstenLee Cinquetti, Kitty Barnett, Latif Khalifa,  Lance Corrimal, Lilly Zenovka, Makomk Makosen, Mana Janus, Matthew Dowd, Michelle2 Zenovka, Mimika Oh, Mm Alder, Nemurimasu Neiro, Nicholaz Beresford, Nicky Perian, Patrick Sapinski, Paul Churchill, Peter Lameth, Qarl Fizz, Revolution Smythe, Robin Cornelius, Seraph Linden, Shyotl Kuhr,  Siana Gearz, SignpostMarv Martin, Stephen Zenith, TankMaster Finesmith, Thickbrick Sleaford, Thomas Shikami, Tom Meta, Tonya Souther, tx Oh, Vaalith Jinn, Vadim Bigbear, Vex Streeter, WhiteStar Magic, Zi Ree, and Zwagoth Klaar.
+        For their patches and code contributions, we thank Admiral Admiral, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Angus Boyd, Ansariel Hiller, Archimedies Plutonian, Ardy Lay, Asuka Neely, Balp Allen, Carjay McGinnis, Chalice Yao, Dale Glass, Damian Delacrois, Danny Nolan, Eryn, Felix Duesenburg, Frederick Martian, Geneko Nemeth, Grandma Bates, Hazim Gazov, Henri Beauchamp, Hg Beeks, Hiroshi Kumaki, Johnnie Carling, Lord Drakeo, Kakurady Drakenar, Katharine Berry, Kentron Katana, KirstenLee Cinquetti, Kitty Barnett, Latif Khalifa, Lance Corrimal, Lilly Zenovka, Makomk Makosen, Mana Janus, Matthew Dowd, Michelle2 Zenovka, Mimika Oh, Mm Alder, Nemurimasu Neiro, Nicholaz Beresford, Nicky Perian, Patrick Sapinski, Paul Churchill, Peter Lameth, Qarl Fizz, Revolution Smythe, Robin Cornelius, Seraph Linden, Shyotl Kuhr, Siana Gearz, SignpostMarv Martin, Stephen Zenith, TankMaster Finesmith, Thickbrick Sleaford, Thomas Shikami, Tom Meta, Tonya Souther, tx Oh, Vaalith Jinn, Vadim Bigbear, Vex Streeter, WhiteStar Magic, Zi Ree, and Zwagoth Klaar.
 
         For their WindLight presets, we thank Ana Lutetia, CodeBastard Redgrave, and Torley Linden.
 
-        Thanks also to the developer(s) of the  Ascent Viewer, Astra Viewer, Cool VL Viewer, Dolphin Viewer, Emerald Viewer, FrozenGlobe Viewer, Hippo Viewer, Meerkat Viewer, Meta7 Viewer, Phoenix Viewer, Singularity Viewer and Snowglobe Viewer  for viewer enhancements we have incorporated, as well as Kitty Barnett for RLVa. Special thanks to the folks at Linden Lab for releasing the viewer source, without which this endeavor would have been impossible.
+        Thanks also to the developer(s) of the Ascent Viewer, Astra Viewer, Cool VL Viewer, Dolphin Viewer, Emerald Viewer, FrozenGlobe Viewer, Hippo Viewer, Meerkat Viewer, Meta7 Viewer, Phoenix Viewer, Singularity Viewer and Snowglobe Viewer for viewer enhancements we have incorporated, as well as Kitty Barnett for RLVa. Special thanks to the folks at Linden Lab for releasing the viewer source, without which this endeavor would have been impossible.
 
         For a complete list of who did what, read the release notes!
 
-- 
cgit v1.1


From ffe6207af4fd2e731aba4248629a622514a44852 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Thu, 2 May 2013 22:49:55 +1000
Subject: Update boost on Linux to 1.52.

Mac and Windows will be done when I can test them better.
---
 linden/indra/newview/viewer_manifest.py | 40 +++++++++++++++++++++++----------
 linden/install.xml                      | 29 ++++--------------------
 2 files changed, 32 insertions(+), 37 deletions(-)

diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index ea18cd2..01e422f 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -1023,9 +1023,27 @@ class Linux_i686Manifest(LinuxManifest):
                 #self.path("libgstvolume.so")
                 #self.path("libgstvorbis.so")
                 #self.path("libgstwavparse.so")
-                
+
                 #self.end_prefix("gstreamer-plugins")
-            
+
+            # Wish I could kill it with fire.  lol
+            self.path("libboost_date_time-mt.so")
+            self.path("libboost_date_time-mt.so.1.52.0")
+            self.path("libboost_filesystem-mt.so")
+            self.path("libboost_filesystem-mt.so.1.52.0")
+            self.path("libboost_iostreams-mt.so")
+            self.path("libboost_iostreams-mt.so.1.52.0")
+            self.path("libboost_program_options-mt.so")
+            self.path("libboost_program_options-mt.so.1.52.0")
+            self.path("libboost_regex-mt.so")
+            self.path("libboost_regex-mt.so.1.52.0")
+            self.path("libboost_signals-mt.so")
+            self.path("libboost_signals-mt.so.1.52.0")
+            self.path("libboost_system-mt.so")
+            self.path("libboost_system-mt.so.1.52.0")
+            self.path("libboost_thread-mt.so")
+            self.path("libboost_thread-mt.so.1.52.0")
+
             self.end_prefix("lib")
 
             # Vivox runtimes and libs
@@ -1128,23 +1146,21 @@ class Linux_x86_64Manifest(LinuxManifest):
 
             # Wish I could kill it with fire.  lol
             self.path("libboost_date_time-mt.so")
-            self.path("libboost_date_time-mt.so.1.48.0")
+            self.path("libboost_date_time-mt.so.1.52.0")
             self.path("libboost_filesystem-mt.so")
-            self.path("libboost_filesystem-mt.so.1.48.0")
+            self.path("libboost_filesystem-mt.so.1.52.0")
             self.path("libboost_iostreams-mt.so")
-            self.path("libboost_iostreams-mt.so.1.48.0")
+            self.path("libboost_iostreams-mt.so.1.52.0")
             self.path("libboost_program_options-mt.so")
-            self.path("libboost_program_options-mt.so.1.48.0")
+            self.path("libboost_program_options-mt.so.1.52.0")
             self.path("libboost_regex-mt.so")
-            self.path("libboost_regex-mt.so.1.48.0")
+            self.path("libboost_regex-mt.so.1.52.0")
             self.path("libboost_signals-mt.so")
-            self.path("libboost_signals-mt.so.1.48.0")
+            self.path("libboost_signals-mt.so.1.52.0")
             self.path("libboost_system-mt.so")
-            self.path("libboost_system-mt.so.1.48.0")
+            self.path("libboost_system-mt.so.1.52.0")
             self.path("libboost_thread-mt.so")
-            self.path("libboost_thread-mt.so.1.48.0")
-            self.path("libboost_wave-mt.so")
-            self.path("libboost_wave-mt.so.1.48.0")
+            self.path("libboost_thread-mt.so.1.52.0")
 
             self.end_prefix("lib64")
 
diff --git a/linden/install.xml b/linden/install.xml
index c18e55a..dff0768 100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -195,16 +195,16 @@
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>4db3d74e40d149eeec06f4d97a609bb1</string>
+            <string>146ed8a8c2ef8ab3f0a6c4f214fc5c22</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-linux-20100624.tar.bz2</uri>
+            <uri>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-boost/rev/268347/arch/Linux/installer/boost-1.52.0-linux-20121218.tar.bz2</uri>
           </map>
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>fb26c88983b6bf9b5042d00bfdd3ade4</string>
+            <string>b9dbe1ab34187a9a6f53fd89f88060d2</string>
             <key>url</key>
-            <uri>https://bitbucket.org/kokua/3p-boost/downloads/boost-1.48.0-linux64-20130103.tar.bz2</uri>
+            <uri>https://bitbucket.org/kokua/3p-boost-64/downloads/boost-1.52.0-linux64-20130107.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>
@@ -701,27 +701,6 @@ cairo: Copyright © 2002 University of Southern California, Copyright © 2005 Re
 				  </map>
 			  </map>
 		  </map>
-      <key>icu</key>
-      <map>
-        <key>copyright</key>
-        <string>various</string>
-        <key>description</key>
-        <string>Unicode and globalization support for software applications.</string>
-        <key>license</key>
-        <string>icu</string>
-        <key>license</key>
-        <string>unicode-license</string>
-        <key>packages</key>
-        <map>
-          <key>linux64</key>
-          <map>
-            <key>md5sum</key>
-            <string>bc3226223f0d14881a84c2e836c4a81a</string>
-            <key>url</key>
-            <uri>https://bitbucket.org/kokua/3p-icu4c-64/downloads/icu4c-48.1-linux64-20121227.tar.bz2</uri>
-          </map>
-        </map>
-      </map>
       <key>jpeglib</key>
       <map>
         <key>copyright</key>
-- 
cgit v1.1


From 3803ad92d5362f7363af584361549c99a694195c Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 4 May 2013 02:43:35 +1000
Subject: Retroactively update the release notes for 1.4.0 beta 1 and 2, mostly
 by copying the blog announcements from Jacek and Codie.

---
 RELEASE_NOTES.txt | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)

diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt
index b2532be..55e04c3 100644
--- a/RELEASE_NOTES.txt
+++ b/RELEASE_NOTES.txt
@@ -4,6 +4,97 @@
 
 
   =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+  =-                         1.4.0 beta 2                   -=
+  =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+
+    CHANGES
+
+      This version of Imprudence mostly contains bug fixes, as
+      Imprudence went into a feature freeze in anticipation of an RC
+      release to come later.
+
+
+      IMPROVEMENTS
+
+        * Selective cache clearing: now you can selectively delete
+          different types of disk cache separately.
+
+      BUG FIXES
+
+        Many bug fixes that are listed here -
+
+        http://wiki.kokuaviewer.org/wiki/Imprudence:Release_Notes/1.4.0_Beta_2
+
+
+
+  =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+  =-                         1.4.0 beta 1                   -=
+  =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+    There was very many changes in 1.4.0 beta 1 compared to Imprudence
+    1.3.2, this file only summarizes some of them.  A more complete list
+    is here -
+
+    http://wiki.kokuaviewer.org/wiki/Imprudence:Release_Notes/1.4.0_Beta_1
+
+
+    RELEASE HIGHLIGHTS
+
+      Compared to Imprudence 1.3, Imprudence 1.4 adds a mind-blowing
+      number of new features, UI improvements, and bug fixes. We
+      recommend Imprudence 1.3 users also upgrade to Imprudence 1.4
+      soon, unless you require streaming audio support on Mac.
+
+      Here is a brief overview of some of the most notable new features,
+      grouped by category:
+
+      * General: Support for WindLight notecards; Updated Chinese,
+        French, German, and Japanese UIs; Derender object/avatar; Gestures
+        can use more keys; Reload $ Balance; Animation Overrider starts
+        working sooner.
+
+      * Communication: Spell Checking; AutoCorrect; Chat Translation;
+        Chatbar Commands; Display Names support; Highlight chat from
+        friends; Highlight chat mentioning your name or nickname(s);
+        Search bar in Friends and Groups lists.
+
+      * Content Creation: Support for Alpha and Tattoo layers; new Prim
+        Alignment tool; Local Textures (real-time preview of textures on
+        your computer without uploading); Object texture export from SL
+        (with TPVP-compliant permission checks); Upload support for
+        Photoshop PSD image files (available on Mac only); Copy/Paste
+        buttons in Build tools.
+
+      * Login, Grids, and OpenSim: Login name and password saved
+        per-grid; Support for variable sized regions (i.e. bigger than
+        256m) when available; Support for the OpenRegionInfo capability.
+
+      * Map, Radar, and Teleport: Full Radar; Teleport History; Estate
+        Managers’ minimap radar distance is no longer limited; Right
+        clicking objects in Area Object Search to teleport to/cam to/edit
+        them.
+
+      * Media, Browser, and Networking: Media system revamped with
+        SLPlugin; Media Filters; Interaction and zoom with streaming
+        media/webpages; Improved XMLPRC and SOCKS5 proxy support; Parcel
+        media URLs are no longer hidden.
+
+      * Preferences: Reorganized Preferences window; New UI skins (Dark
+        and Gemini); Sliders for draw distance, etc. allow typing in exact
+        values; Search bar in Debug Settings.
+
+      * Texture Loading: Many, many texture loading improvements from
+        Robin Cornelius, Thickbrick Sleaford, and others; Various
+        improvements to help prevent unloaded (cloud) avatars.
+
+      * Development: Many, many, many code improvements and cleanup
+        under the hood. Special thanks to Aleric Inglewood and others for
+        their work on this.
+
+
+
+  =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
   =-                         1.3.2                          -=
   =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
-- 
cgit v1.1


From e0be0f4d1a35d4f3fce701b9895fefbbe5ca459f Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 11 May 2013 21:06:10 +1000
Subject: Fix http://redmine.kokuaviewer.org/issues/944 - Shadow Frustra
 missing from Advanced Menu > Rendering > Info Display

---
 linden/indra/newview/llviewermenu.cpp                        | 5 ++++-
 linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 7fd58db..1ee00d0 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -1258,7 +1258,6 @@ void init_debug_rendering_menu(LLMenuGL* menu)
 	sub_menu->append(new LLMenuItemCheckGL("Octree",	&LLPipeline::toggleRenderDebug, NULL,
 													&LLPipeline::toggleRenderDebugControl,
 													(void*)LLPipeline::RENDER_DEBUG_OCTREE));
-	// For Imprudence 1.3 - need to XUIfy
 	sub_menu->append(new LLMenuItemCheckGL("Shadow Frusta",	&LLPipeline::toggleRenderDebug, NULL,
 													&LLPipeline::toggleRenderDebugControl,
 													(void*)LLPipeline::RENDER_DEBUG_SHADOW_FRUSTA));
@@ -9263,6 +9262,10 @@ U32 info_display_from_string(std::string info_display)
 	{
 		return LLPipeline::RENDER_DEBUG_SCULPTED;
 	}
+	else if ("shadow frusta" == info_display)
+	{
+		return LLPipeline::RENDER_DEBUG_SHADOW_FRUSTA;
+	}
 	else
 	{
 		return 0;
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index c66bce0..284f1d3 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -1327,6 +1327,12 @@
           <on_check function="Advanced.CheckInfoDisplay"
                     userdata="sculpt" />
         </menu_item_check>
+        <menu_item_check name="ShadowFrusta" label="Shadow Frusta">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="shadow frusta" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="shadow frusta" />
+        </menu_item_check>
         <menu_item_check name="Vectorize Perf Test"
                          label="Vectorize Perf Test">
           <on_click function="ToggleControl"
-- 
cgit v1.1


From 47910c5c5a64bff26e87161994be8e5d70c96eaf Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 11 May 2013 22:50:45 +1000
Subject: Add descriptive text for the face select tool.

It was missing any, and ended up with text from the last tool selected.
---
 linden/indra/newview/llfloatertools.cpp                        | 1 +
 linden/indra/newview/lltoolface.cpp                            | 1 +
 linden/indra/newview/skins/default/xui/en-us/floater_tools.xml | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index e22de66..2bf4b31 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -393,6 +393,7 @@ BOOL	LLFloaterTools::postBuild()
 	mStatusText["rotate"] = getString("status_rotate");
 	mStatusText["scale"] = getString("status_scale");
 	mStatusText["move"] = getString("status_move");
+	mStatusText["selectface"] = getString("status_selectface");
 	mStatusText["align"] = getString("status_align");
 	mStatusText["modifyland"] = getString("status_modifyland");
 	mStatusText["camera"] = getString("status_camera");
diff --git a/linden/indra/newview/lltoolface.cpp b/linden/indra/newview/lltoolface.cpp
index 735ecd9..51a4561 100644
--- a/linden/indra/newview/lltoolface.cpp
+++ b/linden/indra/newview/lltoolface.cpp
@@ -156,6 +156,7 @@ void LLToolFace::pickCallback(const LLPickInfo& pick_info)
 
 void LLToolFace::handleSelect()
 {
+	gFloaterTools->setStatusText("selectface");
 	// From now on, draw faces
 	LLSelectMgr::getInstance()->setTEMode(TRUE);
 }
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index 3f476cf..db7e75e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -1366,6 +1366,9 @@
   <string name="status_align">
     CTRL-A to align on an axis, CTRL-Shift-A to Pack 
   </string>
+	<string name="status_selectface">
+		Click to selet a Face for texturing
+	</string>
 	<string name="status_modifyland">
 		Click and Hold to Modify Land
 	</string>
-- 
cgit v1.1


From b73070b7d57835ef76a95e6b630262056af37e12 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 11 May 2013 22:50:54 +1000
Subject: White space fixups.

---
 linden/indra/newview/skins/default/xui/en-us/floater_tools.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index db7e75e..3b78eab 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -1363,12 +1363,12 @@
 	<string name="status_move">
 		Drag to Move, Shift-Drag to Copy
 	</string>
-  <string name="status_align">
-    CTRL-A to align on an axis, CTRL-Shift-A to Pack 
-  </string>
 	<string name="status_selectface">
 		Click to selet a Face for texturing
 	</string>
+	<string name="status_align">
+		CTRL-A to align on an axis, CTRL-Shift-A to Pack 
+	</string>
 	<string name="status_modifyland">
 		Click and Hold to Modify Land
 	</string>
-- 
cgit v1.1


From e403206882a1f890f1c0ed273f36b23bc265168d Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sun, 12 May 2013 00:53:03 +1000
Subject: White space fixes.

---
 .../newview/skins/default/xui/en-us/menu_inventory.xml     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
index 0cbd7c6..51e966c 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
@@ -167,16 +167,16 @@
 	</menu_item_call>
 	<menu_item_separator name="Copy Separator" />
 <!-- See IMP-961 http://redmine.kokuaviewer.org/issues/961
-  <menu_item_call bottom_delta="-18" height="18" label="Cut" left="0" mouse_opaque="true"
+	<menu_item_call bottom_delta="-18" height="18" label="Cut" left="0" mouse_opaque="true"
 	     name="Cut" width="128">
-    <on_click filter="" function="Inventory.DoToSelected" userdata="cut" />
-  </menu_item_call>
 -->
-  <menu_item_call bottom_delta="-18" height="18" label="Copy" left="0" mouse_opaque="true"
+	    <on_click filter="" function="Inventory.DoToSelected" userdata="cut" />
+	</menu_item_call>
+	<menu_item_call bottom_delta="-18" height="18" label="Copy" left="0" mouse_opaque="true"
 	     name="Copy" width="128">
-    <on_click filter="" function="Inventory.DoToSelected" userdata="copy" />
-  </menu_item_call>
-  <menu_item_call bottom_delta="-18" height="18" label="Paste" left="0" mouse_opaque="true"
+	    <on_click filter="" function="Inventory.DoToSelected" userdata="copy" />
+	</menu_item_call>
+	<menu_item_call bottom_delta="-18" height="18" label="Paste" left="0" mouse_opaque="true"
 	     name="Paste" width="128">
 		<on_click filter="" function="Inventory.DoToSelected" userdata="paste" />
 	</menu_item_call>
-- 
cgit v1.1


From 5ec39de2d9733b92d5ba79349e407702c5786dfd Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sun, 12 May 2013 01:40:08 +1000
Subject: Fix Inventory "Cut" and "Paste" deletes inventory item instead of
 moving it, http://redmine.kokuaviewer.org/issues/961

Instead of copying something, then trying to delete the original,
which was happening before the copy hit the sim server,
just move it to a different folder like drag and drop does.
---
 linden/indra/newview/llinventorybridge.cpp         | 23 +++++-----------------
 .../skins/default/xui/en-us/menu_inventory.xml     |  2 --
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index df32eab..c67c3c2 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -1921,24 +1921,11 @@ void LLFolderBridge::pasteFromClipboard()
 			item = model->getItem(objects.get(i));
 			if (item)
 			{
-				copy_inventory_item(
-					gAgent.getID(),
-					item->getPermissions().getOwner(),
-					item->getUUID(),
-					parent_id,
-					std::string(),
-					LLPointer<LLInventoryCallback>(NULL));
-				LLInventoryCategory* cat = model->getCategory(item->getUUID());
-				if(cat)
-				{
-					model->purgeDescendentsOf(mUUID);
-				}
-				LLInventoryObject* obj = model->getObject(item->getUUID());
-				if(!obj) return;
-				obj->removeFromServer();
-				LLPreview::hide(item->getUUID());
-				model->deleteObject(item->getUUID());
-				model->notifyObservers();
+				LLInvFVBridge::changeItemParent(
+					model,
+					(LLViewerInventoryItem*)item,
+					mUUID,
+					FALSE);
 			}
 		}
 	}
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
index 51e966c..8295d3a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_inventory.xml
@@ -166,10 +166,8 @@
 		<on_click filter="" function="Inventory.DoToSelected" userdata="copy_uuid" />
 	</menu_item_call>
 	<menu_item_separator name="Copy Separator" />
-<!-- See IMP-961 http://redmine.kokuaviewer.org/issues/961
 	<menu_item_call bottom_delta="-18" height="18" label="Cut" left="0" mouse_opaque="true"
 	     name="Cut" width="128">
--->
 	    <on_click filter="" function="Inventory.DoToSelected" userdata="cut" />
 	</menu_item_call>
 	<menu_item_call bottom_delta="-18" height="18" label="Copy" left="0" mouse_opaque="true"
-- 
cgit v1.1


From 979e9f8ad7732e4f084f02b62d4508b2eb6f28a3 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sun, 12 May 2013 02:43:29 +1000
Subject: Fix - Did not register secondlife:// handler with KDE -
 http://redmine.kokuaviewer.org/issues/1068

---
 .../linux_tools/register_secondlifeprotocol.sh      | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/linden/indra/newview/linux_tools/register_secondlifeprotocol.sh b/linden/indra/newview/linux_tools/register_secondlifeprotocol.sh
index 338fc26..3f2378a 100755
--- a/linden/indra/newview/linux_tools/register_secondlifeprotocol.sh
+++ b/linden/indra/newview/linux_tools/register_secondlifeprotocol.sh
@@ -22,13 +22,12 @@ else
 fi
 
 # Register handler for KDE-aware apps
-if [ -z "$KDEHOME" ]; then
-    KDEHOME=~/.kde
-fi
-LLKDEPROTDIR=${KDEHOME}/share/services
-if [ -d "$LLKDEPROTDIR" ]; then
-    LLKDEPROTFILE=${LLKDEPROTDIR}/secondlife.protocol
-    cat > ${LLKDEPROTFILE} <<EOF || echo Warning: Did not register secondlife:// handler with KDE: Could not write ${LLKDEPROTFILE}
+for LLKDECONFIG in kde-config kde4-config; do
+    if [ `which $LLKDECONFIG` ]; then
+        LLKDEPROTODIR=`$LLKDECONFIG --path services | cut -d ':' -f 1`
+        if [ -d "$LLKDEPROTODIR" ]; then
+            LLKDEPROTOFILE=${LLKDEPROTODIR}/secondlife.protocol
+            cat > ${LLKDEPROTOFILE} <<EOF || echo Warning: Did not register secondlife:// handler with KDE: Could not write ${LLKDEPROTOFILE} 
 [Protocol]
 exec=${HANDLER} '%u'
 protocol=secondlife
@@ -41,6 +40,8 @@ writing=false
 makedir=false
 deleting=false
 EOF
-else
-    echo Info: Did not register secondlife:// handler with KDE: Directory $LLKDEPROTDIR does not exist. You can safely ignore this if you are not using KDE.
-fi
+        else
+            echo Warning: Did not register secondlife:// handler with KDE: Directory $LLKDEPROTODIR does not exist.
+        fi
+    fi
+done
-- 
cgit v1.1


From db5bd09b7eeb233b5e646f1764cc00e5fc16e123 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sun, 12 May 2013 23:51:40 +1000
Subject: Add 'Show hidden selection' to advanced build options -
 http://redmine.kokuaviewer.org/issues/606

Also added the other "Show x" from the Tools menu, and sorted that part of the menu into alphabetical order.
---
 linden/indra/newview/llfloaterbuildoptions.cpp     | 17 ++++++++++++
 .../default/xui/en-us/floater_build_options.xml    | 31 ++++++++++++++++++----
 .../skins/default/xui/en-us/menu_viewer.xml        | 10 +++----
 3 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/linden/indra/newview/llfloaterbuildoptions.cpp b/linden/indra/newview/llfloaterbuildoptions.cpp
index 8c6c5f3..b6c15b6 100644
--- a/linden/indra/newview/llfloaterbuildoptions.cpp
+++ b/linden/indra/newview/llfloaterbuildoptions.cpp
@@ -115,6 +115,9 @@ BOOL LLFloaterBuildOptions::postBuild()
 	getChild<LLTextureCtrl>("texture control")->setImageAssetID(LLUUID(gSavedPerAccountSettings.getString("BuildPrefs_Texture")));
 
 	childSetValue("BuildPrefsRenderHighlight_toggle", gSavedSettings.getBOOL("RenderHighlightSelections") );
+	childSetValue("BuildPrefsRenderHidden_toggle", gSavedSettings.getBOOL("RenderHiddenSelections") );
+	childSetValue("BuildPrefsRenderLightRadius_toggle", gSavedSettings.getBOOL("RenderLightRadius") );
+	childSetValue("BuildPrefsShowSelectionBeam_toggle", gSavedSettings.getBOOL("ShowSelectionBeam") );
 	childSetValue("grouplandrez", gSavedSettings.getBOOL("RezWithLandGroup") );
 	childSetValue("GridSubUnit", gSavedSettings.getBOOL("GridSubUnit") );
 	childSetValue("GridCrossSection", gSavedSettings.getBOOL("GridCrossSections") );
@@ -293,6 +296,17 @@ void LLFloaterBuildOptions::apply()
 		LLSelectMgr::sRenderSelectionHighlights = !LLSelectMgr::sRenderSelectionHighlights;
 		gSavedSettings.setBOOL("RenderHighlightSelections", LLSelectMgr::sRenderSelectionHighlights);
 	}
+	if (gSavedSettings.getBOOL("RenderHiddenSelections") != (BOOL)(childGetValue("BuildPrefsRenderHidden_toggle").asBoolean()))
+	{
+		LLSelectMgr::sRenderHiddenSelections = !LLSelectMgr::sRenderHiddenSelections;
+		gSavedSettings.setBOOL("RenderHiddenSelections", LLSelectMgr::sRenderHiddenSelections);
+	}
+	if (gSavedSettings.getBOOL("RenderLightRadius") != (BOOL)(childGetValue("BuildPrefsRenderLightRadius_toggle").asBoolean()))
+	{
+		LLSelectMgr::sRenderLightRadius = !LLSelectMgr::sRenderLightRadius;
+		gSavedSettings.setBOOL("RenderLightRadius", LLSelectMgr::sRenderLightRadius);
+	}
+	gSavedSettings.setBOOL("ShowSelectionBeam", childGetValue("BuildPrefsShowSelectionBeam_toggle").asBoolean() );
 
 	gSavedSettings.setBOOL("RezWithLandGroup", childGetValue("grouplandrez").asBoolean() );
 	gSavedSettings.setBOOL("GridSubUnit", childGetValue("GridSubUnit").asBoolean() );
@@ -340,6 +354,9 @@ void LLFloaterBuildOptions::reset()
 	mBuildTextureUUID = (LLUUID)gSavedPerAccountSettings.getControl("BuildPrefs_Texture")->getDefault().asString();
 
 	childSetValue("BuildPrefsRenderHighlight_toggle", gSavedSettings.getControl("RenderHighlightSelections")->getDefault() );
+	childSetValue("BuildPrefsRenderHidden_toggle", gSavedSettings.getControl("RenderHiddenSelections")->getDefault() );
+	childSetValue("BuildPrefsRenderLightRadius_toggle", gSavedSettings.getControl("RenderLightRadius")->getDefault() );
+	childSetValue("BuildPrefsShowSelectionBeam_toggle", gSavedSettings.getControl("ShowSelectionBeam")->getDefault() );
 	childSetValue("grouplandrez", gSavedSettings.getControl("RezWithLandGroup")->getDefault() );
 	childSetValue("GridSubUnit", gSavedSettings.getControl("GridSubUnit")->getDefault() );
 	childSetValue("GridCrossSection", gSavedSettings.getControl("GridCrossSections")->getDefault() );
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml b/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml
index 53dd217..5f9e745 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml
@@ -68,13 +68,34 @@
      label="Values are percent" left_delta="-5" mouse_opaque="true"
      tool_tip="Default settings are Percentages and every axis set at 50"
      name="PivotPercToggle" radio_style="false" width="100" />
-  
-  <check_box bottom_delta="60" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-					 initial_value="true" label="Show selection outlines" left_delta="143"
-					 mouse_opaque="true" name="BuildPrefsRenderHighlight_toggle" 
+
+  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
+					 bottom_delta="-50" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
+					 h_pad="0" halign="left" height="10" left="220" mouse_opaque="false"
+					 name="text_box8" v_pad="0" width="150">Show during build:</text>
+  <view_border bevel_style="none" border_thickness="1" bottom_delta="-98" follows="top|left" height="90"
+     left="198" name="ShowBorder" width="135" />
+
+
+  <check_box bottom_delta="70" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+					 initial_value="true" label="Hidden selection" left_delta="0"
+					 mouse_opaque="true" name="BuildPrefsRenderHidden_toggle" 
 					 radio_style="false" width="270"/>
   <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-     label="Limit Select Distance" left_delta="0" mouse_opaque="true"
+					 initial_value="true" label="Light radius" left_delta="0"
+					 mouse_opaque="true" name="BuildPrefsRenderLightRadius_toggle" 
+					 radio_style="false" width="270"/>
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+					 initial_value="true" label="Selection beam" left_delta="0"
+					 mouse_opaque="true" name="BuildPrefsShowSelectionBeam_toggle" 
+					 radio_style="false" width="270"/>
+  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+					 initial_value="true" label="Selection outlines" left_delta="0"
+					 mouse_opaque="true" name="BuildPrefsRenderHighlight_toggle" 
+					 radio_style="false" width="270"/>
+
+  <check_box bottom_delta="198" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
+     label="Limit Select Distance" left_delta="148" mouse_opaque="true"
      tooltip=""
      name="limit_select_dist_check" radio_style="false" width="270" />
   <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 284f1d3..0dcc2d0 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -681,17 +681,17 @@
                   userdata="" />
         <on_check control="RenderLightRadius" />
       </menu_item_check>
-      <menu_item_check label="Show Selection Outlines"
-                       name="Show Selection Outlines">
-        <on_click function="Tools.ShowSelectionHighlights" userdata="" />
-        <on_check control="RenderHighlightSelections" />
-      </menu_item_check>
       <menu_item_check name="Show Selection Beam"
                        label="Show Selection Beam">
         <on_click function="ToggleControl"
                   userdata="ShowSelectionBeam" />
         <on_check control="ShowSelectionBeam" />
       </menu_item_check>
+      <menu_item_check label="Show Selection Outlines"
+                       name="Show Selection Outlines">
+        <on_click function="Tools.ShowSelectionHighlights" userdata="" />
+        <on_check control="RenderHighlightSelections" />
+      </menu_item_check>
     </menu>
     <menu_item_separator />
     <menu_item_check name="Snap to Grid" enabled="false"
-- 
cgit v1.1


From 0b36b5d241ca423e33486c9560359d7ceb952fb2 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Mon, 13 May 2013 20:00:40 +1000
Subject: Add new communication channel urls to the viewer's Help menu -
 http://redmine.kokuaviewer.org/issues/867

Also removed forums and blog links, since they are part of the comms channels page,
but added bug reporting link.
---
 .../newview/skins/default/xui/en-us/menu_login.xml     | 12 ++++++------
 .../newview/skins/default/xui/en-us/menu_viewer.xml    | 12 ++++++------
 .../newview/skins/default/xui/en-us/notifications.xml  | 12 ++++++------
 .../newview/skins/default/xui/zh/notifications.xml     | 18 ------------------
 4 files changed, 18 insertions(+), 36 deletions(-)

diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
index 4582f4e..aaae5b7 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_login.xml
@@ -23,15 +23,15 @@
 			<on_click function="ShowFloater" userdata="help f1" />
 		</menu_item_call>
     <menu_item_separator />
-    <menu_item_call name="Imprudence Blog"
-                    label="Imprudence Blog">
+    <menu_item_call name="Imprudence communication channels"
+                    label="Imprudence communication channels">
       <on_click function="PromptShowURL"
-                userdata="WebLaunchImprudenceBlog,http://imprudenceviewer.org/" />
+                userdata="WebLaunchImprudenceComms,http://wiki.kokuaviewer.org/wiki/Communication_Channels" />
     </menu_item_call>
-    <menu_item_call name="Imprudence Forums"
-                    label="Imprudence Forums">
+    <menu_item_call name="Imprudence bug reporting"
+                    label="Imprudence bug reporting">
       <on_click function="PromptShowURL"
-                userdata="WebLaunchImprudenceForums,http://imprudenceviewer.org/forums/" />
+                userdata="WebLaunchImprudenceBugs,http://wiki.kokuaviewer.org/wiki/Reporting_a_bug" />
     </menu_item_call>
     <menu_item_separator />
 		<menu_item_call label="About Imprudence" name="About Imprudence">
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 0dcc2d0..bace111 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -848,15 +848,15 @@
       <on_click function="ShowFloater" userdata="help tutorial" />
     </menu_item_call>
     <menu_item_separator />
-    <menu_item_call name="Imprudence Blog"
-                    label="Imprudence Blog">
+    <menu_item_call name="Imprudence communication channels"
+                    label="Imprudence communication channels">
       <on_click function="PromptShowURL"
-                userdata="WebLaunchImprudenceBlog,http://blog.kokuaviewer.org/" />
+                userdata="WebLaunchImprudenceComms,http://wiki.kokuaviewer.org/wiki/Communication_Channels" />
     </menu_item_call>
-    <menu_item_call name="Imprudence Forums"
-                    label="Imprudence Forums">
+    <menu_item_call name="Imprudence bug reporting"
+                    label="Imprudence bug reporting">
       <on_click function="PromptShowURL"
-                userdata="WebLaunchImprudenceForums,http://forums.kokuaviewer.org/" />
+                userdata="WebLaunchImprudenceBugs,http://wiki.kokuaviewer.org/wiki/Reporting_a_bug" />
     </menu_item_call>
     <menu_item_separator />
     <menu_item_call name="Scripting Portal"
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index 033b01b..ae50e49 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -7245,11 +7245,11 @@ Show Look At is a debug setting that displays where an avatar's head is looking.
   
 <notification
  icon="alert.tga"
- name="WebLaunchImprudenceBlog"
+ name="WebLaunchImprudenceComms"
  type="alert">
-Go to the Official Imprudence Blog, for the Latest News and Information.
+Go to the Official Imprudence communications channels, to discuss the Imprudence Project.
   <usetemplate
-   ignoretext="When launching web browser to view the blog"
+   ignoretext="When launching web browser to view the communications channels"
    name="okcancelignore"
    notext="Cancel"
    yestext="Go to page"/>
@@ -7257,11 +7257,11 @@ Go to the Official Imprudence Blog, for the Latest News and Information.
 
 <notification
  icon="alert.tga"
- name="WebLaunchImprudenceForums"
+ name="WebLaunchImprudenceBugs"
  type="alert">
-Go to the Official Imprudence Forums to discuss the Imprudence Project.
+Go to the Official Imprudence bug and feature trackers, to report bugs and request new features.
   <usetemplate
-   ignoretext="When launching web browser to view the forums"
+   ignoretext="When launching web browser to view the bug and feature trackers"
    name="okcancelignore"
    notext="Cancel"
    yestext="Go to page"/>
diff --git a/linden/indra/newview/skins/default/xui/zh/notifications.xml b/linden/indra/newview/skins/default/xui/zh/notifications.xml
index 1234e02..1b85998 100644
--- a/linden/indra/newview/skins/default/xui/zh/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/zh/notifications.xml
@@ -3647,24 +3647,6 @@ GLOW —  发光
    name="okignore"
    yestext="OK"/>
 </notification>
-  
-<notification name="WebLaunchImprudenceBlog">
-前往 Imprudence 官方日志阅读最新的新闻和信息。
-  <usetemplate
-   ignoretext="打开网络浏览器阅读网络日志时"
-   name="okcancelignore"
-   notext="取消"
-   yestext="打开网页"/>
-</notification>
-
-<notification name="WebLaunchImprudenceForums">
-前往 Imprudence 官方论坛讨论 Imprudence 工程。
-  <usetemplate
-   ignoretext="打开网络浏览器阅读论坛时"
-   name="okcancelignore"
-   notext="取消"
-   yestext="打开网页"/>
-</notification>
 
 <notification
  icon="alert.tga"
-- 
cgit v1.1


From 66f5181a17fbe49a42bf864679f3af08a85bcb08 Mon Sep 17 00:00:00 2001
From: David Seikel
Date: Thu, 9 Jun 2011 23:40:21 +1000
Subject: Update the basic graphics detail slider.

Looks like LL has had two ways of dealing with the basic graphics detail slider in preferences, which is typical of them.
And looks like they left crap laying around from the old method.

Removed the crap.
Updated the values the slider uses to better suit modern equipment, while leaving the low end the same.
Pumped up "linden" tree rendering, it was way too low.
---
 linden/indra/newview/CMakeLists.txt                |  8 +--
 .../indra/newview/app_settings/high_graphics.xml   | 39 -----------
 linden/indra/newview/app_settings/low_graphics.xml | 39 -----------
 linden/indra/newview/app_settings/mid_graphics.xml | 39 -----------
 .../indra/newview/app_settings/ultra_graphics.xml  | 39 -----------
 linden/indra/newview/featuretable.txt              | 26 ++++----
 linden/indra/newview/featuretable_linux.txt        | 24 +++----
 linden/indra/newview/featuretable_mac.txt          | 78 +++++++++++-----------
 8 files changed, 66 insertions(+), 226 deletions(-)
 delete mode 100644 linden/indra/newview/app_settings/high_graphics.xml
 delete mode 100644 linden/indra/newview/app_settings/low_graphics.xml
 delete mode 100644 linden/indra/newview/app_settings/mid_graphics.xml
 delete mode 100644 linden/indra/newview/app_settings/ultra_graphics.xml

diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 907fa5c..540754d 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -1204,19 +1204,19 @@ set(viewer_APPSETTINGS_FILES
     app_settings/cmd_line.xml
     app_settings/default_grids.xml
     app_settings/grass.xml
-    app_settings/high_graphics.xml
+#    app_settings/high_graphics.xml
     app_settings/keys.ini
     app_settings/keywords.ini
     app_settings/logcontrol.xml
-    app_settings/low_graphics.xml
-    app_settings/mid_graphics.xml
+#    app_settings/low_graphics.xml
+#    app_settings/mid_graphics.xml
     app_settings/settings.xml
     app_settings/settings_crash_behavior.xml
     app_settings/settings_files.xml
     app_settings/settings_per_account.xml
     app_settings/std_bump.ini
     app_settings/trees.xml
-    app_settings/ultra_graphics.xml
+#    app_settings/ultra_graphics.xml
     app_settings/viewerart.xml
     ${CMAKE_SOURCE_DIR}/../etc/message.xml
     ${CMAKE_SOURCE_DIR}/../scripts/messages/message_template.msg
diff --git a/linden/indra/newview/app_settings/high_graphics.xml b/linden/indra/newview/app_settings/high_graphics.xml
deleted file mode 100644
index 6368f70..0000000
--- a/linden/indra/newview/app_settings/high_graphics.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<settings version = "101">
-	<!--NO SHADERS-->
-	<RenderAvatarCloth value="FALSE"/>
-	<!--Default for now-->
-	<RenderAvatarLODFactor value="1.0"/>
-	<!--NO SHADERS-->
-	<RenderAvatarVP value="TRUE"/>
-	<!--Short Range-->
-	<RenderFarClip value="128"/>
-	<!--Default for now-->
-	<RenderFlexTimeFactor value="1"/>
-	<!--256... but they don't use this-->
-	<RenderGlowResolutionPow value="9"/>
-	<!--Sun/Moon only-->
-	<RenderLightingDetail value="1"/>
-	<!--Low number-->
-	<RenderMaxPartCount value="4096"/>
-	<!--bump okay-->
-	<RenderObjectBump value="TRUE"/>
-	<!--NO SHADERS-->
-	<RenderReflectionDetail value="2"/>
-	<!--Simple-->
-	<RenderTerrainDetail value="1"/>
-	<!--Default for now-->
-	<RenderTerrainLODFactor value="2"/>
-	<!--Default for now-->
-	<RenderTreeLODFactor value="0.5"/>
-	<!--Try Impostors-->
-	<RenderUseImpostors value="TRUE"/>
-	<!--Default for now-->
-	<RenderVolumeLODFactor value="1.125"/>
-	<!--NO SHADERS-->
-	<RenderWaterReflections value="FALSE"/>
-	<!--NO SHADERS-->
-	<VertexShaderEnable value="TRUE"/>
-	<!--NO SHADERS-->
-	<WindLightUseAtmosShaders value="TRUE"/>
-</settings>
diff --git a/linden/indra/newview/app_settings/low_graphics.xml b/linden/indra/newview/app_settings/low_graphics.xml
deleted file mode 100644
index 3f67a70..0000000
--- a/linden/indra/newview/app_settings/low_graphics.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<settings version = "101">
-	<!--NO SHADERS-->
-	<RenderAvatarCloth value="FALSE"/>
-	<!--Default for now-->
-	<RenderAvatarLODFactor value="0.5"/>
-	<!--NO SHADERS-->
-	<RenderAvatarVP value="FALSE"/>
-	<!--Short Range-->
-	<RenderFarClip value="64"/>
-	<!--Default for now-->
-	<RenderFlexTimeFactor value="0.5"/>
-	<!--256... but they don't use this-->
-	<RenderGlowResolutionPow value="8"/>
-	<!--Sun/Moon only-->
-	<RenderLightingDetail value="0"/>
-	<!--Low number-->
-	<RenderMaxPartCount value="1024"/>
-	<!--bump okay-->
-	<RenderObjectBump value="FALSE"/>
-	<!--NO SHADERS-->
-	<RenderReflectionDetail value="0"/>
-	<!--Simple-->
-	<RenderTerrainDetail value="0"/>
-	<!--Default for now-->
-	<RenderTerrainLODFactor value="1.0"/>
-	<!--Default for now-->
-	<RenderTreeLODFactor value="0.5"/>
-	<!--Try Impostors-->
-	<RenderUseImpostors value="TRUE"/>
-	<!--Default for now-->
-	<RenderVolumeLODFactor value="1.125"/>
-	<!--NO SHADERS-->
-	<RenderWaterReflections value="FALSE"/>
-	<!--NO SHADERS-->
-	<VertexShaderEnable value="FALSE"/>
-	<!--NO SHADERS-->
-	<WindLightUseAtmosShaders value="FALSE"/>
-</settings>
diff --git a/linden/indra/newview/app_settings/mid_graphics.xml b/linden/indra/newview/app_settings/mid_graphics.xml
deleted file mode 100644
index 12da77d..0000000
--- a/linden/indra/newview/app_settings/mid_graphics.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<settings version = "101">
-	<!--NO SHADERS-->
-	<RenderAvatarCloth value="FALSE"/>
-	<!--Default for now-->
-	<RenderAvatarLODFactor value="0.5"/>
-	<!--NO SHADERS-->
-	<RenderAvatarVP value="TRUE"/>
-	<!--Short Range-->
-	<RenderFarClip value="96"/>
-	<!--Default for now-->
-	<RenderFlexTimeFactor value="1"/>
-	<!--256... but they don't use this-->
-	<RenderGlowResolutionPow value="8"/>
-	<!--Sun/Moon only-->
-	<RenderLightingDetail value="1"/>
-	<!--Low number-->
-	<RenderMaxPartCount value="2048"/>
-	<!--bump okay-->
-	<RenderObjectBump value="TRUE"/>
-	<!--NO SHADERS-->
-	<RenderReflectionDetail value="0"/>
-	<!--Simple-->
-	<RenderTerrainDetail value="1"/>
-	<!--Default for now-->
-	<RenderTerrainLODFactor value="1.0"/>
-	<!--Default for now-->
-	<RenderTreeLODFactor value="0.5"/>
-	<!--Try Impostors-->
-	<RenderUseImpostors value="TRUE"/>
-	<!--Default for now-->
-	<RenderVolumeLODFactor value="1.125"/>
-	<!--NO SHADERS-->
-	<RenderWaterReflections value="FALSE"/>
-	<!--NO SHADERS-->
-	<VertexShaderEnable value="TRUE"/>
-	<!--NO SHADERS-->
-	<WindLightUseAtmosShaders value="FALSE"/>
-</settings>
diff --git a/linden/indra/newview/app_settings/ultra_graphics.xml b/linden/indra/newview/app_settings/ultra_graphics.xml
deleted file mode 100644
index f16ec6c..0000000
--- a/linden/indra/newview/app_settings/ultra_graphics.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
-<settings version = "101">
-	<!--NO SHADERS-->
-	<RenderAvatarCloth value="TRUE"/>
-	<!--Default for now-->
-	<RenderAvatarLODFactor value="1.0"/>
-	<!--NO SHADERS-->
-	<RenderAvatarVP value="TRUE"/>
-	<!--Short Range-->
-	<RenderFarClip value="256"/>
-	<!--Default for now-->
-	<RenderFlexTimeFactor value="1"/>
-	<!--256... but they don't use this-->
-	<RenderGlowResolutionPow value="9"/>
-	<!--Sun/Moon only-->
-	<RenderLightingDetail value="1"/>
-	<!--Low number-->
-	<RenderMaxPartCount value="4096"/>
-	<!--bump okay-->
-	<RenderObjectBump value="TRUE"/>
-	<!--NO SHADERS-->
-	<RenderReflectionDetail value="3"/>
-	<!--Simple-->
-	<RenderTerrainDetail value="1"/>
-	<!--Default for now-->
-	<RenderTerrainLODFactor value="2.0"/>
-	<!--Default for now-->
-	<RenderTreeLODFactor value="1.0"/>
-	<!--Try Impostors-->
-	<RenderUseImpostors value="TRUE"/>
-	<!--Default for now-->
-	<RenderVolumeLODFactor value="2.0"/>
-	<!--NO SHADERS-->
-	<RenderWaterReflections value="TRUE"/>
-	<!--NO SHADERS-->
-	<VertexShaderEnable value="TRUE"/>
-	<!--NO SHADERS-->
-	<WindLightUseAtmosShaders value="TRUE"/>
-</settings>
diff --git a/linden/indra/newview/featuretable.txt b/linden/indra/newview/featuretable.txt
index a31cd71..6da62f0 100644
--- a/linden/indra/newview/featuretable.txt
+++ b/linden/indra/newview/featuretable.txt
@@ -28,7 +28,7 @@ RenderAvatarCloth			1	1
 RenderAvatarLODFactor		1	1.0
 RenderAvatarVP				1	1
 RenderCubeMap				1	1
-RenderFarClip				1	256
+RenderFarClip				1	1024
 RenderFlexTimeFactor		1	1.0
 RenderFogRatio				1	4.0
 RenderGamma					1	0
@@ -41,10 +41,10 @@ RenderObjectBump			1	1
 RenderReflectionDetail		1	3
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
-RenderTreeLODFactor			1	1.0
+RenderTreeLODFactor			1	12.0
 RenderUseImpostors			1	1
 RenderVBOEnable				1	1
-RenderVolumeLODFactor		1	2.0
+RenderVolumeLODFactor		1	4.0
 RenderWaterReflections		1	1
 UseStartScreen				1	1
 UseOcclusion				1	1
@@ -54,8 +54,6 @@ WLSkyDetail					1	128
 Disregard128DefaultDrawDistance	1	1
 Disregard96DefaultDrawDistance	1	1
 RenderTextureMemoryMultiple		1	1.0
-RenderShaderLightingMaxLevel	1	3
-
 
 //
 // Low Graphics Settings
@@ -74,7 +72,7 @@ RenderObjectBump			1	0
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	0
 RenderTerrainLODFactor		1	1
-RenderTreeLODFactor			1	0.5
+RenderTreeLODFactor			1	2.0
 RenderUseImpostors			1	1
 RenderVolumeLODFactor		1	1.125
 RenderWaterReflections		1	0
@@ -90,7 +88,7 @@ RenderAnisotropic			1	0
 RenderAvatarCloth			1	0
 RenderAvatarLODFactor		1	0.5
 RenderAvatarVP				1	1
-RenderFarClip				1	96
+RenderFarClip				1	128
 RenderFlexTimeFactor		1	1.0
 RenderGlowResolutionPow		1	8
 RenderLightingDetail		1	1
@@ -99,7 +97,7 @@ RenderObjectBump			1	1
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	1.0
-RenderTreeLODFactor			1	0.5
+RenderTreeLODFactor			1	4.0
 RenderUseImpostors			1	1
 RenderVolumeLODFactor		1	1.125
 RenderWaterReflections		1	0
@@ -115,7 +113,7 @@ RenderAnisotropic			1	1
 RenderAvatarCloth			1	0
 RenderAvatarLODFactor		1	1.0
 RenderAvatarVP				1	1
-RenderFarClip				1	128
+RenderFarClip				1	256
 RenderFlexTimeFactor		1	1.0
 RenderGlowResolutionPow		1	9
 RenderLightingDetail		1	1
@@ -124,9 +122,9 @@ RenderObjectBump			1	1
 RenderReflectionDetail		1	2
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
-RenderTreeLODFactor			1	0.5
+RenderTreeLODFactor			1	8.0
 RenderUseImpostors			1	1
-RenderVolumeLODFactor		1	1.125
+RenderVolumeLODFactor		1	2.0
 RenderWaterReflections		1	0
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	1
@@ -140,7 +138,7 @@ RenderAnisotropic			1	1
 RenderAvatarCloth			1	1
 RenderAvatarLODFactor		1	1.0
 RenderAvatarVP				1	1
-RenderFarClip				1	256
+RenderFarClip				1	1024
 RenderFlexTimeFactor		1	1.0
 RenderGlowResolutionPow		1	9
 RenderLightingDetail		1	1
@@ -149,9 +147,9 @@ RenderObjectBump			1	1
 RenderReflectionDetail		1	3
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
-RenderTreeLODFactor			1	1.0
+RenderTreeLODFactor			1	12.0
 RenderUseImpostors			1	1
-RenderVolumeLODFactor		1	2.0
+RenderVolumeLODFactor		1	4.0
 RenderWaterReflections		1	1
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	1
diff --git a/linden/indra/newview/featuretable_linux.txt b/linden/indra/newview/featuretable_linux.txt
index 57d712e..c5c685c 100644
--- a/linden/indra/newview/featuretable_linux.txt
+++ b/linden/indra/newview/featuretable_linux.txt
@@ -28,7 +28,7 @@ RenderAvatarCloth			1	1
 RenderAvatarLODFactor		1	1.0
 RenderAvatarVP				1	1
 RenderCubeMap				1	1
-RenderFarClip				1	256
+RenderFarClip				1	1024
 RenderFlexTimeFactor		1	1.0
 RenderFogRatio				1	4.0
 RenderGamma					1	0
@@ -41,10 +41,10 @@ RenderObjectBump			1	1
 RenderReflectionDetail		1	3
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
-RenderTreeLODFactor			1	1.0
+RenderTreeLODFactor			1	12.0
 RenderUseImpostors			1	1
 RenderVBOEnable				1	1
-RenderVolumeLODFactor		1	2.0
+RenderVolumeLODFactor		1	4.0
 RenderWaterReflections		1	1
 UseStartScreen				1	1
 UseOcclusion				1	1
@@ -72,7 +72,7 @@ RenderObjectBump			1	0
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	0
 RenderTerrainLODFactor		1	1
-RenderTreeLODFactor			1	0.5
+RenderTreeLODFactor			1	2.0
 RenderUseImpostors			1	1
 RenderVolumeLODFactor		1	1.125
 RenderWaterReflections		1	0
@@ -88,7 +88,7 @@ RenderAnisotropic			1	0
 RenderAvatarCloth			1	0
 RenderAvatarLODFactor		1	0.5
 RenderAvatarVP				1	1
-RenderFarClip				1	96
+RenderFarClip				1	128
 RenderFlexTimeFactor		1	1.0
 RenderGlowResolutionPow		1	8
 RenderLightingDetail		1	1
@@ -97,7 +97,7 @@ RenderObjectBump			1	1
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	1.0
-RenderTreeLODFactor			1	0.5
+RenderTreeLODFactor			1	4.0
 RenderUseImpostors			1	1
 RenderVolumeLODFactor		1	1.125
 RenderWaterReflections		1	0
@@ -113,7 +113,7 @@ RenderAnisotropic			1	1
 RenderAvatarCloth			1	0
 RenderAvatarLODFactor		1	1.0
 RenderAvatarVP				1	1
-RenderFarClip				1	128
+RenderFarClip				1	256
 RenderFlexTimeFactor		1	1.0
 RenderGlowResolutionPow		1	9
 RenderLightingDetail		1	1
@@ -122,9 +122,9 @@ RenderObjectBump			1	1
 RenderReflectionDetail		1	2
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
-RenderTreeLODFactor			1	0.5
+RenderTreeLODFactor			1	8.0
 RenderUseImpostors			1	1
-RenderVolumeLODFactor		1	1.125
+RenderVolumeLODFactor		1	2.0
 RenderWaterReflections		1	0
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	1
@@ -138,7 +138,7 @@ RenderAnisotropic			1	1
 RenderAvatarCloth			1	1
 RenderAvatarLODFactor		1	1.0
 RenderAvatarVP				1	1
-RenderFarClip				1	256
+RenderFarClip				1	1024
 RenderFlexTimeFactor		1	1.0
 RenderGlowResolutionPow		1	9
 RenderLightingDetail		1	1
@@ -147,9 +147,9 @@ RenderObjectBump			1	1
 RenderReflectionDetail		1	3
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
-RenderTreeLODFactor			1	1.0
+RenderTreeLODFactor			1	12.0
 RenderUseImpostors			1	1
-RenderVolumeLODFactor		1	2.0
+RenderVolumeLODFactor		1	4.0
 RenderWaterReflections		1	1
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	1
diff --git a/linden/indra/newview/featuretable_mac.txt b/linden/indra/newview/featuretable_mac.txt
index 15974c0..dec533b 100644
--- a/linden/indra/newview/featuretable_mac.txt
+++ b/linden/indra/newview/featuretable_mac.txt
@@ -23,39 +23,37 @@ version 20
 // NOTE: All settings are set to the MIN of applied values, including 'all'!
 //
 list all
-RenderAnisotropic				1	0
-RenderAvatarCloth				0	0
-RenderAvatarLODFactor			1	1.0
-RenderAvatarVP					1	0
-RenderCubeMap					1	1
-RenderFarClip					1	256
-RenderFlexTimeFactor			1	1.0
-RenderFogRatio					1	4.0
-RenderGamma						1	0
-RenderGlowResolutionPow			1	9
-RenderGround					1	1
-RenderLightingDetail			1	1
-RenderMaxPartCount				1	8192
-RenderNightBrightness			1	1.0
-RenderObjectBump				1	1
-RenderReflectionDetail			1	3
-RenderTerrainDetail				1	1
-RenderTerrainLODFactor			1	2.0
-RenderTreeLODFactor				1	1.0
-RenderUseImpostors				1	1
-RenderVBOEnable					1	1
-RenderVolumeLODFactor			1	2.0
-RenderWaterReflections			1	1
-UseOcclusion					1	1
-VertexShaderEnable				1	1
-WindLightUseAtmosShaders		1	1
-WLSkyDetail						1	128
-RenderUseCleverUI				1	1
-Disregard128DefaultDrawDistance	1	1
-Disregard96DefaultDrawDistance	1	1
-RenderTextureMemoryMultiple		1	0.5
+RenderAnisotropic			1	0
+RenderAvatarCloth			1	1
+RenderAvatarLODFactor		1	1.0
+RenderAvatarVP				1	1
+RenderCubeMap				1	1
+RenderFarClip				1	1024
+RenderFlexTimeFactor		1	1.0
+RenderFogRatio				1	4.0
+RenderGamma					1	0
+RenderGlowResolutionPow		1	9
+RenderGround				1	1
+RenderLightingDetail		1	1
+RenderMaxPartCount			1	8192
+RenderNightBrightness		1	1.0
+RenderObjectBump			1	1
+RenderReflectionDetail		1	3
+RenderTerrainDetail			1	1
+RenderTerrainLODFactor		1	2.0
+RenderTreeLODFactor			1	12.0
+RenderUseImpostors			1	1
+RenderVBOEnable				1	1
+RenderVolumeLODFactor		1	4.0
+RenderWaterReflections		1	1
+UseStartScreen				1	1
+UseOcclusion				1	1
+VertexShaderEnable			1	1
+WindLightUseAtmosShaders	1	1
+WLSkyDetail					1	128
 Disregard128DefaultDrawDistance	1	1
 Disregard96DefaultDrawDistance	1	1
+RenderTextureMemoryMultiple		1	1.0
 
 //
 // Low Graphics Settings
@@ -74,7 +72,7 @@ RenderObjectBump			1	0
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	0
 RenderTerrainLODFactor		1	1
-RenderTreeLODFactor			1	0.5
+RenderTreeLODFactor			1	2.0
 RenderUseImpostors			1	1
 RenderVolumeLODFactor		1	1.125
 RenderWaterReflections		1	0
@@ -90,7 +88,7 @@ RenderAnisotropic			1	0
 RenderAvatarCloth			1	0
 RenderAvatarLODFactor		1	0.5
 RenderAvatarVP				1	1
-RenderFarClip				1	96
+RenderFarClip				1	128
 RenderFlexTimeFactor		1	1.0
 RenderGlowResolutionPow		1	8
 RenderLightingDetail		1	1
@@ -99,7 +97,7 @@ RenderObjectBump			1	1
 RenderReflectionDetail		1	0
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	1.0
-RenderTreeLODFactor			1	0.5
+RenderTreeLODFactor			1	4.0
 RenderUseImpostors			1	1
 RenderVolumeLODFactor		1	1.125
 RenderWaterReflections		1	0
@@ -115,7 +113,7 @@ RenderAnisotropic			1	1
 RenderAvatarCloth			1	0
 RenderAvatarLODFactor		1	1.0
 RenderAvatarVP				1	1
-RenderFarClip				1	128
+RenderFarClip				1	256
 RenderFlexTimeFactor		1	1.0
 RenderGlowResolutionPow		1	9
 RenderLightingDetail		1	1
@@ -124,9 +122,9 @@ RenderObjectBump			1	1
 RenderReflectionDetail		1	2
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
-RenderTreeLODFactor			1	0.5
+RenderTreeLODFactor			1	8.0
 RenderUseImpostors			1	1
-RenderVolumeLODFactor		1	1.125
+RenderVolumeLODFactor		1	2.0
 RenderWaterReflections		1	0
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	1
@@ -140,7 +138,7 @@ RenderAnisotropic			1	1
 RenderAvatarCloth			1	1
 RenderAvatarLODFactor		1	1.0
 RenderAvatarVP				1	1
-RenderFarClip				1	256
+RenderFarClip				1	1024
 RenderFlexTimeFactor		1	1.0
 RenderGlowResolutionPow		1	9
 RenderLightingDetail		1	1
@@ -149,9 +147,9 @@ RenderObjectBump			1	1
 RenderReflectionDetail		1	3
 RenderTerrainDetail			1	1
 RenderTerrainLODFactor		1	2.0
-RenderTreeLODFactor			1	1.0
+RenderTreeLODFactor			1	12.0
 RenderUseImpostors			1	1
-RenderVolumeLODFactor		1	2.0
+RenderVolumeLODFactor		1	4.0
 RenderWaterReflections		1	1
 VertexShaderEnable			1	1
 WindLightUseAtmosShaders	1	1
-- 
cgit v1.1


From 4a5f8a819844186569f9cab92e03e39fa5c81186 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Wed, 29 Jun 2011 10:30:38 +1000
Subject: Clean out no longer needed commented code.

---
 linden/indra/newview/CMakeLists.txt | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 540754d..a875564 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -1204,19 +1204,15 @@ set(viewer_APPSETTINGS_FILES
     app_settings/cmd_line.xml
     app_settings/default_grids.xml
     app_settings/grass.xml
-#    app_settings/high_graphics.xml
     app_settings/keys.ini
     app_settings/keywords.ini
     app_settings/logcontrol.xml
-#    app_settings/low_graphics.xml
-#    app_settings/mid_graphics.xml
     app_settings/settings.xml
     app_settings/settings_crash_behavior.xml
     app_settings/settings_files.xml
     app_settings/settings_per_account.xml
     app_settings/std_bump.ini
     app_settings/trees.xml
-#    app_settings/ultra_graphics.xml
     app_settings/viewerart.xml
     ${CMAKE_SOURCE_DIR}/../etc/message.xml
     ${CMAKE_SOURCE_DIR}/../scripts/messages/message_template.msg
-- 
cgit v1.1


From dbc65cef0cf5be5963b95e245476f22aff840f21 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Tue, 14 May 2013 01:18:28 +1000
Subject: Allow visual studio express builds from develop.py command line -
 http://redmine.kokuaviewer.org/issues/711

A few additions to the previous nmake work, from Robin Cornelius.
---
 linden/indra/develop.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index 76ba0d9..af633b2 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -532,7 +532,7 @@ class WindowsSetup(PlatformSetup):
             value_str = (r'ProductDir')
             reg = _winreg.ConnectRegistry(None, _winreg.HKEY_LOCAL_MACHINE)
             key = _winreg.OpenKey(reg, key_str)
-            value = _winreg.QueryValueEx(key, value_str)[0]+"IDE"
+            value = _winreg.QueryValueEx(key, value_str)[0]+"vcpackages"
             print 'Found: %s' % value
             self.using_express = True
             return value
@@ -618,12 +618,8 @@ class WindowsSetup(PlatformSetup):
                 if environment == '':
                     print >> sys.stderr, "Something went very wrong during build stage, could not find a Visual Studio?"
                 else:
-                    print >> sys.stderr, "\nSolution generation complete, as you are using an express edition the final\n stages will need to be completed by hand"
                     build_dirs=self.build_dirs();
-                    print >> sys.stderr, "Solution can now be found in:", build_dirs[0]
-                    print >> sys.stderr, "Set %s as startup project" % self.project_name
-                    print >> sys.stderr, "Set build target is Release or RelWithDbgInfo"
-                    exit(0)
+                    return("\"\"%s\\vcbuild\" /useenv %s.sln \"%s|win32\"\"" % (environment, self.project_name, self.build_type))
 
         if self.generator == 'nmake':
            # Hack around a bug in cmake that I'm surprised did not hit GUI controlled builds.
-- 
cgit v1.1


From 3fedb39c8555715eae69d77b1436ff4a1b2581f0 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Wed, 15 May 2013 21:53:17 +1000
Subject: Updated New World Grid details, at their request.

---
 linden/indra/newview/app_settings/default_grids.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/linden/indra/newview/app_settings/default_grids.xml b/linden/indra/newview/app_settings/default_grids.xml
index 180a76f..ec184a4 100644
--- a/linden/indra/newview/app_settings/default_grids.xml
+++ b/linden/indra/newview/app_settings/default_grids.xml
@@ -227,16 +227,16 @@
 
     <!-- The New World Grid -->
     <map>
-        <key>gridname</key><string>The New World Grid</string>
-        <key>gridnick</key><string>thenewworldgrid</string>
+        <key>gridname</key><string>New World Grid</string>
+        <key>gridnick</key><string>newworldgrid</string>
         <key>platform</key><string>OpenSim</string>
-        <key>loginuri</key><string>http://grid.newworldgrid.com:8002/</string>
-        <key>loginpage</key><string>http://account.newworldgrid.com/loginscreen.php</string>
-        <key>helperuri</key><string>http://account.newworldgrid.com/</string>
+        <key>loginuri</key><string>http://3d.newworldgrid.com:8002/</string>
+        <key>loginpage</key><string>http://www.newworldgrid.com/loginpage/</string>
+        <key>helperuri</key><string>http://3d.newworldgrid.com/services/helper/</string>
         <key>website</key><string>http://www.newworldgrid.com/</string>
-        <key>support</key><string>http://www.newworldgrid.com/</string>
-        <key>register</key><string>http://www.newworldgrid.com/register</string>
-        <key>password</key><string>http://account.newworldgrid.com/</string>
+        <key>support</key><string>http://www.newworldgrid.com/contact/</string>
+        <key>register</key><string>http://www.newworldgrid.com/virreacentral/redirect.php?page=register</string>
+        <key>password</key><string>http://www.newworldgrid.com/virreacentral/redirect.php?page=login</string>
         <key>version</key><string>0</string>
     </map>
 
-- 
cgit v1.1


From d147504a2b6fc2597e7d2e3d0e690693dd6a91a1 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Wed, 15 May 2013 21:54:19 +1000
Subject: Resorted the grid list file.

---
 .../indra/newview/app_settings/default_grids.xml   | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/linden/indra/newview/app_settings/default_grids.xml b/linden/indra/newview/app_settings/default_grids.xml
index ec184a4..46a77f0 100644
--- a/linden/indra/newview/app_settings/default_grids.xml
+++ b/linden/indra/newview/app_settings/default_grids.xml
@@ -146,6 +146,21 @@
         <key>register</key><string>http://www.hypergrid.org/metropolis/metro_rg.php</string>
     </map>
 
+    <!-- New World Grid -->
+    <map>
+        <key>gridname</key><string>New World Grid</string>
+        <key>gridnick</key><string>newworldgrid</string>
+        <key>platform</key><string>OpenSim</string>
+        <key>loginuri</key><string>http://3d.newworldgrid.com:8002/</string>
+        <key>loginpage</key><string>http://www.newworldgrid.com/loginpage/</string>
+        <key>helperuri</key><string>http://3d.newworldgrid.com/services/helper/</string>
+        <key>website</key><string>http://www.newworldgrid.com/</string>
+        <key>support</key><string>http://www.newworldgrid.com/contact/</string>
+        <key>register</key><string>http://www.newworldgrid.com/virreacentral/redirect.php?page=register</string>
+        <key>password</key><string>http://www.newworldgrid.com/virreacentral/redirect.php?page=login</string>
+        <key>version</key><string>0</string>
+    </map>
+
     <!-- OSGrid -->
     <map>
         <key>gridname</key><string>OSGrid</string>
@@ -225,21 +240,6 @@
         <key>version</key><string>3</string>
     </map>
 
-    <!-- The New World Grid -->
-    <map>
-        <key>gridname</key><string>New World Grid</string>
-        <key>gridnick</key><string>newworldgrid</string>
-        <key>platform</key><string>OpenSim</string>
-        <key>loginuri</key><string>http://3d.newworldgrid.com:8002/</string>
-        <key>loginpage</key><string>http://www.newworldgrid.com/loginpage/</string>
-        <key>helperuri</key><string>http://3d.newworldgrid.com/services/helper/</string>
-        <key>website</key><string>http://www.newworldgrid.com/</string>
-        <key>support</key><string>http://www.newworldgrid.com/contact/</string>
-        <key>register</key><string>http://www.newworldgrid.com/virreacentral/redirect.php?page=register</string>
-        <key>password</key><string>http://www.newworldgrid.com/virreacentral/redirect.php?page=login</string>
-        <key>version</key><string>0</string>
-    </map>
-
     <!-- Virtual Highway -->
     <map>
         <key>gridname</key><string>Virtual Highway</string>
-- 
cgit v1.1


From 0334b87b9c54f4c766e57cdfe4220a76d9526c95 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 25 May 2013 11:57:57 +1000
Subject: White space fix.

---
 linden/indra/newview/lltoolmgr.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linden/indra/newview/lltoolmgr.cpp b/linden/indra/newview/lltoolmgr.cpp
index 675412d..9e7bc5c 100644
--- a/linden/indra/newview/lltoolmgr.cpp
+++ b/linden/indra/newview/lltoolmgr.cpp
@@ -193,7 +193,7 @@ LLTool* LLToolMgr::getCurrentTool()
 	else
 	{
 		// due to window management weirdness we can get here with gToolNull
-		bool can_override = mBaseTool && (mBaseTool != gToolNull) ;					
+		bool can_override = mBaseTool && (mBaseTool != gToolNull);
 		mOverrideTool = can_override ? mBaseTool->getOverrideTool(override_mask) : NULL;
 
 		// use keyboard-override tool if available otherwise drop back to base tool
-- 
cgit v1.1


From 0d5f83ff72ab0604d06993bce035989804fef1ec Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 25 May 2013 11:59:42 +1000
Subject: Dump hotkeys for obscure debugging stuff, to free them up for other
 things.

---
 linden/indra/newview/llviewermenu.cpp                      |  8 ++++----
 .../indra/newview/skins/default/xui/en-us/menu_viewer.xml  | 14 ++++----------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 1ee00d0..0f6e5c4 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -1098,10 +1098,10 @@ void init_debug_ui_menu(LLMenuGL* menu)
 	menu->append(new LLMenuItemCallGL("Editable UI", &edit_ui));
 	menu->append(new LLMenuItemCallGL( "Dump SelectMgr", &dump_select_mgr));
 	menu->append(new LLMenuItemCallGL( "Dump Inventory", &dump_inventory));
-	menu->append(new LLMenuItemCallGL( "Dump Focus Holder", &handle_dump_focus, NULL, NULL, 'F', MASK_ALT | MASK_CONTROL));
-	menu->append(new LLMenuItemCallGL( "Print Selected Object Info",	&print_object_info, NULL, NULL, 'P', MASK_CONTROL|MASK_SHIFT ));
-	menu->append(new LLMenuItemCallGL( "Print Agent Info",			&print_agent_nvpairs, NULL, NULL, 'P', MASK_SHIFT ));
-	menu->append(new LLMenuItemCallGL( "Memory Stats",  &output_statistics, NULL, NULL, 'M', MASK_SHIFT | MASK_ALT | MASK_CONTROL));
+	menu->append(new LLMenuItemCallGL( "Dump Focus Holder", &handle_dump_focus));
+	menu->append(new LLMenuItemCallGL( "Print Selected Object Info",	&print_object_info));
+	menu->append(new LLMenuItemCallGL( "Print Agent Info",			&print_agent_nvpairs));
+	menu->append(new LLMenuItemCallGL( "Memory Stats",  &output_statistics));
 	menu->append(new LLMenuItemCheckGL("Double-Click Auto-Pilot", 
 		menu_toggle_control, NULL, menu_check_control, 
 		(void*)"DoubleClickAutoPilot"));
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index bace111..46a2c81 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -1654,23 +1654,17 @@
       <menu_item_call name="Dump Inventory" label="Dump Inventory">
         <on_click function="Advanced.DumpInventory" userdata="" />
       </menu_item_call>
-      <menu_item_call name="Dump Focus Holder"
-                      label="Dump Focus Holder"
-                      shortcut="control|alt|F">
+      <menu_item_call name="Dump Focus Holder" label="Dump Focus Holder">
         <on_click function="Advanced.DumpFocusHolder" userdata="" />
       </menu_item_call>
-      <menu_item_call name="Print Selected Object Info"
-                      label="Print Selected Object Info"
-                      shortcut="control|shift|P">
+      <menu_item_call name="Print Selected Object Info" label="Print Selected Object Info">
         <on_click function="Advanced.PrintSelectedObjectInfo"
                   userdata="" />
       </menu_item_call>
-      <menu_item_call name="Print Agent Info"
-                      label="Print Agent Info" shortcut="shift|P">
+      <menu_item_call name="Print Agent Info" label="Print Agent Info">
         <on_click function="Advanced.PrintAgentInfo" userdata="" />
       </menu_item_call>
-      <menu_item_call name="Memory Stats" label="Memory Stats"
-                      shortcut="control|alt|shift|M">
+      <menu_item_call name="Memory Stats" label="Memory Stats">
         <on_click function="Advanced.PrintTextureMemoryStats"
                   userdata="" />
       </menu_item_call>
-- 
cgit v1.1


From 50dc3e705bb2cc7552a2c23683cf6b9ed94711a5 Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 25 May 2013 23:16:00 +1000
Subject: White space cleanups.

---
 linden/indra/newview/lltoolcomp.h   | 24 ++++++++++++------------
 linden/indra/newview/qtoolalign.cpp | 10 ++--------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/linden/indra/newview/lltoolcomp.h b/linden/indra/newview/lltoolcomp.h
index 81ed0ba..b7ec940 100644
--- a/linden/indra/newview/lltoolcomp.h
+++ b/linden/indra/newview/lltoolcomp.h
@@ -113,8 +113,8 @@ public:
 	virtual ~LLToolCompInspect();
 
 	// Overridden from LLToolComposite
-    virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask);
-    virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask);
+	virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask);
+	virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask);
 
 	static void pickCallback(const LLPickInfo& pick_info);
 };
@@ -150,9 +150,9 @@ public:
 	virtual ~LLToolCompScale();
 
 	// Overridden from LLToolComposite
-    virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask);
-    virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask);
-    virtual BOOL		handleHover(S32 x, S32 y, MASK mask);
+	virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask);
+	virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask);
+	virtual BOOL		handleHover(S32 x, S32 y, MASK mask);
 	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask);			// Returns to the default tool
 	virtual void		render();
 
@@ -172,9 +172,9 @@ public:
 	virtual ~LLToolCompRotate();
 
 	// Overridden from LLToolComposite
-    virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask);
-    virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask);
-    virtual BOOL		handleHover(S32 x, S32 y, MASK mask);
+	virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask);
+	virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask);
+	virtual BOOL		handleHover(S32 x, S32 y, MASK mask);
 	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask);
 	virtual void		render();
 
@@ -195,14 +195,14 @@ public:
 	virtual ~LLToolCompCreate();
 
 	// Overridden from LLToolComposite
-    virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask);
-    virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask);
+	virtual BOOL		handleMouseDown(S32 x, S32 y, MASK mask);
+	virtual BOOL		handleDoubleClick(S32 x, S32 y, MASK mask);
 	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask);
 	
 	static void pickCallback(const LLPickInfo& pick_info);
 protected:
 	LLToolPlacer*		mPlacer;
-	BOOL				mObjectPlacedOnMouseDown;
+	BOOL			mObjectPlacedOnMouseDown;
 };
 
 
@@ -220,7 +220,7 @@ public:
 	virtual ~LLToolCompGun();
 
 	// Overridden from LLToolComposite
-    virtual BOOL			handleHover(S32 x, S32 y, MASK mask);
+	virtual BOOL			handleHover(S32 x, S32 y, MASK mask);
 	virtual BOOL			handleMouseDown(S32 x, S32 y, MASK mask);
 	virtual BOOL			handleDoubleClick(S32 x, S32 y, MASK mask);
 	virtual BOOL			handleRightMouseDown(S32 x, S32 y, MASK mask);
diff --git a/linden/indra/newview/qtoolalign.cpp b/linden/indra/newview/qtoolalign.cpp
index 3fe31f7..cb32d0d 100644
--- a/linden/indra/newview/qtoolalign.cpp
+++ b/linden/indra/newview/qtoolalign.cpp
@@ -46,7 +46,6 @@ QToolAlign::~QToolAlign()
 }
 
 
-
 BOOL QToolAlign::handleMouseDown(S32 x, S32 y, MASK mask)
 {
 	if (mHighlightedAxis != -1)
@@ -105,7 +104,6 @@ void QToolAlign::pickCallback(const LLPickInfo& pick_info)
 }
 
 
-
 void QToolAlign::handleSelect()
 {
 	// no parts, please
@@ -207,7 +205,6 @@ BOOL QToolAlign::handleHover(S32 x, S32 y, MASK mask)
 }
 
 
-
 void setup_transforms_bbox(LLBBox bbox)
 {
 	// translate to center
@@ -242,6 +239,7 @@ void render_bbox(LLBBox bbox)
 	gGL.popMatrix();
 }
 
+
 void render_cone_bbox(LLBBox bbox)
 {
 	glMatrixMode(GL_MODELVIEW);
@@ -256,7 +254,6 @@ void render_cone_bbox(LLBBox bbox)
 }
 
 
-
 // the selection bbox isn't axis aligned, so we must construct one
 // should this be cached in the selection manager?  yes.
 LLBBox get_selection_axis_aligned_bbox()
@@ -288,7 +285,6 @@ LLBBox get_selection_axis_aligned_bbox()
 }
 
 
-
 void QToolAlign::computeManipulatorSize()
 {
 	if (LLSelectMgr::getInstance()->getSelection()->getSelectType() == SELECT_TYPE_HUD)
@@ -407,6 +403,7 @@ void QToolAlign::render()
 	}
 }
 
+
 // only works for our specialized (AABB, position centered) bboxes
 BOOL bbox_overlap(LLBBox bbox1, LLBBox bbox2)
 {
@@ -422,7 +419,6 @@ BOOL bbox_overlap(LLBBox bbox1, LLBBox bbox2)
 }
 
 
-
 // used to sort bboxes before packing
 class BBoxCompare
 {
@@ -598,5 +594,3 @@ void QToolAlign::align()
 	
 	LLSelectMgr::getInstance()->sendMultipleUpdate(UPD_POSITION);
 }
-
-
-- 
cgit v1.1


From f4d49c31da1bdc3e9072365c1f54fce5b964dafc Mon Sep 17 00:00:00 2001
From: David Walter Seikel
Date: Sat, 25 May 2013 23:22:31 +1000
Subject: Fix Align tool conflicts with Edit Linked Parts -
 http://redmine.kokuaviewer.org/issues/948

The new hot keys are -
Ctrl-Shift-P for position (Ctrl-Alt-P was taken).
Ctrl-Alt-F for face selection.
Ctrl-Alt-M for align, and Ctrl-Alt-Shift-M for pack.

Also fixed things so they all work all the time, and refactored common code.
---
 linden/indra/newview/lltool.cpp                    |  4 +-
 linden/indra/newview/lltoolcomp.cpp                | 79 +++++++++-------------
 linden/indra/newview/lltoolcomp.h                  | 11 +--
 linden/indra/newview/lltoolface.cpp                |  2 +-
 linden/indra/newview/lltoolface.h                  |  3 +-
 linden/indra/newview/qtoolalign.cpp                |  9 ++-
 linden/indra/newview/qtoolalign.h                  |  4 +-
 .../skins/default/xui/en-us/floater_tools.xml      | 20 +++---
 8 files changed, 62 insertions(+), 70 deletions(-)

diff --git a/linden/indra/newview/lltool.cpp b/linden/indra/newview/lltool.cpp
index df2191b..f8188e3 100644
--- a/linden/indra/newview/lltool.cpp
+++ b/linden/indra/newview/lltool.cpp
@@ -40,10 +40,12 @@
 
 #include "llviewerwindow.h"
 #include "lltoolcomp.h"
+#include "lltoolface.h"
 #include "lltoolfocus.h"
 #include "llfocusmgr.h"
 #include "llagent.h"
 #include "llviewerjoystick.h"
+#include "qtoolalign.h"
 
 extern BOOL gDebugClicks;
 
@@ -187,7 +189,7 @@ LLTool* LLTool::getOverrideTool(MASK mask)
 	{
 		return NULL;
 	}
-	if (mask & MASK_ALT)
+	else if (mask & MASK_ALT)
 	{
 		return LLToolCamera::getInstance();
 	}
diff --git a/linden/indra/newview/lltoolcomp.cpp b/linden/indra/newview/lltoolcomp.cpp
index 172f71d..2ec1d8e 100644
--- a/linden/indra/newview/lltoolcomp.cpp
+++ b/linden/indra/newview/lltoolcomp.cpp
@@ -43,6 +43,7 @@
 #include "llmaniptranslate.h"
 #include "llmenugl.h"			// for right-click menu hack
 #include "llselectmgr.h"
+#include "lltoolface.h"
 #include "lltoolfocus.h"
 #include "lltoolgrab.h"
 #include "lltoolgun.h"
@@ -131,6 +132,36 @@ void LLToolComposite::handleSelect()
 	mSelected = TRUE; 
 }
 
+
+LLTool* LLToolComposite::getOverrideTool(MASK mask)
+{
+	if (gKeyboard->getKeyDown('M') && 
+		((mask == (MASK_ALT | MASK_CONTROL)) || (mask == (MASK_ALT | MASK_CONTROL | MASK_SHIFT))))
+	{
+		return QToolAlign::getInstance();
+	}
+	else if (gKeyboard->getKeyDown('P') &&
+		(mask == (MASK_CONTROL | MASK_SHIFT)))
+	{
+		return LLToolCompTranslate::getInstance();
+	}
+	else if (gKeyboard->getKeyDown('F') &&
+		(mask == (MASK_ALT | MASK_CONTROL)))
+	{
+		return LLToolFace::getInstance();
+	}
+	else if (mask == (MASK_CONTROL | MASK_SHIFT))
+	{
+		return LLToolCompScale::getInstance();
+	}
+	else if (mask == MASK_CONTROL)
+	{
+		return LLToolCompRotate::getInstance();
+	}
+	return LLTool::getOverrideTool(mask);
+}
+
+
 //----------------------------------------------------------------------------
 // LLToolCompInspect
 //----------------------------------------------------------------------------
@@ -277,24 +308,6 @@ BOOL LLToolCompTranslate::handleMouseUp(S32 x, S32 y, MASK mask)
 	return LLToolComposite::handleMouseUp(x, y, mask);
 }
 
-LLTool* LLToolCompTranslate::getOverrideTool(MASK mask)
-{
-	if (gKeyboard->getKeyDown('A') && 
-		((mask & MASK_CONTROL) || (mask == (MASK_CONTROL | MASK_SHIFT))))
-	{
-		return QToolAlign::getInstance();
-	}
-	else if (mask == MASK_CONTROL)
-	{
-		return LLToolCompRotate::getInstance();
-	}
-	else if (mask == (MASK_CONTROL | MASK_SHIFT))
-	{
-		return LLToolCompScale::getInstance();
-	}
-	return LLToolComposite::getOverrideTool(mask);
-}
-
 BOOL LLToolCompTranslate::handleDoubleClick(S32 x, S32 y, MASK mask)
 {
 	if (mManip->getSelection()->isEmpty() && mManip->getHighlightedPart() == LLManip::LL_NO_PART)
@@ -401,22 +414,6 @@ BOOL LLToolCompScale::handleMouseUp(S32 x, S32 y, MASK mask)
 	return LLToolComposite::handleMouseUp(x, y, mask);
 }
 
-LLTool* LLToolCompScale::getOverrideTool(MASK mask)
-{
-	if (gKeyboard->getKeyDown('A') && 
-		((mask & MASK_CONTROL) || (mask == (MASK_CONTROL | MASK_SHIFT))))
-	{
-		return QToolAlign::getInstance();
-	}
-	else if (mask == MASK_CONTROL)
-	{
-		return LLToolCompRotate::getInstance();
-	}
-
-	return LLToolComposite::getOverrideTool(mask);
-}
-
-
 BOOL LLToolCompScale::handleDoubleClick(S32 x, S32 y, MASK mask)
 {
 	if (!mManip->getSelection()->isEmpty() && mManip->getHighlightedPart() == LLManip::LL_NO_PART)
@@ -604,20 +601,6 @@ BOOL LLToolCompRotate::handleMouseUp(S32 x, S32 y, MASK mask)
 	return LLToolComposite::handleMouseUp(x, y, mask);
 }
 
-LLTool* LLToolCompRotate::getOverrideTool(MASK mask)
-{
-	if (gKeyboard->getKeyDown('A') && 
-		((mask & MASK_CONTROL) || (mask == (MASK_CONTROL | MASK_SHIFT))))
-	{
-		return QToolAlign::getInstance();
-	}
-	else if (mask == (MASK_CONTROL | MASK_SHIFT))
-	{
-		return LLToolCompScale::getInstance();
-	}
-	return LLToolComposite::getOverrideTool(mask);
-}
-
 BOOL LLToolCompRotate::handleDoubleClick(S32 x, S32 y, MASK mask)
 {
 	if (!mManip->getSelection()->isEmpty() && mManip->getHighlightedPart() == LLManip::LL_NO_PART)
diff --git a/linden/indra/newview/lltoolcomp.h b/linden/indra/newview/lltoolcomp.h
index b7ec940..cb5e544 100644
--- a/linden/indra/newview/lltoolcomp.h
+++ b/linden/indra/newview/lltoolcomp.h
@@ -84,6 +84,9 @@ public:
 								{ mCur->localPointToScreen(local_x, local_y, screen_x, screen_y); }
 
 	BOOL					isSelecting();
+
+	virtual LLTool*			getOverrideTool(MASK mask);
+
 protected:
 	void					setCurrentTool( LLTool* new_tool );
 	LLTool*					getCurrentTool()								{ return mCur; }
@@ -135,8 +138,6 @@ public:
 	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask);			// Returns to the default tool
 	virtual void		render();
 
-	virtual LLTool*		getOverrideTool(MASK mask);
-
 	static void pickCallback(const LLPickInfo& pick_info);
 };
 
@@ -156,8 +157,6 @@ public:
 	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask);			// Returns to the default tool
 	virtual void		render();
 
-	virtual LLTool*		getOverrideTool(MASK mask);
-	
 	static void pickCallback(const LLPickInfo& pick_info);
 };
 
@@ -178,11 +177,7 @@ public:
 	virtual BOOL		handleMouseUp(S32 x, S32 y, MASK mask);
 	virtual void		render();
 
-	virtual LLTool*		getOverrideTool(MASK mask);
-
 	static void pickCallback(const LLPickInfo& pick_info);
-
-protected:
 };
 
 //-----------------------------------------------------------------------
diff --git a/linden/indra/newview/lltoolface.cpp b/linden/indra/newview/lltoolface.cpp
index 51a4561..834bf76 100644
--- a/linden/indra/newview/lltoolface.cpp
+++ b/linden/indra/newview/lltoolface.cpp
@@ -57,7 +57,7 @@
 //
 
 LLToolFace::LLToolFace()
-:	LLTool(std::string("Texture"))
+:	LLToolComposite(std::string("Texture"))
 { }
 
 
diff --git a/linden/indra/newview/lltoolface.h b/linden/indra/newview/lltoolface.h
index f2b7d23..fc6f7de 100644
--- a/linden/indra/newview/lltoolface.h
+++ b/linden/indra/newview/lltoolface.h
@@ -34,12 +34,13 @@
 #define LL_LLTOOLFACE_H
 
 #include "lltool.h"
+#include "lltoolcomp.h"
 
 class LLViewerObject;
 class LLPickInfo;
 
 class LLToolFace
-:	public LLTool, public LLSingleton<LLToolFace>
+:	public LLToolComposite, public LLSingleton<LLToolFace>
 {
 public:
 	LLToolFace();
diff --git a/linden/indra/newview/qtoolalign.cpp b/linden/indra/newview/qtoolalign.cpp
index cb32d0d..b4944fe 100644
--- a/linden/indra/newview/qtoolalign.cpp
+++ b/linden/indra/newview/qtoolalign.cpp
@@ -36,7 +36,7 @@ const F32 MANIPULATOR_SELECT_SIZE = 20.0;
 
 
 QToolAlign::QToolAlign()
-:	LLTool(std::string("Align"))
+:	LLToolComposite(std::string("Align"))
 {
 }
 
@@ -61,6 +61,11 @@ BOOL QToolAlign::handleMouseDown(S32 x, S32 y, MASK mask)
 }
 
 
+BOOL QToolAlign::handleDoubleClick(S32 x, S32 y, MASK mask)
+{
+	return TRUE;
+}
+
 
 void QToolAlign::pickCallback(const LLPickInfo& pick_info)
 {
@@ -94,7 +99,7 @@ void QToolAlign::pickCallback(const LLPickInfo& pick_info)
 	}
 	else
 	{
-		if (!(pick_info.mKeyMask == MASK_SHIFT))
+		if (!(pick_info.mKeyMask & MASK_SHIFT))
 		{
 			LLSelectMgr::getInstance()->deselectAll();
 		}
diff --git a/linden/indra/newview/qtoolalign.h b/linden/indra/newview/qtoolalign.h
index b2c18b7..2d30b92 100644
--- a/linden/indra/newview/qtoolalign.h
+++ b/linden/indra/newview/qtoolalign.h
@@ -13,6 +13,7 @@
 #define Q_QTOOLALIGN_H
 
 #include "lltool.h"
+#include "lltoolcomp.h"
 #include "llbbox.h"
 
 class LLViewerObject;
@@ -20,7 +21,7 @@ class LLPickInfo;
 class LLToolSelectRect;
 
 class QToolAlign
-:	public LLTool, public LLSingleton<QToolAlign>
+:	public LLToolComposite, public LLSingleton<QToolAlign>
 {
 public:
 	QToolAlign();
@@ -29,6 +30,7 @@ public:
 	virtual void	handleSelect();
 	virtual void	handleDeselect();
 	virtual BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
+	virtual BOOL	handleDoubleClick(S32 x, S32 y, MASK mask);
 	virtual BOOL    handleHover(S32 x, S32 y, MASK mask);
 	virtual void	render();
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index 3b78eab..2ed5120 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -69,20 +69,24 @@
 
 	<check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
 	     initial_value="false" label="Position" left="4" mouse_opaque="true"
-	     name="radio position" radio_style="true" width="114" />
+	     name="radio position" radio_style="true" width="114"
+	     tool_tip="Position selected prims (Ctrl-Shift-P)." />
 	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
 	     initial_value="false" label="Rotate (Ctrl)" left="4" mouse_opaque="true"
-	     name="radio rotate" radio_style="true" width="114" />
+	     name="radio rotate" radio_style="true" width="114"
+	     tool_tip="Rotate selected prims (Ctrl)." />
 	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
 	     initial_value="false" label="Stretch (Ctrl-Shift)" left="4"
-	     mouse_opaque="true" name="radio stretch" radio_style="true" width="123" />
+	     mouse_opaque="true" name="radio stretch" radio_style="true" width="123"
+	     tool_tip="Resize selected prims (Ctrl-Shift)." />
 	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
 	     initial_value="false" label="Select faces to texture" left="4" mouse_opaque="true"
-	     name="radio select face" radio_style="true" width="114" />
+	     name="radio select face" radio_style="true" width="114"
+	     tool_tip="Select faces of prims to texture (Ctrl-Alt-F)." />
 	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
 	     initial_value="false" label="Align (Shift to Pack)" left="4" mouse_opaque="true"
 	     name="radio align" radio_style="true" width="114"
-       tool_tip="Align aligns all selected prims' edges along an axis, Pack moves all selected prims' edges so they're touching" />
+	     tool_tip="Align (Ctrl-Alt-M) aligns all selected prims edges along an axis.  Pack (Ctrl-Alt-Shift-M) moves all selected prims edges so they're touching." />
 	<check_box bottom_delta="-19" control_name="EditLinkedParts" follows="left|top"
 	     font="SansSerifSmall" height="16" initial_value="false"
 	     label="Edit linked parts" left="4" mouse_opaque="true"
@@ -1364,10 +1368,10 @@
 		Drag to Move, Shift-Drag to Copy
 	</string>
 	<string name="status_selectface">
-		Click to selet a Face for texturing
+		Click to select a Face for texturing
 	</string>
 	<string name="status_align">
-		CTRL-A to align on an axis, CTRL-Shift-A to Pack 
+		Click to Align, Shift-Click to Pack 
 	</string>
 	<string name="status_modifyland">
 		Click and Hold to Modify Land
@@ -1382,7 +1386,7 @@
 		Click Inworld to Build
 	</string>
 	<string name="status_selectland">
-		Click and Drag to Select Land
+		Click and Drag to select Land
 	</string>
 	<string name="grid_screen_text">
 		Screen
-- 
cgit v1.1