Merge remote-tracking branch 'singu/master'

indra/llmessage/llhttpclient.cpp

@@ -208,11 +208,13 @@ static void request(
 	AIStateMachine* parent = NULL,
 	AIStateMachine::state_type new_parent_state = 0)
 {
-	if (responder)
+	llassert(responder);
-	{
+
-		// For possible debug output from within the responder.
+	if (!responder) {
-		responder->setURL(url);
+		responder = new LLHTTPClient::ResponderIgnore;
 	}
+	// For possible debug output from within the responder.
+	responder->setURL(url);
 
 	LLURLRequest* req;
 	try

indra/llui/lluictrlfactory.cpp

@@ -293,6 +293,20 @@ void LLUICtrlFactory::buildFloaterInternal(LLFloater *floaterp, LLXMLNodePtr &ro
 	mBuiltFloaters[handle] = filename;
 }
 
+//-----------------------------------------------------------------------------
+// getBuiltFloater()
+//-----------------------------------------------------------------------------
+LLFloater* LLUICtrlFactory::getBuiltFloater(const std::string name) const
+{
+	for (built_floater_t::const_iterator i = mBuiltFloaters.begin(); i != mBuiltFloaters.end(); ++i)
+	{
+		LLFloater* floater = i->first.get();
+		if (floater && floater->getName() == name)
+			return floater;
+	}
+	return NULL;
+}
+
 //-----------------------------------------------------------------------------
 // saveToXML()
 //-----------------------------------------------------------------------------

indra/llui/lluictrlfactory.h

@@ -61,6 +61,8 @@ public:
 	BOOL buildPanelFromBuffer(LLPanel *panelp, const std::string &buffer,
 							  const LLCallbackMap::map_t* factory_map = NULL);
 
+	LLFloater* getBuiltFloater(const std::string name) const;
+
 	void removePanel(LLPanel* panelp) { mBuiltPanels.erase(panelp->getHandle()); }
 	void removeFloater(LLFloater* floaterp) { mBuiltFloaters.erase(floaterp->getHandle()); }
 	

indra/newview/app_settings/settings.xml

@@ -192,7 +192,7 @@
     <key>Type</key>
     <string>U32</string>
     <key>Value</key>
-    <integer>32</integer>
+    <integer>12</integer>
   </map>
   <key>HTTPMinRequests</key>
   <map>
@@ -205,6 +205,17 @@
     <key>Value</key>
     <integer>2</integer>
   </map>
+  <key>HTTPThrottleBandwidth</key>
+  <map>
+    <key>Comment</key>
+    <string>The bandwidth (in kbit/s) to strive for</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>F32</string>
+    <key>Value</key>
+    <real>3000</real>
+  </map>
 
   <key>TeleportHistoryMaxEntries</key>
   <map>
@@ -815,6 +826,17 @@ This should be as low as possible, but too low may break functionality</string>
 		<key>Value</key>
 		<integer>1</integer>
 		</map>
+    <key>ShowSimChannel</key>
+    <map>
+      <key>Comment</key>
+      <string>Show the channel information for the current sim in the status bar</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>0</integer>
+    </map>
     <key>MoyFastMiniMap</key>
     <map>
       <key>Comment</key>
@@ -6329,6 +6351,22 @@ This should be as low as possible, but too low may break functionality</string>
         <integer>0</integer>
       </array>
     </map>
+    <key>FloaterFavoritesRect</key>
+    <map>
+      <key>Comment</key>
+      <string>Rectangle for favorites window</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Rect</string>
+      <key>Value</key>
+      <array>
+        <integer>0</integer>
+        <integer>400</integer>
+        <integer>250</integer>
+        <integer>0</integer>
+      </array>
+    </map>
     <key>FloaterFindRect2</key>
     <map>
       <key>Comment</key>
@@ -6906,6 +6944,22 @@ This should be as low as possible, but too low may break functionality</string>
         <integer>0</integer>
       </array>
     </map>
+    <key>FloaterMyOutfitsRect</key>
+    <map>
+      <key>Comment</key>
+      <string>Rectangle for My Outfits window</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Rect</string>
+      <key>Value</key>
+      <array>
+        <integer>0</integer>
+        <integer>400</integer>
+        <integer>250</integer>
+        <integer>0</integer>
+      </array>
+    </map>
     <key>FloaterObjectIMInfo</key>
     <map>
       <key>Comment</key>

indra/newview/lldrawpool.h

@@ -51,9 +51,9 @@ public:
 		POOL_FULLBRIGHT,
 		POOL_BUMP,
 		POOL_TERRAIN,	
+		POOL_TREE,	// Singu Note: Before sky for zcull.
 		POOL_SKY,
 		POOL_WL_SKY,
-		POOL_TREE,
 		POOL_GRASS,
 		POOL_INVISIBLE, // see below *
 		POOL_AVATAR,

indra/newview/lldrawpoolwlsky.cpp

@@ -327,8 +327,6 @@ void LLDrawPoolWLSky::renderDeferred(S32 pass)
 	LLGLDepthTest depth(GL_TRUE, GL_FALSE);
 	LLGLDisable clip(GL_CLIP_PLANE0);
 
-	gGL.setColorMask(true, false);	//Just in case.
-
 	LLGLSquashToFarClip far_clip(glh_get_current_projection());
 
 	renderSkyHaze(camHeightLocal);

indra/newview/llfloaterpreference.cpp

@@ -136,7 +136,6 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
 	mMsgPanel(NULL),
 	mSkinsPanel(NULL),
 	mGridsPanel(NULL),
-	mLCDPanel(NULL),
 	mPrefsAscentChat(NULL),
 	mPrefsAscentSys(NULL),
 	mPrefsAscentVan(NULL)

indra/newview/llfloaterpreference.h

@@ -44,7 +44,6 @@
 class HippoPanelGrids;
 class LLPanelGeneral;
 class LLPanelInput;
-class LLPanelLCD;
 class LLPanelDisplay;
 class LLPanelAudioPrefs;
 class LLPanelDebug;
@@ -97,7 +96,6 @@ private:
 	LLPrefsIM				*mPrefsIM;
 	LLPanelWeb				*mWebPanel;
 	LLPanelMsgs				*mMsgPanel;
-	LLPanelLCD				*mLCDPanel;
 	LLPrefsAscentChat		*mPrefsAscentChat;
 	LLPrefsAscentSys		*mPrefsAscentSys;
 	LLPrefsAscentVan		*mPrefsAscentVan;

indra/newview/llimview.cpp

@@ -351,7 +351,7 @@ bool inviteUserResponse(const LLSD& notification, const LLSD& response)
 			LLHTTPClient::post(
 				url,
 				data,
-				NULL);				
+				new LLHTTPClient::ResponderIgnore);
 		}
 	}
 

indra/newview/llstatusbar.cpp

@@ -503,51 +503,12 @@ void LLStatusBar::refresh()
 			pos_y -= pos_y % 2;
 		}
 
-		mRegionDetails.mTime = mTextTime->getText();
-		mRegionDetails.mBalance = mBalance;
-		mRegionDetails.mAccessString = region->getSimAccessString();
-		mRegionDetails.mPing = region->getNetDetailsForLCD();
 		if (parcel)
 		{
 			if (!LLAgentUI::buildLocationString(location_name, LLAgentUI::LOCATION_FORMAT_FULL)) 
 			{
 				location_name = "???";
 			}
-
-			// keep these around for the LCD to use
-			mRegionDetails.mRegionName = region->getName();
-			mRegionDetails.mParcelName = parcel->getName();
-			mRegionDetails.mX = pos_x;
-			mRegionDetails.mY = pos_y;
-			mRegionDetails.mZ = pos_z;
-
-			mRegionDetails.mArea = parcel->getArea();
-			mRegionDetails.mForSale = parcel->getForSale();
-			mRegionDetails.mTraffic = LLViewerParcelMgr::getInstance()->getDwelling();
-			
-			if (parcel->isPublic())
-			{
-				mRegionDetails.mOwner = "Public";
-			}
-			else
-			{
-				if (parcel->getIsGroupOwned())
-				{
-					if(!parcel->getGroupID().isNull())
-					{
-						gCacheName->getGroupName(parcel->getGroupID(), mRegionDetails.mOwner);
-					}
-					else
-					{
-						mRegionDetails.mOwner = "Group Owned";
-					}
-				}
-				else
-				{
-					// Figure out the owner's name
-					gCacheName->getFullName(parcel->getOwnerID(), mRegionDetails.mOwner);
-				}
-			}
 		}
 		else
 		{
@@ -555,40 +516,19 @@ void LLStatusBar::refresh()
 				+ llformat(" %d, %d, %d (%s)", 
 						   pos_x, pos_y, pos_z,
 						   region->getSimAccessString().c_str());
-			// keep these around for the LCD to use
-			mRegionDetails.mRegionName = region->getName();
-			mRegionDetails.mParcelName = "Unknown";
-			
-			mRegionDetails.mX = pos_x;
-			mRegionDetails.mY = pos_y;
-			mRegionDetails.mZ = pos_z;
-			mRegionDetails.mArea = 0;
-			mRegionDetails.mForSale = FALSE;
-			mRegionDetails.mOwner = "Unknown";
-			mRegionDetails.mTraffic = 0.0f;
 		}
+		static LLCachedControl<bool> show_channel("ShowSimChannel");
+		if (show_channel && !gLastVersionChannel.empty()) location_name += " - " + gLastVersionChannel;
 	}
 	else
 	{
 		// no region
 		location_name = "(Unknown)";
-		// keep these around for the LCD to use
-		mRegionDetails.mRegionName = "Unknown";
-		mRegionDetails.mParcelName = "Unknown";
-		mRegionDetails.mAccessString = "Unknown";
-		mRegionDetails.mX = 0;
-		mRegionDetails.mY = 0;
-		mRegionDetails.mZ = 0;
-		mRegionDetails.mArea = 0;
-		mRegionDetails.mForSale = FALSE;
-		mRegionDetails.mOwner = "Unknown";
-		mRegionDetails.mTraffic = 0.0f;
 	}
 
 // [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a) | Modified: RLVa-1.0.0a
-	if ( (region) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) )	// region == NULL if we loose our connection to the grid
+	if ( (region) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) )	// region == NULL if we lose our connection to the grid
 	{
-		// TODO-RLVa: find out whether the LCD code is still used because if so then we need to filter that as well
 		location_name = llformat("%s (%s) - %s", 
 			RlvStrings::getString(RLV_STRING_HIDDEN_REGION).c_str(), region->getSimAccessString().c_str(), 
 			RlvStrings::getString(RLV_STRING_HIDDEN).c_str());

indra/newview/llstatusbar.h

@@ -48,40 +48,6 @@ class LLUUID;
 class LLFrameTimer;
 class LLStatGraph;
 
-// used by LCD screen
-class LLRegionDetails
-{
-public:
-	LLRegionDetails() :
-		mRegionName("Unknown"),
-		mParcelName("Unknown"),
-		mAccessString("Unknown"),
-		mX(0),
-		mY(0),
-		mZ(0),
-		mArea (0),
-		mForSale(FALSE),
-		mOwner("Unknown"),
-		mTraffic(0),
-		mBalance(0),
-		mPing(0)
-	{
-	}
-	std::string mRegionName;
-	std::string	mParcelName;
-	std::string	mAccessString;
-	S32		mX;
-	S32		mY;
-	S32		mZ;
-	S32		mArea;
-	BOOL	mForSale;
-	std::string	mOwner;
-	F32		mTraffic;
-	S32		mBalance;
-	std::string mTime;
-	U32		mPing;
-};
-
 class LLStatusBar
 :	public LLPanel
 {
@@ -116,7 +82,6 @@ public:
 	S32 getSquareMetersCredit() const;
 	S32 getSquareMetersCommitted() const;
 	S32 getSquareMetersLeft() const;
-	LLRegionDetails mRegionDetails;
 
 private:
 	// simple method to setup the part that holds the date

indra/newview/lltexturefetch.cpp

@@ -490,6 +490,7 @@ public:
 
 SGHostBlackList::blacklist_t SGHostBlackList::blacklist;
 
+#if 0
 //call every time a connection is opened
 //return true if connecting allowed
 static bool sgConnectionThrottle() {
@@ -511,6 +512,7 @@ static bool sgConnectionThrottle() {
 		return false;
 	}
 }
+#endif
 
 #if HTTP_METRICS
 // Cross-thread messaging for asset metrics.
@@ -1286,12 +1288,12 @@ bool LLTextureFetchWorker::doWork(S32 param)
 			//1, not opening too many file descriptors at the same time;
 			//2, control the traffic of http so udp gets bandwidth.
 			//
-			static const LLCachedControl<U32> max_http_requests("HTTPMaxRequests", 32);
+			static const LLCachedControl<U32> max_http_requests("HTTPMaxRequests", 8);
 			static const LLCachedControl<U32> min_http_requests("HTTPMinRequests", 2);
-			if(((U32)mFetcher->getNumHTTPRequests() > max_http_requests) ||
+			static const LLCachedControl<F32> throttle_bandwidth("HTTPThrottleBandwidth", 2000);
-			   ((mFetcher->getTextureBandwidth() > mFetcher->mMaxBandwidth) &&
+			if(((U32)mFetcher->getNumHTTPRequests() >= max_http_requests) ||
-				((U32)mFetcher->getNumHTTPRequests() > min_http_requests)) ||
+			   ((mFetcher->getTextureBandwidth() > throttle_bandwidth) &&
-			    !sgConnectionThrottle())
+				((U32)mFetcher->getNumHTTPRequests() > min_http_requests)))
 			{
 				return false ; //wait.
 			}
@@ -1329,9 +1331,10 @@ bool LLTextureFetchWorker::doWork(S32 param)
 				mLoaded = FALSE;
 				mGetStatus = 0;
 				mGetReason.clear();
+				static const LLCachedControl<F32> throttle_bandwidth("HTTPThrottleBandwidth", 2000);
 				LL_DEBUGS("Texture") << "HTTP GET: " << mID << " Offset: " << mRequestedOffset
 									 << " Bytes: " << mRequestedSize
-									 << " Bandwidth(kbps): " << mFetcher->getTextureBandwidth() << "/" << mFetcher->mMaxBandwidth
+									 << " Bandwidth(kbps): " << mFetcher->getTextureBandwidth() << "/" << throttle_bandwidth
 									 << LL_ENDL;
 				setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority);
 				mState = WAIT_HTTP_REQ;	
@@ -2062,7 +2065,6 @@ LLTextureFetch::LLTextureFetch(LLTextureCache* cache, LLImageDecodeThread* image
 #if HTTP_METRICS
 	mCurlPOSTRequestCount = 0;
 #endif
-	mMaxBandwidth = gSavedSettings.getF32("ThrottleBandwidthKBPS");
 	mTextureInfo.setUpLogging(gSavedSettings.getBOOL("LogTextureDownloadsToViewerLog"), gSavedSettings.getBOOL("LogTextureDownloadsToSimulator"), gSavedSettings.getU32("TextureLoggingThreshold"));
 }
 
@@ -2446,11 +2448,8 @@ void LLTextureFetch::commonUpdate()
 //virtual
 S32 LLTextureFetch::update(F32 max_time_ms)
 {
-	static LLCachedControl<F32> band_width(gSavedSettings,"ThrottleBandwidthKBPS");
-
 	{
 		mNetworkQueueMutex.lock() ;
-		mMaxBandwidth = band_width ;
 
 		gTextureList.sTextureBits += mHTTPTextureBits ;
 		mHTTPTextureBits = 0 ;

indra/newview/lltexturefetch.h

@@ -186,7 +186,6 @@ private:
 	typedef std::map<LLHost,std::set<LLUUID> > cancel_queue_t;
 	cancel_queue_t mCancelQueue;
 	F32 mTextureBandwidth;
-	F32 mMaxBandwidth;
 	LLTextureInfo mTextureInfo;
 
 	U32 mHTTPTextureBits;

indra/newview/lltextureview.cpp

@@ -610,7 +610,7 @@ void LLGLTexMemBar::draw()
 
 	left += LLFontGL::getFontMonospace()->getWidth(text);
 	F32 bandwidth = LLAppViewer::getTextureFetch()->getTextureBandwidth();
-	F32 max_bandwidth = gSavedSettings.getF32("ThrottleBandwidthKBPS");
+	F32 max_bandwidth = gSavedSettings.getF32("HTTPThrottleBandwidth");
 	color = bandwidth > max_bandwidth ? LLColor4::red : bandwidth > max_bandwidth*.75f ? LLColor4::yellow : text_color;
 	color[VALPHA] = text_color[VALPHA];
 	text = llformat("BW:%.0f/%.0f",bandwidth, max_bandwidth);

indra/newview/llviewermenu.cpp

@@ -6530,6 +6530,7 @@ class LLShowFloater : public view_listener_t
 	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
 	{
 		std::string floater_name = userdata.asString();
+		if (floater_name.empty()) return false;
 		if (floater_name == "gestures")
 		{
 			LLFloaterGesture::toggleVisibility();
@@ -6701,6 +6702,14 @@ class LLShowFloater : public view_listener_t
 		{
 			LLFloaterOutbox::toggleInstance(LLSD());
 		}
+		else // Simple codeless floater
+		{
+			LLFloater* floater = LLUICtrlFactory::getInstance()->getBuiltFloater(floater_name);
+			if (floater)
+				gFloaterView->bringToFront(floater);
+			else
+				LLUICtrlFactory::getInstance()->buildFloater(new LLFloater(), floater_name);
+		}
 		return true;
 	}
 };

indra/newview/llviewerregion.cpp

@@ -927,11 +927,6 @@ void LLViewerRegion::calculateCameraDistance()
 	mCameraDistanceSquared = (F32)(gAgentCamera.getCameraPositionGlobal() - getCenterGlobal()).magVecSquared();
 }
 
-U32 LLViewerRegion::getNetDetailsForLCD()
-{
-	return mPingDelay;
-}
-
 std::ostream& operator<<(std::ostream &s, const LLViewerRegion &region)
 {
 	s << "{ ";

indra/newview/llviewerregion.h

@@ -337,10 +337,6 @@ public:
 	void calculateCameraDistance();
 
 	friend std::ostream& operator<<(std::ostream &s, const LLViewerRegion &region);
-
-	// used by LCD to get details for debug screen
-	U32 getNetDetailsForLCD();
-	
     /// implements LLCapabilityProvider
     virtual std::string getDescription() const;
 	std::string getHttpUrl() const { return mHttpUrl ;}

indra/newview/pipeline.cpp

@@ -213,10 +213,10 @@ std::string gPoolNames[] =
 	"POOL_GROUND",
 	"POOL_FULLBRIGHT",
 	"POOL_BUMP",
-	"POOL_TERRAIN",	
+	"POOL_TERRAIN",
+	"POOL_TREE", // Singu Note: Before sky for zcull.
 	"POOL_SKY",
 	"POOL_WL_SKY",
-	"POOL_TREE",
 	"POOL_GRASS",
 	"POOL_INVISIBLE",
 	"POOL_AVATAR",

indra/newview/skins/Nano-Green/colors.xml

@@ -0,0 +1,212 @@
+<?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="201, 250, 86, 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"/>
+<TextLinkColor value="144, 165, 208, 255"/>
+<TextLinkHoverColor value="255, 255, 255, 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"/>          <!-- Scroll bar background-->
+<DefaultListText value="0, 0, 0, 255"/> <!-- We are replacing all the hardcoded black text with this color so we can make skins with white text on dark background -->
+<DefaultListTextHidden value="0, 0, 0, 128"/>
+<DefaultListIcon value="255, 255, 255, 255"/>
+
+<!-- MENUS -->
+<MenuBarBgColor value="62, 62, 62, 255"/>
+<MenuBarGodBgColor value="62, 128, 62, 255"/>
+<MenuNonProductionGodBgColor value="0,128,0,255"/>
+<MenuNonProductionBgColor value="128, 0, 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" />
+
+<!-- RADAR -->
+
+<RadarTextChatRange value="0, 0, 0, 255"/>
+<RadarTextShoutRange value="0, 0, 0, 128"/>
+<RadarTextDrawDist value="128, 0, 0, 128"/>
+<RadarTextYoung value="255, 0, 0, 255"/>
+<RadarTextAgeNormal value="0, 0, 0, 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 -->
+<HealthTextColor value="255, 255, 255, 255" />
+<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" />
+<ComboBoxBg value="255, 255, 255, 255"/>
+<ConsoleBackground value="0, 0, 0, 255" />
+<FolderViewLoadingMessageTextColor value="240, 165, 90, 255"/>     <!-- "loading..." in the inv -->
+<InventoryBackgroundColor value="62, 62, 62, 80"/>
+
+<!-- Alert box colors -->
+<AlertBoxColor value="62, 62, 62, 255" />               <!-- Warnings floaters, like when returning objects -->
+<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>