From 8fdfda9b50e0dcee50652c502825783e8794815f Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Wed, 24 Nov 2010 23:48:10 +0200
Subject: Fix #729: Some PNG images lose alpha channel

Ignore the background color specified in PNG's bKGD chunk, since it's only
there as a fallback.
---
 linden/indra/llimage/llpngwrapper.cpp | 18 ++++--------------
 linden/indra/llimage/llpngwrapper.h   |  3 ---
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/linden/indra/llimage/llpngwrapper.cpp b/linden/indra/llimage/llpngwrapper.cpp
index 0dd991a..2274a38 100644
--- a/linden/indra/llimage/llpngwrapper.cpp
+++ b/linden/indra/llimage/llpngwrapper.cpp
@@ -56,8 +56,6 @@ LLPngWrapper::LLPngWrapper()
 	  mCompressionType( 0 ),
 	  mFilterMethod( 0 ),
 	  mFinalSize( 0 ),
-	  mHasBKGD(false),
-	  mBackgroundColor(),
 	  mGamma(0.f)
 {
 }
@@ -117,9 +115,9 @@ void LLPngWrapper::writeFlush(png_structp png_ptr)
 }
 
 // Read the PNG file using the libpng.  The low-level interface is used here
-// because we want to do various transformations (including setting the
-// matte background if any, and applying gama) which can't be done with
-// the high-level interface. The scanline also begins at the bottom of
+// because we want to do various transformations (including applying gama)
+// which can't be done with the high-level interface.
+// The scanline also begins at the bottom of
 // the image (per SecondLife conventions) instead of at the top, so we
 // must assign row-pointers in "reverse" order.
 BOOL LLPngWrapper::readPng(U8* src, LLImageRaw* rawImage, ImageInfo *infop)
@@ -207,8 +205,7 @@ void LLPngWrapper::normalizeImage()
 	//		2. Convert grayscales to RGB
 	//		3. Create alpha layer from transparency
 	//		4. Ensure 8-bpp for all images
-	//		5. Apply background matte if any
-	//		6. Set (or guess) gamma
+	//		5. Set (or guess) gamma
 
 	if (mColorType == PNG_COLOR_TYPE_PALETTE)
 	{
@@ -235,12 +232,6 @@ void LLPngWrapper::normalizeImage()
 	{
 		png_set_strip_16(mReadPngPtr);
 	}
-	mHasBKGD = png_get_bKGD(mReadPngPtr, mReadInfoPtr, &mBackgroundColor);
-	if (mHasBKGD)
-	{
-		png_set_background(mReadPngPtr, mBackgroundColor,
-			PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
-	}
 
 #if LL_DARWIN
 	const F64 SCREEN_GAMMA = 1.8;
@@ -267,7 +258,6 @@ void LLPngWrapper::updateMetaData()
     mBitDepth = png_get_bit_depth(mReadPngPtr, mReadInfoPtr);
     mColorType = png_get_color_type(mReadPngPtr, mReadInfoPtr);
 	mChannels = png_get_channels(mReadPngPtr, mReadInfoPtr);
-	mHasBKGD = png_get_bKGD(mReadPngPtr, mReadInfoPtr, &mBackgroundColor);
 }
 
 // Method to write raw image into PNG at dest. The raw scanline begins
diff --git a/linden/indra/llimage/llpngwrapper.h b/linden/indra/llimage/llpngwrapper.h
index 2e6c1dc..0c3168c 100644
--- a/linden/indra/llimage/llpngwrapper.h
+++ b/linden/indra/llimage/llpngwrapper.h
@@ -94,9 +94,6 @@ private:
 
 	U32 mFinalSize;
 
-	bool mHasBKGD;
-	png_color_16p mBackgroundColor;
-
 	F64 mGamma;
 
 	std::string mErrorMessage;
-- 
cgit v1.1


From a6ada6652524fc2b708bdae82ca3b5cb44bbbb2d Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Tue, 30 Nov 2010 16:53:55 +0200
Subject: Fix #673: IMs & Logging prefs don't persist

Enable per-account settings only after we have an account. Also, make
settings that are saved locally not depend on UserInfoReply being received.
---
 linden/indra/newview/llfloaterpreference.cpp       |  14 ++
 linden/indra/newview/llfloaterpreference.h         |   3 +
 linden/indra/newview/llprefsim.cpp                 | 166 ++++++++++++---------
 linden/indra/newview/llprefsim.h                   |   1 +
 linden/indra/newview/llstartup.cpp                 |   3 +
 .../default/xui/en-us/panel_preferences_im.xml     |   3 +
 6 files changed, 117 insertions(+), 73 deletions(-)

diff --git a/linden/indra/newview/llfloaterpreference.cpp b/linden/indra/newview/llfloaterpreference.cpp
index 2fe4b4d..0f81be6 100644
--- a/linden/indra/newview/llfloaterpreference.cpp
+++ b/linden/indra/newview/llfloaterpreference.cpp
@@ -362,6 +362,11 @@ void LLPreferenceCore::setPersonalInfo(const std::string& visibility, bool im_vi
 	mPrefsIM->setPersonalInfo(visibility, im_via_email, email);
 }
 
+void LLPreferenceCore::updateIsLoggedIn(bool enable)
+{
+	mPrefsIM->preparePerAccountPrefs(enable);
+}
+
 void LLPreferenceCore::refreshEnabledGraphics()
 {
 	LLFloaterHardwareSettings::instance()->refreshEnabledState();
@@ -537,6 +542,15 @@ void LLFloaterPreference::updateUserInfo(const std::string& visibility, bool im_
 	}
 }
 
+// static
+void LLFloaterPreference::updateIsLoggedIn(bool enable)
+{
+	if(sInstance && sInstance->mPreferenceCore)
+	{
+		sInstance->mPreferenceCore->updateIsLoggedIn(enable);
+	}
+}
+
 void LLFloaterPreference::refreshEnabledGraphics()
 {
 	sInstance->mPreferenceCore->refreshEnabledGraphics();
diff --git a/linden/indra/newview/llfloaterpreference.h b/linden/indra/newview/llfloaterpreference.h
index c52f541..931c8b6 100644
--- a/linden/indra/newview/llfloaterpreference.h
+++ b/linden/indra/newview/llfloaterpreference.h
@@ -73,6 +73,7 @@ public:
 	LLTabContainer* getTabContainer() { return mTabContainer; }
 
 	void setPersonalInfo(const std::string& visibility, bool im_via_email, const std::string&  email);
+	void updateIsLoggedIn(bool enable);
 
 	static void onTabChanged(void* user_data, bool from_click);
 	
@@ -113,6 +114,8 @@ public:
 
 	// static data update, called from message handler
 	static void updateUserInfo(const std::string& visibility, bool im_via_email, const std::string& email);
+	// static data update, called after login
+	static void updateIsLoggedIn(bool enable);
 
 	// refresh all the graphics preferences menus
 	static void refreshEnabledGraphics();
diff --git a/linden/indra/newview/llprefsim.cpp b/linden/indra/newview/llprefsim.cpp
index 9e86cd3..5ac2bb2 100644
--- a/linden/indra/newview/llprefsim.cpp
+++ b/linden/indra/newview/llprefsim.cpp
@@ -66,6 +66,7 @@ public:
 	void apply();
 	void cancel();
 	void setPersonalInfo(const std::string& visibility, bool im_via_email, const std::string& email);
+	void preparePerAccountPrefs(bool enable);
 	void enableHistory();
 	
 	static void onClickLogPath(void* user_data);
@@ -76,6 +77,7 @@ public:
 protected:
  
 	bool mGotPersonalInfo;
+	bool mGotPerAccountSettings;
 	bool mOriginalIMViaEmail;
 
 	bool mOriginalHideOnlineStatus;
@@ -86,7 +88,9 @@ protected:
 LLPrefsIMImpl::LLPrefsIMImpl()
 	: LLPanel(std::string("IM Prefs Panel")),
 	  mGotPersonalInfo(false),
-	  mOriginalIMViaEmail(false)
+	  mGotPerAccountSettings(false),
+	  mOriginalIMViaEmail(false),
+	  mOriginalHideOnlineStatus(false)
 {
 	LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_im.xml");
 }
@@ -106,55 +110,38 @@ BOOL LLPrefsIMImpl::postBuild()
 
 	childSetLabelArg("send_im_to_email", "[EMAIL]", getString("log_in_to_change"));
 
-	// Don't enable this until we get personal data
-	// Unless we're already logged in. Some non-SL grids won't send us the data we need -- MC
-	childSetEnabled("include_im_in_chat_console", LLStartUp::isLoggedIn());
-	childSetEnabled("include_im_in_chat_history", LLStartUp::isLoggedIn());
-	childSetEnabled("show_timestamps_check", LLStartUp::isLoggedIn());
-	childSetEnabled("friends_online_notify_checkbox", LLStartUp::isLoggedIn());
-	
-	childSetEnabled("online_visibility", LLStartUp::isLoggedIn());
-	childSetEnabled("send_im_to_email", LLStartUp::isLoggedIn());
-	childSetEnabled("log_instant_messages", LLStartUp::isLoggedIn());
-	childSetEnabled("log_chat", LLStartUp::isLoggedIn());
-	childSetEnabled("log_show_history", LLStartUp::isLoggedIn());
-	childSetEnabled("log_path_button", LLStartUp::isLoggedIn());
-	childSetEnabled("busy_response", LLStartUp::isLoggedIn());
-	childSetEnabled("log_instant_messages_timestamp", LLStartUp::isLoggedIn());
-	childSetEnabled("log_chat_timestamp", LLStartUp::isLoggedIn());
-	childSetEnabled("log_chat_IM", LLStartUp::isLoggedIn());
-	childSetEnabled("log_date_timestamp", LLStartUp::isLoggedIn());
-
-	childSetText("busy_response", getString("log_in_to_change"));
+	// Don't enable these until we get personal data
+	childSetEnabled("online_visibility", false);
+	childSetEnabled("send_im_to_email", false);
 
+	// These are safe to enable
+	childSetEnabled("include_im_in_chat_console", true);
+	childSetEnabled("include_im_in_chat_history", true);
+	childSetEnabled("show_timestamps_check", true);
+	childSetEnabled("friends_online_notify_checkbox", true);
+	childSetEnabled("vertical-imtabs-toggle", true);
 	childSetValue("include_im_in_chat_console", gSavedSettings.getBOOL("IMInChatConsole"));
 	childSetValue("include_im_in_chat_history", gSavedSettings.getBOOL("IMInChatHistory"));
 	childSetValue("show_timestamps_check", gSavedSettings.getBOOL("IMShowTimestamps"));
 	childSetValue("friends_online_notify_checkbox", gSavedSettings.getBOOL("ChatOnlineNotification"));
 	childSetValue("vertical-imtabs-toggle", gSavedSettings.getBOOL("VerticalIMTabs"));
 
-	childSetText("log_path_string", gSavedPerAccountSettings.getString("InstantMessageLogPath"));
-	childSetValue("log_instant_messages", gSavedPerAccountSettings.getBOOL("LogInstantMessages")); 
-	childSetValue("log_chat", gSavedPerAccountSettings.getBOOL("LogChat")); 
-	childSetValue("log_show_history", gSavedPerAccountSettings.getBOOL("LogShowHistory"));
-	childSetValue("log_instant_messages_timestamp", gSavedPerAccountSettings.getBOOL("IMLogTimestamp"));
-	childSetValue("log_chat_timestamp", gSavedPerAccountSettings.getBOOL("LogChatTimestamp"));
-	childSetValue("log_chat_IM", gSavedPerAccountSettings.getBOOL("LogChatIM"));
-	childSetValue("log_date_timestamp", gSavedPerAccountSettings.getBOOL("LogTimestampDate"));
-
 	childSetAction("log_path_button", onClickLogPath, this);
 	childSetCommitCallback("log_chat",onCommitLogging,this);
 	childSetCommitCallback("log_instant_messages",onCommitLogging,this);
 
 	childSetAction("busy_adv_btn", onClickBusyAdvanced, this);
 	
+	preparePerAccountPrefs(LLStartUp::isLoggedIn());
+
 	return TRUE;
 }
 
 void LLPrefsIMImpl::enableHistory()
 {
 	
-	if (childGetValue("log_instant_messages").asBoolean() || childGetValue("log_chat").asBoolean())
+	if  (mGotPerAccountSettings &&
+		(childGetValue("log_instant_messages").asBoolean() || childGetValue("log_chat").asBoolean()))
 	{
 		childEnable("log_show_history");
 		childEnable("log_path_button");
@@ -168,23 +155,16 @@ void LLPrefsIMImpl::enableHistory()
 
 void LLPrefsIMImpl::apply()
 {
-	LLTextEditor* busy = getChild<LLTextEditor>("busy_response");
-	LLWString busy_response;
-	if (busy) busy_response = busy->getWText(); 
-	LLWStringUtil::replaceTabsWithSpaces(busy_response, 4);
-	LLWStringUtil::replaceChar(busy_response, '\n', '^');
-	LLWStringUtil::replaceChar(busy_response, ' ', '%');
-	
-	if(mGotPersonalInfo)
+	if (mGotPerAccountSettings)
 	{ 
-
+		LLTextEditor* busy = getChild<LLTextEditor>("busy_response");
+		LLWString busy_response;
+		if (busy) busy_response = busy->getWText(); 
+		LLWStringUtil::replaceTabsWithSpaces(busy_response, 4);
+		LLWStringUtil::replaceChar(busy_response, '\n', '^');
+		LLWStringUtil::replaceChar(busy_response, ' ', '%');
 		gSavedPerAccountSettings.setString("BusyModeResponse", std::string(wstring_to_utf8str(busy_response)));
 
-		gSavedSettings.setBOOL("IMInChatConsole", childGetValue("include_im_in_chat_console").asBoolean());
-		gSavedSettings.setBOOL("IMInChatHistory", childGetValue("include_im_in_chat_history").asBoolean());
-		gSavedSettings.setBOOL("IMShowTimestamps", childGetValue("show_timestamps_check").asBoolean());
-		gSavedSettings.setBOOL("ChatOnlineNotification", childGetValue("friends_online_notify_checkbox").asBoolean());
-		
 		gSavedPerAccountSettings.setString("InstantMessageLogPath", childGetText("log_path_string"));
 		gSavedPerAccountSettings.setBOOL("LogInstantMessages",childGetValue("log_instant_messages").asBoolean());
 		gSavedPerAccountSettings.setBOOL("LogChat",childGetValue("log_chat").asBoolean());
@@ -207,7 +187,10 @@ void LLPrefsIMImpl::apply()
 				gSavedSettings.getString("FirstName"), gSavedSettings.getString("LastName") );
 		}
 		LLFile::mkdir(gDirUtilp->getPerAccountChatLogsDir());
-		
+	}
+
+	if (mGotPersonalInfo)
+	{
 		bool new_im_via_email = childGetValue("send_im_to_email").asBoolean();
 		bool new_hide_online = childGetValue("online_visibility").asBoolean();		
 
@@ -237,9 +220,15 @@ void LLPrefsIMImpl::apply()
 			gAgent.sendReliableMessage();
 		}
 	}
+
 	gSavedSettings.setBOOL("VerticalIMTabs", childGetValue("vertical-imtabs-toggle").asBoolean());
+	gSavedSettings.setBOOL("IMInChatConsole", childGetValue("include_im_in_chat_console").asBoolean());
+	gSavedSettings.setBOOL("IMInChatHistory", childGetValue("include_im_in_chat_history").asBoolean());
+	gSavedSettings.setBOOL("IMShowTimestamps", childGetValue("show_timestamps_check").asBoolean());
+	gSavedSettings.setBOOL("ChatOnlineNotification", childGetValue("friends_online_notify_checkbox").asBoolean());
 }
 
+// Enable and set the value of settings recieved from the sim in AgentInfoReply
 void LLPrefsIMImpl::setPersonalInfo(const std::string& visibility, bool im_via_email, const std::string& email)
 {
 	mGotPersonalInfo = true;
@@ -261,36 +250,10 @@ void LLPrefsIMImpl::setPersonalInfo(const std::string& visibility, bool im_via_e
 		mOriginalHideOnlineStatus = true;
 	}
 
-	childEnable("include_im_in_chat_console");
-	childEnable("include_im_in_chat_history");
-	childEnable("show_timestamps_check");
-	childEnable("friends_online_notify_checkbox");
-
 	childSetValue("online_visibility", mOriginalHideOnlineStatus); 	 
 	childSetLabelArg("online_visibility", "[DIR_VIS]", mDirectoryVisibility);
 	childEnable("send_im_to_email");
 	childSetValue("send_im_to_email", im_via_email);
-	childEnable("log_instant_messages");
-	childEnable("log_chat");
-	childEnable("busy_response");
-	childEnable("log_instant_messages_timestamp");
-	childEnable("log_chat_timestamp");
-	childEnable("log_chat_IM");
-	childEnable("log_date_timestamp");
-	
-	//RN: get wide string so replace char can work (requires fixed-width encoding)
-	LLWString busy_response = utf8str_to_wstring( gSavedPerAccountSettings.getString("BusyModeResponse") );
-	LLWStringUtil::replaceChar(busy_response, '^', '\n');
-	LLWStringUtil::replaceChar(busy_response, '%', ' ');
-	childSetText("busy_response", wstring_to_utf8str(busy_response));
-// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
-	if (gRlvHandler.hasBehaviour(RLV_BHVR_SENDIM))
-	{
-		childDisable("busy_response");
-	}
-// [/RLVa:KB]
-
-	enableHistory();
 
 	// Truncate the e-mail address if it's too long (to prevent going off
 	// the edge of the dialog).
@@ -300,10 +263,62 @@ void LLPrefsIMImpl::setPersonalInfo(const std::string& visibility, bool im_via_e
 		display_email.resize(30);
 		display_email += "...";
 	}
-
+	else if (display_email.empty())
+	{
+		display_email = getString("default_email_used");
+	}
 	childSetLabelArg("send_im_to_email", "[EMAIL]", display_email);
 }
 
+// Enable and set the value of settings that need an account name
+void LLPrefsIMImpl::preparePerAccountPrefs(bool enable)
+{
+	if (mGotPerAccountSettings && enable)
+	{
+		return; // prevent overwriting unsaved changes.
+	}
+	mGotPerAccountSettings = enable;
+
+	childSetEnabled("log_chat", enable);
+	childSetEnabled("log_chat_timestamp", enable);
+	childSetEnabled("log_chat_IM", enable);
+	childSetEnabled("log_instant_messages_timestamp", enable);
+	childSetEnabled("log_instant_messages", enable);
+	childSetEnabled("log_date_timestamp", enable);
+
+	childSetValue("log_chat", gSavedPerAccountSettings.getBOOL("LogChat"));
+	childSetValue("log_chat_timestamp", gSavedPerAccountSettings.getBOOL("LogChatTimestamp"));
+	childSetValue("log_chat_IM", gSavedPerAccountSettings.getBOOL("LogChatIM"));
+	childSetValue("log_instant_messages_timestamp", gSavedPerAccountSettings.getBOOL("IMLogTimestamp"));
+	childSetValue("log_instant_messages", gSavedPerAccountSettings.getBOOL("LogInstantMessages"));
+	childSetValue("log_date_timestamp", gSavedPerAccountSettings.getBOOL("LogTimestampDate"));
+
+	childSetValue("log_show_history", gSavedPerAccountSettings.getBOOL("LogShowHistory"));
+	enableHistory();
+	childSetText("log_path_string", gSavedPerAccountSettings.getString("InstantMessageLogPath"));
+
+	childSetEnabled("busy_response", enable);
+	if (enable)
+	{
+		//RN: get wide string so replace char can work (requires fixed-width encoding)
+		LLWString busy_response = utf8str_to_wstring( gSavedPerAccountSettings.getString("BusyModeResponse") );
+		LLWStringUtil::replaceChar(busy_response, '^', '\n');
+		LLWStringUtil::replaceChar(busy_response, '%', ' ');
+		childSetText("busy_response", wstring_to_utf8str(busy_response));
+	}
+	else
+	{
+		childSetText("busy_response", getString("log_in_to_change"));
+	}
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+	if (gRlvHandler.hasBehaviour(RLV_BHVR_SENDIM))
+	{
+		childDisable("busy_response");
+	}
+// [/RLVa:KB]
+
+	childSetEnabled("busy_adv_btn", enable);
+}
 
 // static
 void LLPrefsIMImpl::onClickBusyAdvanced(void* user_data)
@@ -363,6 +378,11 @@ void LLPrefsIM::setPersonalInfo(const std::string& visibility, bool im_via_email
 	impl.setPersonalInfo(visibility, im_via_email, email);
 }
 
+void LLPrefsIM::preparePerAccountPrefs(bool enable)
+{
+	impl.preparePerAccountPrefs(enable);
+}
+
 LLPanel* LLPrefsIM::getPanel()
 {
 	return &impl;
diff --git a/linden/indra/newview/llprefsim.h b/linden/indra/newview/llprefsim.h
index 90bf465..acf9b0f 100644
--- a/linden/indra/newview/llprefsim.h
+++ b/linden/indra/newview/llprefsim.h
@@ -46,6 +46,7 @@ public:
 	void apply();
 	void cancel();
 	void setPersonalInfo(const std::string& visibility, bool im_via_email, const std::string& email);
+	void preparePerAccountPrefs(bool enable);
 
 	LLPanel* getPanel();
 
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index b744961..aba9bb6 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -101,6 +101,7 @@
 #include "llfloatergesture.h"
 #include "llfloaterhud.h"
 #include "llfloaterland.h"
+#include "llfloaterpreference.h"
 #include "llfloaterteleporthistory.h"
 #include "llfloatertopobjects.h"
 #include "llfloatertos.h"
@@ -2876,6 +2877,8 @@ bool idle_startup()
 		gDebugView->mFastTimerView->setVisible(TRUE);
 #endif
 
+		LLFloaterPreference::updateIsLoggedIn(true);
+
 		return TRUE;
 	}
 
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
index e64f6c7..fe17e7a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_im.xml
@@ -22,6 +22,9 @@
   <string name="log_in_to_change">
     log in to change
   </string>
+  <string name="default_email_used">
+    using default address
+  </string>
   <check_box bottom="-45" enabled="true" follows="left|top" font="SansSerifSmall"
 	     height="16" initial_value="false" label="Send IM to email ([EMAIL])"
 	     left="148" mouse_opaque="true" name="send_im_to_email" radio_style="false"
-- 
cgit v1.1


From c959177214ca5c69221e648f771958a35c8aece5 Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Fri, 14 Jan 2011 23:59:54 +0200
Subject: Fix #771: some small lossless textures fail to load from cache

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

diff --git a/linden/indra/newview/lltexturefetch.cpp b/linden/indra/newview/lltexturefetch.cpp
index f93a574..6ab4d24 100644
--- a/linden/indra/newview/lltexturefetch.cpp
+++ b/linden/indra/newview/lltexturefetch.cpp
@@ -724,6 +724,7 @@ bool LLTextureFetchWorker::doWork(S32 param)
 		{
 			// we have enough data, decode it
 			llassert_always(mFormattedImage->getDataSize() > 0);
+			mLoadedDiscard = mDesiredDiscard;
 			mState = DECODE_IMAGE;
 			mWriteToCacheState = NOT_WRITE ;
 			LL_DEBUGS("Texture") << mID << ": Cached. Bytes: " << mFormattedImage->getDataSize()
-- 
cgit v1.1


From 9f13705eb64c74184a67bb5eba24f3e8c6531e89 Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Sat, 15 Jan 2011 00:06:28 +0200
Subject: Fix small potential leak of CacheReadResponder objects

Taken from V2/Henry.
---
 linden/indra/newview/lltexturefetch.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/linden/indra/newview/lltexturefetch.cpp b/linden/indra/newview/lltexturefetch.cpp
index 6ab4d24..83a54e4 100644
--- a/linden/indra/newview/lltexturefetch.cpp
+++ b/linden/indra/newview/lltexturefetch.cpp
@@ -665,16 +665,17 @@ bool LLTextureFetchWorker::doWork(S32 param)
 			mLoaded = FALSE;
 			setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority); // Set priority first since Responder may change it
 
-			CacheReadResponder* responder = new CacheReadResponder(mFetcher, mID, mFormattedImage);
 			if (mUrl.compare(0, 7, "file://") == 0)
 			{
 				// read file from local disk
 				std::string filename = mUrl.substr(7, std::string::npos);
+				CacheReadResponder* responder = new CacheReadResponder(mFetcher, mID, mFormattedImage);
 				mCacheReadHandle = mFetcher->mTextureCache->readFromCache(filename, mID, cache_priority,
 																		  offset, size, responder);
 			}
 			else if (mUrl.empty())
 			{
+				CacheReadResponder* responder = new CacheReadResponder(mFetcher, mID, mFormattedImage);
 				mCacheReadHandle = mFetcher->mTextureCache->readFromCache(mID, cache_priority,
 																		  offset, size, responder);
 			}
-- 
cgit v1.1


From fe9a3fe4bfb5589332a21fd07ce4966aaf38117e Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Sat, 15 Jan 2011 01:11:46 +0200
Subject: Fix offset reading from local files

Fix offset reading from local files (non-cached.) This is a bug, so needs
fixing, even though the offset is always 0 here, currently.

Taken from Cool Viewer (patch orginally by Max Fox.)
---
 linden/indra/newview/lltexturecache.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linden/indra/newview/lltexturecache.cpp b/linden/indra/newview/lltexturecache.cpp
index a1a9a39..4efd10c 100644
--- a/linden/indra/newview/lltexturecache.cpp
+++ b/linden/indra/newview/lltexturecache.cpp
@@ -250,9 +250,9 @@ bool LLTextureCacheLocalFileWorker::doRead()
 		}
 	}
 #else
-	if (!mDataSize || mDataSize > local_size)
+	if (!mDataSize || mDataSize + mOffset > local_size)
 	{
-		mDataSize = local_size;
+		mDataSize = local_size - mOffset;
 	}
 	mReadData = new U8[mDataSize];
 	
-- 
cgit v1.1


From 77883aef4bb8531c83bdeac45a5463a76e1158d7 Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Sun, 16 Jan 2011 02:03:16 +0200
Subject: Fix #756: Link button in build floater can crash

Prevent null dereference when the selection has no primary object,
e.g. rubber band selection.
---
 linden/indra/newview/llfloatertools.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp
index 683ebd4..cc205ee 100644
--- a/linden/indra/newview/llfloatertools.cpp
+++ b/linden/indra/newview/llfloatertools.cpp
@@ -1256,7 +1256,8 @@ void LLFloaterTools::onClickLink(void* data)
 	}
 
 	S32 max_linked_prims = 0;
-	if(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject()->usePhysics())
+	LLViewerObject* first_rootp = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject();
+	if(first_rootp && first_rootp->usePhysics())
 	{
 		//Physical - use phys prim limit
 		max_linked_prims = gHippoLimits->getMaxPhysLinkedPrims();
-- 
cgit v1.1


From 817c12436ed1c4a1500cb2e836625c4f3e9b32b7 Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Thu, 20 Jan 2011 01:28:55 +0200
Subject: Fix #773: Crash in Advanced -> Rendering -> Debug GL

Missing “POOL_VOIDWATER” item in pool names array caused crash.
---
 linden/indra/newview/pipeline.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index 9da0da0..36ffb05 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -157,6 +157,7 @@ std::string gPoolNames[] =
 	"POOL_GROUND",
 	"POOL_INVISIBLE",
 	"POOL_AVATAR",
+	"POOL_VOIDWATER",
 	"POOL_WATER",
 	"POOL_GRASS",
 	"POOL_FULLBRIGHT",
-- 
cgit v1.1


From 02d06e7cf7c15ddd427197dbe177ea58ffc91319 Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Thu, 20 Jan 2011 01:34:15 +0200
Subject: Add menu option for sculpt debugging in Advanced menu.

The new option is Advanced -> Rendering -> Info Displays -> Sculpt.

The code for displaying this debug info is old, but the menu option was
lost when the Advanced menu was converted to xml.
---
 linden/indra/newview/llviewermenu.cpp                        | 4 ++++
 linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index b81a2a2..da7d815 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -9192,6 +9192,10 @@ U32 info_display_from_string(std::string info_display)
 	{
 		return LLPipeline::RENDER_DEBUG_GLOW;
 	}
+	else if ("sculpt" == info_display)
+	{
+		return LLPipeline::RENDER_DEBUG_SCULPTED;
+	}
 	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 53e9e2d..9ff5048 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
@@ -1279,6 +1279,12 @@
           <on_check function="Advanced.CheckInfoDisplay"
                     userdata="glow" />
         </menu_item_check>
+        <menu_item_check name="Sculpt" label="Sculpt">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="sculpt" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="sculpt" />
+        </menu_item_check>
         <menu_item_check name="Vectorize Perf Test"
                          label="Vectorize Perf Test">
           <on_click function="ToggleControl"
-- 
cgit v1.1


From 5b6c9def0d80473cef910d832bc07c4b4c11db3f Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Thu, 20 Jan 2011 17:03:03 +0200
Subject: Fix #757: Missing Raycasting tool from Advanced menu

The code to render this tool is in the viewer, but the menu option was
dropped when the advanced menu was moved to xml. This adds it back.
---
 linden/indra/newview/llviewermenu.cpp                        | 4 ++++
 linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index da7d815..95e686d 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -9192,6 +9192,10 @@ U32 info_display_from_string(std::string info_display)
 	{
 		return LLPipeline::RENDER_DEBUG_GLOW;
 	}
+	else if ("raycasting" == info_display)
+	{
+		return LLPipeline::RENDER_DEBUG_RAYCAST;
+	}
 	else if ("sculpt" == info_display)
 	{
 		return LLPipeline::RENDER_DEBUG_SCULPTED;
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 9ff5048..534ca83 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
@@ -1279,6 +1279,12 @@
           <on_check function="Advanced.CheckInfoDisplay"
                     userdata="glow" />
         </menu_item_check>
+        <menu_item_check name="Raycasting" label="Raycasting">
+          <on_click function="Advanced.ToggleInfoDisplay"
+                    userdata="raycasting" />
+          <on_check function="Advanced.CheckInfoDisplay"
+                    userdata="raycasting" />
+        </menu_item_check>
         <menu_item_check name="Sculpt" label="Sculpt">
           <on_click function="Advanced.ToggleInfoDisplay"
                     userdata="sculpt" />
-- 
cgit v1.1


From 4e577785ba1417cd9ef6742a33e818016697b508 Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Fri, 21 Jan 2011 15:10:56 +0200
Subject: Partial fix #772: Large sculpt maps are deformed

This is a partial fix for cases where the sculpt map is larger than
128x128, like in some old sculpted trees. This was done by content
creators to beat bugs in old viewers. The sculpties still need a lod
change to trigger a rebuild once they are fully decoded, and that doesn't
always happen, because we abuse RenderVolumeLODFactor.

Ported from Snowglobe2 (GPL)
---
 linden/indra/newview/llviewerimage.cpp | 13 ++++++++++---
 linden/indra/newview/llvovolume.cpp    |  6 +++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/linden/indra/newview/llviewerimage.cpp b/linden/indra/newview/llviewerimage.cpp
index 671a359..a600dc5 100644
--- a/linden/indra/newview/llviewerimage.cpp
+++ b/linden/indra/newview/llviewerimage.cpp
@@ -1759,13 +1759,19 @@ void LLViewerImage::setCachedRawImage()
 		if(mForSculpt)
 		{
 			max_size = MAX_CACHED_RAW_SCULPT_IMAGE_AREA ;
+			// Even though we don't use the full pixel size, we want to decode up to discard 0,
+			// because some legacy sculpts are weird like that.
+			mCachedRawImageReady = !mRawDiscardLevel ;
+		}
+		else
+		{
+			mCachedRawImageReady = (!mRawDiscardLevel || ((w * h) >= max_size)) ;
 		}
 
 		while(((w >> i) * (h >> i)) > max_size)
 		{
 			++i ;
 		}
-		mCachedRawImageReady = (!mRawDiscardLevel || ((w * h) >= max_size)) ;
 		
 		if(i)
 		{
@@ -1776,7 +1782,8 @@ void LLViewerImage::setCachedRawImage()
 			mRawImage->scale(w >> i, h >> i) ;
 		}
 		mCachedRawImage = mRawImage ;
-		mCachedRawDiscardLevel = mRawDiscardLevel + i ;			
+		mRawDiscardLevel += i ;
+		mCachedRawDiscardLevel = mRawDiscardLevel ;			
 	}
 }
 
@@ -1784,7 +1791,7 @@ void LLViewerImage::checkCachedRawSculptImage()
 {
 	if(mCachedRawImageReady && mCachedRawDiscardLevel > 0)
 	{
-		if(mCachedRawImage->getWidth() * mCachedRawImage->getHeight() < MAX_CACHED_RAW_SCULPT_IMAGE_AREA)
+		if(getDiscardLevel() != 0)
 		{
 			mCachedRawImageReady = FALSE ;
 		}
diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index 73ff860..632bca2 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -527,8 +527,8 @@ void LLVOVolume::updateTextureVirtualSize()
 				}
 			}
 	
-			S32 texture_discard = mSculptTexture->getCachedRawImageLevel(); //try to match the texture
-			S32 current_discard = mSculptLevel;
+			S32 texture_discard = mSculptTexture->getDiscardLevel(); //try to match the texture
+			S32 current_discard = getVolume() ? getVolume()->getSculptLevel() : -2 ;
 
 			if (texture_discard >= 0 && //texture has some data available
 				(texture_discard < current_discard || //texture has more data than last rebuild
@@ -711,7 +711,7 @@ void LLVOVolume::sculpt()
 		S8 sculpt_components = 0;
 		const U8* sculpt_data = NULL;
 	
-		S32 discard_level = mSculptTexture->getCachedRawImageLevel() ;
+		S32 discard_level = mSculptTexture->getDiscardLevel();
 		LLImageRaw* raw_image = mSculptTexture->getCachedRawImage() ;
 		
 		S32 max_discard = mSculptTexture->getMaxDiscardLevel();
-- 
cgit v1.1


From 981e88b92549cae661a077490df693f1d207c808 Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Mon, 24 Jan 2011 19:40:13 +0200
Subject: Additional Fix #772 and other sculpt problems

Port from V2 (Snowglobe2) that adds to each texture a list of faces and
sculpt volumes that use that texture, and rebuild all sculpts when the
texture is decoded. This is needed so that we don't depend on LOD changes
which may never/rarely happen for some megaprim sculpts.
---
 linden/indra/newview/llface.h          |   4 +
 linden/indra/newview/llviewerimage.cpp | 131 ++++++++++++++++++++++++++++++---
 linden/indra/newview/llviewerimage.h   |  26 ++++++-
 linden/indra/newview/llvovolume.cpp    |  56 +++++++++++---
 linden/indra/newview/llvovolume.h      |   6 +-
 5 files changed, 195 insertions(+), 28 deletions(-)

diff --git a/linden/indra/newview/llface.h b/linden/indra/newview/llface.h
index 4893e82..e31b93f 100644
--- a/linden/indra/newview/llface.h
+++ b/linden/indra/newview/llface.h
@@ -106,6 +106,9 @@ public:
 	F32				getVirtualSize() const { return mVSize; }
 	F32				getPixelArea() const { return mPixelArea; }
 
+	S32				getIndexInTex() const {return mIndexInTex ;}
+	void			setIndexInTex(S32 index) { mIndexInTex = index ;}
+
 	void			renderSetColor() const;
 	S32				renderElements(const U16 *index_array) const;
 	S32				renderIndexed ();
@@ -225,6 +228,7 @@ private:
 	U16			mGeomIndex;			// index into draw pool
 	U32			mIndicesCount;
 	U32			mIndicesIndex;		// index into draw pool for indices (yeah, I know!)
+	S32			mIndexInTex ;
 
 	//previous rebuild's geometry info
 	U16			mLastGeomCount;
diff --git a/linden/indra/newview/llviewerimage.cpp b/linden/indra/newview/llviewerimage.cpp
index a600dc5..28561ed 100644
--- a/linden/indra/newview/llviewerimage.cpp
+++ b/linden/indra/newview/llviewerimage.cpp
@@ -61,6 +61,7 @@
 #include "llappviewer.h"
 #include "llface.h"
 #include "llviewercamera.h"
+#include "llvovolume.h"
 ///////////////////////////////////////////////////////////////////////////////
 
 // statics
@@ -352,6 +353,11 @@ void LLViewerImage::init(bool firstinit)
 	mDesiredSavedRawDiscardLevel = -1 ;
 
 	mCanUseHTTP = true; //default on if cap/settings allows us
+	
+	mNumFaces = 0 ;
+	mNumVolumes = 0;
+	mFaceList.clear() ;
+	mVolumeList.clear();
 }
 
 // virtual
@@ -388,6 +394,7 @@ LLViewerImage::~LLViewerImage()
 void LLViewerImage::cleanup()
 {
 	mFaceList.clear() ;
+	mVolumeList.clear();
 	for(callback_list_t::iterator iter = mLoadedCallbackList.begin();
 		iter != mLoadedCallbackList.end(); )
 	{
@@ -754,19 +761,19 @@ void LLViewerImage::updateVirtualSize()
 	{
 		addTextureStats(0.f, FALSE) ;//reset
 	}
-	if(mFaceList.size() > 0) 
+	for(U32 i = 0 ; i < mNumFaces ; i++)
 	{				
-		for(std::list<LLFace*>::iterator iter = mFaceList.begin(); iter != mFaceList.end(); ++iter)
+		LLFace* facep = mFaceList[i] ;
+		if(facep->getDrawable()->isRecentlyVisible())
 		{
-			LLFace* facep = *iter ;
-			if(facep->getDrawable()->isRecentlyVisible())
-			{
-				addTextureStats(facep->getVirtualSize()) ;
-				setAdditionalDecodePriority(facep->getImportanceToCamera()) ;
-			}
-		}	
+			addTextureStats(facep->getVirtualSize()) ;
+			setAdditionalDecodePriority(facep->getImportanceToCamera()) ;
+		}
 	}
+
 	mNeedsResetMaxVirtualSize = TRUE ;
+	reorganizeFaceList();
+	reorganizeVolumeList();
 #endif	
 }
 void LLViewerImage::scaleDown()
@@ -1817,11 +1824,111 @@ void LLViewerImage::setForSculpt()
 	checkCachedRawSculptImage() ;
 }
 
+//virtual
 void LLViewerImage::addFace(LLFace* facep) 
 {
-	mFaceList.push_back(facep) ;
+	if(mNumFaces >= mFaceList.size())
+	{
+		mFaceList.resize(2 * mNumFaces + 1) ;		
+	}
+	mFaceList[mNumFaces] = facep ;
+	facep->setIndexInTex(mNumFaces) ;
+	mNumFaces++ ;
+	mLastFaceListUpdateTimer.reset() ;
+}
+
+//virtual
+void LLViewerImage::removeFace(LLFace* facep)
+{
+	if(mNumFaces > 1)
+	{
+		S32 index = facep->getIndexInTex() ; 
+		mFaceList[index] = mFaceList[--mNumFaces] ;
+		mFaceList[index]->setIndexInTex(index) ;
+	}
+	else
+	{
+		mFaceList.clear() ;
+		mNumFaces = 0 ;
+	}
+	mLastFaceListUpdateTimer.reset() ;
+}
+
+S32 LLViewerImage::getNumFaces() const
+{
+	return mNumFaces ;
+}
+
+
+//virtual
+void LLViewerImage::addVolume(LLVOVolume* volumep)
+{
+	if( mNumVolumes >= mVolumeList.size())
+	{
+		mVolumeList.resize(2 * mNumVolumes + 1) ;		
+	}
+	mVolumeList[mNumVolumes] = volumep ;
+	volumep->setIndexInTex(mNumVolumes) ;
+	mNumVolumes++ ;
+	mLastVolumeListUpdateTimer.reset() ;
 }
-void LLViewerImage::removeFace(LLFace* facep) 
+
+//virtual
+void LLViewerImage::removeVolume(LLVOVolume* volumep) 
 {
-	mFaceList.remove(facep) ;
+	if(mNumVolumes > 1)
+	{
+		S32 index = volumep->getIndexInTex() ;
+		mVolumeList[index] = mVolumeList[--mNumVolumes] ;
+		mVolumeList[index]->setIndexInTex(index) ;
+	}
+	else
+	{
+		mVolumeList.clear() ;
+		mNumVolumes = 0 ;
+	}
+	mLastVolumeListUpdateTimer.reset() ;
+}
+
+S32 LLViewerImage::getNumVolumes() const
+{
+	return mNumVolumes ;
+}
+
+void LLViewerImage::reorganizeFaceList()
+{
+	static const F32 MAX_WAIT_TIME = 20.f; // seconds
+	static const U32 MAX_EXTRA_BUFFER_SIZE = 4 ;
+
+	if(mNumFaces + MAX_EXTRA_BUFFER_SIZE > mFaceList.size())
+	{
+		return ;
+	}
+
+	if(mLastFaceListUpdateTimer.getElapsedTimeF32() < MAX_WAIT_TIME)
+	{
+		return ;
+	}
+
+	mLastFaceListUpdateTimer.reset() ;
+	mFaceList.erase(mFaceList.begin() + mNumFaces, mFaceList.end());
+}
+
+void LLViewerImage::reorganizeVolumeList()
+{
+	static const F32 MAX_WAIT_TIME = 20.f; // seconds
+	static const U32 MAX_EXTRA_BUFFER_SIZE = 4 ;
+
+	if(mNumVolumes + MAX_EXTRA_BUFFER_SIZE > mVolumeList.size())
+	{
+		return ;
+	}
+
+	if(mLastVolumeListUpdateTimer.getElapsedTimeF32() < MAX_WAIT_TIME)
+	{
+		return ;
+	}
+
+	mLastVolumeListUpdateTimer.reset() ;
+	mVolumeList.erase(mVolumeList.begin() + mNumVolumes, mVolumeList.end());
 }
diff --git a/linden/indra/newview/llviewerimage.h b/linden/indra/newview/llviewerimage.h
index 3bee51c..c2e3303 100644
--- a/linden/indra/newview/llviewerimage.h
+++ b/linden/indra/newview/llviewerimage.h
@@ -51,6 +51,7 @@ typedef	void	(*loaded_callback_func)( BOOL success, LLViewerImage *src_vi, LLIma
 
 class LLVFile;
 class LLMessageSystem;
+class LLVOVolume;
  
 class LLLoadedCallbackEntry
 {
@@ -209,6 +210,9 @@ public:
 		INVALID_DISCARD_LEVEL = 0x7fff
 	};
 
+	typedef std::vector<LLFace*> ll_face_list_t;
+	typedef std::vector<LLVOVolume*> ll_volume_list_t;
+
 protected:
 	/*virtual*/ ~LLViewerImage();
 	
@@ -311,8 +315,17 @@ public:
 
 	BOOL        isSameTexture(const LLViewerImage* tex) const ;
 
-	void        addFace(LLFace* facep) ;
-	void        removeFace(LLFace* facep) ;
+	virtual void addFace(LLFace* facep) ;
+	virtual void removeFace(LLFace* facep) ;
+	S32 getNumFaces() const;
+	const ll_face_list_t* getFaceList() const {return &mFaceList;}
+	void reorganizeFaceList() ;
+
+	virtual void addVolume(LLVOVolume* volumep);
+	virtual void removeVolume(LLVOVolume* volumep);
+	S32 getNumVolumes() const;
+	const ll_volume_list_t* getVolumeList() const { return &mVolumeList; }
+	void reorganizeVolumeList() ;
 
 	void        setCanUseHTTP(bool can_use_http) {mCanUseHTTP = can_use_http;};
 
@@ -417,8 +430,13 @@ private:
 	BOOL   mForSculpt ; //a flag if the texture is used for a sculpt data.
 	mutable BOOL    mNeedsResetMaxVirtualSize ;
 
-	typedef std::list<LLFace*> ll_face_list_t ;
-	ll_face_list_t mFaceList ; //reverse pointer pointing to the faces using this image as texture
+	ll_face_list_t    mFaceList ; //reverse pointer pointing to the faces using this image as texture
+	U32               mNumFaces ;
+	LLFrameTimer      mLastFaceListUpdateTimer ;
+
+	ll_volume_list_t  mVolumeList;
+	U32				  mNumVolumes;
+	LLFrameTimer	  mLastVolumeListUpdateTimer;
 
 	bool mCanUseHTTP; // can this image be fetched by http
 
diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index 632bca2..e4a0d0c 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -89,12 +89,12 @@ LLVOVolume::LLVOVolume(const LLUUID &id, const LLPCode pcode, LLViewerRegion *re
 	mRelativeXformInvTrans.setIdentity();
 
 	mLOD = MIN_LOD;
-	mSculptLevel = -2;
 	mTextureAnimp = NULL;
 	mVObjRadius = LLVector3(1,1,0.5f).length();
 	mNumFaces = 0;
 	mLODChanged = FALSE;
 	mSculptChanged = FALSE;
+	mIndexInTex = 0;
 }
 
 LLVOVolume::~LLVOVolume()
@@ -502,9 +502,8 @@ void LLVOVolume::updateTextureVirtualSize()
 	
 	if (isSculpted())
 	{
-		LLSculptParams *sculpt_params = (LLSculptParams *)getParameterEntry(LLNetworkData::PARAMS_SCULPT);
-		LLUUID id =  sculpt_params->getSculptTexture(); 
-		mSculptTexture = gImageList.getImage(id);
+		updateSculptTexture();
+
 		if (mSculptTexture.notNull())
 		{
 			mSculptTexture->setBoostLevel(llmax((S32)mSculptTexture->getBoostLevel(),
@@ -682,25 +681,52 @@ BOOL LLVOVolume::setVolume(const LLVolumeParams &volume_params, const S32 detail
 			mVolumeImpl->onSetVolume(volume_params, detail);
 		}
 		
+		updateSculptTexture();
+
 		if (isSculpted())
 		{
-			mSculptTexture = gImageList.getImage(volume_params.getSculptID());
 			if (mSculptTexture.notNull())
 			{
 				sculpt();
-				mSculptLevel = getVolume()->getSculptLevel();
 			}
 		}
-		else
-		{
-			mSculptTexture = NULL;
-		}
 
 		return TRUE;
 	}
 	return FALSE;
 }
 
+void LLVOVolume::updateSculptTexture()
+{
+	LLPointer<LLViewerImage> old_sculpt = mSculptTexture;
+
+	if (isSculpted())
+	{
+		LLSculptParams *sculpt_params = (LLSculptParams *)getParameterEntry(LLNetworkData::PARAMS_SCULPT);
+		LLUUID id =  sculpt_params->getSculptTexture();
+		if (id.notNull())
+		{
+			mSculptTexture = gImageList::getImage(id);
+		}
+	}
+	else
+	{
+		mSculptTexture = NULL;
+	}
+
+	if (mSculptTexture != old_sculpt)
+	{
+		if (old_sculpt.notNull())
+		{
+			old_sculpt->removeVolume(this);
+		}
+		if (mSculptTexture.notNull())
+		{
+			mSculptTexture->addVolume(this);
+		}
+	}
+}
+
 // sculpt replaces generate() for sculpted surfaces
 void LLVOVolume::sculpt()
 {	
@@ -754,6 +780,16 @@ void LLVOVolume::sculpt()
 			sculpt_data = raw_image->getData();
 		}
 		getVolume()->sculpt(sculpt_width, sculpt_height, sculpt_components, sculpt_data, discard_level);
+
+		//notify rebuild any other VOVolumes that reference this sculpty volume
+		for (S32 i = 0; i < mSculptTexture->getNumVolumes(); ++i)
+		{
+			LLVOVolume* volume = (*(mSculptTexture->getVolumeList()))[i];
+			if (volume != this && volume->getVolume() == getVolume())
+			{
+				gPipeline.markRebuild(volume->mDrawable, LLDrawable::REBUILD_GEOMETRY, FALSE);
+			}
+		}
 	}
 }
 
diff --git a/linden/indra/newview/llvovolume.h b/linden/indra/newview/llvovolume.h
index a78aa37..7c8a68d 100644
--- a/linden/indra/newview/llvovolume.h
+++ b/linden/indra/newview/llvovolume.h
@@ -169,8 +169,10 @@ public:
 	/*virtual*/ BOOL 	setMaterial(const U8 material);
 
 				void	setTexture(const S32 face);
-
+				S32     getIndexInTex() const {return mIndexInTex ;}
 	/*virtual*/ BOOL	setVolume(const LLVolumeParams &volume_params, const S32 detail, bool unique_volume = false);
+				void	updateSculptTexture();
+				void    setIndexInTex(S32 index) { mIndexInTex = index ;}
 				void	sculpt();
 				void	updateRelativeXform();
 	/*virtual*/ BOOL	updateGeometry(LLDrawable *drawable);
@@ -231,7 +233,6 @@ private:
 	LLFrameTimer mTextureUpdateTimer;
 	S32			mLOD;
 	BOOL		mLODChanged;
-	S32         mSculptLevel;
 	BOOL		mSculptChanged;
 	LLMatrix4	mRelativeXform;
 	LLMatrix3	mRelativeXformInvTrans;
@@ -239,6 +240,7 @@ private:
 	F32			mVObjRadius;
 	LLVolumeInterface *mVolumeImpl;
 	LLPointer<LLViewerImage> mSculptTexture;
+	S32 mIndexInTex;
 	
 	// statics
 public:
-- 
cgit v1.1


From 2de3325acadcb3a67978ae27ad69981c8c47aa29 Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Mon, 24 Jan 2011 23:15:49 +0200
Subject: Fix a brain fart in 981e88b925

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

diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index e4a0d0c..204d641 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -706,7 +706,7 @@ void LLVOVolume::updateSculptTexture()
 		LLUUID id =  sculpt_params->getSculptTexture();
 		if (id.notNull())
 		{
-			mSculptTexture = gImageList::getImage(id);
+			mSculptTexture = gImageList.getImage(id);
 		}
 	}
 	else
-- 
cgit v1.1


From 21d0848f94c64b20fb7ceedd4ae7b71012a834d7 Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Sun, 6 Feb 2011 23:42:37 +0200
Subject: Fix #778: Textures get stuck half fetched.

Make sure partial textures are cached as partial, so that they will
finish fetching in consequent sessions. This is a rare case, but does
happen. Backported from viewer2.
---
 linden/indra/newview/lltexturefetch.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/linden/indra/newview/lltexturefetch.cpp b/linden/indra/newview/lltexturefetch.cpp
index 83a54e4..4b1a9cb 100644
--- a/linden/indra/newview/lltexturefetch.cpp
+++ b/linden/indra/newview/lltexturefetch.cpp
@@ -1116,6 +1116,17 @@ bool LLTextureFetchWorker::doWork(S32 param)
 			return false;
 		}
 		S32 datasize = mFormattedImage->getDataSize();
+		if(mFileSize < datasize)//This could happen when http fetching and sim fetching mixed.
+		{
+			if(mHaveAllData)
+			{
+				mFileSize = datasize ;
+			}
+			else
+			{
+				mFileSize = datasize + 1 ; //flag not fully loaded.
+			}
+		}
 		llassert_always(datasize);
 		setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority); // Set priority first since Responder may change it
 		U32 cache_priority = mWorkPriority;
-- 
cgit v1.1


From cff413945bdf7423797ad82220a20aad65587671 Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Thu, 24 Feb 2011 19:09:20 +0200
Subject: Workaround #726: SIGSEGV in memcpy in LLImageRaw::LLImageRaw with
 data=0

Not sure why this happens, but is related to mForceToSaveRawImage=TRUE
(e.g. in the texture preview floater.) This workaround seems to work for
Singularity, as suggested by Siana Gears.
---
 linden/indra/llimage/llimage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linden/indra/llimage/llimage.cpp b/linden/indra/llimage/llimage.cpp
index 776c481..1df3793 100644
--- a/linden/indra/llimage/llimage.cpp
+++ b/linden/indra/llimage/llimage.cpp
@@ -269,7 +269,7 @@ LLImageRaw::LLImageRaw(U8 *data, U16 width, U16 height, S8 components)
 	: LLImageBase()
 {
 	mMemType = LLMemType::MTYPE_IMAGERAW;
-	if(allocateDataSize(width, height, components))
+	if(allocateDataSize(width, height, components) && data)
 	{
 		memcpy(getData(), data, width*height*components);
 	}
-- 
cgit v1.1


From 6c6c66ea4d76fc5282fd03baf1112fbc44014cb9 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sun, 27 Feb 2011 18:07:08 -0700
Subject: Fixed login menu bar not resizing with the window

---
 linden/indra/newview/skins/default/xui/en-us/menu_login.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 18fb8e6..c65a737 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
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<menu_bar name="Login Menu" opaque="true" tear_off="false" height="18" bottom="-18">
+<menu_bar name="Login Menu" opaque="true" tear_off="false" height="18" bottom="-18" follows="left|top|right">
 	<menu create_jump_keys="true" label="File" name="File" opaque="true" tear_off="false">
 		<menu_item_call label="Quit" name="Quit" shortcut="control|Q">
 			<on_click function="File.Quit" userdata="" />
-- 
cgit v1.1


From d0fb6d12ed15efa02f881903b0741d7cc3139cab Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Tue, 1 Mar 2011 14:13:55 +0100
Subject: fix gstreamer plugin doesn't compile on linux

---
 .../gstreamer010/media_plugin_gstreamer010.cpp     | 106 ++++++++++-----------
 1 file changed, 53 insertions(+), 53 deletions(-)

diff --git a/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp b/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
index 7e2833a..553cdd5 100755
--- a/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
+++ b/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
@@ -181,7 +181,7 @@ MediaPluginGStreamer010::MediaPluginGStreamer010(
 	mVideoSink ( NULL ),
 	mCommand ( COMMAND_NONE )
 {
-	writeToLog("MediaPluginGStreamer010 PID=%u", U32(LL_GETPID()));
+	writeToLog((char*)"MediaPluginGStreamer010 PID=%u", U32(LL_GETPID()));
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -236,7 +236,7 @@ MediaPluginGStreamer010::processGSTEvents(GstBus     *bus,
 		GST_MESSAGE_TYPE(message) != GST_MESSAGE_BUFFERING &&
 	    GST_MESSAGE_TYPE(message) != GST_MESSAGE_TAG)
 	{
-		writeToLog("Got GST message type: %s", GST_MESSAGE_TYPE_NAME (message));
+		writeToLog((char*)"Got GST message type: %s", GST_MESSAGE_TYPE_NAME (message));
 	}
 
 	switch (GST_MESSAGE_TYPE (message))
@@ -246,7 +246,7 @@ MediaPluginGStreamer010::processGSTEvents(GstBus     *bus,
 			// NEEDS GST 0.10.11+ and America discovered by C.Columbus
 			gint percent = 0;
 			gst_message_parse_buffering(message, &percent);
-			writeToLog("GST buffering: %d%%", percent);
+			writeToLog((char*)"GST buffering: %d%%", percent);
 
 			break;
 		}
@@ -260,7 +260,7 @@ MediaPluginGStreamer010::processGSTEvents(GstBus     *bus,
 							&pending_state);
 			#ifdef LL_GST_REPORT_STATE_CHANGES
 			// not generally very useful, and rather spammy.
-			writeToLog("state change (old,<new>,pending): %s,<%s>,%s",
+			writeToLog((char*)"state change (old,<new>,pending): %s,<%s>,%s",
 				get_gst_state_name(old_state),
 				get_gst_state_name(new_state),
 				get_gst_state_name(pending_state));
@@ -290,7 +290,7 @@ MediaPluginGStreamer010::processGSTEvents(GstBus     *bus,
 			gchar *debug = NULL;
 	
 			gst_message_parse_error (message, &err, &debug);
-			writeToLog("GST error: %s", err?err->message:"(unknown)");
+			writeToLog((char*)"GST error: %s", err?err->message:"(unknown)");
 			if (err)
 				g_error_free (err);
 			g_free (debug);
@@ -307,7 +307,7 @@ MediaPluginGStreamer010::processGSTEvents(GstBus     *bus,
 			gchar *debug = NULL;
 			
 			gst_message_parse_info (message, &err, &debug);
-			writeToLog("GST info: %s", err?err->message:"(unknown)");
+			writeToLog((char*)"GST info: %s", err?err->message:"(unknown)");
 			if (err)
 				g_error_free (err);
 			g_free (debug);
@@ -320,7 +320,7 @@ MediaPluginGStreamer010::processGSTEvents(GstBus     *bus,
 			gchar *debug = NULL;
 	
 			gst_message_parse_warning (message, &err, &debug);
-			writeToLog("GST warning: %s", err?err->message:"(unknown)");
+			writeToLog((char*)"GST warning: %s", err?err->message:"(unknown)");
 			if (err)
 				g_error_free (err);
 			g_free (debug);
@@ -337,7 +337,7 @@ MediaPluginGStreamer010::processGSTEvents(GstBus     *bus,
 
 			if ( gst_tag_list_get_string(new_tags, GST_TAG_TITLE, &title) )
 			{
-				//writeToLog("Title: %s", title);
+				//writeToLog((char*)"Title: %s", title);
 				std::string newtitle(title);
 				gst_tag_list_free(new_tags);
 
@@ -356,10 +356,10 @@ MediaPluginGStreamer010::processGSTEvents(GstBus     *bus,
 		case GST_MESSAGE_EOS:
 		{
 			/* end-of-stream */
-			writeToLog("GST end-of-stream.");
+			writeToLog((char*)"GST end-of-stream.");
 			if (mIsLooping)
 			{
-				//writeToLog("looping media...");
+				//writeToLog((char*)"looping media...");
 				double eos_pos_sec = 0.0F;
 				bool got_eos_position = getTimePos(eos_pos_sec);
 	
@@ -368,7 +368,7 @@ MediaPluginGStreamer010::processGSTEvents(GstBus     *bus,
 					// if we know that the movie is really short, don't
 					// loop it else it can easily become a time-hog
 					// because of GStreamer spin-up overhead
-					writeToLog("really short movie (%0.3fsec) - not gonna loop this, pausing instead.", eos_pos_sec);
+					writeToLog((char*)"really short movie (%0.3fsec) - not gonna loop this, pausing instead.", eos_pos_sec);
 					// inject a COMMAND_PAUSE
 					mCommand = COMMAND_PAUSE;
 				}
@@ -387,7 +387,7 @@ MediaPluginGStreamer010::processGSTEvents(GstBus     *bus,
 					else
 					#endif // LLGST_LOOP_BY_SEEKING
 					{  // use clumsy stop-start to loop
-						writeToLog("didn't loop by rewinding - stopping and starting instead...");
+						writeToLog((char*)"didn't loop by rewinding - stopping and starting instead...");
 						stop();
 						play(1.0);
 					}
@@ -433,7 +433,7 @@ MediaPluginGStreamer010::navigateTo ( const std::string urlIn )
 
 	setStatus(STATUS_LOADING);
 
-	writeToLog("Setting media URI: %s", urlIn.c_str());
+	writeToLog((char*)"Setting media URI: %s", urlIn.c_str());
 
 	mSeekWanted = false;
 
@@ -461,13 +461,13 @@ MediaPluginGStreamer010::update(int milliseconds)
 	if (!mDoneInit)
 		return false; // error
 
-	//writeToLog("updating media...");
+	//writeToLog((char*)"updating media...");
 	
 	// sanity check
 	if (NULL == mPump ||
 	    NULL == mPlaybin)
 	{
-		writeToLog("dead media...");
+		writeToLog((char*)"dead media...");
 		return false;
 	}
 
@@ -497,7 +497,7 @@ MediaPluginGStreamer010::update(int milliseconds)
 	        GST_OBJECT_LOCK(mVideoSink);
 		if (mVideoSink->retained_frame_ready)
 		{
-			writeToLog("NEW FRAME READY");
+			writeToLog((char*)"NEW FRAME READY");
 
 			if (mVideoSink->retained_frame_width != mCurrentWidth ||
 			    mVideoSink->retained_frame_height != mCurrentHeight)
@@ -528,7 +528,7 @@ MediaPluginGStreamer010::update(int milliseconds)
 				GST_OBJECT_UNLOCK(mVideoSink);
 
 				mCurrentRowbytes = neww * newd;
-				writeToLog("video container resized to %dx%d",
+				writeToLog((char*)"video container resized to %dx%d",
 					 neww, newh);
 
 				mDepth = newd;
@@ -556,7 +556,7 @@ MediaPluginGStreamer010::update(int milliseconds)
 				}
 
 				GST_OBJECT_UNLOCK(mVideoSink);
-				writeToLog("NEW FRAME REALLY TRULY CONSUMED, TELLING HOST");
+				writeToLog((char*)"NEW FRAME REALLY TRULY CONSUMED, TELLING HOST");
 
 				setDirty(0,0,mCurrentWidth,mCurrentHeight);
 			}
@@ -567,7 +567,7 @@ MediaPluginGStreamer010::update(int milliseconds)
 
 				GST_OBJECT_UNLOCK(mVideoSink);
 
-				writeToLog("NEW FRAME not consumed, still waiting for a shm segment and/or shm resize");
+				writeToLog((char*)"NEW FRAME not consumed, still waiting for a shm segment and/or shm resize");
 			}
 
 			return true;
@@ -606,7 +606,7 @@ MediaPluginGStreamer010::mouseMove( int x, int y )
 bool
 MediaPluginGStreamer010::pause()
 {
-	writeToLog("pausing media...");
+	writeToLog((char*)"pausing media...");
 	// todo: error-check this?
 	gst_element_set_state(mPlaybin, GST_STATE_PAUSED);
 	return true;
@@ -615,7 +615,7 @@ MediaPluginGStreamer010::pause()
 bool
 MediaPluginGStreamer010::stop()
 {
-	writeToLog("stopping media...");
+	writeToLog((char*)"stopping media...");
 	// todo: error-check this?
 	gst_element_set_state(mPlaybin, GST_STATE_READY);
 	return true;
@@ -625,7 +625,7 @@ bool
 MediaPluginGStreamer010::play(double rate)
 {
 	// NOTE: we don't actually support non-natural rate.
-	writeToLog("playing media... rate=%f", rate);
+	writeToLog((char*)"playing media... rate=%f", rate);
 	// todo: error-check this?
 	gst_element_set_state(mPlaybin, GST_STATE_PLAYING);
 	return true;
@@ -662,7 +662,7 @@ MediaPluginGStreamer010::seek(double time_sec)
 				GST_SEEK_TYPE_SET, gint64(time_sec*GST_SECOND),
 				GST_SEEK_TYPE_NONE, GST_CLOCK_TIME_NONE);
 	}
-	writeToLog("MEDIA SEEK REQUEST to %f sec result was %d",
+	writeToLog((char*)"MEDIA SEEK REQUEST to %f sec result was %d",
 		 float(time_sec), int(success));
 	return success;
 }
@@ -716,7 +716,7 @@ MediaPluginGStreamer010::load()
 
 	setStatus(STATUS_LOADING);
 
-	writeToLog("setting up media...");
+	writeToLog((char*)"setting up media...");
 
 	mIsLooping = false;
 	mVolume = (float) 0.1234567; // minor hack to force an initial volume update
@@ -755,7 +755,7 @@ MediaPluginGStreamer010::load()
 			GST_SLVIDEO(gst_element_factory_make ("private-slvideo", "slvideo"));
 		if (!mVideoSink)
 		{
-			writeToLog("Could not instantiate private-slvideo element.");
+			writeToLog((char*)"Could not instantiate private-slvideo element.");
 			// todo: cleanup.
 			setStatus(STATUS_ERROR);
 			return false; // error
@@ -774,7 +774,7 @@ MediaPluginGStreamer010::unload ()
 	if (!mDoneInit)
 		return false; // error
 
-	writeToLog("unloading media...");
+	writeToLog((char*)"unloading media...");
 	
 	// stop getting callbacks for this bus
 	g_source_remove(mBusWatchID);
@@ -832,7 +832,7 @@ MediaPluginGStreamer010::startup()
 				    "libgstvideo-0.10.so.0") )
 #endif
 		{
-			writeToLog("Couldn't find suitable GStreamer 0.10 support on this system - video playback disabled.");
+			writeToLog((char*)"Couldn't find suitable GStreamer 0.10 support on this system - video playback disabled.");
 			return false;
 		}
 */
@@ -842,7 +842,7 @@ MediaPluginGStreamer010::startup()
 // 		}
 // 		else
 // 		{
-// 			writeToLog("gst_segtrap_set_enabled() is not available; plugin crashes won't be caught.");
+// 			writeToLog((char*)"gst_segtrap_set_enabled() is not available; plugin crashes won't be caught.");
 // 		}
 /*
 #if LL_LINUX
@@ -885,12 +885,12 @@ MediaPluginGStreamer010::startup()
 		{
 			if (err)
 			{
-				writeToLog("GST init failed: %s", err->message);
+				writeToLog((char*)"GST init failed: %s", err->message);
 				g_error_free(err);
 			}
 			else
 			{
-				writeToLog("GST init failed for unspecified reason.");
+				writeToLog((char*)"GST init failed for unspecified reason.");
 			}
 			return false;
 		}
@@ -903,7 +903,7 @@ MediaPluginGStreamer010::startup()
 		gst_slvideo_init_class();
 
 		// List the plugins GStreamer can find
-		writeToLog("Found GStreamer plugins:");
+		writeToLog((char*)"Found GStreamer plugins:");
 		GList *list;
 		GstRegistry *registry = gst_registry_get_default();
 		std::string loaded = "No";
@@ -913,7 +913,7 @@ MediaPluginGStreamer010::startup()
 		{	 
 			GstPlugin *list_plugin = (GstPlugin *)list->data;
 			if (gst_plugin_is_loaded(list_plugin)) loaded = "Yes";
-			writeToLog("%s, loaded? %s", gst_plugin_get_name(list_plugin), loaded.c_str());
+			writeToLog((char*)"%s, loaded? %s", gst_plugin_get_name(list_plugin), loaded.c_str());
 		}
 		gst_plugin_list_free(list);
 
@@ -960,11 +960,11 @@ void MediaPluginGStreamer010::set_gst_plugin_path()
 
 	if( imp_dir == "" )
 	{
-		writeToLog("Could not get application directory, not setting GST_PLUGIN_PATH.");
+		writeToLog((char*)"Could not get application directory, not setting GST_PLUGIN_PATH.");
 		return;
 	}
 
-	writeToLog("Imprudence is installed at %s", imp_dir.c_str());
+	writeToLog((char*)"Imprudence is installed at %s", imp_dir.c_str());
 
 	// ":" on Mac and 'Nix, ";" on Windows
 	std::string separator = G_SEARCHPATH_SEPARATOR_S;
@@ -974,7 +974,7 @@ void MediaPluginGStreamer010::set_gst_plugin_path()
 	char *old_path = getenv("GST_PLUGIN_PATH");
 	if(old_path == NULL)
 	{
-		writeToLog("Did not find user-set GST_PLUGIN_PATH.");
+		writeToLog((char*)"Did not find user-set GST_PLUGIN_PATH.");
 	}
 	else
 	{
@@ -1005,11 +1005,11 @@ void MediaPluginGStreamer010::set_gst_plugin_path()
 
 	if( put_result == -1 )
 	{
-		writeToLog("Setting GST_PLUGIN_PATH failed!");
+		writeToLog((char*)"Setting GST_PLUGIN_PATH failed!");
 	}
 	else
 	{
-		writeToLog("GST_PLUGIN_PATH set to %s", getenv("GST_PLUGIN_PATH"));
+		writeToLog((char*)"GST_PLUGIN_PATH set to %s", getenv("GST_PLUGIN_PATH"));
 	}
 		
 	// Don't load system plugins. We only want to use ours, to avoid conflicts.
@@ -1021,7 +1021,7 @@ void MediaPluginGStreamer010::set_gst_plugin_path()
 
 	if( put_result == -1 )
 	{
-		writeToLog("Setting GST_PLUGIN_SYSTEM_PATH=\"\" failed!");
+		writeToLog((char*)"Setting GST_PLUGIN_SYSTEM_PATH=\"\" failed!");
 	}
 		
 #endif // LL_WINDOWS || LL_DARWIN
@@ -1039,7 +1039,7 @@ MediaPluginGStreamer010::sizeChanged()
 	{
 		mNaturalWidth = mCurrentWidth;
 		mNaturalHeight = mCurrentHeight;
-		writeToLog("Media NATURAL size better detected as %dx%d",
+		writeToLog((char*)"Media NATURAL size better detected as %dx%d",
 			 mNaturalWidth, mNaturalHeight);
 	}
 
@@ -1054,7 +1054,7 @@ MediaPluginGStreamer010::sizeChanged()
 		message.setValue("name", mTextureSegmentName);
 		message.setValueS32("width", mNaturalWidth);
 		message.setValueS32("height", mNaturalHeight);
-		writeToLog("<--- Sending size change request to application with name: '%s' - natural size is %d x %d", mTextureSegmentName.c_str(), mNaturalWidth, mNaturalHeight);
+		writeToLog((char*)"<--- Sending size change request to application with name: '%s' - natural size is %d x %d", mTextureSegmentName.c_str(), mNaturalWidth, mNaturalHeight);
 		sendMessage(message);
 	}
 }
@@ -1077,11 +1077,11 @@ MediaPluginGStreamer010::closedown()
 
 MediaPluginGStreamer010::~MediaPluginGStreamer010()
 {
-	//writeToLog("MediaPluginGStreamer010 destructor");
+	//writeToLog((char*)"MediaPluginGStreamer010 destructor");
 
 	closedown();
 
-	writeToLog("GStreamer010 closing down");
+	writeToLog((char*)"GStreamer010 closing down");
 }
 
 
@@ -1125,11 +1125,11 @@ void MediaPluginGStreamer010::receiveMessage(const char *message_string)
 
 				if ( load() )
 				{
-					writeToLog("GStreamer010 media instance set up");
+					writeToLog((char*)"GStreamer010 media instance set up");
 				}
 				else
 				{
-					writeToLog("GStreamer010 media instance failed to set up");
+					writeToLog((char*)"GStreamer010 media instance failed to set up");
 				}
 
 				message.setValue("plugin_version", getVersion());
@@ -1156,7 +1156,7 @@ void MediaPluginGStreamer010::receiveMessage(const char *message_string)
 				std::string name = message_in.getValue("name");
 
 				std::ostringstream str;
-				writeToLog("MediaPluginGStreamer010::receiveMessage: shared memory added, name: %s, size: %d, address: %p", name.c_str(), int(info.mSize), info.mAddress);
+				writeToLog((char*)"MediaPluginGStreamer010::receiveMessage: shared memory added, name: %s, size: %d, address: %p", name.c_str(), int(info.mSize), info.mAddress);
 
 				mSharedSegments.insert(SharedSegmentMap::value_type(name, info));
 			}
@@ -1164,7 +1164,7 @@ void MediaPluginGStreamer010::receiveMessage(const char *message_string)
 			{
 				std::string name = message_in.getValue("name");
 
-				writeToLog("MediaPluginGStreamer010::receiveMessage: shared memory remove, name = %s", name.c_str());
+				writeToLog((char*)"MediaPluginGStreamer010::receiveMessage: shared memory remove, name = %s", name.c_str());
 				
 				SharedSegmentMap::iterator iter = mSharedSegments.find(name);
 				if(iter != mSharedSegments.end())
@@ -1182,7 +1182,7 @@ void MediaPluginGStreamer010::receiveMessage(const char *message_string)
 				}
 				else
 				{
-					writeToLog("MediaPluginGStreamer010::receiveMessage: unknown shared memory region!");
+					writeToLog((char*)"MediaPluginGStreamer010::receiveMessage: unknown shared memory region!");
 				}
 
 				// Send the response so it can be cleaned up.
@@ -1193,7 +1193,7 @@ void MediaPluginGStreamer010::receiveMessage(const char *message_string)
 			else
 			{
 				std::ostringstream str;
-				writeToLog("MediaPluginGStreamer010::receiveMessage: unknown base message: %s", message_name.c_str());
+				writeToLog((char*)"MediaPluginGStreamer010::receiveMessage: unknown base message: %s", message_name.c_str());
 			}
 		}
 		else if(message_class == LLPLUGIN_MESSAGE_CLASS_MEDIA)
@@ -1236,7 +1236,7 @@ void MediaPluginGStreamer010::receiveMessage(const char *message_string)
 				S32 texture_height = message_in.getValueS32("texture_height");
 
 				std::ostringstream str;
-				writeToLog("---->Got size change instruction from application with shm name: %s - size is %d x %d", name.c_str(), width, height);
+				writeToLog((char*)"---->Got size change instruction from application with shm name: %s - size is %d x %d", name.c_str(), width, height);
 
 				LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "size_change_response");
 				message.setValue("name", name);
@@ -1252,8 +1252,8 @@ void MediaPluginGStreamer010::receiveMessage(const char *message_string)
 					SharedSegmentMap::iterator iter = mSharedSegments.find(name);
 					if(iter != mSharedSegments.end())
 					{
-						writeToLog("*** Got size change with matching shm, new size is %d x %d", width, height);
-						writeToLog("*** Got size change with matching shm, texture size size is %d x %d", texture_width, texture_height);
+						writeToLog((char*)"*** Got size change with matching shm, new size is %d x %d", width, height);
+						writeToLog((char*)"*** Got size change with matching shm, texture size size is %d x %d", texture_width, texture_height);
 
 						mPixels = (unsigned char*)iter->second.mAddress;
 						mTextureSegmentName = name;
@@ -1263,7 +1263,7 @@ void MediaPluginGStreamer010::receiveMessage(const char *message_string)
 						if (texture_width > 1 ||
 						    texture_height > 1) // not a dummy size from the app, a real explicit forced size
 						{
-							writeToLog("**** = REAL RESIZE REQUEST FROM APP");
+							writeToLog((char*)"**** = REAL RESIZE REQUEST FROM APP");
 							
 							GST_OBJECT_LOCK(mVideoSink);
 							mVideoSink->resize_forced_always = true;
@@ -1345,7 +1345,7 @@ void MediaPluginGStreamer010::receiveMessage(const char *message_string)
 		}
 		else
 		{
-			writeToLog("MediaPluginGStreamer010::receiveMessage: unknown message class: %s", message_class.c_str());
+			writeToLog((char*)"MediaPluginGStreamer010::receiveMessage: unknown message class: %s", message_class.c_str());
 		}
 	}
 }
-- 
cgit v1.1


From 340b9eda6fd80907deaa2757db63d3e1040599e6 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Tue, 1 Mar 2011 14:16:06 +0100
Subject: fix packaging fails on linux

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

diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 56c2410..4703f16 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -134,7 +134,7 @@ class ViewerManifest(LLManifest):
             self.path("README.txt")
             self.path("MANIFESTO.txt")
             self.path("CONTRIBUTE.txt")
-            self.path("RELEASE_NOTES.txt")
+            #self.path("RELEASE_NOTES.txt")
             self.path("ChangeLog.txt", required=False)
             self.end_prefix("../../..")
 
-- 
cgit v1.1


From 58d0360b3a78729d0446d3703160ecb4b97721a3 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Tue, 1 Mar 2011 14:19:55 +0100
Subject: fix news bar doesn't open internal browser

---
 linden/indra/llplugin/llpluginclassmedia.cpp     |  3 ++-
 linden/indra/newview/app_settings/logcontrol.xml | 16 +++++++++-------
 linden/indra/newview/llmediactrl.cpp             |  7 ++++++-
 linden/indra/newview/llpanellogin.cpp            |  1 +
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/linden/indra/llplugin/llpluginclassmedia.cpp b/linden/indra/llplugin/llpluginclassmedia.cpp
index 5a81c46..02da271 100755
--- a/linden/indra/llplugin/llpluginclassmedia.cpp
+++ b/linden/indra/llplugin/llpluginclassmedia.cpp
@@ -777,7 +777,7 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message)
 					mDirtyRect.unionWith(newDirtyRect);
 				}
 
-				LL_DEBUGS("PluginClassMedia") << "adjusted incoming rect is: ("
+				LL_DEBUGS("PluginClassMediaRect") << "adjusted incoming rect is: ("
 					<< newDirtyRect.mLeft << ", "
 					<< newDirtyRect.mTop << ", "
 					<< newDirtyRect.mRight << ", "
@@ -973,6 +973,7 @@ void LLPluginClassMedia::receivePluginMessage(const LLPluginMessage &message)
 		{
 			mClickURL = message.getValue("uri");
 			mClickTarget = message.getValue("target");
+			LL_DEBUGS("PluginClassMedia") << "Click target \"" << mClickTarget << "\"" << LL_ENDL;
 			mediaEvent(LLPluginClassMediaOwner::MEDIA_EVENT_CLICK_LINK_HREF);
 		}
 		else if(message_name == "click_nofollow")
diff --git a/linden/indra/newview/app_settings/logcontrol.xml b/linden/indra/newview/app_settings/logcontrol.xml
index cdc837d..b7bc07b 100644
--- a/linden/indra/newview/app_settings/logcontrol.xml
+++ b/linden/indra/newview/app_settings/logcontrol.xml
@@ -57,7 +57,7 @@
               <!--<string>Inventory</string>-->
 							<!--<string>HUDEffect</string>-->
               <!--<string>MarkerFile</string>-->
-							<!--<string>MediaImpl</string>-->
+							<!--<string>Media</string>-->
 							<!--<string>MediaInfo</string>-->
 							<!--<string>MediaCallback</string>-->
 							<!--<string>MediaBuffering</string>-->
@@ -65,15 +65,17 @@
 							<!--<string>MediaState</string>-->
 
 							<!--<string>Messaging</string>-->
+							
+							<string>NewsBar</string>
 							<!--<string>Notifications</string>-->
-		<string>Plugin</string>
+<!-- 		<string>Plugin</string> -->
 		<string>PluginClassMedia</string>
-		<string>PluginInstance</string>
-		<string>PluginPipe</string>
-		<string>PluginChild</string>
+<!-- 		<string>PluginInstance</string> -->
+<!-- 		<string>PluginPipe</string> -->
+<!-- 		<string>PluginChild</string> -->
 	        <!--<string>PluginSpam</string>-->
-		<string>PluginParent</string>
-		<string>PluginViewerMedia</string>
+<!-- 		<string>PluginParent</string> -->
+<!-- 		<string>PluginViewerMedia</string> -->
 
               <!--<string>Radar</string>-->
 							<!--<string>ShaderLoading</string>-->
diff --git a/linden/indra/newview/llmediactrl.cpp b/linden/indra/newview/llmediactrl.cpp
index 8b60326..ff7ba22 100644
--- a/linden/indra/newview/llmediactrl.cpp
+++ b/linden/indra/newview/llmediactrl.cpp
@@ -37,6 +37,7 @@
 
 // viewer includes
 #include "llfloaterhtml.h"
+#include "llfloatermediabrowser.h"
 #include "llfloaterworldmap.h"
 #include "lluictrlfactory.h"
 #include "llurldispatcher.h"
@@ -746,7 +747,7 @@ void LLMediaCtrl::handleMediaEvent(LLPluginClassMedia* self, EMediaEvent event)
 		
 		case MEDIA_EVENT_CURSOR_CHANGED:
 		{
-			LL_INFOS("Media") <<  "Media event:  MEDIA_EVENT_CURSOR_CHANGED, new cursor is " << self->getCursorName() << LL_ENDL;
+			LL_DEBUGS("MediaEventCursor") <<  "Media event:  MEDIA_EVENT_CURSOR_CHANGED, new cursor is " << self->getCursorName() << LL_ENDL;
 
 			std::string cursor = self->getCursorName();
 			
@@ -865,6 +866,7 @@ void LLMediaCtrl::onClickLinkHref( LLPluginClassMedia* self )
 	const std::string protocol2( "https://" );
 	if( mOpenLinksInExternalBrowser )
 	{
+		LL_DEBUGS("Media") <<  "OpenLinksInExternalBrowser" << LL_ENDL;
 		if ( !url.empty() )
 		{
 			if ( LLStringUtil::compareInsensitive( url.substr( 0, protocol1.length() ), protocol1 ) == 0 ||
@@ -877,6 +879,7 @@ void LLMediaCtrl::onClickLinkHref( LLPluginClassMedia* self )
 	else
 	if( mOpenLinksInInternalBrowser )
 	{
+		LL_DEBUGS("Media") <<  "OpenLinksInInternalBrowser" << LL_ENDL;
 		if ( !url.empty() )
 		{
 			if ( LLStringUtil::compareInsensitive( url.substr( 0, protocol1.length() ), protocol1 ) == 0 ||
@@ -891,6 +894,8 @@ void LLMediaCtrl::onClickLinkHref( LLPluginClassMedia* self )
 //						"Second Life Browser",
 //							open_links_externally,
 //								mTrusted);
+
+				LLFloaterMediaBrowser::getInstance()->openMedia(url);
 			}
 		}
 	}
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 4fe0624..e67f336 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -1216,6 +1216,7 @@ bool LLPanelLogin::loadNewsBar()
 	curl_free(curl_version);
 	curl_free(curl_skin);
 
+        LL_DEBUGS("NewsBar")<< "news bar setup to navigate to: " << full_url.str() << LL_ENDL;
 	news_bar->navigateTo( full_url.str() );
 
 
-- 
cgit v1.1


From 3659dd79710a4cffd8ff6a76714de48af1c33aa6 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Tue, 1 Mar 2011 14:29:08 +0100
Subject: remove llfloaterhtml.* (not used anymore).

---
 linden/indra/newview/llfloaterchat.cpp         |   1 -
 linden/indra/newview/llfloaterhtml.cpp         | 253 -------------------------
 linden/indra/newview/llfloaterhtml.h           |  77 --------
 linden/indra/newview/llfloatermediabrowser.cpp |   5 +-
 linden/indra/newview/llmediactrl.cpp           |   1 -
 5 files changed, 2 insertions(+), 335 deletions(-)
 delete mode 100644 linden/indra/newview/llfloaterhtml.cpp
 delete mode 100644 linden/indra/newview/llfloaterhtml.h

diff --git a/linden/indra/newview/llfloaterchat.cpp b/linden/indra/newview/llfloaterchat.cpp
index e9ea14b..79dddaa 100644
--- a/linden/indra/newview/llfloaterchat.cpp
+++ b/linden/indra/newview/llfloaterchat.cpp
@@ -73,7 +73,6 @@
 #include "lllogchat.h"
 #include "lltexteditor.h"
 #include "lltextparser.h"
-#include "llfloaterhtml.h"
 #include "llweb.h"
 #include "llstylemap.h"
 #include "llviewermenu.h"
diff --git a/linden/indra/newview/llfloaterhtml.cpp b/linden/indra/newview/llfloaterhtml.cpp
deleted file mode 100644
index 5822ed5..0000000
--- a/linden/indra/newview/llfloaterhtml.cpp
+++ /dev/null
@@ -1,253 +0,0 @@
-/** 
- * @file llfloaterhtml.cpp
- * @brief In-world HTML dialog
- *
- * $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
- * ("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 "llfloaterhtml.h"
-
-// viewer includes
-#include "lluictrlfactory.h"
-#include "llviewercontrol.h"
-#include "lllineeditor.h"
-#include "llviewerwindow.h"
-#include "llweb.h"
-
-
-LLFloaterHtml* LLFloaterHtml::sInstance = 0;
-
-////////////////////////////////////////////////////////////////////////////////
-//
-LLFloaterHtml* LLFloaterHtml::getInstance()
-{
-    if ( ! sInstance )
-        sInstance = new LLFloaterHtml();
-
-	return sInstance;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-LLFloaterHtml::LLFloaterHtml()
-:	LLFloater( std::string("HTML Floater") )
-
-        ,
-	mWebBrowser( 0 )
-{
-	LLUICtrlFactory::getInstance()->buildFloater( this, "floater_html.xml" );
-
-	childSetAction("back_btn", onClickBack, this);
-	childSetAction("home_btn", onClickHome, this);
-	childSetAction("forward_btn", onClickForward, this);
-	childSetAction("close_btn", onClickClose, this);
-	childSetCommitCallback("url_edit", onCommitUrlEdit, this );
-	childSetAction("go_btn", onClickGo, this );
-
-	// reposition floater from saved settings
-	LLRect rect = gSavedSettings.getRect( "FloaterHtmlRect" );
-	reshape( rect.getWidth(), rect.getHeight(), FALSE );
-	setRect( rect );
-
-	mWebBrowser = getChild<LLWebBrowserCtrl>("html_floater_browser" );
-	if ( mWebBrowser )
-	{
-		// open links in internal browser
-		mWebBrowser->setOpenInExternalBrowser( false );
-	}
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-LLFloaterHtml::~LLFloaterHtml()
-{
-	// save position of floater
-	gSavedSettings.setRect( "FloaterHtmlRect", getRect() );
-
-	sInstance = 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// virtual 
-void LLFloaterHtml::draw()
-{
-	// enable/disable buttons depending on state
-	if ( mWebBrowser )
-	{
-		bool enable_back = mWebBrowser->canNavigateBack();	
-		childSetEnabled( "back_btn", enable_back );
-
-		bool enable_forward = mWebBrowser->canNavigateForward();	
-		childSetEnabled( "forward_btn", enable_forward );
-	};
-
-	LLFloater::draw();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-void LLFloaterHtml::show( std::string content_id, bool open_link_external, bool open_app_slurls )
-{
-	// calculate the XML labels we'll need (if only XML folders worked)
-	std::string title_str = content_id + "_title";
-	std::string url_str = content_id + "_url";
-
-	std::string title = getString( title_str );
-	std::string url = getString( url_str );
-
-	show( url, title, open_link_external, open_app_slurls );
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-void LLFloaterHtml::show( std::string start_url, std::string title, bool open_link_external, bool trusted_browser )
-{
-	// set the title 
-	setTitle( title );
-
-	// navigate to the URL
-	if ( mWebBrowser )
-	{
-		mWebBrowser->setTrusted( trusted_browser );
-		mWebBrowser->setOpenInExternalBrowser( open_link_external );
-		mWebBrowser->navigateTo( start_url );
-	}
-
-	// make floater appear
-	setVisibleAndFrontmost();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-std::string LLFloaterHtml::getSupportUrl()
-{
-	return getString("support_page_url");
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-void LLFloaterHtml::onClose( bool app_quitting )
-{
-	setVisible( false );
-	// HACK for fast XML iteration replace with:
-	// destroy();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-void LLFloaterHtml::onClickClose( void* data )
-{
-	LLFloaterHtml* self = ( LLFloaterHtml* )data;
-	self->close();
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// static
-void LLFloaterHtml::onClickBack( void* data )
-{
-	LLFloaterHtml* self = ( LLFloaterHtml* )data;
-	if ( self )
-	{
-		if ( self->mWebBrowser )
-		{
-			self->mWebBrowser->navigateBack();
-		};
-	};
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//
-void LLFloaterHtml::onClickHome( void* data )
-{
-	LLFloaterHtml* self = ( LLFloaterHtml* )data;
-	if ( self )
-	{
-		if ( self->mWebBrowser )
-		{
-			std::string home_url = self->getString("home_page_url");
-			if ( home_url.length() > 4 )
-			{
-				self->mWebBrowser->navigateTo( home_url );
-			}
-			else
-			{
-				llwarns << "Invalid home page specified for HTML floater - navigating to default" << llendl;
-				self->mWebBrowser->navigateTo( "http://secondlife.com" );
-			}
-		};
-	};
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// static
-void LLFloaterHtml::onClickForward( void* data )
-{
-	LLFloaterHtml* self = ( LLFloaterHtml* )data;
-	if ( self )
-	{
-		if ( self->mWebBrowser )
-		{
-			self->mWebBrowser->navigateForward();
-		};
-	};
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// static
-void LLFloaterHtml::onCommitUrlEdit(LLUICtrl* ctrl, void* user_data)
-{
-	LLFloaterHtml* self = (LLFloaterHtml*)user_data;
-
-	LLLineEditor* editor = (LLLineEditor*)ctrl;
-	std::string url = editor->getText();
-
-	if ( self->mWebBrowser )
-	{
-		self->mWebBrowser->navigateTo( url );
-	};
-}
-
-////////////////////////////////////////////////////////////////////////////////
-//  static
-void LLFloaterHtml::onClickGo( void* data )
-{
-	LLFloaterHtml* self = ( LLFloaterHtml* )data;
-	if ( self )
-	{
-		std::string url = self->childGetValue( "url_edit" ).asString();
-		if ( url.length() )
-		{
-			if ( self->mWebBrowser )
-			{
-				self->mWebBrowser->navigateTo( url );
-			}
-		}
-	}
-}
diff --git a/linden/indra/newview/llfloaterhtml.h b/linden/indra/newview/llfloaterhtml.h
deleted file mode 100644
index 4383472..0000000
--- a/linden/indra/newview/llfloaterhtml.h
+++ /dev/null
@@ -1,77 +0,0 @@
- /** 
- * @file llfloaterhtml.h
- * @author James Cook
- * @brief In-world HTML dialog
- *
- * $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
- * ("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$
- */
-
-#ifndef LL_LLFLOATERHTML_H
-#define LL_LLFLOATERHTML_H
-
-#include "llfloater.h"
-#include "llhtmlhelp.h"
-
-class LLWebBrowserCtrl;
-
-class LLFloaterHtml :
-	public LLFloater
-{
-	public:
-		static LLFloaterHtml* getInstance();
-		virtual ~LLFloaterHtml();
-		
-		virtual void draw();
-		virtual void onClose( bool app_quitting );
-		
-		// Pass string like "in-world_help" or "additional help"
-		void show( std::string content_id, bool open_link_external, bool trusted_browser );
-
-		// Pass raw URL and window title
-		// Can be set to handle secondlife:///app/ URLs, but this should
-		// usually be false.
-		void show( std::string start_url, std::string title, bool open_link_external, bool trusted_browser );
-
-		std::string getSupportUrl(); 
-		
-		static void onClickClose( void* data );
-		static void onClickBack( void* data );
-		static void onClickHome( void* data );
-		static void onClickForward( void* data );
-		static void onCommitUrlEdit(LLUICtrl* ctrl, void* user_data);
-		static void onClickGo( void* data );
-		
-	private:
-		LLFloaterHtml();
-
-		LLWebBrowserCtrl* mWebBrowser;
-		static LLFloaterHtml* sInstance;
-		LLButton* mCloseButton;
-};
-
-#endif
diff --git a/linden/indra/newview/llfloatermediabrowser.cpp b/linden/indra/newview/llfloatermediabrowser.cpp
index d658a11..a78c9d1 100644
--- a/linden/indra/newview/llfloatermediabrowser.cpp
+++ b/linden/indra/newview/llfloatermediabrowser.cpp
@@ -1,6 +1,6 @@
 /** 
- * @file llfloaterhtmlhelp.cpp
- * @brief HTML Help floater - uses embedded web browser control
+ * @file llmediabrowser.cpp
+ * @brief embedded web browser
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
@@ -33,7 +33,6 @@
 #include "llviewerprecompiledheaders.h"
 
 #include "llfloatermediabrowser.h"
-#include "llfloaterhtml.h"
 
 #include "llchat.h"
 #include "llfloaterchat.h"
diff --git a/linden/indra/newview/llmediactrl.cpp b/linden/indra/newview/llmediactrl.cpp
index ff7ba22..8b10fa3 100644
--- a/linden/indra/newview/llmediactrl.cpp
+++ b/linden/indra/newview/llmediactrl.cpp
@@ -36,7 +36,6 @@
 #include "llmediactrl.h"
 
 // viewer includes
-#include "llfloaterhtml.h"
 #include "llfloatermediabrowser.h"
 #include "llfloaterworldmap.h"
 #include "lluictrlfactory.h"
-- 
cgit v1.1


From de7bae0930e4830bbb90f12652d9a75088d431de Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Thu, 3 Feb 2011 22:24:21 +0100
Subject: Revolution Smythe: load voice module depending on login response

---
 linden/indra/newview/app_settings/settings.xml | 12 +++++++++++-
 linden/indra/newview/hippolimits.cpp           |  5 ++++-
 linden/indra/newview/hippolimits.h             |  3 ++-
 linden/indra/newview/kowopenregionsettings.cpp |  7 +++++++
 linden/indra/newview/llvoiceclient.cpp         | 23 +++++++++++++++++------
 linden/indra/newview/llvoiceclient.h           |  3 +++
 6 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 17d4c3c..fbb51e8 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -37,7 +37,17 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
-
+  <key>VoiceModule</key>
+  <map>
+    <key>Comment</key>
+    <string>Executable file that runs voice. Platform specific parts (like .exe on windows) are added automatically.</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>SLVoice</string>
+  </map>
   <!-- Imprudence-specific settings -->
 
   <key>AllowEditingOfTrees</key>
diff --git a/linden/indra/newview/hippolimits.cpp b/linden/indra/newview/hippolimits.cpp
index d4c8efb..bb2e805 100644
--- a/linden/indra/newview/hippolimits.cpp
+++ b/linden/indra/newview/hippolimits.cpp
@@ -22,7 +22,8 @@ HippoLimits::HippoLimits()
 	mMinPrimScale(0.001f),
 	mMaxPrimScale(256.0f),
 	mMaxLinkedPrims(-1),
-	mMaxDragDistance(0.f)
+	mMaxDragDistance(0.f),
+	mVoiceConnector("SLVoice")
 {
 	setLimits();
 }
@@ -68,6 +69,7 @@ void HippoLimits::setOpenSimLimits()
 	mEnableTeenMode = FALSE;
 	mEnforceMaxBuild = FALSE;
 	mRenderWater = TRUE;
+	mVoiceConnector = "SLVoice";
 
 	if (gHippoGridManager->getConnectedGrid()->isRenderCompat()) {
 		llinfos << "Using rendering compatible OpenSim limits" << llendl;
@@ -110,6 +112,7 @@ void HippoLimits::setSecondLifeLimits()
 	mEnableTeenMode = FALSE;
 	mEnforceMaxBuild = FALSE;
 	mRenderWater = TRUE;
+	mVoiceConnector = "SLVoice";
 }
 
 F32 HippoLimits::getMaxPrimScale() const
diff --git a/linden/indra/newview/hippolimits.h b/linden/indra/newview/hippolimits.h
index 7792a2c..9d6b2f6 100644
--- a/linden/indra/newview/hippolimits.h
+++ b/linden/indra/newview/hippolimits.h
@@ -14,7 +14,7 @@ public:
 	const S32&	getMaxLinkedPrims() const { return mMaxLinkedPrims; }
 	const S32&	getMaxPhysLinkedPrims() const { return mMaxPhysLinkedPrims; }
 	const F32&	getMaxInventoryItemsTransfer() const { return mMaxInventoryItemsTransfer; }
-	
+	const std::string& getVoiceConnector()  const { return mVoiceConnector; }
 
 	// Returns the max prim size we can use on a grid
 	F32		getMinPrimScale() const;
@@ -59,6 +59,7 @@ public:
 	BOOL    mEnableTeenMode;
 	BOOL    mEnforceMaxBuild;
 	BOOL    mRenderWater;
+	std::string    mVoiceConnector;
 
 private:
 	void	setOpenSimLimits();
diff --git a/linden/indra/newview/kowopenregionsettings.cpp b/linden/indra/newview/kowopenregionsettings.cpp
index 8aac87c..ef14d2a 100644
--- a/linden/indra/newview/kowopenregionsettings.cpp
+++ b/linden/indra/newview/kowopenregionsettings.cpp
@@ -36,6 +36,7 @@
 #include "llviewerobject.h"
 #include "llfloaterregioninfo.h"
 #include "llfloaterworldmap.h"
+#include "llvoiceclient.h"
 
 //DEBUG includes
 //#include "llsdserialize.h" //LLSDNotationStreamer - for dumping LLSD to string
@@ -200,6 +201,12 @@ class OpenRegionInfoUpdate : public LLHTTPNode
 		{
 			gHippoLimits->mAllowParcelWindLight = body["AllowParcelWindLight"].asInteger() == 1;
 		}
+		if ( body.has("Voice") )
+		{
+			gSavedSettings.setString("VoiceModule", body["Voice"].asString());
+			//gVoiceClient->close();
+			//gVoiceClient->start();
+		}
 
 		if (limitschanged)
 			gFloaterTools->updateToolsSizeLimits();
diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index 7b1ed95..5517ca2 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -62,6 +62,7 @@
 #include "llfirstuse.h"
 #include "llviewerwindow.h"
 #include "llviewercamera.h"
+#include "hippolimits.h"
 
 #include "llfloaterfriends.h"  //VIVOX, inorder to refresh communicate panel
 #include "llfloaterchat.h"		// for LLFloaterChat::addChat()
@@ -1524,6 +1525,15 @@ void LLVoiceClient::setState(state inState)
 	
 	mState = inState;
 }
+void LLVoiceClient::close()
+{
+	setState(stateDisableCleanup);
+}
+
+void LLVoiceClient::start()
+{
+	setState(stateStart);
+}
 
 void LLVoiceClient::stateMachine()
 {
@@ -1654,12 +1664,12 @@ void LLVoiceClient::stateMachine()
 					//std::string exe_path = gDirUtilp->getAppRODataDir();
 					std::string exe_path = gDirUtilp->getExecutableDir();
 					exe_path += gDirUtilp->getDirDelimiter();
+#if LL_DARWIN
+					exe_path += "../Resources/";
+#endif
+					exe_path += gSavedSettings.getString("VoiceModule");
 #if LL_WINDOWS
-					exe_path += "SLVoice.exe";
-#elif LL_DARWIN
-					exe_path += "../Resources/SLVoice";
-#else
-					exe_path += "SLVoice";
+					exe_path += ".exe";
 #endif
 					// See if the vivox executable exists
 					llstat s;
@@ -1687,7 +1697,8 @@ void LLVoiceClient::stateMachine()
 						STARTUPINFOA sinfo;
 						memset(&sinfo, 0, sizeof(sinfo));
 						std::string exe_dir = gDirUtilp->getAppRODataDir();
-						cmd = "SLVoice.exe";
+						cmd = gSavedSettings.getString("VoiceModule");
+						cmd += ".exe";
 						cmd += args;
 						
 						// So retarded.  Windows requires that the second parameter to CreateProcessA be a writable (non-const) string...
diff --git a/linden/indra/newview/llvoiceclient.h b/linden/indra/newview/llvoiceclient.h
index cfc336b..9ef3be9 100644
--- a/linden/indra/newview/llvoiceclient.h
+++ b/linden/indra/newview/llvoiceclient.h
@@ -516,6 +516,9 @@ static	void updatePosition(void);
 		// Currently this will be false only for PSTN P2P calls.
 		// NOTE: this will return true if the session can't be found. 
 		bool isSessionTextIMPossible(const LLUUID &session_id);
+
+		void close();
+		void start();
 		
 	private:
 
-- 
cgit v1.1


From d2180c8379f33351aecfce95833bcdbd176fa698 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Wed, 9 Feb 2011 16:16:29 +0100
Subject: fix: imprudence logo not showing in login screen; login screens not
 loading anymore after navigating to a broken one.

This also shows an error page if the login screen page is broken.
Todo: replace the trademarked logo.
---
 linden/indra/newview/llpanellogin.cpp                      | 14 ++------------
 .../newview/skins/default/html/en-us/loading/loading.html  |  9 +++++++++
 2 files changed, 11 insertions(+), 12 deletions(-)
 create mode 100644 linden/indra/newview/skins/default/html/en-us/loading/loading.html

diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index e67f336..0b91091 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -297,7 +297,7 @@ LLPanelLogin::LLPanelLogin(const LLRect &rect,
 
 	// don't make it a tab stop until SL-27594 is fixed
 	web_browser->setTabStop(FALSE);
-	// web_browser->navigateToLocalPage( "loading", "loading.html" );
+	web_browser->navigateToLocalPage( "loading", "loading.html" );
 
 	// make links open in external browser
 	web_browser->setOpenInExternalBrowser( true );
@@ -338,16 +338,6 @@ void LLPanelLogin::setSiteIsAlive( bool alive )
 	else
 	// the site is not available (missing page, server down, other badness)
 	{
-#if !USE_VIEWER_AUTH
-		if ( web_browser )
-		{
-			// hide browser control (revealing default one)
-			web_browser->setVisible( FALSE );
-
-			// mark as unavailable
-			mHtmlAvailable = FALSE;
-		}
-#else
 
 		if ( web_browser )
 		{	
@@ -356,7 +346,7 @@ void LLPanelLogin::setSiteIsAlive( bool alive )
 			// mark as available
 			mHtmlAvailable = TRUE;
 		}
-#endif
+
 	}
 }
 
diff --git a/linden/indra/newview/skins/default/html/en-us/loading/loading.html b/linden/indra/newview/skins/default/html/en-us/loading/loading.html
new file mode 100644
index 0000000..97174b0
--- /dev/null
+++ b/linden/indra/newview/skins/default/html/en-us/loading/loading.html
@@ -0,0 +1,9 @@
+<body style="background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;">
+<table width="100%" height="100%" border="0">
+	<tr>
+		<td align="center" valign="middle" style="font-size:0.8em;">
+			<img src="imprudence_loading.png" align="absmiddle"><br/>&nbsp;&nbsp;&nbsp;loading...
+		</td>
+	</tr>
+</table>
+</body>
-- 
cgit v1.1


From 4d29299ac5f83a7e5c6da2c277b8efff0bf787dd Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Wed, 16 Feb 2011 10:14:20 +0100
Subject: Add short documentation to which project/s
 (viewer/SLPlugin/libmediaplugin) llplugin* classes belong to

Yes, I confess: I grepped for unique strings in the binaries, to be absolutely sure.
---
 linden/indra/llplugin/llpluginclassmedia.cpp    | 2 ++
 linden/indra/llplugin/llpluginclassmediaowner.h | 2 +-
 linden/indra/llplugin/llplugincookiestore.cpp   | 2 ++
 linden/indra/llplugin/llplugininstance.cpp      | 2 ++
 linden/indra/llplugin/llpluginmessage.cpp       | 2 ++
 linden/indra/llplugin/llpluginmessagepipe.cpp   | 2 ++
 linden/indra/llplugin/llpluginprocesschild.cpp  | 2 ++
 linden/indra/llplugin/llpluginprocessparent.cpp | 2 ++
 linden/indra/llplugin/llpluginsharedmemory.cpp  | 3 ++-
 linden/indra/llplugin/slplugin/slplugin.cpp     | 1 +
 10 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/linden/indra/llplugin/llpluginclassmedia.cpp b/linden/indra/llplugin/llpluginclassmedia.cpp
index 02da271..520d9f5 100755
--- a/linden/indra/llplugin/llpluginclassmedia.cpp
+++ b/linden/indra/llplugin/llpluginclassmedia.cpp
@@ -33,6 +33,8 @@
  * @endcond
  */
 
+/// IMPRUDENCE: this is part of the viewer
+
 #include "linden_common.h"
 #include "indra_constants.h"
 
diff --git a/linden/indra/llplugin/llpluginclassmediaowner.h b/linden/indra/llplugin/llpluginclassmediaowner.h
index 9d1f352..0e54f7f 100755
--- a/linden/indra/llplugin/llpluginclassmediaowner.h
+++ b/linden/indra/llplugin/llpluginclassmediaowner.h
@@ -41,7 +41,7 @@
 #include <queue>
 
 class LLPluginClassMedia;
-class LLPluginCookieStore;
+//class LLPluginCookieStore; // IMPRUDENCE: this is currently not used 
 
 class LLPluginClassMediaOwner
 {
diff --git a/linden/indra/llplugin/llplugincookiestore.cpp b/linden/indra/llplugin/llplugincookiestore.cpp
index 283ba35..6b193de 100644
--- a/linden/indra/llplugin/llplugincookiestore.cpp
+++ b/linden/indra/llplugin/llplugincookiestore.cpp
@@ -33,6 +33,8 @@
  * @endcond
  */
 
+/// IMPRUDENCE: this is currently not used
+
 #include "linden_common.h"
 #include "indra_constants.h"
 
diff --git a/linden/indra/llplugin/llplugininstance.cpp b/linden/indra/llplugin/llplugininstance.cpp
index 67457f2..399f157 100755
--- a/linden/indra/llplugin/llplugininstance.cpp
+++ b/linden/indra/llplugin/llplugininstance.cpp
@@ -33,6 +33,8 @@
  * @endcond
  */
 
+/// IMPRUDENCE: this is part of the SLPlugin
+
 #include "linden_common.h"
 
 #include "llplugininstance.h"
diff --git a/linden/indra/llplugin/llpluginmessage.cpp b/linden/indra/llplugin/llpluginmessage.cpp
index 6452f4a..0810a04 100755
--- a/linden/indra/llplugin/llpluginmessage.cpp
+++ b/linden/indra/llplugin/llpluginmessage.cpp
@@ -33,6 +33,8 @@
  * @endcond
  */
 
+/// IMPRUDENCE: this is part of the viewer and the SLPlugin and the libmedia_plugin_* libraries
+
 #include "linden_common.h"
 
 #include "llpluginmessage.h"
diff --git a/linden/indra/llplugin/llpluginmessagepipe.cpp b/linden/indra/llplugin/llpluginmessagepipe.cpp
index ac3a902..2cad188 100755
--- a/linden/indra/llplugin/llpluginmessagepipe.cpp
+++ b/linden/indra/llplugin/llpluginmessagepipe.cpp
@@ -33,6 +33,8 @@
  * @endcond
  */
 
+/// IMPRUDENCE: this is part of the viewer and the SLPlugin
+
 #include "linden_common.h"
 
 #include "llpluginmessagepipe.h"
diff --git a/linden/indra/llplugin/llpluginprocesschild.cpp b/linden/indra/llplugin/llpluginprocesschild.cpp
index a1291c0..0d95cac 100755
--- a/linden/indra/llplugin/llpluginprocesschild.cpp
+++ b/linden/indra/llplugin/llpluginprocesschild.cpp
@@ -33,6 +33,8 @@
  * @endcond
  */
 
+/// IMPRUDENCE: this is part of the SLPlugin
+
 #include "linden_common.h"
 
 #include "llpluginprocesschild.h"
diff --git a/linden/indra/llplugin/llpluginprocessparent.cpp b/linden/indra/llplugin/llpluginprocessparent.cpp
index 5a66279..26572a0 100755
--- a/linden/indra/llplugin/llpluginprocessparent.cpp
+++ b/linden/indra/llplugin/llpluginprocessparent.cpp
@@ -33,6 +33,8 @@
  * @endcond
  */
 
+/// IMPRUDENCE: this is part of the viewer
+
 #include "linden_common.h"
 
 #include "llpluginprocessparent.h"
diff --git a/linden/indra/llplugin/llpluginsharedmemory.cpp b/linden/indra/llplugin/llpluginsharedmemory.cpp
index 6becb8d..882a2a1 100755
--- a/linden/indra/llplugin/llpluginsharedmemory.cpp
+++ b/linden/indra/llplugin/llpluginsharedmemory.cpp
@@ -33,6 +33,8 @@
  * @endcond
  */
 
+/// IMPRUDENCE: this is part of the viewer and the SLPlugin
+
 #include "linden_common.h"
 
 #include "llpluginsharedmemory.h"
@@ -89,7 +91,6 @@
 #include <windows.h>
 #endif // USE_APR_SHARED_MEMORY
 
-
 int LLPluginSharedMemory::sSegmentNumber = 0;
 
 std::string LLPluginSharedMemory::createName(void)
diff --git a/linden/indra/llplugin/slplugin/slplugin.cpp b/linden/indra/llplugin/slplugin/slplugin.cpp
index 878577b..09331ca 100755
--- a/linden/indra/llplugin/slplugin/slplugin.cpp
+++ b/linden/indra/llplugin/slplugin/slplugin.cpp
@@ -35,6 +35,7 @@
  * @endcond
  */
 
+/// IMPRUDENCE: this is part of the SLPlugin
 
 #include "linden_common.h"
 
-- 
cgit v1.1


From c2756f03fd663619e793fa7fdb96172d9bb4501d Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Wed, 16 Feb 2011 10:36:45 +0100
Subject: remove unused webkit include in llplugin

---
 linden/indra/llplugin/CMakeLists.txt         | 1 -
 linden/indra/llplugin/llpluginclassmedia.cpp | 2 --
 2 files changed, 3 deletions(-)

diff --git a/linden/indra/llplugin/CMakeLists.txt b/linden/indra/llplugin/CMakeLists.txt
index 7a7f4e5..5dbe07c 100644
--- a/linden/indra/llplugin/CMakeLists.txt
+++ b/linden/indra/llplugin/CMakeLists.txt
@@ -20,7 +20,6 @@ include_directories(
     ${LLRENDER_INCLUDE_DIRS}
     ${LLXML_INCLUDE_DIRS}
     ${LLWINDOW_INCLUDE_DIRS}
-    ${LLQTWEBKIT_INCLUDE_DIR}
     )
 
 set(llplugin_SOURCE_FILES
diff --git a/linden/indra/llplugin/llpluginclassmedia.cpp b/linden/indra/llplugin/llpluginclassmedia.cpp
index 520d9f5..f0a44f7 100755
--- a/linden/indra/llplugin/llpluginclassmedia.cpp
+++ b/linden/indra/llplugin/llpluginclassmedia.cpp
@@ -41,8 +41,6 @@
 #include "llpluginclassmedia.h"
 #include "llpluginmessageclasses.h"
 
-#include "llqtwebkit.h"
-
 static int LOW_PRIORITY_TEXTURE_SIZE_DEFAULT = 256;
 
 static int nextPowerOf2( int value )
-- 
cgit v1.1


From 35f256d0597e55c6e2680ca612871c9b457a572a Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Wed, 16 Feb 2011 13:20:04 +0100
Subject: use logcontrol.xml also for SLPlugin

---
 linden/indra/llcommon/llerror.cpp           |  2 +-
 linden/indra/llplugin/slplugin/slplugin.cpp | 39 ++++++++++++++++++++++++++---
 2 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/linden/indra/llcommon/llerror.cpp b/linden/indra/llcommon/llerror.cpp
index a9587c6..532a453 100644
--- a/linden/indra/llcommon/llerror.cpp
+++ b/linden/indra/llcommon/llerror.cpp
@@ -563,7 +563,7 @@ namespace
 #if LL_WINDOWS
 		LLError::addRecorder(new RecordToWinDebug);
 #endif
-
+		llwarns << "Load LogControlFile from Directory:"<< dir << llendl;
 		LogControlFile& e = LogControlFile::fromDirectory(dir);
 
 		// NOTE: We want to explicitly load the file before we add it to the event timer
diff --git a/linden/indra/llplugin/slplugin/slplugin.cpp b/linden/indra/llplugin/slplugin/slplugin.cpp
index 09331ca..347f1de 100755
--- a/linden/indra/llplugin/slplugin/slplugin.cpp
+++ b/linden/indra/llplugin/slplugin/slplugin.cpp
@@ -54,6 +54,20 @@
 	#include <signal.h>
 #endif
 
+//imprudence: or we include lldir, or use apache runtime
+//though the one is probably bloat and the other we rather want to avoid
+#include <stdio.h>  // FILENAME_MAX
+#ifdef WINDOWS
+    #include <direct.h>
+    #define getImpruDir _getcwd
+    #define DIR_DELIMITER "\\"
+#else
+    #include <unistd.h>
+    #define getImpruDir getcwd
+    #define DIR_DELIMITER "/"
+#endif
+
+
 /*
 	On Mac OS, since we call WaitNextEvent, this process will show up in the dock unless we set the LSBackgroundOnly or LSUIElement flag in the Info.plist.
 
@@ -188,9 +202,28 @@ int main(int argc, char **argv)
 {
 	// Set up llerror logging
 	{
-		LLError::initForApplication(".");
-		LLError::setDefaultLevel(LLError::LEVEL_INFO);
-//		LLError::setTagLevel("Plugin", LLError::LEVEL_DEBUG);
+		std::string path;
+		char impruPath[FILENAME_MAX];
+
+		if (!getImpruDir(impruPath, sizeof(impruPath)))
+		{
+			path = "."; //FIXME: root directory of the system - bad idea
+		}
+		else
+		{
+			path = std::string(impruPath);
+
+			path.append(DIR_DELIMITER);
+			path.append("app_settings");
+		}
+		LLError::initForApplication(path);
+// 		LLError::setDefaultLevel(LLError::LEVEL_INFO);
+// 		LLError::setPrintLocation(true);
+// 		LLError::setTagLevel("Plugin", LLError::LEVEL_DEBUG);
+// 		LLError::setTagLevel("PluginPipe", LLError::LEVEL_DEBUG);
+// 		LLError::setTagLevel("PluginChild", LLError::LEVEL_DEBUG);
+// 		LLError::setTagLevel("PluginInstance", LLError::LEVEL_DEBUG);
+
 //		LLError::logToFile("slplugin.log");
 	}
 
-- 
cgit v1.1


From 2ed44e4426cdd810cb204cbdafb78ff03964c1a8 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Tue, 1 Mar 2011 17:33:03 +0100
Subject: Improve the error message for a missing login screen

---
 .../default/html/en-us/loading-error/index.html    | 54 ++++++++++++++--------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/linden/indra/newview/skins/default/html/en-us/loading-error/index.html b/linden/indra/newview/skins/default/html/en-us/loading-error/index.html
index 71f9c86..37c8405 100644
--- a/linden/indra/newview/skins/default/html/en-us/loading-error/index.html
+++ b/linden/indra/newview/skins/default/html/en-us/loading-error/index.html
@@ -1,14 +1,14 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+		DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<title>Unable to Connect</title>
-<style>
-body {background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:62.5%;color:#e9f1f8;width:100%;padding:0px;margin:0px;}
+<title>Unable to Connect</title><style>
+body {background-color:#000000;font-family:verdana,helvetica,sans-serif;font-size:85%;color:#e9f1f8;width:100%;padding:0px;margin:0px;}
 a {color:#93a9d5;}
 a:active {color:#50607C;text-decoration:underline;}
 a:hover {color:#ff7900;text-decoration:underline;}
-#infobox{position:absolute;top:40%;left:50%;z-index:1;padding:0;width:592px;margin-left:-296px;margin-top:-150px;text-align:center;font-size:1.2em; color:#ccc;}
-#infobox #submitbtn {padding:15px 3px 5px 15px;height:28px;width:127px;margin-left:244px;}
+#infobox{position:absolute;top:40%;left:50%;z-index:1;padding:0;width:592px;margin-left:-296px;margin-top:-80px;text-align:left;font-size:1.2em; color:#ccc;}
+#infobox #submitbtn {height:28px;width:127px;}
 #infobox #submitbtn input {text-transform:capitalize;color:#fff;font-size:1.0em;height:28px;width:127px;border:none;font-weight:normal;background:url(../../btn_purplepill_bg.png) bottom left no-repeat;vertical-align:text-bottom;font-weight:bold;}
 #infobox #submitbtn input:hover.input_over, #login_box #submitbtn input:hover.input_off {color:#fff;border:none;background:url(../../btn_purplepill_bg.png) bottom right no-repeat;}
 #infobox #submitbtn input:active.input_over {color:#fff;border:none;background:url(../../btn_purplepill_bg.png) top left no-repeat;}
@@ -17,16 +17,34 @@ a:hover {color:#ff7900;text-decoration:underline;}
 </head>
 <body>
 <div id="infobox">
-	<img src="../../unabletoconnect.png"><br/>
-		<p>
-			Second Life can't establish a connection to the login server.
-		</p>
-		<p>
-			Please check your internet connection. If your computer or network is protected by a firewall or proxy, make sure that Second Life is permitted to access the network.
-		</p>
-		<div id="submitbtn">
-			<input class="input_over" type="submit" value="Try Again" onclick="document.location='secondlife:///app/login_refresh'; this.className='pressed';" onmouseover="this.className='input_over';" onmouseout="this.className='input_off';" />
-		</div>
-	</div>
+      <table>
+
+      <tbody style="height: 100px; overflow: scroll">
+        <tr>
+            Imprudence can't establish a connection to the login screen of the grid you have chosen.
+        </tr>
+        <tr>
+          <td>
+	    <img src="../../unabletoconnect.png"><br/>
+
+          <div id="submitbtn">
+            <input class="input_over" type="submit" value="Try Again" onclick="document.location='secondlife:///app/login_refresh'; this.className='pressed';" onmouseover="this.className='input_over';" onmouseout="this.className='input_off';" />
+	   </div>
+
+          <td>
+            If you are used to see a loginscreen for that grid please
+         <ul>
+          <li>for OpenSimulator grids:  check if the loginuri of that grid is still valid.</li>
+          <li>for OpenSimulator and Second Life: check the grid status page of the grid, and</li>
+          <li>if the grid status page of the grid says online check your internet connection.
+                If your computer or network is protected by a firewall or proxy, make sure that 
+                Imprudence is permitted to access the network</li>
+
+         </ul>
+         </td>
+        </tr>
+
+       </tbody>
+      </table>
 </div>
-</body>
\ No newline at end of file
+</body>
-- 
cgit v1.1


From 5303292454d2827a561f05b1126e7b9deb9c25b4 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Tue, 1 Mar 2011 18:00:46 +0100
Subject: update the artwork package

---
 linden/install.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linden/install.xml b/linden/install.xml
index b600e87..fdb39c9 100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -179,9 +179,9 @@
           <key>common</key>
           <map>
             <key>md5sum</key>
-            <string>a2cde4f24bdcc260b661e139846b8acd</string>
+            <string>bf3547c5bf5555e82355cd82ad8eaf73</string>
             <key>url</key>
-			<uri>http://imprudenceviewer.org/download/libs/imprudence-artwork-20101026.tar.bz2</uri>
+            <uri>http://download.kokuaviewer.org/files/extras/imprudence-artwork-20110301.tar.bz2</uri>
           </map>
         </map>
       </map>
-- 
cgit v1.1


From a251815c318cf44070892bc41a3da5ca49e95eb3 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Fri, 4 Mar 2011 08:52:48 +0100
Subject: don't package libgdk_pixbuf on linux64, it breaks webkit on distros
 less conservative than debian oldstable (lenny)

---
 linden/indra/newview/viewer_manifest.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 4703f16..7b0d6ca 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -1144,8 +1144,7 @@ class Linux_x86_64Manifest(LinuxManifest):
             ##self.path("libcairo.so.2")
             ##self.path("libfontconfig.so.1")
             ##self.path("libfreetype.so.6")
-            self.path("libgdk_pixbuf-2.0.so.0")	# was commented to use systems gdk pixbufs instead -
-	    					# but seems webkit needs it o_O . Packaging for testing now.
+            #self.path("libgdk_pixbuf-2.0.so.0")
             ##self.path("libgdk-x11-2.0.so.0")
             ##self.path("libgtk-x11-2.0.so.0")
 #            self.path("libpango-1.0.so.0")		# use systems pango instead
-- 
cgit v1.1


From e77b94aeea4b3e20b08232d04514c37bfba7a796 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Fri, 4 Mar 2011 14:36:52 +0100
Subject: update openal and pulse headers to pulseaudio 0.9.21 on linux*

however the old reference in install.xml is kept commented for linux32 in case it causes trouble
---
 linden/indra/newview/viewer_manifest.py |  9 ++++-----
 linden/install.xml                      | 22 ++++++++++++++++------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 7b0d6ca..e449a7e 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -1002,8 +1002,8 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libz.so.1")
 
             # OpenAL
-            self.path("libopenal.so.1")
-            self.path("libalut.so.0")
+            self.path("libopenal.so.1.12.854", "libopenal.so.1")
+            self.path("libalut.so.0.1.0", "libalut.so.0")
 
             # GTK+ and dependencies
             ## Lets just use the system libraries for all of these:
@@ -1135,9 +1135,8 @@ class Linux_x86_64Manifest(LinuxManifest):
             #self.path("libz.so.1") #not needed
 
             # OpenAL
-            self.path("libopenal.so.1")
-            self.path("libalut.so.0")
-
+            self.path("libopenal.so.1.12.854", "libopenal.so.1")
+            self.path("libalut.so.0.1.0", "libalut.so.0")
             # GTK+ and dependencies
             ## Lets just use the system libraries for all of these:
             ##self.path("libatk-1.0.so.0")
diff --git a/linden/install.xml b/linden/install.xml
index fdb39c9..10f7a8c 100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -1220,6 +1220,7 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn
             <key>url</key>
             <uri>http://imprudenceviewer.org/download/libs/openal-darwin-20091118.tar.bz2</uri>
           </map>
+<!--      openal compiled against pulse 0.9.10
           <key>linux</key>
           <map>
             <key>md5sum</key>
@@ -1227,12 +1228,21 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn
             <key>url</key>
             <uri>http://imprudenceviewer.org/download/libs/openal-linux32-20100426.tar.bz2</uri>
           </map>
+-->
+	  <!--      openal compiled against pulse 0.9.21 -->
+          <key>linux</key>
+          <map>
+            <key>md5sum</key>
+            <string>44f9bacc69a3d29ae0b46ed69ad7c2ce</string>
+            <key>url</key>
+            <uri>http://download.kokuaviewer.org/files/libs/openal-linux32-20110304.tar.bz2</uri>
+          </map>
           <key>linux64</key>
           <map>
              <key>md5sum</key>
-            <string>ea42b868511e2d5fab2df11dceaf2b7e</string>
+            <string>ea42b868511e2d5fab2df11dceaf2b7e</string>032848c2591a15e26c71998df3644cfc
              <key>url</key>
-            <uri>http://imprudenceviewer.org/download/libs/openal-linux64-20100428.tar.bz2</uri>
+            <uri>http://download.kokuaviewer.org/files/libs/openal-linux64-pulse0.9.21-20110304.tar.bz2</uri>
            </map>
           <key>windows</key>
           <map>
@@ -1336,19 +1346,19 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn
         <string>lgpl</string>
         <key>packages</key>
         <map>
-          <key>linux</key>
+<!--          <key>linux</key>
           <map>
             <key>md5sum</key>
             <string>30cb00069fe2a545fbf7be1070386236</string>
             <key>url</key>
             <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/linux-pulse-headers-0.9.14.tar.bz2</uri>
           </map>
-          <key>linux64</key>
+          <key>linux64</key>--><key>common</key>
           <map>
             <key>md5sum</key>
-            <string>30cb00069fe2a545fbf7be1070386236</string>
+            <string>c5c3b840bb77ee41fa06970663c15302</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/linux-pulse-headers-0.9.14.tar.bz2</uri>
+            <uri>http://download.kokuaviewer.org/files/libs/pulseaudio-headers-0.9.21-63-gd3efa-dirty.tar.bz2</uri>
           </map>
         </map>
       </map>
-- 
cgit v1.1


From 5f9f7f5b75debf0b93e7857838edc434e5beb444 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 4 Mar 2011 17:05:56 -0700
Subject: Recommented out plugin log info in logcontrol.xml

---
 linden/indra/newview/app_settings/logcontrol.xml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/linden/indra/newview/app_settings/logcontrol.xml b/linden/indra/newview/app_settings/logcontrol.xml
index cdc837d..2c6c6a4 100644
--- a/linden/indra/newview/app_settings/logcontrol.xml
+++ b/linden/indra/newview/app_settings/logcontrol.xml
@@ -66,14 +66,15 @@
 
 							<!--<string>Messaging</string>-->
 							<!--<string>Notifications</string>-->
-		<string>Plugin</string>
-		<string>PluginClassMedia</string>
-		<string>PluginInstance</string>
-		<string>PluginPipe</string>
-		<string>PluginChild</string>
-	        <!--<string>PluginSpam</string>-->
-		<string>PluginParent</string>
-		<string>PluginViewerMedia</string>
+              
+              <!--<string>Plugin</string>-->
+              <!--<string>PluginClassMedia</string>-->
+              <!--<string>PluginInstance</string>-->
+              <!--<string>PluginPipe</string>-->
+              <!--<string>PluginChild</string>-->
+              <!--<string>PluginSpam</string>-->
+              <!--<string>PluginParent</string>-->
+              <!--<string>PluginViewerMedia</string>-->
 
               <!--<string>Radar</string>-->
 							<!--<string>ShaderLoading</string>-->
-- 
cgit v1.1


From 9aebca3bd830fce9b0ee0adadf372be293ad0bf5 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 4 Mar 2011 17:21:57 -0700
Subject: Updated default_grids.xml to include Aurora-Grid

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

diff --git a/linden/indra/newview/app_settings/default_grids.xml b/linden/indra/newview/app_settings/default_grids.xml
index 802558a..cdf99e5 100644
--- a/linden/indra/newview/app_settings/default_grids.xml
+++ b/linden/indra/newview/app_settings/default_grids.xml
@@ -1,7 +1,7 @@
 <llsd>
   <array>
     <map>
-      <key>default_grids_version</key><string>31</string>
+      <key>default_grids_version</key><string>32</string>
     </map>
 
     <!-- Second Life -->
@@ -60,6 +60,21 @@
       <key>version</key><string>2</string>
     </map>
 
+    <!-- Aurora Grid -->
+    <map>
+      <key>gridname</key>   <string>Aurora-Grid</string>
+      <key>gridnick</key>   <string>auroragrid</string>
+      <key>platform</key>   <string>OpenSim</string>
+      <key>loginuri</key>   <string>http://login.aurora-sim.org:8002/</string>
+      <key>loginpage</key>  <string>http://login.aurora-sim.org/splash/</string>
+      <key>helperuri</key>  <string>http://grid.aurora-sim.org/</string>
+      <key>password</key>   <string />
+      <key>register</key>   <string />
+      <key>support</key>    <string>http://forum.aurora-sim.org/</string>
+      <key>website</key>    <string>http://aurora-sim.org</string>
+      <key>version</key>    <string>0</string>
+    </map>
+
     <!-- WorldSimTerra -->
     <map>
       <key>gridnick</key><string>worldsimterra</string>
-- 
cgit v1.1


From 242a3c5290ef3aa2ce9655fdc780692734b068a4 Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Thu, 24 Feb 2011 19:09:20 +0200
Subject: Workaround #726: SIGSEGV in memcpy in LLImageRaw::LLImageRaw with
 data=0

Not sure why this happens, but is related to mForceToSaveRawImage=TRUE
(e.g. in the texture preview floater.) This workaround seems to work for
Singularity, as suggested by Siana Gears.
---
 linden/indra/llimage/llimage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linden/indra/llimage/llimage.cpp b/linden/indra/llimage/llimage.cpp
index e933750..3a8dc3b 100644
--- a/linden/indra/llimage/llimage.cpp
+++ b/linden/indra/llimage/llimage.cpp
@@ -269,7 +269,7 @@ LLImageRaw::LLImageRaw(U8 *data, U16 width, U16 height, S8 components)
 	: LLImageBase()
 {
 	mMemType = LLMemType::MTYPE_IMAGERAW;
-	if(allocateDataSize(width, height, components))
+	if(allocateDataSize(width, height, components) && data)
 	{
 		memcpy(getData(), data, width*height*components);
 	}
-- 
cgit v1.1


From 923d486f58a105c9eb7404e3601ef17d2d7c0240 Mon Sep 17 00:00:00 2001
From: thickbrick
Date: Sun, 6 Feb 2011 23:42:37 +0200
Subject: Fix #778: Textures get stuck half fetched.

Make sure partial textures are cached as partial, so that they will
finish fetching in consequent sessions. This is a rare case, but does
happen. Backported from viewer2.
---
 linden/indra/newview/lltexturefetch.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/linden/indra/newview/lltexturefetch.cpp b/linden/indra/newview/lltexturefetch.cpp
index 072af25..878c2fa 100644
--- a/linden/indra/newview/lltexturefetch.cpp
+++ b/linden/indra/newview/lltexturefetch.cpp
@@ -1113,6 +1113,17 @@ bool LLTextureFetchWorker::doWork(S32 param)
 			return false;
 		}
 		S32 datasize = mFormattedImage->getDataSize();
+		if(mFileSize < datasize)//This could happen when http fetching and sim fetching mixed.
+		{
+			if(mHaveAllData)
+			{
+				mFileSize = datasize ;
+			}
+			else
+			{
+				mFileSize = datasize + 1 ; //flag not fully loaded.
+			}
+		}
 		llassert_always(datasize);
 		setPriority(LLWorkerThread::PRIORITY_LOW | mWorkPriority); // Set priority first since Responder may change it
 		U32 cache_priority = mWorkPriority;
-- 
cgit v1.1


From 59a7c88ecaeb5fbb0873f8aaf081eaa057572806 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 4 Mar 2011 22:41:24 -0600
Subject: Fixed Linux compile warnings in media_plugin_gstreamer010.cpp.

Warning was because writeToLog expected a char pointer, but was being
given string constants. Exact warning message was:

  deprecated conversion from string constant to ‘char*’
---
 linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp b/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
index 7e2833a..32c4376 100755
--- a/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
+++ b/linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
@@ -84,7 +84,7 @@ public:
 				  GstMessage *message);
 
 	// basic log file writing
-	static bool writeToLog(char* str, ...);
+	static bool writeToLog(const char* str, ...);
 
 private:
 	std::string getVersion();
@@ -202,7 +202,7 @@ static char* get_gst_state_name(GstState state)
 #endif // LL_GST_REPORT_STATE_CHANGES
 
 // static
-bool MediaPluginGStreamer010::writeToLog(char* str, ...)
+bool MediaPluginGStreamer010::writeToLog(const char* str, ...)
 {
 	LLFILE* fp = LLFile::fopen("media_plugin_gstreamer010.log", "a");
 
-- 
cgit v1.1


From f889dfd4cebc260a547cf14ea728aa80023f726e Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 4 Mar 2011 22:47:21 -0600
Subject: Don't try to package RELEASE_NOTES.txt, it doesn't exist for
 Experimentals.

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

diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 56c2410..6bca6e0 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -134,7 +134,6 @@ class ViewerManifest(LLManifest):
             self.path("README.txt")
             self.path("MANIFESTO.txt")
             self.path("CONTRIBUTE.txt")
-            self.path("RELEASE_NOTES.txt")
             self.path("ChangeLog.txt", required=False)
             self.end_prefix("../../..")
 
-- 
cgit v1.1


From d5963bcdeff171d660567fca445688ea91ea9da6 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 8 Mar 2011 00:21:30 -0700
Subject: Fixed bug where Windows sometimes didn't do streainreaming audio
 (failed because openal wasn't initing too, removed the check)

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

diff --git a/linden/indra/newview/llmediaremotectrl.cpp b/linden/indra/newview/llmediaremotectrl.cpp
index 48715fc..27a686d 100644
--- a/linden/indra/newview/llmediaremotectrl.cpp
+++ b/linden/indra/newview/llmediaremotectrl.cpp
@@ -204,7 +204,7 @@ void LLMediaRemoteCtrl::enableMediaButtons()
 		}
 	}
 	
-	if (gSavedSettings.getBOOL("AudioStreamingMusic") && gAudiop)
+	if (gSavedSettings.getBOOL("AudioStreamingMusic"))
 	{
 		if ( parcel && !parcel->getMusicURL().empty())
 		{
-- 
cgit v1.1


From b2ae29c1a898e829c4bb7b8aa12cac80f71e38f7 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Sat, 26 Feb 2011 11:15:10 +0100
Subject: fix llerrs crash "Vertex buffer destroyed while mapped!" in sse2
 codepath

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

diff --git a/linden/indra/newview/llviewerjointmesh_sse2.cpp b/linden/indra/newview/llviewerjointmesh_sse2.cpp
index 550044c..450582f 100644
--- a/linden/indra/newview/llviewerjointmesh_sse2.cpp
+++ b/linden/indra/newview/llviewerjointmesh_sse2.cpp
@@ -114,7 +114,7 @@ void LLViewerJointMesh::updateGeometrySSE2(LLFace *face, LLPolyMesh *mesh)
 		((LLV4Matrix3)blend_mat).multiply(normals[index], o_normals[index]);
 	}
 	
-	//setBuffer(0) called in LLVOAvatar::renderSkinned
+	buffer->setBuffer(0);
 }
 
 #else
-- 
cgit v1.1


From 17ebfe27a6615541fed0f41bfe1ea70e4e5d4546 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 8 Mar 2011 14:57:07 -0700
Subject: Fixed windows compile error

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

diff --git a/linden/indra/llplugin/slplugin/slplugin.cpp b/linden/indra/llplugin/slplugin/slplugin.cpp
index 347f1de..4ef24a2 100755
--- a/linden/indra/llplugin/slplugin/slplugin.cpp
+++ b/linden/indra/llplugin/slplugin/slplugin.cpp
@@ -57,7 +57,7 @@
 //imprudence: or we include lldir, or use apache runtime
 //though the one is probably bloat and the other we rather want to avoid
 #include <stdio.h>  // FILENAME_MAX
-#ifdef WINDOWS
+#ifdef LL_WINDOWS
     #include <direct.h>
     #define getImpruDir _getcwd
     #define DIR_DELIMITER "\\"
-- 
cgit v1.1


From 16ce373d14199b94729caffcb099d8a6bd37f882 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 9 Mar 2011 20:37:53 -0700
Subject: #787: Horizontal mouse scrolling support, patch by Kakurady Drakenar

---
 linden/indra/llui/lllineeditor.cpp             |  5 +++
 linden/indra/llui/lllineeditor.h               |  1 +
 linden/indra/llui/llscrollbar.cpp              |  5 +++
 linden/indra/llui/llscrollbar.h                |  1 +
 linden/indra/llui/llscrollcontainer.cpp        | 17 ++++++++
 linden/indra/llui/llscrollcontainer.h          |  1 +
 linden/indra/llui/llview.cpp                   | 41 ++++++++++++++++++
 linden/indra/llui/llview.h                     |  2 +
 linden/indra/llwindow/llmousehandler.cpp       |  6 +++
 linden/indra/llwindow/llmousehandler.h         |  1 +
 linden/indra/llwindow/llwindow.cpp             |  4 ++
 linden/indra/llwindow/llwindow.h               |  1 +
 linden/indra/llwindow/llwindowmacosx.cpp       | 31 +++++++++++---
 linden/indra/llwindow/llwindowsdl.cpp          |  5 ++-
 linden/indra/llwindow/llwindowwin32.cpp        | 16 +++++++
 linden/indra/newview/llagent.cpp               |  6 ++-
 linden/indra/newview/llagent.h                 |  1 +
 linden/indra/newview/llfloateranimpreview.cpp  | 12 ++++++
 linden/indra/newview/llfloateranimpreview.h    |  1 +
 linden/indra/newview/llfloaterimagepreview.cpp | 16 +++++++
 linden/indra/newview/llfloaterimagepreview.h   |  1 +
 linden/indra/newview/lltool.cpp                |  7 ++++
 linden/indra/newview/lltool.h                  |  1 +
 linden/indra/newview/llviewerwindow.cpp        | 58 ++++++++++++++++++++++++++
 linden/indra/newview/llviewerwindow.h          |  2 +
 25 files changed, 234 insertions(+), 8 deletions(-)

diff --git a/linden/indra/llui/lllineeditor.cpp b/linden/indra/llui/lllineeditor.cpp
index a3785e4..76b8927 100644
--- a/linden/indra/llui/lllineeditor.cpp
+++ b/linden/indra/llui/lllineeditor.cpp
@@ -1034,6 +1034,11 @@ BOOL LLLineEditor::handleHover(S32 x, S32 y, MASK mask)
 
 	return handled;
 }
+BOOL LLLineEditor::handleHScrollWheel(S32 x, S32 y, S32 clicks)
+{
+	mScrollHPos = llclamp(mScrollHPos + clicks * 3, 0, mText.length());
+	return TRUE;
+}
 
 
 BOOL LLLineEditor::handleMouseUp(S32 x, S32 y, MASK mask)
diff --git a/linden/indra/llui/lllineeditor.h b/linden/indra/llui/lllineeditor.h
index f9e0621..d217859 100644
--- a/linden/indra/llui/lllineeditor.h
+++ b/linden/indra/llui/lllineeditor.h
@@ -90,6 +90,7 @@ public:
 	/*virtual*/ BOOL	handleMouseDown(S32 x, S32 y, MASK mask);
 	/*virtual*/ BOOL	handleMouseUp(S32 x, S32 y, MASK mask);
 	/*virtual*/ BOOL	handleHover(S32 x, S32 y, MASK mask);
+	/*virtual*/ BOOL	handleHScrollWheel(S32 x, S32 y, S32 clicks);
 	/*virtual*/ BOOL	handleDoubleClick(S32 x,S32 y,MASK mask);
 	/*virtual*/ BOOL	handleMiddleMouseDown(S32 x,S32 y,MASK mask);
 	/*virtual*/ BOOL	handleRightMouseDown( S32 x, S32 y, MASK mask );
diff --git a/linden/indra/llui/llscrollbar.cpp b/linden/indra/llui/llscrollbar.cpp
index 65086d8..11e6239 100644
--- a/linden/indra/llui/llscrollbar.cpp
+++ b/linden/indra/llui/llscrollbar.cpp
@@ -426,6 +426,11 @@ BOOL LLScrollbar::handleScrollWheel(S32 x, S32 y, S32 clicks)
 	changeLine( clicks * mStepSize, TRUE );
 	return TRUE;
 }
+BOOL LLScrollbar::handleHScrollWheel(S32 x, S32 y, S32 clicks)
+{
+	changeLine( clicks * mStepSize, TRUE );
+	return TRUE;
+}
 
 BOOL LLScrollbar::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 									EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string &tooltip_msg)
diff --git a/linden/indra/llui/llscrollbar.h b/linden/indra/llui/llscrollbar.h
index 0bbf866..6969662 100644
--- a/linden/indra/llui/llscrollbar.h
+++ b/linden/indra/llui/llscrollbar.h
@@ -69,6 +69,7 @@ public:
 	virtual BOOL	handleMouseUp(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleHover(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleScrollWheel(S32 x, S32 y, S32 clicks);
+	virtual BOOL	handleHScrollWheel(S32 x, S32 y, S32 clicks);
 	virtual BOOL	handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, 
 		EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string &tooltip_msg);
 
diff --git a/linden/indra/llui/llscrollcontainer.cpp b/linden/indra/llui/llscrollcontainer.cpp
index 6f037e2..8737a70 100644
--- a/linden/indra/llui/llscrollcontainer.cpp
+++ b/linden/indra/llui/llscrollcontainer.cpp
@@ -239,6 +239,23 @@ BOOL LLScrollableContainerView::handleScrollWheel( S32 x, S32 y, S32 clicks )
 	return TRUE;
 }
 
+BOOL LLScrollableContainerView::handleHScrollWheel( S32 x, S32 y, S32 clicks )
+{
+	for( S32 i = SCROLLBAR_COUNT - 1; i >= 0; i++ )
+	{
+		// Note: tries horizontal and then vertical
+
+		// Pretend the mouse is over the scrollbar
+		if( mScrollbar[i]->handleScrollWheel( 0, 0, clicks ) )
+		{
+			return TRUE;
+		}
+	}
+
+	// Eat scroll wheel event (to avoid scrolling nested containers?)
+	return TRUE;
+}
+
 BOOL LLScrollableContainerView::needsToScroll(S32 x, S32 y, LLScrollableContainerView::SCROLL_ORIENTATION axis) const
 {
 	if(mScrollbar[axis]->getVisible())
diff --git a/linden/indra/llui/llscrollcontainer.h b/linden/indra/llui/llscrollcontainer.h
index 70fc908..c18a0db 100644
--- a/linden/indra/llui/llscrollcontainer.h
+++ b/linden/indra/llui/llscrollcontainer.h
@@ -91,6 +91,7 @@ public:
 	virtual void	reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
 	virtual BOOL	handleKeyHere(KEY key, MASK mask);
 	virtual BOOL	handleScrollWheel( S32 x, S32 y, S32 clicks );
+	virtual BOOL	handleHScrollWheel( S32 x, S32 y, S32 clicks );
 	virtual BOOL	handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
 								   EDragAndDropType cargo_type,
 								   void* cargo_data,
diff --git a/linden/indra/llui/llview.cpp b/linden/indra/llui/llview.cpp
index d4eda8f..507c5f5 100644
--- a/linden/indra/llui/llview.cpp
+++ b/linden/indra/llui/llview.cpp
@@ -960,6 +960,19 @@ BOOL LLView::handleScrollWheel(S32 x, S32 y, S32 clicks)
 	return handled;
 }
 
+BOOL LLView::handleHScrollWheel(S32 x, S32 y, S32 clicks)
+{
+	BOOL handled = FALSE;
+	if( getVisible() && getEnabled() )
+	{
+		handled = childrenHandleHScrollWheel( x, y, clicks ) != NULL;
+		if( !handled && blockMouseEvent(x, y) )
+		{
+			handled = TRUE;
+		}
+	}
+	return handled;
+}
 BOOL LLView::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
 	BOOL handled = childrenHandleRightMouseDown( x, y, mask ) != NULL;
@@ -1032,6 +1045,34 @@ LLView* LLView::childrenHandleScrollWheel(S32 x, S32 y, S32 clicks)
 	return handled_view;
 }
 
+LLView* LLView::childrenHandleHScrollWheel(S32 x, S32 y, S32 clicks)
+{
+	LLView* handled_view = NULL;
+	if (getVisible() && getEnabled() )
+	{
+		for ( child_list_iter_t child_it = mChildList.begin(); child_it != mChildList.end(); ++child_it)
+		{
+			LLView* viewp = *child_it;
+			S32 local_x = x - viewp->getRect().mLeft;
+			S32 local_y = y - viewp->getRect().mBottom;
+			if (viewp->pointInView(local_x, local_y)
+				&& viewp->getVisible()
+				&& viewp->getEnabled()
+				&& viewp->handleHScrollWheel( local_x, local_y, clicks ))
+			{
+				if (sDebugMouseHandling)
+				{
+					sMouseHandlerMessage = std::string("->") + viewp->mName + sMouseHandlerMessage;
+				}
+
+				handled_view = viewp;
+				break;
+			}
+		}
+	}
+	return handled_view;
+}
+
 LLView* LLView::childrenHandleHover(S32 x, S32 y, MASK mask)
 {
 	LLView* handled_view = NULL;
diff --git a/linden/indra/llui/llview.h b/linden/indra/llui/llview.h
index 1c8ab31..9243f4f 100644
--- a/linden/indra/llui/llview.h
+++ b/linden/indra/llui/llview.h
@@ -473,6 +473,7 @@ public:
 	/*virtual*/ BOOL	handleMiddleMouseDown(S32 x, S32 y, MASK mask);
 	/*virtual*/ BOOL	handleDoubleClick(S32 x, S32 y, MASK mask);
 	/*virtual*/ BOOL	handleScrollWheel(S32 x, S32 y, S32 clicks);
+	/*virtual*/ BOOL	handleHScrollWheel(S32 x, S32 y, S32 clicks);
 	/*virtual*/ BOOL	handleRightMouseDown(S32 x, S32 y, MASK mask);
 	/*virtual*/ BOOL	handleRightMouseUp(S32 x, S32 y, MASK mask);	
 	/*virtual*/ BOOL	handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect); // Display mToolTipMsg if no child handles it.
@@ -613,6 +614,7 @@ protected:
 	LLView* childrenHandleMiddleMouseDown(S32 x, S32 y, MASK mask);
 	LLView* childrenHandleDoubleClick(S32 x, S32 y, MASK mask);
 	LLView*	childrenHandleScrollWheel(S32 x, S32 y, S32 clicks);
+	LLView*	childrenHandleHScrollWheel(S32 x, S32 y, S32 clicks);
 	LLView* childrenHandleRightMouseDown(S32 x, S32 y, MASK mask);
 	LLView* childrenHandleRightMouseUp(S32 x, S32 y, MASK mask);
 
diff --git a/linden/indra/llwindow/llmousehandler.cpp b/linden/indra/llwindow/llmousehandler.cpp
index ae2f147..e3ea979 100644
--- a/linden/indra/llwindow/llmousehandler.cpp
+++ b/linden/indra/llwindow/llmousehandler.cpp
@@ -57,3 +57,9 @@ BOOL LLMouseHandler::handleAnyMouseClick(S32 x, S32 y, MASK mask, EClickType cli
 	}
 	return handled;
 }
+
+BOOL LLMouseHandler::handleHScrollWheel(S32 x, S32 y, S32 clicks)
+{
+	BOOL handled = FALSE;
+	return handled;
+}
diff --git a/linden/indra/llwindow/llmousehandler.h b/linden/indra/llwindow/llmousehandler.h
index 7bd0f2e..1a4ea65 100644
--- a/linden/indra/llwindow/llmousehandler.h
+++ b/linden/indra/llwindow/llmousehandler.h
@@ -67,6 +67,7 @@ public:
 
 	virtual BOOL	handleHover(S32 x, S32 y, MASK mask) = 0;
 	virtual BOOL	handleScrollWheel(S32 x, S32 y, S32 clicks) = 0;
+	virtual BOOL	handleHScrollWheel(S32 x, S32 y, S32 clicks);
 	virtual BOOL	handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen) = 0;
 	virtual EShowToolTip getShowToolTip() { return SHOW_IF_NOT_BLOCKED; };
 	virtual const std::string& getName() const = 0;
diff --git a/linden/indra/llwindow/llwindow.cpp b/linden/indra/llwindow/llwindow.cpp
index 53ca68d..6ac42b2 100644
--- a/linden/indra/llwindow/llwindow.cpp
+++ b/linden/indra/llwindow/llwindow.cpp
@@ -155,6 +155,10 @@ void LLWindowCallbacks::handleScrollWheel(LLWindow *window, S32 clicks)
 {
 }
 
+void LLWindowCallbacks::handleHScrollWheel(LLWindow *window, S32 clicks)
+{
+}
+
 void LLWindowCallbacks::handleResize(LLWindow *window, const S32 width, const S32 height)
 {
 }
diff --git a/linden/indra/llwindow/llwindow.h b/linden/indra/llwindow/llwindow.h
index 5e93ab3..cbcfc5a 100644
--- a/linden/indra/llwindow/llwindow.h
+++ b/linden/indra/llwindow/llwindow.h
@@ -69,6 +69,7 @@ public:
 	virtual BOOL handleActivateApp(LLWindow *window, BOOL activating);
 	virtual void handleMouseMove(LLWindow *window,  LLCoordGL pos, MASK mask);
 	virtual void handleScrollWheel(LLWindow *window,  S32 clicks);
+	virtual void handleHScrollWheel(LLWindow *window,  S32 clicks);
 	virtual void handleResize(LLWindow *window,  S32 width,  S32 height);
 	virtual void handleFocus(LLWindow *window);
 	virtual void handleFocusLost(LLWindow *window);
diff --git a/linden/indra/llwindow/llwindowmacosx.cpp b/linden/indra/llwindow/llwindowmacosx.cpp
index 99daa4d..93bff99 100644
--- a/linden/indra/llwindow/llwindowmacosx.cpp
+++ b/linden/indra/llwindow/llwindowmacosx.cpp
@@ -2384,6 +2384,7 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 				HIPoint				location = {0.0f, 0.0f};
 				UInt32				modifiers = 0;
 				UInt32				clickCount = 1;
+				EventMouseWheelAxis	wheelAxis = kEventMouseWheelAxisX;
 				long				wheelDelta = 0;
 				LLCoordScreen		inCoords;
 				LLCoordGL			outCoords;
@@ -2393,6 +2394,7 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 				GetEventParameter(event, kEventParamMouseLocation, typeHIPoint, NULL, sizeof(location), NULL, &location);
 				GetEventParameter(event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(modifiers), NULL, &modifiers);
 				GetEventParameter(event, kEventParamMouseWheelDelta, typeLongInteger, NULL, sizeof(wheelDelta), NULL, &wheelDelta);
+				GetEventParameter(event, kEventParamMouseWheelAxis, typeMouseWheelAxis, NULL, sizeof(wheelAxis), NULL, &wheelAxis);
 				GetEventParameter(event, kEventParamClickCount, typeUInt32, NULL, sizeof(clickCount), NULL, &clickCount);
 
 				inCoords.mX = llround(location.x);
@@ -2501,14 +2503,31 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e
 
 				case kEventMouseWheelMoved:
 					{
-						static S32  z_delta = 0;
+						switch (wheelAxis){
+						case kEventMouseWheelAxisX:
 
-						z_delta += wheelDelta;
+							static S32  wheel_x_delta = 0;
 
-						if (z_delta <= -WHEEL_DELTA || WHEEL_DELTA <= z_delta)
-						{
-							mCallbacks->handleScrollWheel(this, -z_delta / WHEEL_DELTA);
-							z_delta = 0;
+							wheel_x_delta += wheelDelta;
+
+							if (wheel_x_delta <= -WHEEL_DELTA || WHEEL_DELTA <= wheel_x_delta)
+							{
+								mCallbacks->handleHScrollWheel(this, wheel_x_delta / WHEEL_DELTA);
+								wheel_x_delta = 0;
+							}
+							break;
+						case kEventMouseWheelAxisY:
+
+							static S32  wheel_y_delta = 0;
+
+							wheel_y_delta += wheelDelta;
+
+							if (wheel_y_delta <= -WHEEL_DELTA || WHEEL_DELTA <= wheel_y_delta)
+							{
+								mCallbacks->handleScrollWheel(this, -wheel_y_delta / WHEEL_DELTA);
+								wheel_y_delta = 0;
+							}
+							break;
 						}
 					}
 					result = noErr;
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index f7d7587..edfe33b 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -1731,7 +1731,10 @@ void LLWindowSDL::gatherInput()
 					mCallbacks->handleScrollWheel(this, -1);
                 else if (event.button.button == 5)  // mousewheel down...thanks to X11 for making SDL consider these "buttons".
 					mCallbacks->handleScrollWheel(this, 1);
-
+                else if (event.button.button == 6)
+					mCallbacks->handleHScrollWheel(this, -1);
+                else if (event.button.button == 7)
+					mCallbacks->handleHScrollWheel(this, 1);
                 break;
             }
 
diff --git a/linden/indra/llwindow/llwindowwin32.cpp b/linden/indra/llwindow/llwindowwin32.cpp
index 7bc9a3b..dacee34 100644
--- a/linden/indra/llwindow/llwindowwin32.cpp
+++ b/linden/indra/llwindow/llwindowwin32.cpp
@@ -2259,6 +2259,22 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
 				}
 				return 0;
 			}
+#ifdef WM_MOUSEHWHEEL
+		case WM_MOUSEHWHEEL:
+			{
+				window_imp->mCallbacks->handlePingWatchdog(window_imp, "Main:WM_MOUSEHWHEEL");
+				static short z_delta = 0;
+
+				z_delta += HIWORD(w_param);
+
+				if (z_delta <= -WHEEL_DELTA || WHEEL_DELTA <= z_delta)
+				{
+					window_imp->mCallbacks->handleHScrollWheel(window_imp, z_delta / WHEEL_DELTA);
+					z_delta = 0;
+				}
+				return 0;
+			}
+#endif //WM_MOUSEHWHEEL
 			/*
 			// TODO: add this after resolving _WIN32_WINNT issue
 			case WM_MOUSELEAVE:
diff --git a/linden/indra/newview/llagent.cpp b/linden/indra/newview/llagent.cpp
index 515d588..871c90d 100644
--- a/linden/indra/newview/llagent.cpp
+++ b/linden/indra/newview/llagent.cpp
@@ -4043,7 +4043,11 @@ void LLAgent::handleScrollWheel(S32 clicks)
 		}
 	}
 }
-
+void LLAgent::handleHScrollWheel(S32 clicks)
+{
+	const F32 RAD_PER_CLICK = -F_PI / 16.0f;
+	cameraOrbitAround(RAD_PER_CLICK * clicks);
+}
 
 //-----------------------------------------------------------------------------
 // getCameraMinOffGround()
diff --git a/linden/indra/newview/llagent.h b/linden/indra/newview/llagent.h
index fe50bf5..cea55fb 100644
--- a/linden/indra/newview/llagent.h
+++ b/linden/indra/newview/llagent.h
@@ -163,6 +163,7 @@ public:
 	void			endAnimationUpdateUI();
 	void			setKey(const S32 direction, S32 &key);		// sets key to +1 for +direction, -1 for -direction
 	void			handleScrollWheel(S32 clicks);				// mousewheel driven zoom
+	void			handleHScrollWheel(S32 clicks);
 	
 	void			setAvatarObject(LLVOAvatar *avatar);
 
diff --git a/linden/indra/newview/llfloateranimpreview.cpp b/linden/indra/newview/llfloateranimpreview.cpp
index 232530c..6d7f350 100644
--- a/linden/indra/newview/llfloateranimpreview.cpp
+++ b/linden/indra/newview/llfloateranimpreview.cpp
@@ -617,6 +617,18 @@ BOOL LLFloaterAnimPreview::handleScrollWheel(S32 x, S32 y, S32 clicks)
 }
 
 //-----------------------------------------------------------------------------
+// handleHScrollWheel()
+//-----------------------------------------------------------------------------
+BOOL LLFloaterAnimPreview::handleHScrollWheel(S32 x, S32 y, S32 clicks)
+{
+	const F32 RAD_PER_CLICK = -F_PI / 16.0f;
+	mAnimPreview->rotate(RAD_PER_CLICK * clicks, 0);
+	mAnimPreview->requestUpdate();
+
+	return TRUE;
+}
+
+//-----------------------------------------------------------------------------
 // onMouseCaptureLost()
 //-----------------------------------------------------------------------------
 void LLFloaterAnimPreview::onMouseCaptureLost()
diff --git a/linden/indra/newview/llfloateranimpreview.h b/linden/indra/newview/llfloateranimpreview.h
index e8f79e2..0107165 100644
--- a/linden/indra/newview/llfloateranimpreview.h
+++ b/linden/indra/newview/llfloateranimpreview.h
@@ -80,6 +80,7 @@ public:
 	BOOL handleMouseUp(S32 x, S32 y, MASK mask);
 	BOOL handleHover(S32 x, S32 y, MASK mask);
 	BOOL handleScrollWheel(S32 x, S32 y, S32 clicks); 
+	BOOL handleHScrollWheel(S32 x, S32 y, S32 clicks);
 	void onMouseCaptureLost();
 
 	void refresh();
diff --git a/linden/indra/newview/llfloaterimagepreview.cpp b/linden/indra/newview/llfloaterimagepreview.cpp
index aa8a94f..e792f8c 100644
--- a/linden/indra/newview/llfloaterimagepreview.cpp
+++ b/linden/indra/newview/llfloaterimagepreview.cpp
@@ -616,6 +616,22 @@ BOOL LLFloaterImagePreview::handleScrollWheel(S32 x, S32 y, S32 clicks)
 	return TRUE;
 }
 
+BOOL LLFloaterImagePreview::handleHScrollWheel(S32 x, S32 y, S32 clicks)
+{
+	const F32 RAD_PER_CLICK = -F_PI / 16.0f;
+
+	if (mPreviewRect.pointInRect(x, y) && mAvatarPreview)
+	{
+		mAvatarPreview->rotate(RAD_PER_CLICK * clicks, 0);
+		mAvatarPreview->refresh();
+
+		mSculptedPreview->rotate(RAD_PER_CLICK * clicks, 0);
+		mSculptedPreview->refresh();
+	}
+
+	return TRUE;
+}
+
 //-----------------------------------------------------------------------------
 // onMouseCaptureLost()
 //-----------------------------------------------------------------------------
diff --git a/linden/indra/newview/llfloaterimagepreview.h b/linden/indra/newview/llfloaterimagepreview.h
index 6a4de3d..1ccfeb4 100644
--- a/linden/indra/newview/llfloaterimagepreview.h
+++ b/linden/indra/newview/llfloaterimagepreview.h
@@ -115,6 +115,7 @@ public:
 	BOOL handleMouseUp(S32 x, S32 y, MASK mask);
 	BOOL handleHover(S32 x, S32 y, MASK mask);
 	BOOL handleScrollWheel(S32 x, S32 y, S32 clicks); 
+	BOOL handleHScrollWheel(S32 x, S32 y, S32 clicks);
 
 	static void onMouseCaptureLostImagePreview(LLMouseHandler*);
 	static void setUploadAmount(S32 amount) { sUploadAmount = amount; }
diff --git a/linden/indra/newview/lltool.cpp b/linden/indra/newview/lltool.cpp
index 6a3ada0..df2191b 100644
--- a/linden/indra/newview/lltool.cpp
+++ b/linden/indra/newview/lltool.cpp
@@ -104,6 +104,13 @@ BOOL LLTool::handleScrollWheel(S32 x, S32 y, S32 clicks)
 	return FALSE;
 }
 
+BOOL LLTool::handleHScrollWheel(S32 x, S32 y, S32 clicks)
+{
+	// by default, didn't handle it
+	// llinfos << "LLTool::handleScrollWheel" << llendl;
+	return FALSE;
+}
+
 BOOL LLTool::handleDoubleClick(S32 x,S32 y,MASK mask)
 {
 	// llinfos << "LLTool::handleDoubleClick" << llendl;
diff --git a/linden/indra/newview/lltool.h b/linden/indra/newview/lltool.h
index f954a8c..26e6623 100644
--- a/linden/indra/newview/lltool.h
+++ b/linden/indra/newview/lltool.h
@@ -62,6 +62,7 @@ public:
 
 	virtual BOOL	handleHover(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleScrollWheel(S32 x, S32 y, S32 clicks);
+	virtual BOOL	handleHScrollWheel(S32 x, S32 y, S32 clicks);
 	virtual BOOL	handleDoubleClick(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleRightMouseDown(S32 x, S32 y, MASK mask);
 	virtual BOOL	handleRightMouseUp(S32 x, S32 y, MASK mask);
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index 920d42e..b4ef3ff 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -1134,6 +1134,10 @@ void LLViewerWindow::handleScrollWheel(LLWindow *window,  S32 clicks)
 {
 	handleScrollWheel( clicks );
 }
+void LLViewerWindow::handleHScrollWheel(LLWindow *window,  S32 clicks)
+{
+	handleHScrollWheel( clicks );
+}
 
 void LLViewerWindow::handleWindowBlock(LLWindow *window)
 {
@@ -2486,6 +2490,60 @@ void LLViewerWindow::handleScrollWheel(S32 clicks)
 	return;
 }
 
+void LLViewerWindow::handleHScrollWheel(S32 clicks)
+{
+	LLView::sMouseHandlerMessage.clear();
+
+	gMouseIdleTimer.reset();
+
+	// Hide tooltips
+	if( mToolTip )
+	{
+		mToolTip->setVisible( FALSE );
+	}
+
+	LLMouseHandler* mouse_captor = gFocusMgr.getMouseCapture();
+	if( mouse_captor )
+	{
+		S32 local_x;
+		S32 local_y;
+		mouse_captor->screenPointToLocal( mCurrentMousePoint.mX, mCurrentMousePoint.mY, &local_x, &local_y );
+		mouse_captor->handleHScrollWheel(local_x, local_y, clicks);
+		if (LLView::sDebugMouseHandling)
+		{
+			llinfos << "Tilt Wheel handled by captor " << mouse_captor->getName() << llendl;
+		}
+		return;
+	}
+
+	LLUICtrl* top_ctrl = gFocusMgr.getTopCtrl();
+	if (top_ctrl)
+	{
+		S32 local_x;
+		S32 local_y;
+		top_ctrl->screenPointToLocal( mCurrentMousePoint.mX, mCurrentMousePoint.mY, &local_x, &local_y );
+		if (top_ctrl->handleHScrollWheel(local_x, local_y, clicks)) return;
+	}
+
+	if (mRootView->handleHScrollWheel(mCurrentMousePoint.mX, mCurrentMousePoint.mY, clicks) )
+	{
+		if (LLView::sDebugMouseHandling)
+		{
+			llinfos << "Tilt Wheel" << LLView::sMouseHandlerMessage << llendl;
+		}
+		return;
+	}
+	else if (LLView::sDebugMouseHandling)
+	{
+		llinfos << "Tilt Wheel not handled by view" << llendl;
+	}
+
+
+	gAgent.handleHScrollWheel(clicks);
+
+	return;
+}
+
 void LLViewerWindow::moveCursorToCenter()
 {
 	S32 x = mVirtualWindowRect.getWidth() / 2;
diff --git a/linden/indra/newview/llviewerwindow.h b/linden/indra/newview/llviewerwindow.h
index d26d820..fd159e1 100644
--- a/linden/indra/newview/llviewerwindow.h
+++ b/linden/indra/newview/llviewerwindow.h
@@ -172,6 +172,7 @@ public:
 	/*virtual*/ void handleMenuSelect(LLWindow *window,  S32 menu_item);
 	/*virtual*/ BOOL handlePaint(LLWindow *window,  S32 x,  S32 y,  S32 width,  S32 height);
 	/*virtual*/ void handleScrollWheel(LLWindow *window,  S32 clicks);
+	/*virtual*/ void handleHScrollWheel(LLWindow *window,  S32 clicks);
 	/*virtual*/ BOOL handleDoubleClick(LLWindow *window,  LLCoordGL pos, MASK mask);
 	/*virtual*/ void handleWindowBlock(LLWindow *window);
 	/*virtual*/ void handleWindowUnblock(LLWindow *window);
@@ -266,6 +267,7 @@ public:
 
 	BOOL			handleKey(KEY key, MASK mask);
 	void			handleScrollWheel	(S32 clicks);
+	void			handleHScrollWheel	(S32 clicks);
 
 	// Hide normal UI when a logon fails, re-show everything when logon is attempted again
 	void			setNormalControlsVisible( BOOL visible );
-- 
cgit v1.1


From f1e07ededc31c335b5b6507ab7cf885dff11e607 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 9 Mar 2011 22:18:22 -0700
Subject: Fixed being unable to change streaming audio volume on Windows

---
 linden/indra/cmake/GStreamer010Plugin.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/linden/indra/cmake/GStreamer010Plugin.cmake b/linden/indra/cmake/GStreamer010Plugin.cmake
index ec9b828..ccad5be 100644
--- a/linden/indra/cmake/GStreamer010Plugin.cmake
+++ b/linden/indra/cmake/GStreamer010Plugin.cmake
@@ -38,7 +38,8 @@ if (WINDOWS)
          gstaudio-0.10.lib
          gstbase-0.10.lib
          gstreamer-0.10.lib
-         gstvideo-0.10.lib
+         gstvideo-0.10.lib #slvideoplugin
+		 gstinterfaces-0.10.lib
          gobject-2.0
          gmodule-2.0
          gthread-2.0
-- 
cgit v1.1


From 37076c285bceb4546bd3e7b6fa1b175008508368 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 9 Mar 2011 22:45:57 -0700
Subject: Fixed play button disappearing when you play streaming audio

---
 linden/indra/newview/llmediaremotectrl.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/linden/indra/newview/llmediaremotectrl.cpp b/linden/indra/newview/llmediaremotectrl.cpp
index 27a686d..8186293 100644
--- a/linden/indra/newview/llmediaremotectrl.cpp
+++ b/linden/indra/newview/llmediaremotectrl.cpp
@@ -153,7 +153,7 @@ void LLMediaRemoteCtrl::enableMediaButtons()
 	bool stop_media_enabled = false;
 	bool play_music_enabled = false;
 	bool stop_music_enabled = false;
-	bool music_show_pause = false;
+	//bool music_show_pause = false;
 	bool media_show_pause = false;
 
 	static LLColor4* sIconDisabledColor = rebind_llcontrol<LLColor4>("IconDisabledColor", &gColors, true);
@@ -213,12 +213,12 @@ void LLMediaRemoteCtrl::enableMediaButtons()
 
 			if (gOverlayBar->musicPlaying())
 			{
-				music_show_pause = true;
+				play_music_enabled = false;
 				stop_music_enabled = true;
 			}
 			else
 			{
-				music_show_pause = false;
+				play_music_enabled = true;
 				stop_music_enabled = false;
 			}
 		}
@@ -227,7 +227,7 @@ void LLMediaRemoteCtrl::enableMediaButtons()
 	const std::string media_icon_name = LLMIMETypes::findIcon(media_type);
 	LLButton* music_play_btn = getChild<LLButton>("music_play");
 	LLButton* music_stop_btn = getChild<LLButton>("music_stop");
-	LLButton* music_pause_btn = getChild<LLButton>("music_pause");
+	//LLButton* music_pause_btn = getChild<LLButton>("music_pause");
 	LLButton* media_play_btn = getChild<LLButton>("media_play");
 	LLButton* media_stop_btn = getChild<LLButton>("media_stop");
 	LLButton* media_pause_btn = getChild<LLButton>("media_pause");
@@ -235,9 +235,9 @@ void LLMediaRemoteCtrl::enableMediaButtons()
 
 	music_play_btn->setEnabled(play_music_enabled);
 	music_stop_btn->setEnabled(stop_music_enabled);
-	music_pause_btn->setEnabled(music_show_pause);
-	music_pause_btn->setVisible(music_show_pause);
-	music_play_btn->setVisible(! music_show_pause);
+	//music_pause_btn->setEnabled(music_show_pause);
+	//music_pause_btn->setVisible(music_show_pause);
+	//music_play_btn->setVisible(music_show_pause);
 	childSetColor("music_icon", music_icon_color);
 	if(!media_icon_name.empty())
 	{
-- 
cgit v1.1


From a08c72f9556dc8a099ab46af36372845a19e9a67 Mon Sep 17 00:00:00 2001
From: Nicky Perian
Date: Mon, 29 Nov 2010 19:50:49 -0600
Subject: Stage dictionaries directory

---
 linden/doc/contributions.txt            | 1 +
 linden/indra/newview/viewer_manifest.py | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index d18b5ba..8aab5c8 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -474,6 +474,7 @@ Nicholaz Beresford
 Nicky Perian
 	IMP-680
 	IMP-685
+	IMP-741
 Nounouch Hapmouche
 	VWR-238
 Patric Mills
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index dffd794..6a34ed6 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -65,6 +65,9 @@ class ViewerManifest(LLManifest):
             self.path("shaders")
             # ... and the entire windlight directory
             self.path("windlight")
+            # ...and the entire dictionaries directory
+            self.path("dictionaries")
+                  
             self.end_prefix("app_settings")
 
         if self.prefix(src="character"):
-- 
cgit v1.1


From d69828e7acdf7f8761d396eeb1534f36a359612f Mon Sep 17 00:00:00 2001
From: Nicky Perian
Date: Sat, 29 Jan 2011 14:41:38 -0600
Subject: IMP-775 Correct spaces in NSIS call. Reference VWR-20742. Used, with
 permission, Siana Geraz's Singularity Viewer portion related to this issue
 only.

Signed-off-by: Nicky Perian <nickyperian@yahoo.com>
---
 linden/indra/newview/viewer_manifest.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 6a34ed6..26a5d84 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -545,11 +545,16 @@ class WindowsManifest(ViewerManifest):
         # We use the Unicode version of NSIS, available from
         # http://www.scratchpaper.com/
         try:
-            NSIS_path = 'C:\\Program Files\\NSIS\\Unicode\\makensis.exe'
-            self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile))
+          import _winreg as reg
+          NSIS_path = reg.QueryValue(reg.HKEY_LOCAL_MACHINE, r"SOFTWARE\NSIS\Unicode") + '\\makensis.exe'
+          self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile))
         except:
-            NSIS_path = 'C:\\Program Files (x86)\\NSIS\\Unicode\\makensis.exe'
+          try:
+            NSIS_path = os.environ['ProgramFiles'] + '\\NSIS\\Unicode\\makensis.exe'
             self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile))
+          except:
+            NSIS_path = os.environ['ProgramFiles(X86)'] + '\\NSIS\\Unicode\\makensis.exe'
+        self.run_command('"' + proper_windows_path(NSIS_path) + '" ' + self.dst_path_of(tempfile))
         # self.remove(self.dst_path_of(tempfile))
         # If we're on a build machine, sign the code using our Authenticode certificate. JC
         sign_py = 'C:\\buildscripts\\code-signing\\sign.py'
-- 
cgit v1.1


From bab452c74012f9bc262bdc4e78d1c38f08f401cd Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 9 Mar 2011 23:04:48 -0700
Subject: #713: add a ossl osUnixTimeToTimestamp() function for syntax
 highlighting, patch by tx Oh

---
 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 cc56119..e379192 100644
--- a/linden/indra/lscript/lscript_library/lscript_library.cpp
+++ b/linden/indra/lscript/lscript_library/lscript_library.cpp
@@ -571,6 +571,7 @@ void LLScriptLibrary::init()
 	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 fa1aa4620d5cd68effaa68a3453fa401e5472476 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 9 Mar 2011 23:30:59 -0700
Subject: Updated copywinlibs and staging to use the new set of gstreamer libs

---
 linden/indra/cmake/CopyWinLibs.cmake    | 122 ++++++++++++++++++++++++++++++
 linden/indra/newview/viewer_manifest.py | 128 +++++++++++++++++---------------
 2 files changed, 192 insertions(+), 58 deletions(-)

diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index f584689..78c7c96 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -32,6 +32,67 @@ set(debug_files
     libapr-1.dll
     libaprutil-1.dll
     libapriconv-1.dll
+	
+	# gstreamer streaming files below
+	avcodec-gpl-52.dll
+	avdevice-gpl-52.dll
+	avfilter-gpl-1.dll
+	avformat-gpl-52.dll
+	avutil-gpl-50.dll
+	iconv.dll
+	liba52-0.dll
+	libbz2.dll
+	libcelt-0.dll
+	libdca-0.dll
+	libexpat-1.dll
+	libfaad-2.dll
+	libFLAC-8.dll
+	libgcrypt-11.dll
+	libgio-2.0-0.dll
+	libglib-2.0-0.dll
+	libgmodule-2.0-0.dll
+	libgnutls-26.dll
+	libgobject-2.0-0.dll
+	libgpg-error-0.dll
+	libgstapp-0.10.dll
+	libgstaudio-0.10.dll
+	libgstbase-0.10.dll
+	libgstcontroller-0.10.dll
+	libgstdataprotocol-0.10.dll
+	libgstfft-0.10.dll
+	libgstinterfaces-0.10.dll
+	libgstnet-0.10.dll
+	libgstnetbuffer-0.10.dll
+	libgstpbutils-0.10.dll
+	libgstphotography-0.10.dll
+	libgstreamer-0.10.dll
+	libgstriff-0.10.dll
+	libgstrtp-0.10.dll
+	libgstrtsp-0.10.dll
+	libgstsdp-0.10.dll
+	libgstsignalprocessor-0.10.dll
+	libgsttag-0.10.dll
+	libgstvideo-0.10.dll
+	libgthread-2.0-0.dll
+	libmms-0.dll
+	libmpeg2-0.dll
+	libneon-27.dll
+	libogg-0.dll
+	liboil-0.3-0.dll
+	libsoup-2.4-1.dll
+	libtasn1-3.dll
+	libtheora-0.dll
+	libtheoradec-1.dll
+	libvorbis-0.dll
+	libvorbisenc-2.dll
+	libvorbisfile-3.dll
+	libwavpack-1.dll
+	libx264-67.dll
+	libxml2-2.dll
+	libxml2.dll
+	SDL.dll
+	xvidcore.dll
+	z.dll
     )
 
 copy_if_different(
@@ -215,6 +276,67 @@ set(release_files
     libapr-1.dll
     libaprutil-1.dll
     libapriconv-1.dll
+	
+	# gstreamer streaming files below
+	avcodec-gpl-52.dll
+	avdevice-gpl-52.dll
+	avfilter-gpl-1.dll
+	avformat-gpl-52.dll
+	avutil-gpl-50.dll
+	iconv.dll
+	liba52-0.dll
+	libbz2.dll
+	libcelt-0.dll
+	libdca-0.dll
+	libexpat-1.dll
+	libfaad-2.dll
+	libFLAC-8.dll
+	libgcrypt-11.dll
+	libgio-2.0-0.dll
+	libglib-2.0-0.dll
+	libgmodule-2.0-0.dll
+	libgnutls-26.dll
+	libgobject-2.0-0.dll
+	libgpg-error-0.dll
+	libgstapp-0.10.dll
+	libgstaudio-0.10.dll
+	libgstbase-0.10.dll
+	libgstcontroller-0.10.dll
+	libgstdataprotocol-0.10.dll
+	libgstfft-0.10.dll
+	libgstinterfaces-0.10.dll
+	libgstnet-0.10.dll
+	libgstnetbuffer-0.10.dll
+	libgstpbutils-0.10.dll
+	libgstphotography-0.10.dll
+	libgstreamer-0.10.dll
+	libgstriff-0.10.dll
+	libgstrtp-0.10.dll
+	libgstrtsp-0.10.dll
+	libgstsdp-0.10.dll
+	libgstsignalprocessor-0.10.dll
+	libgsttag-0.10.dll
+	libgstvideo-0.10.dll
+	libgthread-2.0-0.dll
+	libmms-0.dll
+	libmpeg2-0.dll
+	libneon-27.dll
+	libogg-0.dll
+	liboil-0.3-0.dll
+	libsoup-2.4-1.dll
+	libtasn1-3.dll
+	libtheora-0.dll
+	libtheoradec-1.dll
+	libvorbis-0.dll
+	libvorbisenc-2.dll
+	libvorbisfile-3.dll
+	libwavpack-1.dll
+	libx264-67.dll
+	libxml2-2.dll
+	libxml2.dll
+	SDL.dll
+	xvidcore.dll
+	z.dll
     )
     
 copy_if_different(
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 26a5d84..44dcb73 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -282,6 +282,11 @@ class WindowsManifest(ViewerManifest):
         if self.prefix(src='../media_plugins/webkit/%s' % self.args['configuration'], 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"):
+            self.path("media_plugin_gstreamer010.dll")
+            self.end_prefix()            
  
         # For WebKit/Qt plugin runtimes
         if self.prefix(src="../../libraries/i686-win32/lib/release", dst="llplugin"):
@@ -305,9 +310,6 @@ class WindowsManifest(ViewerManifest):
             self.path("qtiff4.dll")
             self.end_prefix()
 
-	# Per platform MIME config on the cheap.  See SNOW-307 / DEV-41388
-        self.path("skins/default/xui/en-us/mime_types_windows.xml", "skins/default/xui/en-us/mime_types.xml")
-
         # These need to be installed as a SxS assembly, currently a 'private' assembly.
         # See http://msdn.microsoft.com/en-us/library/ms235291(VS.80).aspx
         if self.prefix(src=self.args['configuration'], dst=""):
@@ -348,64 +350,74 @@ class WindowsManifest(ViewerManifest):
             self.path("ortp.dll")
 
             self.end_prefix()
-# Gstreamer is not used in webkit_plugins. The librries are never delivered/extracted to
-# ../../libraries/i686-win32/lib/release . Commented out until decision made to use or drop.
+
         # Gstreamer plugins
-        #if self.prefix(src="lib/gstreamer-plugins", dst=""):
-        #    self.path("*.dll", dst="lib/gstreamer-plugins/*.dll")
-        #    self.end_prefix()
+        if self.prefix(src="lib/gstreamer-plugins", dst=""):
+            self.path("*.dll", dst="lib/gstreamer-plugins/*.dll")
+            self.end_prefix()
 
         # Gstreamer libs
-        #if (not self.standalone()) and self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
-        #    self.path("iconv.dll")
-        #    self.path("libxml2.dll")
-        #    self.path("libcairo-2.dll")
-        #    self.path("libgio-2.0-0.dll")
-        #    self.path("libglib-2.0-0.dll")
-        #    self.path("libgmodule-2.0-0.dll")
-        #    self.path("libgobject-2.0-0.dll")
-        #    self.path("libgthread-2.0-0.dll")
-        #    self.path("charset.dll")
-        #    self.path("intl.dll")
-        #    self.path("libgcrypt-11.dll")
-        #    self.path("libgnutls-26.dll")
-        #    self.path("libgpg-error-0.dll")
-        #    self.path("libgstapp.dll")
-        #    self.path("libgstaudio.dll")
-        #    self.path("libgstbase-0.10.dll")
-        #    self.path("libgstcdda.dll")
-        #    self.path("libgstcontroller-0.10.dll")
-        #    self.path("libgstdataprotocol-0.10.dll")
-        #    self.path("libgstdshow.dll")
-        #    self.path("libgstfft.dll")
-        #    self.path("libgstinterfaces.dll")
-        #    self.path("libgstnet-0.10.dll")
-        #    self.path("libgstnetbuffer.dll")
-        #    self.path("libgstpbutils.dll")
-        #    self.path("libgstreamer-0.10.dll")
-        #    self.path("libgstriff.dll")
-        #    self.path("libgstrtp.dll")
-        #    self.path("libgstrtsp.dll")
-        #    self.path("libgstsdp.dll")
-        #    self.path("libgsttag.dll")
-        #    self.path("libgstvideo.dll")
-        #    self.path("libjpeg.dll")
-        #    self.path("libmp3lame-0.dll")
-        #    self.path("libneon-27.dll")
-        #    self.path("libogg-0.dll")
-        #    self.path("liboil-0.3-0.dll")
-        #    self.path("libopenjpeg-2.dll")
-        #    self.path("libpng12-0.dll")
-        #    self.path("libschroedinger-1.0-0.dll")
-        #    self.path("libspeex-1.dll")
-        #    self.path("libtheora-0.dll")
-        #    self.path("libvorbis-0.dll")
-        #    self.path("libvorbisenc-2.dll")
-        #    self.path("libxml2-2.dll")
-        #    self.path("glew32.dll")
-        #    self.path("xvidcore.dll")
-        #    self.path("zlib1.dll")
-        #    self.end_prefix()
+        if (not self.standalone()) and self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
+        self.path("avcodec-gpl-52.dll")
+        self.path("avdevice-gpl-52.dll")
+        self.path("avfilter-gpl-1.dll")
+        self.path("avformat-gpl-52.dll")
+        self.path("avutil-gpl-50.dll")
+        self.path("iconv.dll")
+        self.path("liba52-0.dll")
+        self.path("libbz2.dll")
+        self.path("libcelt-0.dll")
+        self.path("libdca-0.dll")
+        self.path("libexpat-1.dll")
+        self.path("libfaad-2.dll")
+        self.path("libFLAC-8.dll")
+        self.path("libgcrypt-11.dll")
+        self.path("libgio-2.0-0.dll")
+        self.path("libglib-2.0-0.dll")
+        self.path("libgmodule-2.0-0.dll")
+        self.path("libgnutls-26.dll")
+        self.path("libgobject-2.0-0.dll")
+        self.path("libgpg-error-0.dll")
+        self.path("libgstapp-0.10.dll")
+        self.path("libgstaudio-0.10.dll")
+        self.path("libgstbase-0.10.dll")
+        self.path("libgstcontroller-0.10.dll")
+        self.path("libgstdataprotocol-0.10.dll")
+        self.path("libgstfft-0.10.dll")
+        self.path("libgstinterfaces-0.10.dll")
+        self.path("libgstnet-0.10.dll")
+        self.path("libgstnetbuffer-0.10.dll")
+        self.path("libgstpbutils-0.10.dll")
+        self.path("libgstphotography-0.10.dll")
+        self.path("libgstreamer-0.10.dll")
+        self.path("libgstriff-0.10.dll")
+        self.path("libgstrtp-0.10.dll")
+        self.path("libgstrtsp-0.10.dll")
+        self.path("libgstsdp-0.10.dll")
+        self.path("libgstsignalprocessor-0.10.dll")
+        self.path("libgsttag-0.10.dll")
+        self.path("libgstvideo-0.10.dll")
+        self.path("libgthread-2.0-0.dll")
+        self.path("libmms-0.dll")
+        self.path("libmpeg2-0.dll")
+        self.path("libneon-27.dll")
+        self.path("libogg-0.dll")
+        self.path("liboil-0.3-0.dll")
+        self.path("libsoup-2.4-1.dll")
+        self.path("libtasn1-3.dll")
+        self.path("libtheora-0.dll")
+        self.path("libtheoradec-1.dll")
+        self.path("libvorbis-0.dll")
+        self.path("libvorbisenc-2.dll")
+        self.path("libvorbisfile-3.dll")
+        self.path("libwavpack-1.dll")
+        self.path("libx264-67.dll")
+        self.path("libxml2-2.dll")
+        self.path("libxml2.dll")
+        self.path("SDL.dll")
+        self.path("xvidcore.dll")
+        self.path("z.dll")
+        self.end_prefix()
 
 #        # pull in the crash logger and updater from other projects
 #        self.path(src=self.find_existing_file( # tag:"crash-logger" here as a cue to the exporter
-- 
cgit v1.1


From e686c9f724ad7d5c72e57925baac144af8e6f192 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Thu, 10 Mar 2011 00:18:06 -0700
Subject: Replaced old 1.3.x Windows gstreamer files with new files for 1.4.
 Note that this also replaces glib, iconv, and libxml

---
 linden/install.xml | 125 +++++++++++++++++++++++------------------------------
 1 file changed, 55 insertions(+), 70 deletions(-)

diff --git a/linden/install.xml b/linden/install.xml
index 10f7a8c..8e83eb8 100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -586,13 +586,6 @@
             <key>url</key>
             <uri>http://imprudenceviewer.org/download/libs/glib-2.20.5-linux64-20100515.tar.bz2</uri>
           </map>
-          <key>windows</key>
-          <map>
-            <key>md5sum</key>
-            <string>b1e0e16472c0e5d3b6291870e3f20b0c</string>
-            <key>url</key>
-            <uri>http://imprudenceviewer.org/download/libs/glib-2.18.4-windows-03162009.tar.bz2</uri>
-          </map>
         </map>
       </map>
 	  <key>glui</key>
@@ -666,8 +659,15 @@
             <key>url</key>
             <uri>http://imprudenceviewer.org/download/libs/gstreamer-0.10.24-linux64-20091230.tar.bz2</uri>
           </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>bd07378834cd1a4ecf7de55d4e2a7da2</string>
+            <key>url</key>
+            <uri>http://kokuaviewer.org/download/libs/gstreamer-glib-iconv-libxml-windows-0.10.32-20110503.tar.bz2</uri>
           </map>
         </map>
+      </map>
       <key>gstreamer-plugins</key>
       <map>
         <key>license</key>
@@ -681,8 +681,15 @@
             <key>url</key>
             <uri>http://imprudenceviewer.org/download/libs/gstreamer-plugins-darwin-20100826.tar.bz2</uri>
           </map>
+          <key>windows</key>
+          <map>
+            <key>md5sum</key>
+            <string>76ad5a08f8f07f99c9e1545c2a0adc27</string>
+            <key>url</key>
+            <uri>http://kokuaviewer.org/download/libs/gstreamer-plugins-windows-0.10.32-20110503.tar.bz2</uri>
           </map>
-          </map>
+        </map>
+      </map>
       <key>gtk-etc</key>
       <map>
         <key>copyright</key>
@@ -713,61 +720,46 @@ cairo: Copyright © 2002 University of Southern California, Copyright © 2005 Re
           </map>
         </map>
       </map>
-	  <key>hunspell</key>
-		<map>
-			<key>copyright</key>
-			<string>various</string>
-			<key>description</key>
-			<string>A open source spell check library</string>
-			<key>license</key>
-			<string>lgpl</string>
-			<key>packages</key>
-			<map>
-				<key>windows</key>
-				<map>
-					<key>md5sum</key>
-					<string>1eb49bf9bcce30f5fe0dddaed2a3c628</string>
-					<key>url</key>
-					<uri>http://imprudenceviewer.org/download/libs/windows_hunspell.tar.bz2</uri>
-				</map>
-				<key>linux</key>
-				<map>
-					<key>md5sum</key>
-					<string>dbe264ef2e932980e31db646ea29bbe7</string>
-					<key>url</key>
-					<uri>http://imprudenceviewer.org/download/libs/hunspell-1.2-linux32-20100902.tar.bz2</uri>
-				</map>
-				<key>linux64</key>
-				<map>
-					<key>md5sum</key>
-					<string>5388725d012c3bfabcc420be53442018</string>
-					<key>url</key>
-					<uri>http://imprudenceviewer.org/download/libs/hunspell-1.2-linux64-20100902.tar.bz2</uri>
-				</map>
-				<key>darwin</key>
-				<map>
-					<key>md5sum</key>
-					<string>9b970abfc9df40ad6d183a4b1f732fb2</string>
-					<key>url</key>
-					<uri>http://imprudenceviewer.org/download/libs/hunspell-1.2-darwin.tar.gz</uri>
-				</map>
-			</map>
-		</map>
-      <key>iconv</key>
-      <map>
-        <key>license</key>
-        <string>gpl</string>
-        <key>packages</key>
-        <map>
-          <key>windows</key>
-          <map>
-            <key>md5sum</key>
-            <string>dfd86beda3a27a8bfe9f9c0a3ed0bd80</string>
-            <key>url</key>
-            <uri>http://imprudenceviewer.org/download/libs/iconv-1.9.2-windows-20090608.tar.bz2</uri>
-          </map>
-        </map>
-      </map>
+	    <key>hunspell</key>
+		  <map>
+			  <key>copyright</key>
+			  <string>various</string>
+			  <key>description</key>
+			  <string>A open source spell check library</string>
+			  <key>license</key>
+			  <string>lgpl</string>
+			  <key>packages</key>
+			  <map>
+				  <key>windows</key>
+				  <map>
+					  <key>md5sum</key>
+					  <string>1eb49bf9bcce30f5fe0dddaed2a3c628</string>
+					  <key>url</key>
+					  <uri>http://imprudenceviewer.org/download/libs/windows_hunspell.tar.bz2</uri>
+				  </map>
+				  <key>linux</key>
+				  <map>
+					  <key>md5sum</key>
+					  <string>dbe264ef2e932980e31db646ea29bbe7</string>
+					  <key>url</key>
+					  <uri>http://imprudenceviewer.org/download/libs/hunspell-1.2-linux32-20100902.tar.bz2</uri>
+				  </map>
+				  <key>linux64</key>
+				  <map>
+					  <key>md5sum</key>
+					  <string>5388725d012c3bfabcc420be53442018</string>
+					  <key>url</key>
+					  <uri>http://imprudenceviewer.org/download/libs/hunspell-1.2-linux64-20100902.tar.bz2</uri>
+				  </map>
+				  <key>darwin</key>
+				  <map>
+					  <key>md5sum</key>
+					  <string>9b970abfc9df40ad6d183a4b1f732fb2</string>
+					  <key>url</key>
+					  <uri>http://imprudenceviewer.org/download/libs/hunspell-1.2-darwin.tar.gz</uri>
+				  </map>
+			  </map>
+		  </map>
       <key>jpeglib</key>
       <map>
         <key>copyright</key>
@@ -1018,13 +1010,6 @@ Portions copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura
             <key>url</key>
             <uri>http://imprudenceviewer.org/download/libs/libxml2-2.7.4-r1-linux64-20091230.tar.bz2</uri>
           </map>
-          <key>windows</key>
-          <map>
-            <key>md5sum</key>
-            <string>d96f950a877836b644f5bd047eb52151</string>
-            <key>url</key>
-            <uri>http://imprudence.s3.amazonaws.com/extras/libxml2-2.7.2-windows-01262009.tar.bz2</uri>
-          </map>
         </map>
       </map>
       <key>llqtwebkit</key>
-- 
cgit v1.1


From d7b2279bbc76bd617074969fe7d4a8b5305a6f5b Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Thu, 10 Mar 2011 09:16:09 +0100
Subject: Tazy Scientist: Feature #759 Particle Chat Enhanced

script is here: http://redmine.kokuaviewer.org/attachments/164/script.txt
I (ArminW) added also a ParticleChatCannel setting to Tazys patch.
---
 linden/indra/newview/app_settings/settings.xml | 13 +++++-
 linden/indra/newview/llvoavatar.cpp            | 63 ++++++++++++++------------
 2 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index fbb51e8..59c2982 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -872,7 +872,7 @@
   <key>ParticleChat</key>
   <map>
     <key>Comment</key>
-    <string>Chat target of effect beam to channel 9000</string>
+    <string>Chat target of effect beam to channel given by ParticleChatChannel</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -880,6 +880,17 @@
     <key>Value</key>
     <integer>0</integer>
   </map>
+  <key>ParticleChatChannel</key>
+  <map>
+    <key>Comment</key>
+    <string>Channel for the ParticleChat target</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>S32</string>
+    <key>Value</key>
+    <integer>118000</integer>
+  </map>
   <key>PersistShowLookAt</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 27a848f..204357f 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -3929,7 +3929,7 @@ void LLVOAvatar::idleUpdateTractorBeam()
 				msg->nextBlockFast(_PREHASH_ChatData);
 				msg->addStringFast(_PREHASH_Message, "stop");
 				msg->addU8Fast(_PREHASH_Type, CHAT_TYPE_WHISPER);
-				msg->addS32("Channel", 9000);
+				msg->addS32("Channel", gSavedSettings.getS32("ParticleChatChannel"));
 				
 				gAgent.sendReliableMessage();
 				sBeamLastAt  =  LLVector3d::zero;
@@ -3949,53 +3949,58 @@ void LLVOAvatar::idleUpdateTractorBeam()
 	if (!mBeam.isNull())
 	{
 		LLObjectSelectionHandle selection = LLSelectMgr::getInstance()->getSelection();
+		LLViewerObject* obj_sel = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
 
 		if (gAgent.mPointAt.notNull())
 		{
 			// get point from pointat effect
 			mBeam->setPositionGlobal(gAgent.mPointAt->getPointAtPosGlobal());
 
+			//lgg crap
 			if(gSavedSettings.getBOOL("ParticleChat"))
 			{
 				if(sPartsNow != TRUE)
 				{
-					sPartsNow = TRUE;
-					LLMessageSystem* msg = gMessageSystem;
-					msg->newMessageFast(_PREHASH_ChatFromViewer);
-					msg->nextBlockFast(_PREHASH_AgentData);
-					msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-					msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-					msg->nextBlockFast(_PREHASH_ChatData);
-					msg->addStringFast(_PREHASH_Message, "start");
-					msg->addU8Fast(_PREHASH_Type, CHAT_TYPE_WHISPER);
-					msg->addS32("Channel", 9000);
-					
-					gAgent.sendReliableMessage();
+			
+					sPartsNow = TRUE; 
+					if(obj_sel){
+						LLMessageSystem* msg = gMessageSystem;
+						msg->newMessageFast(_PREHASH_ChatFromViewer);
+						msg->nextBlockFast(_PREHASH_AgentData);
+						msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+						msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+						msg->nextBlockFast(_PREHASH_ChatData);
+						msg->addStringFast(_PREHASH_Message, "start"+obj_sel->getID().asString());
+						msg->addU8Fast(_PREHASH_Type, CHAT_TYPE_WHISPER);
+						msg->addS32("Channel", gSavedSettings.getS32("ParticleChatChannel"));
+						
+						gAgent.sendReliableMessage();
+					}
 
 					LLViewerStats::getInstance()->incStat(LLViewerStats::ST_CHAT_COUNT);
 				}
-				//LLVector3d a = sBeamLastAt-gAgent.mPointAt->getPointAtPosGlobal();
-				//if(a.length > 2)
+
 				if( (sBeamLastAt-gAgent.mPointAt->getPointAtPosGlobal()).length() > .2)
-				//if(sBeamLastAt!=gAgent.mPointAt->getPointAtPosGlobal())
 				{
 					sBeamLastAt = gAgent.mPointAt->getPointAtPosGlobal(); 
-
-					LLMessageSystem* msg = gMessageSystem;
-					msg->newMessageFast(_PREHASH_ChatFromViewer);
-					msg->nextBlockFast(_PREHASH_AgentData);
-					msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-					msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-					msg->nextBlockFast(_PREHASH_ChatData);
-					msg->addStringFast(_PREHASH_Message, llformat("<%.6f, %.6f, %.6f>",(F32)(sBeamLastAt.mdV[VX]),(F32)(sBeamLastAt.mdV[VY]),(F32)(sBeamLastAt.mdV[VZ])));
-					msg->addU8Fast(_PREHASH_Type, CHAT_TYPE_WHISPER);
-					msg->addS32("Channel", 9000); // *TODO: make configurable
 					
-					gAgent.sendReliableMessage();
+					if(obj_sel){
+						LLMessageSystem* msg = gMessageSystem;
+						msg->newMessageFast(_PREHASH_ChatFromViewer);
+						msg->nextBlockFast(_PREHASH_AgentData);
+						msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+						msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+						msg->nextBlockFast(_PREHASH_ChatData);
+						msg->addStringFast(_PREHASH_Message, "start"+obj_sel->getID().asString());
+						msg->addU8Fast(_PREHASH_Type, CHAT_TYPE_WHISPER);
+						msg->addS32("Channel", gSavedSettings.getS32("ParticleChatChannel"));
+						
+						gAgent.sendReliableMessage();
+					}
 				}
 
 			}
-
+			
 			mBeam->triggerLocal();
 		}
 		else if (selection->getFirstRootObject() && 
@@ -4034,6 +4039,8 @@ void LLVOAvatar::idleUpdateTractorBeam()
 		}
 	}
 }
+//</edit>
+
 
 void LLVOAvatar::idleUpdateBelowWater()
 {
-- 
cgit v1.1


From 44905acf5e7f4b320d28cb1d6dba8c52ba48b912 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Thu, 10 Mar 2011 02:18:04 -0600
Subject: Fixed some bad indentation in viewer_manifest.py.

---
 linden/indra/newview/viewer_manifest.py | 120 ++++++++++++++++----------------
 1 file changed, 60 insertions(+), 60 deletions(-)

diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 44dcb73..5ef93a3 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -358,66 +358,66 @@ class WindowsManifest(ViewerManifest):
 
         # Gstreamer libs
         if (not self.standalone()) and self.prefix(src="../../libraries/i686-win32/lib/release", dst=""):
-        self.path("avcodec-gpl-52.dll")
-        self.path("avdevice-gpl-52.dll")
-        self.path("avfilter-gpl-1.dll")
-        self.path("avformat-gpl-52.dll")
-        self.path("avutil-gpl-50.dll")
-        self.path("iconv.dll")
-        self.path("liba52-0.dll")
-        self.path("libbz2.dll")
-        self.path("libcelt-0.dll")
-        self.path("libdca-0.dll")
-        self.path("libexpat-1.dll")
-        self.path("libfaad-2.dll")
-        self.path("libFLAC-8.dll")
-        self.path("libgcrypt-11.dll")
-        self.path("libgio-2.0-0.dll")
-        self.path("libglib-2.0-0.dll")
-        self.path("libgmodule-2.0-0.dll")
-        self.path("libgnutls-26.dll")
-        self.path("libgobject-2.0-0.dll")
-        self.path("libgpg-error-0.dll")
-        self.path("libgstapp-0.10.dll")
-        self.path("libgstaudio-0.10.dll")
-        self.path("libgstbase-0.10.dll")
-        self.path("libgstcontroller-0.10.dll")
-        self.path("libgstdataprotocol-0.10.dll")
-        self.path("libgstfft-0.10.dll")
-        self.path("libgstinterfaces-0.10.dll")
-        self.path("libgstnet-0.10.dll")
-        self.path("libgstnetbuffer-0.10.dll")
-        self.path("libgstpbutils-0.10.dll")
-        self.path("libgstphotography-0.10.dll")
-        self.path("libgstreamer-0.10.dll")
-        self.path("libgstriff-0.10.dll")
-        self.path("libgstrtp-0.10.dll")
-        self.path("libgstrtsp-0.10.dll")
-        self.path("libgstsdp-0.10.dll")
-        self.path("libgstsignalprocessor-0.10.dll")
-        self.path("libgsttag-0.10.dll")
-        self.path("libgstvideo-0.10.dll")
-        self.path("libgthread-2.0-0.dll")
-        self.path("libmms-0.dll")
-        self.path("libmpeg2-0.dll")
-        self.path("libneon-27.dll")
-        self.path("libogg-0.dll")
-        self.path("liboil-0.3-0.dll")
-        self.path("libsoup-2.4-1.dll")
-        self.path("libtasn1-3.dll")
-        self.path("libtheora-0.dll")
-        self.path("libtheoradec-1.dll")
-        self.path("libvorbis-0.dll")
-        self.path("libvorbisenc-2.dll")
-        self.path("libvorbisfile-3.dll")
-        self.path("libwavpack-1.dll")
-        self.path("libx264-67.dll")
-        self.path("libxml2-2.dll")
-        self.path("libxml2.dll")
-        self.path("SDL.dll")
-        self.path("xvidcore.dll")
-        self.path("z.dll")
-        self.end_prefix()
+            self.path("avcodec-gpl-52.dll")
+            self.path("avdevice-gpl-52.dll")
+            self.path("avfilter-gpl-1.dll")
+            self.path("avformat-gpl-52.dll")
+            self.path("avutil-gpl-50.dll")
+            self.path("iconv.dll")
+            self.path("liba52-0.dll")
+            self.path("libbz2.dll")
+            self.path("libcelt-0.dll")
+            self.path("libdca-0.dll")
+            self.path("libexpat-1.dll")
+            self.path("libfaad-2.dll")
+            self.path("libFLAC-8.dll")
+            self.path("libgcrypt-11.dll")
+            self.path("libgio-2.0-0.dll")
+            self.path("libglib-2.0-0.dll")
+            self.path("libgmodule-2.0-0.dll")
+            self.path("libgnutls-26.dll")
+            self.path("libgobject-2.0-0.dll")
+            self.path("libgpg-error-0.dll")
+            self.path("libgstapp-0.10.dll")
+            self.path("libgstaudio-0.10.dll")
+            self.path("libgstbase-0.10.dll")
+            self.path("libgstcontroller-0.10.dll")
+            self.path("libgstdataprotocol-0.10.dll")
+            self.path("libgstfft-0.10.dll")
+            self.path("libgstinterfaces-0.10.dll")
+            self.path("libgstnet-0.10.dll")
+            self.path("libgstnetbuffer-0.10.dll")
+            self.path("libgstpbutils-0.10.dll")
+            self.path("libgstphotography-0.10.dll")
+            self.path("libgstreamer-0.10.dll")
+            self.path("libgstriff-0.10.dll")
+            self.path("libgstrtp-0.10.dll")
+            self.path("libgstrtsp-0.10.dll")
+            self.path("libgstsdp-0.10.dll")
+            self.path("libgstsignalprocessor-0.10.dll")
+            self.path("libgsttag-0.10.dll")
+            self.path("libgstvideo-0.10.dll")
+            self.path("libgthread-2.0-0.dll")
+            self.path("libmms-0.dll")
+            self.path("libmpeg2-0.dll")
+            self.path("libneon-27.dll")
+            self.path("libogg-0.dll")
+            self.path("liboil-0.3-0.dll")
+            self.path("libsoup-2.4-1.dll")
+            self.path("libtasn1-3.dll")
+            self.path("libtheora-0.dll")
+            self.path("libtheoradec-1.dll")
+            self.path("libvorbis-0.dll")
+            self.path("libvorbisenc-2.dll")
+            self.path("libvorbisfile-3.dll")
+            self.path("libwavpack-1.dll")
+            self.path("libx264-67.dll")
+            self.path("libxml2-2.dll")
+            self.path("libxml2.dll")
+            self.path("SDL.dll")
+            self.path("xvidcore.dll")
+            self.path("z.dll")
+            self.end_prefix()
 
 #        # pull in the crash logger and updater from other projects
 #        self.path(src=self.find_existing_file( # tag:"crash-logger" here as a cue to the exporter
-- 
cgit v1.1


From 9a25db9ca26f593e11717abcb4e3a2646fd5ceec Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Thu, 10 Mar 2011 01:11:48 -0600
Subject: Updated boost to 1.39 on Mac.

---
 linden/install.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/linden/install.xml b/linden/install.xml
index 8e83eb8..0ec6bdf 100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -207,9 +207,9 @@
           <key>darwin</key>
           <map>
             <key>md5sum</key>
-            <string>279834a12a0ed4531fd602594eac8509</string>
+            <string>bb8552f22769da81593f7d47a51d83d8</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.32.0-darwin-20080812.tar.bz2</uri>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-darwin-20100226.tar.bz2</uri>
           </map>
           <key>linux</key>
           <map>
-- 
cgit v1.1


From 23145ce170b848cbf27b57fe65d34f7dca377b80 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Thu, 10 Mar 2011 02:05:14 -0600
Subject: Commented out more libs used only by GStreamer from Mac manifest.

Since Mac is still using the Quicktime plugin, these libs aren't
downloaded, so trying to package them makes viewer_manifest.py fail.
---
 linden/indra/newview/viewer_manifest.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 5ef93a3..3651bea 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -596,10 +596,10 @@ class DarwinManifest(ViewerManifest):
                 self.path("libopenal.1.dylib")
                 self.path("libalut.0.dylib")
 
-                self.path("libglib-2.0.dylib")
-                self.path("libgmodule-2.0.dylib")
-                self.path("libgobject-2.0.dylib")
-                self.path("libgthread-2.0.dylib")
+                # self.path("libglib-2.0.dylib")
+                # self.path("libgmodule-2.0.dylib")
+                # self.path("libgobject-2.0.dylib")
+                # self.path("libgthread-2.0.dylib")
                 
                 # self.path("libgstreamer-0.10.dylib")
                 # self.path("libgstapp-0.10.dylib")
@@ -620,15 +620,15 @@ class DarwinManifest(ViewerManifest):
                 # self.path("libgsttag-0.10.dylib")
                 # self.path("libgstvideo-0.10.dylib")
 
-                self.path("libxml2.2.dylib")
+                # self.path("libxml2.2.dylib")
                 # self.path("libfaad.2.dylib")
                 # self.path("libFLAC.8.dylib")
-                self.path("libintl.3.dylib")
+                # self.path("libintl.3.dylib")
                 self.path("libjpeg.62.dylib")
                 self.path("libpng12.0.dylib")
-                self.path("libneon.27.dylib")
+                # self.path("libneon.27.dylib")
                 self.path("libogg.0.dylib")
-                self.path("liboil-0.3.0.dylib")
+                # self.path("liboil-0.3.0.dylib")
                 self.path("libopenjpeg.1.4.dylib")
                 # self.path("libtheora.0.dylib")
                 self.path("libvorbis.0.dylib")
-- 
cgit v1.1


From af6a992d43bb45857fb7928f5f3860ebacc432c4 Mon Sep 17 00:00:00 2001
From: Patrick Sapinski
Date: Mon, 28 Feb 2011 08:22:41 -0500
Subject: fix for AO from Emerald

---
 linden/indra/newview/floaterao.cpp | 11 +++++++++++
 linden/indra/newview/floaterao.h   |  1 +
 2 files changed, 12 insertions(+)

diff --git a/linden/indra/newview/floaterao.cpp b/linden/indra/newview/floaterao.cpp
index cfad0fb..d880722 100644
--- a/linden/indra/newview/floaterao.cpp
+++ b/linden/indra/newview/floaterao.cpp
@@ -601,6 +601,8 @@ void LLFloaterAO::updateLayout(LLFloaterAO* floater)
 	}
 }
 
+BOOL LLFloaterAO::fullfetch = FALSE;
+
 void LLFloaterAO::init()
 {
 	mAOStands.clear();
@@ -695,6 +697,15 @@ void LLFloaterAO::init()
 							success = TRUE;
 						}
 					}
+				}else
+				{
+					//static BOOL startedfetch = FALSE;
+					if(fullfetch == FALSE)
+					{
+						fullfetch = TRUE;
+						//no choice, can't move the AO till we find it, should only have to happen once
+						gInventory.startBackgroundFetch();
+					}
 				}
 			}
 		}
diff --git a/linden/indra/newview/floaterao.h b/linden/indra/newview/floaterao.h
index cf8ee22..ed60140 100644
--- a/linden/indra/newview/floaterao.h
+++ b/linden/indra/newview/floaterao.h
@@ -66,6 +66,7 @@ public:
 
 	static void show(void*);
 	static void init();
+	static BOOL fullfetch;
 
 	static void onClickToggleAO(LLUICtrl *, void*);
 	static void onClickToggleSits(LLUICtrl *, void*);
-- 
cgit v1.1


From 3c471bb3ed3cf5081d52d9318f860abfcdafd0ae Mon Sep 17 00:00:00 2001
From: Patrick Sapinski
Date: Wed, 2 Mar 2011 02:35:40 -0500
Subject: moved the AO inventory preloading to a better place, a place where it
 actually works.

Does anyone even read this? IF YOU SEE THIS TEXT YOU HAVE WON $500, MESSAGE ME TO COLLECT YOUR PRIZE.
---
 linden/indra/newview/floaterao.cpp | 23 ++++++++++++-----------
 linden/indra/newview/floaterao.h   |  2 +-
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/linden/indra/newview/floaterao.cpp b/linden/indra/newview/floaterao.cpp
index d880722..df88d6f 100644
--- a/linden/indra/newview/floaterao.cpp
+++ b/linden/indra/newview/floaterao.cpp
@@ -119,6 +119,9 @@ AOInvTimer::AOInvTimer() : LLEventTimer( (F32)1.0 )
 AOInvTimer::~AOInvTimer()
 {
 }
+
+BOOL AOInvTimer::fullfetch = FALSE;
+
 BOOL AOInvTimer::tick()
 {
 	if (!(gSavedSettings.getBOOL("AOEnabled"))) return TRUE;
@@ -129,6 +132,15 @@ BOOL AOInvTimer::tick()
 //			cmdline_printchat("Inventory fetched, loading AO.");
 			LLFloaterAO::init();
 			return TRUE;
+		}else
+		{
+			//static BOOL startedfetch = FALSE;
+			if(fullfetch == FALSE)
+			{
+				fullfetch = TRUE;
+				//no choice, can't move the AO till we find it, should only have to happen once
+				gInventory.startBackgroundFetch();
+			}
 		}
 	}
 	return FALSE;
@@ -601,8 +613,6 @@ void LLFloaterAO::updateLayout(LLFloaterAO* floater)
 	}
 }
 
-BOOL LLFloaterAO::fullfetch = FALSE;
-
 void LLFloaterAO::init()
 {
 	mAOStands.clear();
@@ -697,15 +707,6 @@ void LLFloaterAO::init()
 							success = TRUE;
 						}
 					}
-				}else
-				{
-					//static BOOL startedfetch = FALSE;
-					if(fullfetch == FALSE)
-					{
-						fullfetch = TRUE;
-						//no choice, can't move the AO till we find it, should only have to happen once
-						gInventory.startBackgroundFetch();
-					}
 				}
 			}
 		}
diff --git a/linden/indra/newview/floaterao.h b/linden/indra/newview/floaterao.h
index ed60140..465f32e 100644
--- a/linden/indra/newview/floaterao.h
+++ b/linden/indra/newview/floaterao.h
@@ -51,6 +51,7 @@ public:
 class AOInvTimer : public LLEventTimer
 {
 public:
+	static BOOL fullfetch;
 	AOInvTimer();
 	~AOInvTimer();
 	BOOL tick();
@@ -66,7 +67,6 @@ public:
 
 	static void show(void*);
 	static void init();
-	static BOOL fullfetch;
 
 	static void onClickToggleAO(LLUICtrl *, void*);
 	static void onClickToggleSits(LLUICtrl *, void*);
-- 
cgit v1.1


From e8037e91e8a729eb5c0adedaf838a4a68b536c26 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 11 Mar 2011 02:04:03 -0700
Subject: Changed version to Experimental 2011.03.11

---
 linden/indra/newview/app_settings/viewerversion.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linden/indra/newview/app_settings/viewerversion.xml b/linden/indra/newview/app_settings/viewerversion.xml
index f9b0ba2..bb1b996 100644
--- a/linden/indra/newview/app_settings/viewerversion.xml
+++ b/linden/indra/newview/app_settings/viewerversion.xml
@@ -20,6 +20,6 @@ need to be changed manually - MC
   <viewer version_patch="0" />
 
   <!--string-->
-  <viewer version_test="Experimental 2010.11.13" />
+  <viewer version_test="Experimental 2011.03.11" />
   
 </viewer_version>
-- 
cgit v1.1


From ae71fc10d5a07ffebda6a8ec6ccf49d6690be06a Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Fri, 11 Mar 2011 19:56:01 +0100
Subject: fix bogus in install.xml

---
 linden/install.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/linden/install.xml b/linden/install.xml
index 0ec6bdf..374f676 100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -664,7 +664,7 @@
             <key>md5sum</key>
             <string>bd07378834cd1a4ecf7de55d4e2a7da2</string>
             <key>url</key>
-            <uri>http://kokuaviewer.org/download/libs/gstreamer-glib-iconv-libxml-windows-0.10.32-20110503.tar.bz2</uri>
+            <uri>http://download.kokuaviewer.org/files/libs/gstreamer-glib-iconv-libxml-windows-0.10.32-20110503.tar.bz2</uri>
           </map>
         </map>
       </map>
@@ -686,7 +686,7 @@
             <key>md5sum</key>
             <string>76ad5a08f8f07f99c9e1545c2a0adc27</string>
             <key>url</key>
-            <uri>http://kokuaviewer.org/download/libs/gstreamer-plugins-windows-0.10.32-20110503.tar.bz2</uri>
+            <uri>http://download.kokuaviewer.org/files/libs/gstreamer-plugins-windows-0.10.32-20110503.tar.bz2</uri>
           </map>
         </map>
       </map>
@@ -1225,7 +1225,7 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn
           <key>linux64</key>
           <map>
              <key>md5sum</key>
-            <string>ea42b868511e2d5fab2df11dceaf2b7e</string>032848c2591a15e26c71998df3644cfc
+            <string>032848c2591a15e26c71998df3644cfc</string>
              <key>url</key>
             <uri>http://download.kokuaviewer.org/files/libs/openal-linux64-pulse0.9.21-20110304.tar.bz2</uri>
            </map>
-- 
cgit v1.1


From 56bf45f3493689b5eb60cf99580adf11d6b02508 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Sun, 13 Mar 2011 09:16:20 +0100
Subject: fix voice doesn't kick in.

also fixed some LL_INFOS that should be LL_WARNS in the voice client.
---
 linden/indra/newview/llvoiceclient.cpp | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/linden/indra/newview/llvoiceclient.cpp b/linden/indra/newview/llvoiceclient.cpp
index 5517ca2..c05f685 100644
--- a/linden/indra/newview/llvoiceclient.cpp
+++ b/linden/indra/newview/llvoiceclient.cpp
@@ -1537,12 +1537,10 @@ void LLVoiceClient::start()
 
 void LLVoiceClient::stateMachine()
 {
-	if(gDisconnected)
-	{
-		// The viewer has been disconnected from the sim.  Disable voice.
-		setVoiceEnabled(false);
-	}
-	
+
+	// Disable voice as long as the viewer is disconnected from the sim (login/relog)
+	setVoiceEnabled(!gDisconnected);
+
 	if(mVoiceEnabled)
 	{
 		updatePosition();
@@ -1559,7 +1557,7 @@ void LLVoiceClient::stateMachine()
 			if(!mConnected)
 			{
 				// if voice was turned off after the daemon was launched but before we could connect to it, we may need to issue a kill.
-				LL_INFOS("Voice") << "Disabling voice before connection to daemon, terminating." << LL_ENDL;
+				LL_WARNS("Voice") << "Disabling voice before connection to daemon, terminating." << LL_ENDL;
 				killGateway();
 			}
 			
@@ -1764,7 +1762,7 @@ void LLVoiceClient::stateMachine()
 					}	
 					else
 					{
-						LL_INFOS("Voice") << exe_path << " not found." << LL_ENDL;
+						LL_WARNS("Voice") << exe_path << " not found." << LL_ENDL;
 						mVoiceEnabled = false;
 					}	
 				}
@@ -3783,7 +3781,7 @@ void LLVoiceClient::loginResponse(int statusCode, std::string &statusString, std
 	if ( statusCode == 401 )
 	{
 		// Login failure which is probably caused by the delay after a user's password being updated.
-		LL_INFOS("Voice") << "Account.Login response failure (" << statusCode << "): " << statusString << LL_ENDL;
+		LL_WARNS("Voice") << "Account.Login response failure (" << statusCode << "): " << statusString << LL_ENDL;
 		setState(stateLoginRetry);
 	}
 	else if(statusCode != 0)
@@ -3961,7 +3959,7 @@ void LLVoiceClient::sessionAddedEvent(
 			}
 			else
 			{
-				LL_INFOS("Voice") << "Could not generate caller id from uri, using hash of uri " << session->mSIPURI << LL_ENDL;
+				LL_WARNS("Voice") << "Could not generate caller id from uri, using hash of uri " << session->mSIPURI << LL_ENDL;
 				setUUIDFromStringHash(session->mCallerID, session->mSIPURI);
 				session->mSynthesizedCallerID = true;
 				
@@ -4479,7 +4477,7 @@ void LLVoiceClient::participantUpdatedEvent(
 	}
 	else
 	{
-		LL_INFOS("Voice") << "unknown session " << sessionHandle << LL_ENDL;
+		LL_WARNS("Voice") << "unknown session " << sessionHandle << LL_ENDL;
 	}
 }
 
@@ -5073,7 +5071,7 @@ void LLVoiceClient::parcelChanged()
 	else
 	{
 		// The transition to stateNoChannel needs to kick this off again.
-		LL_INFOS("Voice") << "not logged in yet, deferring" << LL_ENDL;
+		LL_WARNS("Voice") << "not logged in yet, deferring" << LL_ENDL;
 	}
 }
 
-- 
cgit v1.1


From b543f291fcf945330fd5a533cc7235c20d7cb4c5 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Sun, 13 Mar 2011 15:19:55 +0100
Subject: Henri Beauchamps version of Sione Lomus media filter patch.

from http://sldev.free.fr/ : "MediaFilter_v3: based on code by Sione Lomu with a couple of bugfixes by Tonya Souther, this improved patch brings media and streaming audio URLs filtering (to prevent IP ripping by so-called security systems which violate the SL TOS by catching your IP and associating your various avatars with it, thus violating your anonimity). Beside empowering your viewer with allow/deny/blacklist/whitelist functions per domain, this improved patch makes the difference between external servers (domains names filtering) and in-world servers (scripted objects with built-in HTTP servers). I also fixed various bugs, security holes and shortcomings, refactored the code and improved it, and added a whitelist/blacklist erasing function."

Imprudence changes: added "MediaFilter" debug to be able to inspect the full url and media texture uuid
---
 linden/indra/newview/CMakeLists.txt                |   2 +
 linden/indra/newview/app_settings/logcontrol.xml   |   1 +
 linden/indra/newview/app_settings/settings.xml     |  27 ++
 linden/indra/newview/lloverlaybar.cpp              |  21 +-
 linden/indra/newview/lloverlaybar.h                |   4 +
 linden/indra/newview/llstartup.cpp                 |   2 +
 linden/indra/newview/llviewercontrol.cpp           |   3 +-
 linden/indra/newview/llviewermenu.cpp              |   9 +
 linden/indra/newview/llviewerparcelmedia.cpp       | 397 ++++++++++++++++++++-
 linden/indra/newview/llviewerparcelmedia.h         |  24 +-
 linden/indra/newview/llviewerparcelmgr.cpp         |  12 +-
 .../default/xui/en-us/floater_media_filter.xml     |  61 ++++
 .../skins/default/xui/en-us/menu_viewer.xml        |   5 +
 .../skins/default/xui/en-us/notifications.xml      |  50 +++
 linden/indra/newview/slfloatermediafilter.cpp      | 350 ++++++++++++++++++
 linden/indra/newview/slfloatermediafilter.h        |  70 ++++
 16 files changed, 1025 insertions(+), 13 deletions(-)
 create mode 100644 linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml
 create mode 100644 linden/indra/newview/slfloatermediafilter.cpp
 create mode 100644 linden/indra/newview/slfloatermediafilter.h

diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index dedced0..9a4e2ed 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -498,6 +498,7 @@ set(viewer_SOURCE_FILES
     rlvmultistringsearch.cpp
     rlvextensions.cpp
     rlvfloaterbehaviour.cpp
+    slfloatermediafilter.cpp
     viewertime.cpp
     viewerversion.cpp
     windlightsettingsupdate.cpp
@@ -967,6 +968,7 @@ set(viewer_HEADER_FILES
     rlvmultistringsearch.h
     rlvextensions.h
     rlvfloaterbehaviour.h
+    slfloatermediafilter.h
     VertexCache.h
     VorbisFramework.h
     viewertime.h
diff --git a/linden/indra/newview/app_settings/logcontrol.xml b/linden/indra/newview/app_settings/logcontrol.xml
index 51bb456..c9e9127 100644
--- a/linden/indra/newview/app_settings/logcontrol.xml
+++ b/linden/indra/newview/app_settings/logcontrol.xml
@@ -58,6 +58,7 @@
 							<!--<string>HUDEffect</string>-->
               <!--<string>MarkerFile</string>-->
 							<!--<string>Media</string>-->
+							<string>MediaFilter</string>
 							<!--<string>MediaInfo</string>-->
 							<!--<string>MediaCallback</string>-->
 							<!--<string>MediaBuffering</string>-->
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 59c2982..2a508ee 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -7990,6 +7990,33 @@
     <key>Value</key>
     <real>3.0</real>
   </map>
+  <key>MediaEnableFilter</key>
+  <map>
+    <key>Comment</key>
+    <string>Enable media domain filtering</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>MediaFilterRect</key>
+  <map>
+    <key>Comment</key>
+    <string>Rectangle for Media Filter floater</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Rect</string>
+    <key>Value</key>
+    <array>
+      <integer>0</integer>
+      <integer>100</integer>
+      <integer>100</integer>
+      <integer>100</integer>
+    </array>
+  </map>
   <key>MediaOnAPrimUI</key>
   <map>
     <key>Comment</key>
diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp
index 4e1d03e..93b73c7 100644
--- a/linden/indra/newview/lloverlaybar.cpp
+++ b/linden/indra/newview/lloverlaybar.cpp
@@ -383,6 +383,23 @@ void LLOverlayBar::onClickStandUp(void*)
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+void LLOverlayBar::audioFilterPlay()
+{
+	if (gOverlayBar && gOverlayBar->mMusicState != PLAYING)
+	{
+		gOverlayBar->mMusicState = PLAYING;
+	}
+}
+
+void LLOverlayBar::audioFilterStop()
+{
+	if (gOverlayBar && gOverlayBar->mMusicState != STOPPED)
+	{
+		gOverlayBar->mMusicState = STOPPED;
+	}
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // static media helpers
 // *TODO: Move this into an audio manager abstraction
 //static
@@ -416,6 +433,7 @@ void LLOverlayBar::toggleMediaPlay(void*)
 		LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
 		if (parcel)
 		{
+			LLViewerParcelMedia::sIsUserAction = true;
 			LLViewerParcelMedia::play(parcel);
 		}
 	}
@@ -447,7 +465,8 @@ void LLOverlayBar::toggleMusicPlay(void*)
 				// stream is stopped, it doesn't return the right thing - commenting out for now.
 	// 			if ( gAudioStream->isInternetStreamPlaying() == 0 )
 				{
-					gAudioStream->startInternetStream(parcel->getMusicURL());
+					LLViewerParcelMedia::sIsUserAction = true;
+					LLViewerParcelMedia::playStreamingMusic(parcel);
 				}
 			}
 		}
diff --git a/linden/indra/newview/lloverlaybar.h b/linden/indra/newview/lloverlaybar.h
index 233f5c5..f776639 100644
--- a/linden/indra/newview/lloverlaybar.h
+++ b/linden/indra/newview/lloverlaybar.h
@@ -77,6 +77,10 @@ public:
 	static void onClickStandUp(void* data);
 	static void onClickResetView(void* data);
 
+	// media filter
+	static void audioFilterPlay();
+	static void audioFilterStop();
+
 	//static media helper functions
 	static void toggleMediaPlay(void*);
 	static void toggleMusicPlay(void*);
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 5a3a8ee..a74744b 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -2822,6 +2822,8 @@ bool idle_startup()
 			gFloaterTeleportHistory->addEntry(regionp->getName(),(S16)agent_pos.mV[0],(S16)agent_pos.mV[1],(S16)agent_pos.mV[2],false);
 		}
 
+		LLViewerParcelMedia::loadDomainFilterList();
+
 		// Let the map know about the inventory.
 		if(gFloaterWorldMap)
 		{
diff --git a/linden/indra/newview/llviewercontrol.cpp b/linden/indra/newview/llviewercontrol.cpp
index 572f64a..0a23045 100644
--- a/linden/indra/newview/llviewercontrol.cpp
+++ b/linden/indra/newview/llviewercontrol.cpp
@@ -63,6 +63,7 @@
 #include "llworld.h"
 #include "pipeline.h"
 #include "llviewerjoystick.h"
+#include "llviewerparcelmedia.h"
 #include "llviewerparcelmgr.h"
 #include "llparcel.h"
 #include "llnotify.h"
@@ -324,7 +325,7 @@ static bool handleAudioStreamMusicChanged(const LLSD& newvalue)
 				// otherwise music will briefly stop
 				if ( !gAudioStream->isInternetStreamPlaying() )
 				{
-					gAudioStream->startInternetStream(LLViewerParcelMgr::getInstance()->getAgentParcel()->getMusicURL());
+					LLViewerParcelMedia::playStreamingMusic(LLViewerParcelMgr::getInstance()->getAgentParcel());
 				}
 			}
 		}
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index cf3cec1..a22f704 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -234,6 +234,7 @@
 #include "hippolimits.h"
 
 #include "llfloaterteleporthistory.h"
+#include "slfloatermediafilter.h"
 
 using namespace LLVOAvatarDefines;
 void init_client_menu(LLMenuGL* menu);
@@ -5996,6 +5997,10 @@ class LLShowFloater : public view_listener_t
 		{
 			LLFloaterMute::toggleInstance();
 		}
+		else if (floater_name == "media filter")
+		{
+			SLFloaterMediaFilter::toggleInstance();
+		}
 		else if (floater_name == "camera controls")
 		{
 			LLFloaterCamera::toggleInstance();
@@ -6161,6 +6166,10 @@ class LLFloaterVisible : public view_listener_t
 		{
 			new_value = LLFloaterMute::instanceVisible();
 		}
+		else if (floater_name == "media filter")
+		{
+			new_value = SLFloaterMediaFilter::instanceVisible();
+		}
 		else if (floater_name == "camera controls")
 		{
 			new_value = LLFloaterCamera::instanceVisible();
diff --git a/linden/indra/newview/llviewerparcelmedia.cpp b/linden/indra/newview/llviewerparcelmedia.cpp
index d4ebbd9..a5d97f2 100644
--- a/linden/indra/newview/llviewerparcelmedia.cpp
+++ b/linden/indra/newview/llviewerparcelmedia.cpp
@@ -33,6 +33,7 @@
 #include "llviewerprecompiledheaders.h"
 #include "llviewerparcelmedia.h"
 
+#include "kokuastreamingaudio.h"
 #include "llagent.h"
 #include "llviewercontrol.h"
 #include "llviewermedia.h"
@@ -46,17 +47,27 @@
 #include "llviewerwindow.h"
 #include "llfirstuse.h"
 #include "llpluginclassmedia.h"
+#include "llnotify.h"
+#include "llsdserialize.h"
 
+#include "lloverlaybar.h"
+#include "slfloatermediafilter.h"
+#include "llinventorymodel.h"
 // Static Variables
 
 S32 LLViewerParcelMedia::sMediaParcelLocalID = 0;
 LLUUID LLViewerParcelMedia::sMediaRegionID;
 viewer_media_t LLViewerParcelMedia::sMediaImpl;
-
+bool LLViewerParcelMedia::sIsUserAction = false;
+bool LLViewerParcelMedia::sMediaFilterListLoaded = false;
+LLSD LLViewerParcelMedia::sMediaFilterList;
+std::set<std::string> LLViewerParcelMedia::sMediaQueries;
+std::set<std::string> LLViewerParcelMedia::sAllowedMedia;
+std::set<std::string> LLViewerParcelMedia::sDeniedMedia;
 
 // Local functions
 bool callback_play_media(const LLSD& notification, const LLSD& response, LLParcel* parcel);
-
+void callback_media_alert(const LLSD& notification, const LLSD& response, LLParcel* parcel, U32 type, std::string domain);
 
 // static
 void LLViewerParcelMedia::initClass()
@@ -175,7 +186,7 @@ void LLViewerParcelMedia::update(LLParcel* parcel)
 }
 
 // static
-void LLViewerParcelMedia::play(LLParcel* parcel)
+void LLViewerParcelMedia::play(LLParcel* parcel, bool filter)
 {
 	lldebugs << "LLViewerParcelMedia::play" << llendl;
 
@@ -185,7 +196,17 @@ void LLViewerParcelMedia::play(LLParcel* parcel)
 		return;
 
 	std::string media_url = parcel->getMediaURL();
-	std::string media_current_url = parcel->getMediaCurrentURL();
+	LLStringUtil::trim(media_url);
+
+	if (!media_url.empty() && gSavedSettings.getBOOL("MediaEnableFilter") && (filter || !allowedMedia(media_url)))
+	{
+		// If filtering is needed or in case media_url just changed
+		// to something we did not yet approve.
+		LLViewerParcelMediaAutoPlay::playStarted();
+		filterMedia(parcel, 0);
+		return;
+	}
+
 	std::string mime_type = parcel->getMediaType();
 	LLUUID placeholder_texture_id = parcel->getMediaID();
 	U8 media_auto_scale = parcel->getMediaAutoScale();
@@ -403,6 +424,8 @@ void LLViewerParcelMedia::processParcelMediaUpdate( LLMessageSystem *msg, void *
 	media_url = media_url_buffer;
 	msg->getU8("DataBlock", "MediaAutoScale", media_auto_scale);
 
+	LL_DEBUGS("MediaFilter") << "New media texture id: " << media_id << LL_ENDL;
+
 	if (msg->has("DataBlockExtended")) // do we have the extended data?
 	{
 		char media_type_buffer[257];
@@ -438,6 +461,7 @@ void LLViewerParcelMedia::processParcelMediaUpdate( LLMessageSystem *msg, void *
 
 			play(parcel);
 		}
+
 	}
 }
 // Static
@@ -586,3 +610,368 @@ void LLViewerParcelMediaNavigationObserver::onNavigateComplete( const EventType&
 
 }
 */
+
+void LLViewerParcelMedia::playStreamingMusic(LLParcel* parcel, bool filter)
+{
+	std::string music_url = parcel->getMusicURL();
+	LLStringUtil::trim(music_url);
+	if (!music_url.empty() && gSavedSettings.getBOOL("MediaEnableFilter") && (filter || !allowedMedia(music_url)))
+	{
+		// If filtering is needed or in case music_url just changed
+		// to something we did not yet approve.
+		filterMedia(parcel, 1);
+	}
+	else if (gAudioStream)
+	{
+		LLStringUtil::trim(music_url);
+		gAudioStream->startInternetStream(music_url);
+		if (music_url.empty())
+		{
+			LLOverlayBar::audioFilterStop();
+		}
+		else
+		{
+			LLOverlayBar::audioFilterPlay();
+		}
+	}
+}
+
+void LLViewerParcelMedia::stopStreamingMusic()
+{
+	if (gAudioStream)
+	{
+		gAudioStream->stopInternetStream();
+		LLOverlayBar::audioFilterStop();
+	}
+}
+
+bool LLViewerParcelMedia::allowedMedia(std::string media_url)
+{
+	LLStringUtil::trim(media_url);
+	std::string domain = extractDomain(media_url);
+	if (sAllowedMedia.count(domain))
+	{
+		return true;
+	}
+	for (S32 i = 0; i < (S32)sMediaFilterList.size(); i++)
+	{
+		if (sMediaFilterList[i]["domain"].asString() == domain)
+		{
+			if (sMediaFilterList[i]["action"].asString() == "allow")
+			{
+				return true;
+			}
+			else
+			{
+				return false;
+			}
+		}
+	}
+	return false;
+}
+
+void LLViewerParcelMedia::filterMedia(LLParcel* parcel, U32 type)
+{
+	std::string media_action;
+	std::string media_url;
+	std::string domain;
+
+	if (parcel != LLViewerParcelMgr::getInstance()->getAgentParcel())
+	{
+		// The parcel just changed (may occur right out after a TP)
+		sIsUserAction = false;
+		return;
+	}		
+
+	if (type == 0)
+	{
+		media_url = parcel->getMediaURL();
+	}
+	else
+	{
+		media_url = parcel->getMusicURL();
+	}
+	LLStringUtil::trim(media_url);
+
+	LL_DEBUGS("MediaFilter") << "Requested " << (type == 0 ? "media" : "music") << "-URL: " << media_url << LL_ENDL;
+
+	domain = extractDomain(media_url);
+
+	if (sMediaQueries.count(domain) > 0)
+	{
+		sIsUserAction = false;
+		return;
+	}
+
+	if (sIsUserAction)
+	{
+		// This was a user manual request to play this media, so give
+		// it another chance...
+		sIsUserAction = false;
+		if (sDeniedMedia.count(domain))
+		{
+			sDeniedMedia.erase(domain);
+			SLFloaterMediaFilter::setDirty();
+		}
+	}
+
+	if (!sMediaFilterListLoaded || sDeniedMedia.count(domain))
+	{
+		media_action = "ignore";
+	}
+	else if (sAllowedMedia.count(domain))
+	{
+		media_action = "allow";
+	}
+	else
+	{
+		for (S32 i = 0; i < (S32)sMediaFilterList.size(); i++)
+		{
+			if (sMediaFilterList[i]["domain"].asString() == domain)
+			{
+				media_action = sMediaFilterList[i]["action"].asString();
+				break;
+			}
+		}
+	}
+
+	if (media_action == "allow" || media_url.empty())
+	{
+		if (type == 0)
+		{
+			play(parcel, false);
+		}
+		else
+		{
+			playStreamingMusic(parcel, false);
+		}
+	}
+	else if (media_action == "deny")
+	{
+		LLSD args;
+		args["DOMAIN"] = domain;
+		LLNotifications::instance().add("MediaBlocked", args);
+		if (type == 1)
+		{
+			LLViewerParcelMedia::stopStreamingMusic();
+		}
+		// So to avoid other "blocked" messages later in the session
+		// for this url should it be requested again by a script.
+		sDeniedMedia.insert(domain);
+	}
+	else if (media_action == "ignore")
+	{
+		if (type == 1)
+		{
+			LLViewerParcelMedia::stopStreamingMusic();
+		}
+	}
+	else
+	{
+		sMediaQueries.insert(domain);
+		LLSD args;
+		args["DOMAIN"] = domain;
+		if (media_url.find('?') != std::string::npos)
+		{
+			args["WARNING"] = " (WARNING: this URL also contains parameter(s) that could potentially be used to correlate your avatar name with your IP)";
+		}
+		else
+		{
+			args["WARNING"] = "";
+		}
+		if (type == 0)
+		{
+			args["TYPE"] = "a media";
+		}
+		else
+		{
+			args["TYPE"] = "an audio";
+		}
+		LLNotifications::instance().add("MediaAlert", args, LLSD(), boost::bind(callback_media_alert, _1, _2, parcel, type, domain));
+	}
+}
+
+void callback_media_alert(const LLSD &notification, const LLSD &response, LLParcel* parcel, U32 type, std::string domain)
+{
+	S32 option = LLNotification::getSelectedOption(notification, response);
+
+	LLSD args;
+	args["DOMAIN"] = domain;
+
+	if (option == 0 || option == 3) // Allow or Whitelist
+	{
+		LLViewerParcelMedia::sAllowedMedia.insert(domain);
+		if (option == 3) // Whitelist
+		{
+			LLSD newmedia;
+			newmedia["domain"] = domain;
+			newmedia["action"] = "allow";
+			LLViewerParcelMedia::sMediaFilterList.append(newmedia);
+			LLViewerParcelMedia::saveDomainFilterList();
+			args["LISTED"] = "whitelisted";
+			LLNotifications::instance().add("MediaListed", args);
+		}
+		if (type == 0)
+		{
+			LLViewerParcelMedia::play(parcel, false);
+		}
+		else
+		{
+			LLViewerParcelMedia::playStreamingMusic(parcel, false);
+		}
+	}
+	else if (option == 1 || option == 2) // Deny or Blacklist
+	{
+		LLViewerParcelMedia::sDeniedMedia.insert(domain);
+		if (type == 1)
+		{
+			LLViewerParcelMedia::stopStreamingMusic();
+		}
+		if (option == 1) // Deny
+		{
+			LLNotifications::instance().add("MediaBlocked", args);
+		}
+		else // Blacklist
+		{
+			LLSD newmedia;
+			newmedia["domain"] = domain;
+			newmedia["action"] = "deny";
+			LLViewerParcelMedia::sMediaFilterList.append(newmedia);
+			LLViewerParcelMedia::saveDomainFilterList();
+			args["LISTED"] = "blacklisted";
+			LLNotifications::instance().add("MediaListed", args);
+		}
+	}
+
+	LLViewerParcelMedia::sMediaQueries.erase(domain);
+	SLFloaterMediaFilter::setDirty();
+}
+
+void LLViewerParcelMedia::saveDomainFilterList()
+{
+	std::string medialist_filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "media_filter.xml");
+
+	llofstream medialistFile(medialist_filename);
+	LLSDSerialize::toPrettyXML(sMediaFilterList, medialistFile);
+	medialistFile.close();
+}
+
+bool LLViewerParcelMedia::loadDomainFilterList()
+{
+	sMediaFilterListLoaded = true;
+
+	std::string medialist_filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, "media_filter.xml");
+
+	if (!LLFile::isfile(medialist_filename))
+	{
+		LLSD emptyllsd;
+		llofstream medialistFile(medialist_filename);
+		LLSDSerialize::toPrettyXML(emptyllsd, medialistFile);
+		medialistFile.close();
+	}
+
+	if (LLFile::isfile(medialist_filename))
+	{
+		llifstream medialistFile(medialist_filename);
+		LLSDSerialize::fromXML(sMediaFilterList, medialistFile);
+		medialistFile.close();
+		SLFloaterMediaFilter::setDirty();
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+}
+
+void LLViewerParcelMedia::clearDomainFilterList()
+{
+	sMediaFilterList.clear();
+	sAllowedMedia.clear();
+	sDeniedMedia.clear();
+	saveDomainFilterList();
+	LLNotifications::instance().add("MediaFiltersCleared");
+	SLFloaterMediaFilter::setDirty();
+}
+
+std::string LLViewerParcelMedia::extractDomain(std::string url)
+{
+	static std::string last_region = "@";
+
+	if (url.empty())
+	{
+		return url;
+	}
+
+	LLStringUtil::toLower(url);
+
+	size_t pos = url.find("//");
+
+	if (pos != std::string::npos)
+	{
+		size_t count = url.size() - pos + 2;
+		url = url.substr(pos + 2, count);
+	}
+
+	// Check that there is at least one slash in the URL and add a trailing
+	// one if not (for media/audio URLs such as http://mydomain.net)
+	if (url.find('/') == std::string::npos)
+	{
+		url += '/';
+	}
+
+	// If there's a user:password@ part, remove it
+	pos = url.find('@');
+	if (pos != std::string::npos && pos < url.find('/'))	// if '@' is not before the first '/', then it's not a user:password
+	{
+		size_t count = url.size() - pos + 1;
+		url = url.substr(pos + 1, count);
+	}
+
+	if (url.find(gAgent.getRegion()->getHost().getHostName()) == 0 || url.find(last_region) == 0)
+	{
+		// This must be a scripted object rezzed in the region:
+		// extend the concept of "domain" to encompass the
+		// scripted object server id and avoid blocking all other
+		// objects at once in this region...
+
+		// Get rid of any port number
+		pos = url.find('/');		// We earlier made sure that there's one
+		url = gAgent.getRegion()->getHost().getHostName() + url.substr(pos);
+
+		pos = url.find('?');
+		if (pos != std::string::npos)
+		{
+			// Get rid of any parameter
+			url = url.substr(0, pos);
+		}
+
+		pos = url.rfind('/');
+		if (pos != std::string::npos)
+		{
+			// Get rid of the filename, if any, keeping only the server + path
+			url = url.substr(0, pos);
+		}
+	}
+	else
+	{
+		pos = url.find(':');  
+		if (pos != std::string::npos && pos < url.find('/'))
+		{
+			// Keep anything before the port number and strip the rest off
+			url = url.substr(0, pos);
+		}
+		else
+		{
+			pos = url.find('/');	// We earlier made sure that there's one
+			url = url.substr(0, pos);
+		}
+	}
+
+		
+	// Remember this region, so to cope with requests occuring just after a
+	// TP out of it.
+	last_region = gAgent.getRegion()->getHost().getHostName();
+
+	return url;
+}
diff --git a/linden/indra/newview/llviewerparcelmedia.h b/linden/indra/newview/llviewerparcelmedia.h
index 0f1e85c..7531a0f 100644
--- a/linden/indra/newview/llviewerparcelmedia.h
+++ b/linden/indra/newview/llviewerparcelmedia.h
@@ -35,6 +35,9 @@
 
 #include "llviewermedia.h"
 
+// For use by other patches so they know that media filtering is implemented.
+#define MEDIA_FILTERING 1
+
 class LLMessageSystem;
 class LLParcel;
 class LLViewerParcelMediaNavigationObserver;
@@ -54,8 +57,20 @@ class LLViewerParcelMedia : public LLViewerMediaObserver
 			// called when the agent's parcel has a new URL, or the agent has
 			// walked on to a new parcel with media
 
-		static void play(LLParcel* parcel);
+		static void play(LLParcel* parcel, bool filter = true);
 			// user clicked play button in media transport controls
+		static void playStreamingMusic(LLParcel* parcel, bool filter = true);
+			// play the parcel music stream
+		static void stopStreamingMusic();
+			// stop the parcel music stream
+
+		static void filterMedia(LLParcel* parcel, U32 type); // type: 0 = media, 1 = streaming music
+		static bool allowedMedia(std::string media_url);
+
+		static bool loadDomainFilterList();
+		static void saveDomainFilterList();
+		static void clearDomainFilterList();
+		static std::string extractDomain(std::string url);
 
 		static void stop();
 			// user clicked stop button in media transport controls
@@ -85,6 +100,13 @@ class LLViewerParcelMedia : public LLViewerMediaObserver
 		static LLUUID sMediaRegionID;
 		// HACK: this will change with Media on a Prim
 		static viewer_media_t sMediaImpl;
+
+		static bool sIsUserAction;
+		static bool sMediaFilterListLoaded;
+		static LLSD sMediaFilterList;
+		static std::set<std::string> sMediaQueries;
+		static std::set<std::string> sAllowedMedia;
+		static std::set<std::string> sDeniedMedia;
 };
 
 
diff --git a/linden/indra/newview/llviewerparcelmgr.cpp b/linden/indra/newview/llviewerparcelmgr.cpp
index 630da54..9db65c6 100644
--- a/linden/indra/newview/llviewerparcelmgr.cpp
+++ b/linden/indra/newview/llviewerparcelmgr.cpp
@@ -85,7 +85,7 @@ LLPointer<LLViewerImage> sBlockedImage;
 LLPointer<LLViewerImage> sPassImage;
 
 // Local functions
-void optionally_start_music(const std::string& music_url);
+void optionally_start_music(LLParcel* parcel);
 void callback_start_music(S32 option, void* data);
 void optionally_prepare_video(const LLParcel *parcelp);
 void callback_prepare_video(S32 option, void* data);
@@ -1697,7 +1697,7 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
 					{
 						if (music_url.substr(0,7) == "http://")
 						{
-							optionally_start_music(music_url);
+							optionally_start_music(parcel);
 						}
 					}
 					else if (!gAudioStream->getInternetStreamURL().empty())
@@ -1719,18 +1719,18 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
 	};
 }
 
-void optionally_start_music(const std::string& music_url)
+void optionally_start_music(LLParcel* parcel)
 {
 	if (gSavedSettings.getBOOL("AudioStreamingMusic"))
 	{
 		// Make the user click the start button on the overlay bar. JC
-		//		llinfos << "Starting parcel music " << music_url << llendl;
+		//		llinfos << "Starting parcel music " << parcel->getMusicURL() << llendl;
 
 		// now only play music when you enter a new parcel if the control is in PLAY state
 		// changed as part of SL-4878
-		if ( gOverlayBar && gOverlayBar->musicPlaying())
+		if (gOverlayBar && gOverlayBar->musicPlaying())
 		{
-			gAudioStream->startInternetStream(music_url);
+			LLViewerParcelMedia::playStreamingMusic(parcel);
 		}
 	}
 }
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml b/linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml
new file mode 100644
index 0000000..9b7355c
--- /dev/null
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_media_filter.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater name="floatermediafilter" title="Media Filter" rect_control="MediaFilterRect"
+ can_close="true" can_drag_on_left="false" can_minimize="true" can_resize="true"
+ height="350" width="600" min_height="350" min_width="600">
+	<text name="info1" font="SansSerif" mouse_opaque="true" halign="center"
+	 bottom_delta="-45" left="20" height="20" width="560" follows="left|right|top">
+		Domains in bold are in the persistent list (i.e. they are whitelisted or blacklisted).
+	</text>
+	<text name="info2" font="SansSerif" mouse_opaque="true" halign="center"
+	 bottom_delta="-20" left="20" height="20" width="560" follows="left|right|top">
+		Domains in italics are in the session list (i.e. they are temporarily allowed or denied).
+	</text>
+
+	<scroll_list name="whitelist_list" follows="top|bottom|left"
+	 background_visible="true" mouse_opaque="true"
+	 multi_select="false" column_padding="5" draw_border="true" draw_heading="true"
+	 bottom_delta="-205" left="15" height="200" width="280">
+		<column name="whitelist_col" label="Allowed domains/objects" dynamicwidth="true" />
+	</scroll_list>
+
+	<scroll_list name="blacklist_list" follows="top|bottom|right"
+	 background_visible="true" mouse_opaque="true"
+	 multi_select="false" column_padding="5" draw_border="true" draw_heading="true"
+	 bottom_delta="0" right="-15" height="200" width="280">
+		<column name="blacklist_col" label="Blocked domains/objects" dynamicwidth="true" />
+	</scroll_list>
+
+	<button name="add_whitelist" font="SansSerif" label="Add..." halign="center"
+	 enabled="true" mouse_opaque="true" follows="bottom|left"
+	 bottom_delta="-25" left="30" height="20" width="80" />
+
+	<button name="remove_whitelist" font="SansSerif" label="Remove" halign="center"
+	 enabled="true" mouse_opaque="true" follows="bottom|left"
+	 bottom_delta="0" left_delta="100" height="20" width="80" />
+
+	<button name="clear_lists" font="SansSerif" label="Clear lists" halign="center"
+	 enabled="true" mouse_opaque="true" follows="bottom|left|right"
+	 bottom_delta="0" left_delta="110" height="20" width="120" />
+
+	<button name="add_blacklist" font="SansSerif" label="Add..." halign="center"
+	 enabled="true" mouse_opaque="true" follows="bottom|right"
+	 bottom_delta="0" right="-130" height="20" width="80" />
+
+	<button name="remove_blacklist" font="SansSerif" label="Remove" halign="center"
+	 enabled="true" mouse_opaque="true" follows="bottom|right"
+	 bottom_delta="0" right="-30" height="20" width="80" />
+
+	<text name="add_text" font="SansSerif" mouse_opaque="true" enabled="true"
+	 bottom_delta="-25" left="20" height="20" width="500" follows="left|right|bottom">
+		New domain:
+	</text>
+
+	<line_editor name="input_domain" max_length="255" font="SansSerif" enabled="false"
+	 select_all_on_focus_received="true" select_on_focus="true"
+	 bevel_style="in" border_style="line" border_thickness="1"
+	 bottom_delta="-20"	right="-100" height="20" left="15" follows="left|bottom|right"/>
+
+	<button name="commit_domain" font="SansSerif" label="Add" halign="center" enabled="false"
+	 mouse_opaque="true" follows="bottom|right"
+	 bottom_delta="0" right="-15" height="20" width="80"/>
+</floater>
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 4bde0f0..5fbf337 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
@@ -277,6 +277,11 @@
       <on_click function="ShowAgentGroups"
                 userdata="agent" />
     </menu_item_call>
+    <menu_item_check bottom="-192" enabled="true" height="19" label="Media Filter" left="0"
+                     mouse_opaque="true" name="Media Filter" width="211">
+       <on_click function="ShowFloater" userdata="media filter" />
+       <on_check function="FloaterVisible" userdata="media filter" />
+    </menu_item_check>
     <menu_item_separator />
     <menu_item_call name="Preferences..." label="Preferences..."
                     shortcut="control|P">
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 47d3dbb..27f5529 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -7320,6 +7320,56 @@ The Second Life Terms of Service do not allow you to opt out. By logging in to S
    notext="Cancel"/>
 </notification>
 
+  <notification
+   icon="alert.tga"
+   name="MediaAlert"
+   type="alert">
+The owner of this parcel has requested [TYPE] URL pertaining to the following domain or scripted object to be loaded by your viewer[WARNING]:
+
+[DOMAIN]
+
+"Allow" and "Deny" apply only for this session, while "Blacklist" and "Whitelist" apply forever to the above domain or scripted object.
+   <form name="form">
+    <button
+	 index="0"
+	 name="Allow"
+	 text="Allow"/>
+	<button
+	 index="1"
+	 name="Deny"
+	 text="Deny"/>
+	<button
+	 index="2"
+	 name="Blacklist"
+	 text="Blacklist"/>
+	<button
+	 index="3"
+	 name="Whitelist"
+	 text="Whitelist"/>
+   </form>
+  </notification>
+
+  <notification
+   icon="alert.tga"
+   name="MediaListed"
+   type="alert">
+Media/audio URLs for [DOMAIN] now [LISTED]
+  </notification>
+
+  <notification
+   icon="notifytip.tga"
+   name="MediaBlocked"
+   type="notifytip">
+Media/audio URL blocked for [DOMAIN]
+  </notification>
+
+  <notification
+   icon="alertmodal.tga"
+   name="MediaFiltersCleared"
+   type="alertmodal">
+The media filters have been cleared
+  </notification>
+
 <!--End Imprudence notifications-->
  <!-- [KITTY VIEWER] -->
   <notification
diff --git a/linden/indra/newview/slfloatermediafilter.cpp b/linden/indra/newview/slfloatermediafilter.cpp
new file mode 100644
index 0000000..c47ed26
--- /dev/null
+++ b/linden/indra/newview/slfloatermediafilter.cpp
@@ -0,0 +1,350 @@
+/** 
+ * @file slfloatermediafilter.cpp
+ * @brief The SLFloaterMediaFilter class definitions
+ *
+ * $LicenseInfo:firstyear=2011&license=viewergpl$
+ * 
+ * Copyright (c) 2011, Sione Lomu
+ * with debugging and improvements by Henri Beauchamp
+ * 
+ * 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 "lllineeditor.h"
+#include "llscrolllistctrl.h"
+#include "lluictrlfactory.h" 
+
+#include "slfloatermediafilter.h"
+#include "llviewercontrol.h"
+#include "llviewerparcelmedia.h"
+
+SLFloaterMediaFilter* SLFloaterMediaFilter::sInstance = NULL;
+bool SLFloaterMediaFilter::sIsWhitelist = false;
+
+SLFloaterMediaFilter::SLFloaterMediaFilter() : LLFloater(std::string("media filter")), mIsDirty(false)
+{
+    LLUICtrlFactory::getInstance()->buildFloater(this, "floater_media_filter.xml");
+}
+
+SLFloaterMediaFilter::~SLFloaterMediaFilter()
+{
+    sInstance = NULL;
+}
+
+BOOL SLFloaterMediaFilter::postBuild()
+{
+	mWhitelistSLC = getChild<LLScrollListCtrl>("whitelist_list");
+	mBlacklistSLC = getChild<LLScrollListCtrl>("blacklist_list");
+
+	if (mWhitelistSLC && mBlacklistSLC)
+	{
+		childSetAction("clear_lists", onClearLists, this);
+		childSetAction("add_whitelist", onWhitelistAdd, this);
+		childSetAction("remove_whitelist", onWhitelistRemove, this);
+		childSetAction("add_blacklist", onBlacklistAdd, this);
+		childSetAction("remove_blacklist", onBlacklistRemove, this);
+		childSetAction("commit_domain", onCommitDomain, this);
+		childSetUserData("whitelist_list", this);
+		childSetUserData("blacklist_list", this);
+		mIsDirty = true;
+	}
+
+	return TRUE;
+}
+
+void SLFloaterMediaFilter::draw()
+{
+	if (mIsDirty && mWhitelistSLC && mBlacklistSLC)
+	{
+		S32 whitescrollpos = mWhitelistSLC->getScrollPos();
+		S32 blackscrollpos = mBlacklistSLC->getScrollPos();
+		mWhitelistSLC->deleteAllItems();
+		mBlacklistSLC->deleteAllItems();
+		std::set<std::string> listed;
+		std::string domain;
+		std::string action;
+		LLSD element;
+		element["columns"][0]["font"] = "SANSSERIF";
+		element["columns"][0]["font-style"] = "BOLD";
+		for (S32 i = 0; i < (S32)LLViewerParcelMedia::sMediaFilterList.size(); i++)
+		{
+			domain = LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString();
+			action = LLViewerParcelMedia::sMediaFilterList[i]["action"].asString();
+			if (!domain.empty() && action == "allow")
+			{	
+				element["columns"][0]["column"] = "whitelist_col";
+				element["columns"][0]["value"] = domain;
+				//element["columns"][0]["color"] = LLColor4::green3.getValue();
+				mWhitelistSLC->addElement(element, ADD_BOTTOM);
+				listed.insert(domain);
+			}
+			else if (!domain.empty() && action == "deny")
+			{
+				element["columns"][0]["column"] = "blacklist_col";
+				element["columns"][0]["value"] = domain;
+				//element["columns"][0]["color"] = LLColor4::red2.getValue();
+				mBlacklistSLC->addElement(element, ADD_BOTTOM);
+				listed.insert(domain);
+			}
+			else
+			{
+				LL_WARNS("MediaFilter") << "Bad media filter list: removing corrupted entry for \"" << domain << "\"" << LL_ENDL;
+				LLViewerParcelMedia::sMediaFilterList.erase(i--);
+			}
+		}
+		std::set<std::string>::iterator it;
+		element["columns"][0]["font"] = "SANSSERIF";
+		element["columns"][0]["font-style"] = "ITALIC";
+		//element["columns"][0]["color"] = LLColor4::green3.getValue();
+		element["columns"][0]["column"] = "whitelist_col";
+		for (it = LLViewerParcelMedia::sAllowedMedia.begin(); it != LLViewerParcelMedia::sAllowedMedia.end(); it++)
+		{
+			domain = *it;
+			if (listed.count(domain) == 0)
+			{
+				element["columns"][0]["value"] = domain;
+				mWhitelistSLC->addElement(element, ADD_BOTTOM);
+			}
+		}
+		element["columns"][0]["column"] = "blacklist_col";
+		for (it = LLViewerParcelMedia::sDeniedMedia.begin(); it != LLViewerParcelMedia::sDeniedMedia.end(); it++)
+		{
+			domain = *it;
+			if (listed.count(domain) == 0)
+			{
+				element["columns"][0]["value"] = domain;
+				mBlacklistSLC->addElement(element, ADD_BOTTOM);
+			}
+		}
+		mWhitelistSLC->setScrollPos(whitescrollpos);
+		mBlacklistSLC->setScrollPos(blackscrollpos);
+
+		if (!gSavedSettings.getBOOL("MediaEnableFilter"))
+		{
+			childDisable("clear_lists");
+			childDisable("blacklist_list");
+			childDisable("whitelist_list");
+			childDisable("remove_whitelist");
+			childDisable("add_whitelist");
+			childDisable("remove_blacklist");
+			childDisable("add_blacklist");
+			childDisable("input_domain");
+			childDisable("commit_domain");
+			childSetText("add_text", std::string("****** WARNING: media filtering is currently DISABLED ******"));
+		}
+
+		mIsDirty = false;
+	}
+
+	LLFloater::draw();
+}
+
+void SLFloaterMediaFilter::setDirty()
+{
+    if (sInstance)
+	{
+		sInstance->mIsDirty = true;
+		sInstance->draw();
+	}
+}
+
+BOOL SLFloaterMediaFilter::instanceVisible()
+{
+	if (sInstance)
+	{
+		return sInstance->getVisible();
+	}
+	else
+	{
+		return FALSE;
+	}
+}
+
+void SLFloaterMediaFilter::toggleInstance()
+{
+	if (sInstance)
+	{
+		if (sInstance->getVisible())
+		{
+			sInstance->destroy();
+		}
+		else
+		{
+			sInstance->open();
+		}
+	}
+	else
+	{
+		sInstance = new SLFloaterMediaFilter();
+    	sInstance->open();
+	}
+}
+
+void SLFloaterMediaFilter::onClearLists(void* data)
+{
+	LLViewerParcelMedia::clearDomainFilterList();
+}
+
+void SLFloaterMediaFilter::onWhitelistAdd(void* data)
+{
+    if (!sInstance)
+	{
+		return;
+	}
+	sInstance->childDisable("clear_lists");
+	sInstance->childDisable("blacklist_list");
+	sInstance->childDisable("whitelist_list");
+	sInstance->childDisable("remove_whitelist");
+	sInstance->childDisable("add_whitelist");
+	sInstance->childDisable("remove_blacklist");
+	sInstance->childDisable("add_blacklist");
+	sInstance->childEnable("input_domain");
+	sInstance->childEnable("commit_domain");
+	sInstance->childSetText("add_text", std::string("Enter the domain/url to add to the white list:"));
+	sIsWhitelist = true;
+}
+
+void SLFloaterMediaFilter::onWhitelistRemove(void* data)
+{
+    if (!sInstance)
+	{
+		return;
+	}
+	LLScrollListItem* selected = sInstance->mWhitelistSLC->getFirstSelected();
+
+	if (selected)
+	{
+		std::string domain = sInstance->mWhitelistSLC->getSelectedItemLabel();
+		LLViewerParcelMedia::sAllowedMedia.erase(domain);
+
+		for (S32 i = 0; i < (S32)LLViewerParcelMedia::sMediaFilterList.size(); i++)
+		{
+			if (LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString() == domain)
+			{
+				LLViewerParcelMedia::sMediaFilterList.erase(i);
+				LLViewerParcelMedia::saveDomainFilterList();
+				break;
+			}
+		}
+
+		setDirty();
+	}
+}
+
+void SLFloaterMediaFilter::onBlacklistAdd(void* data)
+{
+    if (!sInstance)
+	{
+		return;
+	}
+	sInstance->childDisable("clear_lists");
+	sInstance->childDisable("blacklist_list");
+	sInstance->childDisable("whitelist_list");
+	sInstance->childDisable("remove_whitelist");
+	sInstance->childDisable("add_whitelist");
+	sInstance->childDisable("remove_blacklist");
+	sInstance->childDisable("add_blacklist");
+	sInstance->childEnable("input_domain");
+	sInstance->childEnable("commit_domain");
+	sInstance->childSetText("add_text", std::string("Enter the domain/url to add to the black list:"));
+	sIsWhitelist = false;
+}
+
+void SLFloaterMediaFilter::onBlacklistRemove(void* data)
+{	
+    if (!sInstance)
+	{
+		return;
+	}
+	LLScrollListItem* selected = sInstance->mBlacklistSLC->getFirstSelected();
+
+	if (selected)
+	{
+		std::string domain = sInstance->mBlacklistSLC->getSelectedItemLabel();
+		LLViewerParcelMedia::sDeniedMedia.erase(domain);
+
+		for (S32 i = 0; i < (S32)LLViewerParcelMedia::sMediaFilterList.size(); i++)
+		{
+			if (LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString() == domain)
+			{
+				LLViewerParcelMedia::sMediaFilterList.erase(i);
+				LLViewerParcelMedia::saveDomainFilterList();
+				break;
+			}
+		}
+
+		setDirty();
+	}
+}	
+
+void SLFloaterMediaFilter::onCommitDomain(void* data)
+{
+    if (!sInstance)
+	{
+		return;
+	}
+	std::string domain = sInstance->childGetText("input_domain");
+	domain = LLViewerParcelMedia::extractDomain(domain);
+
+	if (!domain.empty())
+	{
+		LLViewerParcelMedia::sDeniedMedia.erase(domain);
+		LLViewerParcelMedia::sAllowedMedia.erase(domain);
+		for (S32 i = 0; i < (S32)LLViewerParcelMedia::sMediaFilterList.size(); i++)
+		{
+			if (LLViewerParcelMedia::sMediaFilterList[i]["domain"].asString() == domain)
+			{
+				LLViewerParcelMedia::sMediaFilterList.erase(i);
+				break;
+			}
+		}
+		LLSD newmedia;
+		newmedia["domain"] = domain;
+		if (sIsWhitelist)
+		{
+			newmedia["action"] = "allow";
+		}
+		else
+		{
+			newmedia["action"] = "deny";
+		}
+		LLViewerParcelMedia::sMediaFilterList.append(newmedia);
+		LLViewerParcelMedia::saveDomainFilterList();
+	}
+
+	sInstance->childEnable("clear_lists");
+	sInstance->childEnable("blacklist_list");
+	sInstance->childEnable("whitelist_list");
+	sInstance->childEnable("remove_whitelist");
+	sInstance->childEnable("add_whitelist");
+	sInstance->childEnable("remove_blacklist");
+	sInstance->childEnable("add_blacklist");
+	sInstance->childDisable("input_domain");
+	sInstance->childDisable("commit_domain");
+	sInstance->childSetText("add_text", std::string("New domain:"));
+	sInstance->childSetText("input_domain", std::string(""));
+	setDirty();
+}
diff --git a/linden/indra/newview/slfloatermediafilter.h b/linden/indra/newview/slfloatermediafilter.h
new file mode 100644
index 0000000..0f900be
--- /dev/null
+++ b/linden/indra/newview/slfloatermediafilter.h
@@ -0,0 +1,70 @@
+/** 
+ * @file slfloatermediafilter.h
+ * @brief The SLFloaterMediaFilter class declaration
+ *
+ * $LicenseInfo:firstyear=2011&license=viewergpl$
+ * 
+ * Copyright (c) 2011, Sione Lomu
+ * with debugging and improvements by Henri Beauchamp
+ * 
+ * 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$
+ */
+
+#ifndef LL_SLFLOATERMEDIAFILTER_H
+#define LL_SLFLOATERMEDIAFILTER_H
+
+#include "llfloater.h"
+
+class LLScrollListCtrl;
+class LLButton;
+
+class SLFloaterMediaFilter : public LLFloater
+{
+public:
+	SLFloaterMediaFilter();
+	BOOL postBuild();
+	virtual void draw();
+	virtual ~SLFloaterMediaFilter();
+
+	static void setDirty();
+	static BOOL instanceVisible();
+	static void toggleInstance();
+
+	static void onClearLists(void*);
+	static void onWhitelistAdd(void*);
+	static void onWhitelistRemove(void*);
+	static void onBlacklistAdd(void*);
+	static void onBlacklistRemove(void*);
+	static void onCommitDomain(void*);
+
+private:
+	static bool sIsWhitelist;
+	LLScrollListCtrl* mWhitelistSLC;
+	LLScrollListCtrl* mBlacklistSLC;
+	bool mIsDirty;
+
+	static SLFloaterMediaFilter* sInstance;
+
+};
+#endif
-- 
cgit v1.1


From 70caf225f6ab66561051272c588eff572aa9c72e Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 14 Mar 2011 10:46:05 -0700
Subject: Added the newview/character directory to the repo. This'll make it
 easier to update

---
 .gitignore                                         |     1 -
 avatar_lad.xml                                     | 11454 -------------------
 linden/indra/newview/character/attentions.xml      |    51 +
 linden/indra/newview/character/attentionsN.xml     |    51 +
 linden/indra/newview/character/avatar_eye.llm      |   Bin 0 -> 16011 bytes
 linden/indra/newview/character/avatar_eye_1.llm    |   Bin 0 -> 5591 bytes
 .../indra/newview/character/avatar_eyelashes.llm   |   Bin 0 -> 65637 bytes
 linden/indra/newview/character/avatar_hair.llm     |   Bin 0 -> 690581 bytes
 linden/indra/newview/character/avatar_hair_1.llm   |   Bin 0 -> 5031 bytes
 linden/indra/newview/character/avatar_hair_2.llm   |   Bin 0 -> 3261 bytes
 linden/indra/newview/character/avatar_hair_3.llm   |   Bin 0 -> 1845 bytes
 linden/indra/newview/character/avatar_hair_4.llm   |   Bin 0 -> 927 bytes
 linden/indra/newview/character/avatar_hair_5.llm   |   Bin 0 -> 927 bytes
 linden/indra/newview/character/avatar_head.llm     |   Bin 0 -> 1665493 bytes
 linden/indra/newview/character/avatar_head_1.llm   |   Bin 0 -> 7875 bytes
 linden/indra/newview/character/avatar_head_2.llm   |   Bin 0 -> 3675 bytes
 linden/indra/newview/character/avatar_head_3.llm   |   Bin 0 -> 1797 bytes
 linden/indra/newview/character/avatar_head_4.llm   |   Bin 0 -> 1239 bytes
 linden/indra/newview/character/avatar_lad.xml      | 11417 ++++++++++++++++++
 .../indra/newview/character/avatar_lower_body.llm  |   Bin 0 -> 337125 bytes
 .../newview/character/avatar_lower_body_1.llm      |   Bin 0 -> 7083 bytes
 .../newview/character/avatar_lower_body_2.llm      |   Bin 0 -> 4107 bytes
 .../newview/character/avatar_lower_body_3.llm      |   Bin 0 -> 2115 bytes
 .../newview/character/avatar_lower_body_4.llm      |   Bin 0 -> 1629 bytes
 linden/indra/newview/character/avatar_skeleton.xml |    74 +
 linden/indra/newview/character/avatar_skirt.llm    |   Bin 0 -> 72497 bytes
 linden/indra/newview/character/avatar_skirt_1.llm  |   Bin 0 -> 1899 bytes
 linden/indra/newview/character/avatar_skirt_2.llm  |   Bin 0 -> 1551 bytes
 linden/indra/newview/character/avatar_skirt_3.llm  |   Bin 0 -> 1191 bytes
 linden/indra/newview/character/avatar_skirt_4.llm  |   Bin 0 -> 843 bytes
 .../indra/newview/character/avatar_upper_body.llm  |   Bin 0 -> 929297 bytes
 .../newview/character/avatar_upper_body_1.llm      |   Bin 0 -> 15627 bytes
 .../newview/character/avatar_upper_body_2.llm      |   Bin 0 -> 8991 bytes
 .../newview/character/avatar_upper_body_3.llm      |   Bin 0 -> 4557 bytes
 .../newview/character/avatar_upper_body_4.llm      |   Bin 0 -> 3453 bytes
 linden/indra/newview/character/blush_alpha.tga     |   Bin 0 -> 17352 bytes
 linden/indra/newview/character/body_skingrain.tga  |   Bin 0 -> 262188 bytes
 .../indra/newview/character/bodyfreckles_alpha.tga |   Bin 0 -> 257249 bytes
 .../indra/newview/character/bump_face_wrinkles.tga |   Bin 0 -> 25243 bytes
 linden/indra/newview/character/bump_head_base.tga  |   Bin 0 -> 105525 bytes
 .../newview/character/bump_lowerbody_base.tga      |   Bin 0 -> 112782 bytes
 .../newview/character/bump_pants_wrinkles.tga      |   Bin 0 -> 83183 bytes
 .../newview/character/bump_shirt_wrinkles.tga      |   Bin 0 -> 81501 bytes
 .../newview/character/bump_upperbody_base.tga      |   Bin 0 -> 147581 bytes
 linden/indra/newview/character/eyebrows_alpha.tga  |   Bin 0 -> 9469 bytes
 linden/indra/newview/character/eyeliner_alpha.tga  |   Bin 0 -> 4720 bytes
 .../newview/character/eyeshadow_inner_alpha.tga    |   Bin 0 -> 5466 bytes
 .../newview/character/eyeshadow_outer_alpha.tga    |   Bin 0 -> 7382 bytes
 linden/indra/newview/character/eyewhite.tga        |   Bin 0 -> 42353 bytes
 .../character/facehair_chincurtains_alpha.tga      |   Bin 0 -> 34610 bytes
 .../newview/character/facehair_moustache_alpha.tga |   Bin 0 -> 14017 bytes
 .../newview/character/facehair_sideburns_alpha.tga |   Bin 0 -> 27328 bytes
 .../newview/character/facehair_soulpatch_alpha.tga |   Bin 0 -> 11277 bytes
 linden/indra/newview/character/freckles_alpha.tga  |   Bin 0 -> 140558 bytes
 linden/indra/newview/character/genepool.xml        |  7107 ++++++++++++
 .../indra/newview/character/glove_length_alpha.tga |   Bin 0 -> 49745 bytes
 .../newview/character/gloves_fingers_alpha.tga     |   Bin 0 -> 39616 bytes
 linden/indra/newview/character/head_alpha.tga      |   Bin 0 -> 6066 bytes
 linden/indra/newview/character/head_color.tga      |   Bin 0 -> 70715 bytes
 linden/indra/newview/character/head_hair.tga       |   Bin 0 -> 75600 bytes
 .../newview/character/head_highlights_alpha.tga    |   Bin 0 -> 20503 bytes
 .../indra/newview/character/head_shading_alpha.tga |   Bin 0 -> 35304 bytes
 linden/indra/newview/character/head_skingrain.tga  |   Bin 0 -> 262376 bytes
 .../character/jacket_length_lower_alpha.tga        |   Bin 0 -> 9768 bytes
 .../character/jacket_length_upper_alpha.tga        |   Bin 0 -> 14617 bytes
 .../newview/character/jacket_open_lower_alpha.tga  |   Bin 0 -> 19732 bytes
 .../newview/character/jacket_open_upper_alpha.tga  |   Bin 0 -> 41606 bytes
 linden/indra/newview/character/lipgloss_alpha.tga  |   Bin 0 -> 4738 bytes
 linden/indra/newview/character/lips_mask.tga       |   Bin 0 -> 6110 bytes
 linden/indra/newview/character/lipstick_alpha.tga  |   Bin 0 -> 7966 bytes
 linden/indra/newview/character/lowerbody_color.tga |   Bin 0 -> 135395 bytes
 .../character/lowerbody_highlights_alpha.tga       |   Bin 0 -> 8695 bytes
 .../newview/character/lowerbody_shading_alpha.tga  |   Bin 0 -> 41766 bytes
 .../indra/newview/character/nailpolish_alpha.tga   |   Bin 0 -> 4656 bytes
 .../indra/newview/character/pants_length_alpha.tga |   Bin 0 -> 26843 bytes
 .../indra/newview/character/pants_waist_alpha.tga  |   Bin 0 -> 10487 bytes
 linden/indra/newview/character/rosyface_alpha.tga  |   Bin 0 -> 44382 bytes
 linden/indra/newview/character/rouge_alpha.tga     |   Bin 0 -> 44382 bytes
 .../indra/newview/character/shirt_bottom_alpha.tga |   Bin 0 -> 32242 bytes
 .../indra/newview/character/shirt_collar_alpha.tga |   Bin 0 -> 14417 bytes
 .../newview/character/shirt_collar_back_alpha.tga  |   Bin 0 -> 12789 bytes
 .../indra/newview/character/shirt_sleeve_alpha.tga |   Bin 0 -> 72196 bytes
 .../indra/newview/character/shoe_height_alpha.tga  |   Bin 0 -> 24461 bytes
 .../indra/newview/character/skirt_length_alpha.tga |   Bin 0 -> 4114 bytes
 .../newview/character/skirt_slit_back_alpha.tga    |   Bin 0 -> 90350 bytes
 .../newview/character/skirt_slit_front_alpha.tga   |   Bin 0 -> 90350 bytes
 .../newview/character/skirt_slit_left_alpha.tga    |   Bin 0 -> 82006 bytes
 .../newview/character/skirt_slit_right_alpha.tga   |   Bin 0 -> 91410 bytes
 .../newview/character/underpants_trial_female.tga  |   Bin 0 -> 48063 bytes
 .../newview/character/underpants_trial_male.tga    |   Bin 0 -> 144983 bytes
 .../newview/character/undershirt_trial_female.tga  |   Bin 0 -> 81390 bytes
 linden/indra/newview/character/upperbody_color.tga |   Bin 0 -> 23348 bytes
 .../character/upperbody_highlights_alpha.tga       |   Bin 0 -> 6509 bytes
 .../newview/character/upperbody_shading_alpha.tga  |   Bin 0 -> 25297 bytes
 .../newview/character/upperbodyfreckles_alpha.tga  |   Bin 0 -> 180104 bytes
 linden/install.xml                                 |     4 +-
 96 files changed, 18702 insertions(+), 11457 deletions(-)
 delete mode 100644 avatar_lad.xml
 create mode 100644 linden/indra/newview/character/attentions.xml
 create mode 100644 linden/indra/newview/character/attentionsN.xml
 create mode 100644 linden/indra/newview/character/avatar_eye.llm
 create mode 100644 linden/indra/newview/character/avatar_eye_1.llm
 create mode 100644 linden/indra/newview/character/avatar_eyelashes.llm
 create mode 100644 linden/indra/newview/character/avatar_hair.llm
 create mode 100644 linden/indra/newview/character/avatar_hair_1.llm
 create mode 100644 linden/indra/newview/character/avatar_hair_2.llm
 create mode 100644 linden/indra/newview/character/avatar_hair_3.llm
 create mode 100644 linden/indra/newview/character/avatar_hair_4.llm
 create mode 100644 linden/indra/newview/character/avatar_hair_5.llm
 create mode 100644 linden/indra/newview/character/avatar_head.llm
 create mode 100644 linden/indra/newview/character/avatar_head_1.llm
 create mode 100644 linden/indra/newview/character/avatar_head_2.llm
 create mode 100644 linden/indra/newview/character/avatar_head_3.llm
 create mode 100644 linden/indra/newview/character/avatar_head_4.llm
 create mode 100644 linden/indra/newview/character/avatar_lad.xml
 create mode 100644 linden/indra/newview/character/avatar_lower_body.llm
 create mode 100644 linden/indra/newview/character/avatar_lower_body_1.llm
 create mode 100644 linden/indra/newview/character/avatar_lower_body_2.llm
 create mode 100644 linden/indra/newview/character/avatar_lower_body_3.llm
 create mode 100644 linden/indra/newview/character/avatar_lower_body_4.llm
 create mode 100644 linden/indra/newview/character/avatar_skeleton.xml
 create mode 100644 linden/indra/newview/character/avatar_skirt.llm
 create mode 100644 linden/indra/newview/character/avatar_skirt_1.llm
 create mode 100644 linden/indra/newview/character/avatar_skirt_2.llm
 create mode 100644 linden/indra/newview/character/avatar_skirt_3.llm
 create mode 100644 linden/indra/newview/character/avatar_skirt_4.llm
 create mode 100644 linden/indra/newview/character/avatar_upper_body.llm
 create mode 100644 linden/indra/newview/character/avatar_upper_body_1.llm
 create mode 100644 linden/indra/newview/character/avatar_upper_body_2.llm
 create mode 100644 linden/indra/newview/character/avatar_upper_body_3.llm
 create mode 100644 linden/indra/newview/character/avatar_upper_body_4.llm
 create mode 100644 linden/indra/newview/character/blush_alpha.tga
 create mode 100644 linden/indra/newview/character/body_skingrain.tga
 create mode 100644 linden/indra/newview/character/bodyfreckles_alpha.tga
 create mode 100644 linden/indra/newview/character/bump_face_wrinkles.tga
 create mode 100644 linden/indra/newview/character/bump_head_base.tga
 create mode 100644 linden/indra/newview/character/bump_lowerbody_base.tga
 create mode 100644 linden/indra/newview/character/bump_pants_wrinkles.tga
 create mode 100644 linden/indra/newview/character/bump_shirt_wrinkles.tga
 create mode 100644 linden/indra/newview/character/bump_upperbody_base.tga
 create mode 100644 linden/indra/newview/character/eyebrows_alpha.tga
 create mode 100644 linden/indra/newview/character/eyeliner_alpha.tga
 create mode 100644 linden/indra/newview/character/eyeshadow_inner_alpha.tga
 create mode 100644 linden/indra/newview/character/eyeshadow_outer_alpha.tga
 create mode 100644 linden/indra/newview/character/eyewhite.tga
 create mode 100644 linden/indra/newview/character/facehair_chincurtains_alpha.tga
 create mode 100644 linden/indra/newview/character/facehair_moustache_alpha.tga
 create mode 100644 linden/indra/newview/character/facehair_sideburns_alpha.tga
 create mode 100644 linden/indra/newview/character/facehair_soulpatch_alpha.tga
 create mode 100644 linden/indra/newview/character/freckles_alpha.tga
 create mode 100644 linden/indra/newview/character/genepool.xml
 create mode 100644 linden/indra/newview/character/glove_length_alpha.tga
 create mode 100644 linden/indra/newview/character/gloves_fingers_alpha.tga
 create mode 100644 linden/indra/newview/character/head_alpha.tga
 create mode 100644 linden/indra/newview/character/head_color.tga
 create mode 100644 linden/indra/newview/character/head_hair.tga
 create mode 100644 linden/indra/newview/character/head_highlights_alpha.tga
 create mode 100644 linden/indra/newview/character/head_shading_alpha.tga
 create mode 100644 linden/indra/newview/character/head_skingrain.tga
 create mode 100644 linden/indra/newview/character/jacket_length_lower_alpha.tga
 create mode 100644 linden/indra/newview/character/jacket_length_upper_alpha.tga
 create mode 100644 linden/indra/newview/character/jacket_open_lower_alpha.tga
 create mode 100644 linden/indra/newview/character/jacket_open_upper_alpha.tga
 create mode 100644 linden/indra/newview/character/lipgloss_alpha.tga
 create mode 100644 linden/indra/newview/character/lips_mask.tga
 create mode 100644 linden/indra/newview/character/lipstick_alpha.tga
 create mode 100644 linden/indra/newview/character/lowerbody_color.tga
 create mode 100644 linden/indra/newview/character/lowerbody_highlights_alpha.tga
 create mode 100644 linden/indra/newview/character/lowerbody_shading_alpha.tga
 create mode 100644 linden/indra/newview/character/nailpolish_alpha.tga
 create mode 100644 linden/indra/newview/character/pants_length_alpha.tga
 create mode 100644 linden/indra/newview/character/pants_waist_alpha.tga
 create mode 100644 linden/indra/newview/character/rosyface_alpha.tga
 create mode 100644 linden/indra/newview/character/rouge_alpha.tga
 create mode 100644 linden/indra/newview/character/shirt_bottom_alpha.tga
 create mode 100644 linden/indra/newview/character/shirt_collar_alpha.tga
 create mode 100644 linden/indra/newview/character/shirt_collar_back_alpha.tga
 create mode 100644 linden/indra/newview/character/shirt_sleeve_alpha.tga
 create mode 100644 linden/indra/newview/character/shoe_height_alpha.tga
 create mode 100644 linden/indra/newview/character/skirt_length_alpha.tga
 create mode 100644 linden/indra/newview/character/skirt_slit_back_alpha.tga
 create mode 100644 linden/indra/newview/character/skirt_slit_front_alpha.tga
 create mode 100644 linden/indra/newview/character/skirt_slit_left_alpha.tga
 create mode 100644 linden/indra/newview/character/skirt_slit_right_alpha.tga
 create mode 100644 linden/indra/newview/character/underpants_trial_female.tga
 create mode 100644 linden/indra/newview/character/underpants_trial_male.tga
 create mode 100644 linden/indra/newview/character/undershirt_trial_female.tga
 create mode 100644 linden/indra/newview/character/upperbody_color.tga
 create mode 100644 linden/indra/newview/character/upperbody_highlights_alpha.tga
 create mode 100644 linden/indra/newview/character/upperbody_shading_alpha.tga
 create mode 100644 linden/indra/newview/character/upperbodyfreckles_alpha.tga

diff --git a/.gitignore b/.gitignore
index 877e3ff..b06fc1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,6 @@ 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/character/
 linden/indra/newview/app_settings/*.db2
 linden/indra/newview/app_settings/windlight/
 linden/indra/newview/cursors_mac/
diff --git a/avatar_lad.xml b/avatar_lad.xml
deleted file mode 100644
index 245b393..0000000
--- a/avatar_lad.xml
+++ /dev/null
@@ -1,11454 +0,0 @@
-<?xml version="1.0" encoding="us-ascii" standalone="yes"?>
-<linden_avatar
- version="1.0"
- wearable_definition_version="22">  
- <!-- The wearable_definition_version is checked during asset upload. -->
- <!-- If you increment it, check indra/lib/python/indra/assetutil.py.  -->
-   <skeleton
-    file_name="avatar_skeleton.xml">
-      <attachment_point
-       id="1"
-       group="6"
-       pie_slice="2"
-       name="Chest"
-       joint="mChest"
-       position="0.15 0 -0.1"
-       rotation="0 90 90"
-	   visible_in_first_person="true" />
-
-      <attachment_point
-       id="2"
-       group="2"
-       pie_slice="2"
-       name="Skull"
-       joint="mHead"
-       position="0 0 0.15"
-       rotation="0 0 90"
-       visible_in_first_person="false" />
-
-      <attachment_point
-       id="3"
-       group="3"
-       pie_slice="3"
-       name="Left Shoulder"
-       joint="mCollarLeft"
-       position="0 0 0.08"
-       rotation="0 0 0"
-	   visible_in_first_person="true" />
-
-      <attachment_point
-       id="4"
-       group="1"
-       pie_slice="1"
-       name="Right Shoulder"
-       joint="mCollarRight"
-       position="0 0 0.08"
-       rotation="0 0 0" 
-	   visible_in_first_person="true"/>
-
-      <attachment_point
-       id="5"
-       group="4"
-       name="Left Hand"
-       joint="mWristLeft"
-       position="0 0.08 -0.02"
-       rotation="0 0 0"
-       visible_in_first_person="true"
-       max_attachment_offset="1.5" />
-
-      <attachment_point
-       id="6"
-       group="0"
-       name="Right Hand"
-       joint="mWristRight"
-       position="0 -0.08 -0.02"
-       rotation="0 0 0"
-       visible_in_first_person="true"
-       max_attachment_offset="1.5" />
-
-      <attachment_point
-       id="7"
-       group="5"
-       pie_slice="6"
-       name="Left Foot"
-       joint="mFootLeft"
-       position="0 0.0 0.0"
-       rotation="0 0 0" 
-	   visible_in_first_person="true"/>
-
-      <attachment_point
-       id="8"
-       group="7"
-       pie_slice="6"
-       name="Right Foot"
-       joint="mFootRight"
-       position="0 0.0 0.0"
-       rotation="0 0 0" 
-	   visible_in_first_person="true"/>
-
-      <attachment_point
-       id="9"
-       group="6"
-       pie_slice="7"
-       name="Spine"
-       joint="mChest"
-       position="-0.15 0 -0.1"
-       rotation="0 -90 90"
-	   visible_in_first_person="true" />
-
-      <attachment_point
-       id="10"
-       group="6"
-       pie_slice="6"
-       name="Pelvis"
-       joint="mPelvis"
-       position="0 0 -0.15"
-       rotation="0 0 0"
-	   visible_in_first_person="true" />
-
-      <attachment_point
-       id="11"
-       group="2"
-       pie_slice="6"
-       name="Mouth"
-       joint="mHead"
-       position="0.12 0 0.001"
-       rotation="0 0 0" 
-	   visible_in_first_person="false"/>
-
-      <attachment_point
-       id="12"
-       group="2"
-       pie_slice="7"
-       name="Chin"
-       joint="mHead"
-       position="0.12 0 -0.04"
-       rotation="0 0 0"
-	   visible_in_first_person="false" />
-
-      <attachment_point
-       id="13"
-       group="2"
-       pie_slice="4"
-       name="Left Ear"
-       joint="mHead"
-       position="0.015 0.08 0.017"
-       rotation="0 0 0"
-	   visible_in_first_person="false" />
-
-      <attachment_point
-       id="14"
-       group="2"
-       pie_slice="0"
-       name="Right Ear"
-       joint="mHead"
-       position="0.015 -0.08 0.017"
-       rotation="0 0 0"
-	   visible_in_first_person="false" />
-
-      <attachment_point
-       id="15"
-       group="2"
-       pie_slice="3"
-       name="Left Eyeball"
-       joint="mEyeLeft"
-       position="0 0 0"
-       rotation="0 0 0" 
-	   visible_in_first_person="false"/>
-
-      <attachment_point
-       id="16"
-       group="2"
-       pie_slice="1"
-       name="Right Eyeball"
-       joint="mEyeRight"
-       position="0 0 0"
-       rotation="0 0 0"
-	   visible_in_first_person="false" />
-
-      <attachment_point
-       id="17"
-       group="2"
-       pie_slice="5"
-       name="Nose"
-       joint="mHead"
-       position="0.1 0 0.05"
-       rotation="0 0 0" 
-	   visible_in_first_person="false"/>
-
-      <attachment_point
-       id="18"
-       group="1"
-       pie_slice="0"
-       name="R Upper Arm"
-       joint="mShoulderRight"
-       position="0.01 -0.13 0.01"
-       rotation="0 0 0"
-	   visible_in_first_person="true" />
-
-      <attachment_point
-       id="19"
-       group="1"
-       pie_slice="7"
-       name="R Forearm"
-       joint="mElbowRight"
-       position="0 -0.12 0"
-       rotation="0 0 0"
-	   visible_in_first_person="true"/>
-
-      <attachment_point
-       id="20"
-       group="3"
-       pie_slice="4"
-       name="L Upper Arm"
-       joint="mShoulderLeft"
-       position="0.01 0.15 -0.01"
-       rotation="0 0 0"
-	   visible_in_first_person="true" />
-
-      <attachment_point
-       id="21"
-       group="3"
-       pie_slice="5"
-       name="L Forearm"
-       joint="mElbowLeft"
-       position="0 0.113 0"
-       rotation="0 0 0"
-	   visible_in_first_person="true" />
-
-      <attachment_point
-       id="22"
-       group="7"
-       pie_slice="1"
-       name="Right Hip"
-       joint="mHipRight"
-       position="0 0 0"
-       rotation="0 0 0"
-	   visible_in_first_person="true" />
-
-      <attachment_point
-       id="23"
-       group="7"
-       pie_slice="0"
-       name="R Upper Leg"
-       joint="mHipRight"
-       position="-0.017 0.041 -0.310"
-       rotation="0 0 0"
-	   visible_in_first_person="true" />
-
-      <attachment_point
-       id="24"
-       group="7"
-       pie_slice="7"
-       name="R Lower Leg"
-       joint="mKneeRight"
-       position="-0.044 -0.007 -0.262"
-       rotation="0 0 0"
-	   visible_in_first_person="true" />
-
-      <attachment_point
-       id="25"
-       group="5"
-       pie_slice="3"
-       name="Left Hip"
-       joint="mHipLeft"
-       position="0 0 0"
-       rotation="0 0 0"
-	   visible_in_first_person="true" />
-
-      <attachment_point
-       id="26"
-       group="5"
-       pie_slice="4"
-       name="L Upper Leg"
-       joint="mHipLeft"
-       position="-0.019 -0.034 -0.310"
-       rotation="0 0 0" 
-	   visible_in_first_person="true"/>
-
-      <attachment_point
-       id="27"
-       group="5"
-       pie_slice="5"
-       name="L Lower Leg"
-       joint="mKneeLeft"
-       position="-0.044 -0.007 -0.261"
-       rotation="0 0 0"
-	   visible_in_first_person="true" />
-
-      <attachment_point
-       id="28"
-       group="6"
-       pie_slice="5"
-       name="Stomach"
-       joint="mPelvis"
-       position="0.092 0.0 0.088"
-       rotation="0 0 0"
-	   visible_in_first_person="true" />
-
-      <attachment_point
-       id="29"
-       group="6"
-       pie_slice="3"
-       name="Left Pec"
-       joint="mTorso"
-       position="0.104 0.082 0.247"
-       rotation="0 0 0"
-	   visible_in_first_person="true" />
-
-      <attachment_point
-       id="30"
-       group="6"
-       pie_slice="1"
-       name="Right Pec"
-       joint="mTorso"
-       position="0.104 -0.082 0.247"
-       rotation="0 0 0"
-	   visible_in_first_person="true" />
-
-    <attachment_point
-       id="31"
-       group="8"
-       name="Center 2"
-       joint="mScreen"
-       position="0 0 0"
-       rotation="0 0 0"
-       hud="true"
-       max_attachment_offset="2.0"
-       visible_in_first_person="true" />
-
-    <attachment_point
-       id="32"
-       group="8"
-       name="Top Right"
-       joint="mScreen"
-       position="0 -0.5 0.5"
-       rotation="0 0 0"
-       hud="true"
-       max_attachment_offset="2.0"
-       visible_in_first_person="true" />
-
-    <attachment_point
-       id="33"
-       group="8"
-       name="Top"
-       joint="mScreen"
-       position="0 0 0.5"
-       rotation="0 0 0"
-       hud="true"
-       max_attachment_offset="2.0"
-       visible_in_first_person="true" />
-
-    <attachment_point
-       id="34"
-       group="8"
-       name="Top Left"
-       joint="mScreen"
-       position="0 0.5 0.5"
-       rotation="0 0 0"
-       hud="true"
-       max_attachment_offset="2.0"
-       visible_in_first_person="true" />
-
-    <attachment_point
-       id="35"
-       group="8"
-       name="Center"
-       joint="mScreen"
-       position="0 0 0"
-       rotation="0 0 0"
-       hud="true"
-       max_attachment_offset="2.0"
-       visible_in_first_person="true" />
-
-    <attachment_point
-       id="36"
-       group="8"
-       name="Bottom Left"
-       joint="mScreen"
-       position="0 0.5 -0.5"
-       rotation="0 0 0"
-       hud="true"
-       max_attachment_offset="2.0"
-       visible_in_first_person="true" />
-
-    <attachment_point
-       id="37"
-       group="8"
-       name="Bottom"
-       joint="mScreen"
-       position="0 0 -0.5"
-       rotation="0 0 0"
-       hud="true"
-       max_attachment_offset="2.0"
-       visible_in_first_person="true" />
-
-    <attachment_point
-       id="38"
-       group="8"
-       name="Bottom Right"
-       joint="mScreen"
-       position="0 -0.5 -0.5"
-       rotation="0 0 0"
-       hud="true"
-       max_attachment_offset="2.0"
-       visible_in_first_person="true" />
-
-      <attachment_point
-       id="39"
-       group="6"
-       pie_slice="2"
-       name="Chest 2"
-       joint="mChest"
-       position="0.15 0 -0.1"
-       rotation="0 90 90"
-	   visible_in_first_person="true" />
-
-      <attachment_point
-       id="40"
-       group="2"
-       pie_slice="2"
-       name="Skull 2"
-       joint="mHead"
-       position="0 0 0.15"
-       rotation="0 0 90"
-       visible_in_first_person="false" />
-
-      <attachment_point
-       id="41"
-       group="3"
-       pie_slice="3"
-       name="Left Shoulder 2"
-       joint="mCollarLeft"
-       position="0 0 0.08"
-       rotation="0 0 0"
-	   visible_in_first_person="true" />
-
-      <attachment_point
-       id="42"
-       group="1"
-       pie_slice="1"
-       name="Right Shoulder 2"
-       joint="mCollarRight"
-       position="0 0 0.08"
-       rotation="0 0 0" 
-	   visible_in_first_person="true"/>
-
-      <attachment_point
-       id="43"
-       group="4"
-       name="Left Hand 2"
-       joint="mWristLeft"
-       position="0 0.08 -0.02"
-       rotation="0 0 0"
-       visible_in_first_person="true"
-       max_attachment_offset="1.5" />
-
-      <attachment_point
-       id="44"
-       group="0"
-       name="Right Hand 2"
-       joint="mWristRight"
-       position="0 -0.08 -0.02"
-       rotation="0 0 0"
-       visible_in_first_person="true"
-       max_attachment_offset="1.5" />
-
-      <attachment_point
-       id="45"
-       group="5"
-       pie_slice="6"
-       name="Left Foot 2"
-       joint="mFootLeft"
-       position="0 0.0 0.0"
-       rotation="0 0 0" 
-	   visible_in_first_person="true"/>
-
-      <attachment_point
-       id="46"
-       group="7"
-       pie_slice="6"
-       name="Right Foot 2"
-       joint="mFootRight"
-       position="0 0.0 0.0"
-       rotation="0 0 0" 
-	   visible_in_first_person="true"/>
-
-      <attachment_point
-       id="47"
-       group="6"
-       pie_slice="7"
-       name="Spine 2"
-       joint="mChest"
-       position="-0.15 0 -0.1"
-       rotation="0 -90 90"
-	   visible_in_first_person="true" />
-
-      <attachment_point
-       id="48"
-       group="6"
-       pie_slice="6"
-       name="Pelvis 2"
-       joint="mPelvis"
-       position="0 0 -0.15"
-       rotation="0 0 0"
-	   visible_in_first_person="true" />
-
-      <attachment_point
-       id="49"
-       group="2"
-       pie_slice="6"
-       name="Mouth 2"
-       joint="mHead"
-       position="0.12 0 0.001"
-       rotation="0 0 0" 
-	   visible_in_first_person="false"/>
-
-      <attachment_point
-       id="50"
-       group="2"
-       pie_slice="7"
-       name="Chin 2"
-       joint="mHead"
-       position="0.12 0 -0.04"
-       rotation="0 0 0"
-	   visible_in_first_person="false" />
-
-      <attachment_point
-       id="51"
-       group="2"
-       pie_slice="4"
-       name="Left Ear 2"
-       joint="mHead"
-       position="0.015 0.08 0.017"
-       rotation="0 0 0"
-	   visible_in_first_person="false" />
-
-      <attachment_point
-       id="52"
-       group="2"
-       pie_slice="0"
-       name="Right Ear 2"
-       joint="mHead"
-       position="0.015 -0.08 0.017"
-       rotation="0 0 0"
-	   visible_in_first_person="false" />
-
-      <attachment_point
-       id="53"
-       group="2"
-       pie_slice="3"
-       name="Left Eyeball 2"
-       joint="mEyeLeft"
-       position="0 0 0"
-       rotation="0 0 0" 
-	   visible_in_first_person="false"/>
-
-      <attachment_point
-       id="54"
-       group="2"
-       pie_slice="1"
-       name="Right Eyeball 2"
-       joint="mEyeRight"
-       position="0 0 0"
-       rotation="0 0 0"
-	   visible_in_first_person="false" />
-
-      <attachment_point
-       id="55"
-       group="2"
-       pie_slice="5"
-       name="Nose 2"
-       joint="mHead"
-       position="0.1 0 0.05"
-       rotation="0 0 0" 
-	   visible_in_first_person="false"/>
-
-      <attachment_point
-       id="56"
-       group="1"
-       pie_slice="0"
-       name="R Upper Arm 2"
-       joint="mShoulderRight"
-       position="0.01 -0.13 0.01"
-       rotation="0 0 0"
-	   visible_in_first_person="true" />
-
-      <attachment_point
-       id="57"
-       group="1"
-       pie_slice="7"
-       name="R Forearm 2"
-       joint="mElbowRight"
-       position="0 -0.12 0"
-       rotation="0 0 0"
-	   visible_in_first_person="true"/>
-
-      <attachment_point
-       id="58"
-       group="3"
-       pie_slice="4"
-       name="L Upper Arm 2"
-       joint="mShoulderLeft"
-       position="0.01 0.15 -0.01"
-       rotation="0 0 0"
-	   visible_in_first_person="true" />
-
-      <attachment_point
-       id="59"
-       group="3"
-       pie_slice="5"
-       name="L Forearm 2"
-       joint="mElbowLeft"
-       position="0 0.113 0"
-       rotation="0 0 0"
-	   visible_in_first_person="true" />
-
-      <attachment_point
-       id="60"
-       group="7"
-       pie_slice="1"
-       name="Right Hip 2"
-       joint="mHipRight"
-       position="0 0 0"
-       rotation="0 0 0"
-	   visible_in_first_person="true" />
-
-      <attachment_point
-       id="61"
-       group="7"
-       pie_slice="0"
-       name="R Upper Leg 2"
-       joint="mHipRight"
-       position="-0.017 0.041 -0.310"
-       rotation="0 0 0"
-	   visible_in_first_person="true" />
-
-      <attachment_point
-       id="62"
-       group="7"
-       pie_slice="7"
-       name="R Lower Leg 2"
-       joint="mKneeRight"
-       position="-0.044 -0.007 -0.262"
-       rotation="0 0 0"
-	   visible_in_first_person="true" />
-
-      <attachment_point
-       id="63"
-       group="5"
-       pie_slice="3"
-       name="Left Hip 2"
-       joint="mHipLeft"
-       position="0 0 0"
-       rotation="0 0 0"
-	   visible_in_first_person="true" />
-
-      <attachment_point
-       id="64"
-       group="5"
-       pie_slice="4"
-       name="L Upper Leg 2"
-       joint="mHipLeft"
-       position="-0.019 -0.034 -0.310"
-       rotation="0 0 0" 
-	   visible_in_first_person="true"/>
-
-      <attachment_point
-       id="65"
-       group="5"
-       pie_slice="5"
-       name="L Lower Leg 2"
-       joint="mKneeLeft"
-       position="-0.044 -0.007 -0.261"
-       rotation="0 0 0"
-	   visible_in_first_person="true" />
-
-      <attachment_point
-       id="66"
-       group="6"
-       pie_slice="5"
-       name="Stomach 2"
-       joint="mPelvis"
-       position="0.092 0.0 0.088"
-       rotation="0 0 0"
-	   visible_in_first_person="true" />
-
-      <attachment_point
-       id="67"
-       group="6"
-       pie_slice="3"
-       name="Left Pec 2"
-       joint="mTorso"
-       position="0.104 0.082 0.247"
-       rotation="0 0 0"
-	   visible_in_first_person="true" />
-
-      <attachment_point
-       id="68"
-       group="6"
-       pie_slice="1"
-       name="Right Pec 2"
-       joint="mTorso"
-       position="0.104 -0.082 0.247"
-       rotation="0 0 0"
-	   visible_in_first_person="true" />
-
-    <param
-       id="32"
-       group="1"
-       wearable="shape"
-       name="Male_Skeleton"
-       label_min="Female"
-       label_max="Male"
-       value_min="0"
-       value_max="1">
-         <param_skeleton>
-				<bone name="mNeck" scale="0 0 .2" />
-				<bone name="mCollarLeft" scale="0 .4 0" />
-				<bone name="mCollarRight" scale="0 .4 0" />
-				<bone name="mShoulderLeft" scale="0 .35 0" />
-				<bone name="mShoulderRight" scale="0 .35 0" />
-				<bone name="mElbowLeft" scale="0 .1 0" />
-				<bone name="mElbowRight" scale="0 .1 0" />
-				<bone name="mChest" scale=".05 .05 .05" />
-				<bone name="mTorso" scale="0 0 .05" />
-				<bone name="mPelvis" scale="0 0 0" />
-				<bone name="mHipLeft" scale=".05 .05 0" />
-				<bone name="mHipRight" scale=".05 .05 0" />
-				<bone name="mKneeLeft" scale=".05 .05 .1" />
-				<bone name="mKneeRight" scale=".05 .05 .1" />
-         </param_skeleton>
-      </param>
-
-      <param
-       id="33"
-       group="0"
-       name="Height"
-       label="Height"
-       wearable="shape"
-       edit_group="shape_body"
-       edit_group_order="1"
-       label_min="Short"
-       label_max="Tall"
-       show_simple="true"
-       value_min="-2.3"
-       value_max="2"
-       camera_distance="2.2">
-         <param_skeleton>
-				<bone name="mNeck" scale="0 0 .02" />
-				<bone name="mCollarLeft" scale="0 0 0" />
-				<bone name="mCollarRight" scale="0 0 0" />
-				<bone name="mShoulderLeft" scale="0 0.08 0" />
-				<bone name="mShoulderRight" scale="0 0.08 0" />
-				<bone name="mElbowLeft" scale="0 0.06 0" />
-				<bone name="mElbowRight" scale="0 0.06 0" />
-				<bone name="mChest" scale="0 0 0.05" />
-				<bone name="mTorso" scale="0 0 0.05" />
-				<bone name="mPelvis" scale="0 0 0" />
-				<bone name="mHipLeft" scale="0 0 0.1" />
-				<bone name="mHipRight" scale="0 0 0.1" />
-				<bone name="mKneeLeft" scale="0 0 0.1" />
-				<bone name="mKneeRight" scale="0 0 0.1" />
-         </param_skeleton>
-      </param>
-
-      <param
-       id="34"
-       group="0"
-       name="Thickness"
-       label="Body Thickness"
-       wearable="shape"
-       edit_group="shape_body"
-       edit_group_order="2"
-       label_min="Body Thin"
-       label_max="Body Thick"
-       show_simple="true"
-       value_min="-0.7"
-       value_max="1.5"
-       camera_distance="1.8">
-         <param_skeleton>
-				<bone name="mNeck" scale="0.1 0.1 0" />
-				<bone name="mCollarLeft" scale="0 0.2 0" />
-				<bone name="mCollarRight" scale="0 0.2 0" />
-				<bone name="mShoulderLeft" scale="0.1 0 0.1" />
-				<bone name="mShoulderRight" scale="0.1 0 0.1" />
-				<bone name="mElbowLeft" scale="0.1 0 0.1" />
-				<bone name="mElbowRight" scale="0.1 0 0.1" />
-				<bone name="mChest" scale="0.1 0.1 0" />
-				<bone name="mTorso" scale="0.1 0.1 0" />
-				<bone name="mPelvis" scale="0.1 0.1 0" />
-				<bone name="mHipLeft" scale="0.13 0.13 0" />
-				<bone name="mHipRight" scale="0.13 0.13 0" />
-				<bone name="mKneeLeft" scale="0.12 0.12 0" />
-				<bone name="mKneeRight" scale="0.12 0.12 0" />
-         </param_skeleton>
-      </param>
-
-      <param
-       id="36"
-       group="0"
-       name="Shoulders"
-	   label="Shoulders"
-       wearable="shape"
-       edit_group="shape_torso"
-       edit_group_order="4"
-       label_min="Narrow"
-       label_max="Broad"
-       show_simple="true"
-       value_min="-1.8"
-       value_max="1.4"
-       value_default="-0.5"
-       camera_elevation=".1"
-       camera_distance="1.2"
-       camera_angle="0">
-         <param_skeleton>
-				<bone name="mNeck" scale="0.01 0.03 0" />
-				<bone name="mCollarLeft" scale="0 0 0" offset="0 .02 0" />
-				<bone name="mCollarRight" scale="0 0 0" offset="0 -.02 0" />
-				<bone name="mChest" scale="0.02 0.08 0" />
-         </param_skeleton>
-      </param>
-
-      <param
-       id="37"
-       group="0"
-       name="Hip Width"
-	   label="Hip Width"
-       wearable="shape"
-       edit_group="shape_legs"
-       edit_group_order="3"
-       label_min="Narrow"
-       label_max="Wide"
-       show_simple="true"
-       value_min="-3.2"
-       value_max="2.8"
-       camera_distance="1.8">
-         <param_skeleton>
-				<bone name="mPelvis" scale="0 0.1 0" />
-				<bone name="mHipLeft" scale="0 0 0" offset="0 .004 0" />
-				<bone name="mHipRight" scale="0 0 0" offset="0 -.004 0" />
-         </param_skeleton>
-      </param>
-
-      <param
-       id="842"
-       group="0"
-       name="Hip Length"
-       wearable="shape"
-       edit_group="shape_legs"
-       edit_group_order="3.2"
-       label_min="Short hips"
-       label_max="Long Hips"
-       value_min="-1"
-       value_max="1"
-       camera_distance="1.8">
-         <param_skeleton>
-				<bone name="mPelvis" scale="0 0 0.3" />
-         </param_skeleton>
-      </param>
-
-      <param
-       id="38"
-       group="0"
-       name="Torso Length"
-       wearable="shape"
-       edit_group="shape_torso"
-       edit_group_order="11"
-       label_min="Short Torso"
-       label_max="Long Torso"
-       value_min="-1"
-       value_max="1"
-       camera_distance="1.8">
-         <param_skeleton>
-				<bone name="mTorso" scale="0 0 .3" />
-				<bone name="mPelvis" scale="0 0 .1" />
-				<bone name="mHipLeft" scale="0 0 -.1" />
-				<bone name="mHipRight" scale="0 0 -.1" />
-				<bone name="mKneeRight" scale="0 0 -.05" />
-				<bone name="mKneeLeft" scale="0 0 -.05" />
-         </param_skeleton>
-      </param>
-
-      <param
-       id="195"
-       group="1"
-       name="EyeBone_Spread"
-       wearable="shape"
-       edit_group="shape_eyes"
-       label_min="Eyes Together"
-       label_max="Eyes Spread"
-       value_min="-1"
-       value_max="1">
-         <param_skeleton>
-				<bone name="mEyeLeft" scale="0 0 0" offset="0 .009 0" />
-				<bone name="mEyeRight" scale="0 0 0" offset="0 -.009 0" />
-         </param_skeleton>
-      </param>
-
-      <param
-       id="661"
-       group="1"
-       name="EyeBone_Head_Shear"
-       wearable="shape"
-       edit_group="shape_eyes"
-       label_min="Eyes Shear Left Up"
-       label_max="Eyes Shear Right Up"
-       value_min="-2"
-       value_max="2">
-         <param_skeleton>
-				<bone name="mEyeLeft" scale="0 0 0" offset="0 0 .004" />
-				<bone name="mEyeRight" scale="0 0 0" offset="0 0 -.004" />
-         </param_skeleton>
-      </param>
-
-      <param
-       id="772"
-       group="1"
-       name="EyeBone_Head_Elongate"
-       wearable="shape"
-       edit_group="shape_eyes"
-       label_min="Eyes Short Head"
-       label_max="Eyes Long Head"
-       value_min="-1"
-       value_max="1">
-         <param_skeleton>
-				<bone name="mEyeLeft" scale="0 0 0" offset=".016 0 0" />
-				<bone name="mEyeRight" scale="0 0 0" offset=".016 0 0" />
-         </param_skeleton>
-      </param>
-
-      <param
-       id="768"
-       group="1"
-       name="EyeBone_Bug"
-       wearable="shape"
-       edit_group="shape_eyes"
-       label_min="Eyes Sunken"
-       label_max="Eyes Bugged"
-       value_min="-2"
-       value_max="2">
-         <param_skeleton>
-				<bone name="mEyeLeft" scale="0 0 0" offset=".005 0 0" />
-				<bone name="mEyeRight" scale="0 0 0" offset=".005 0 0" />
-         </param_skeleton>
-      </param>
-
-      <param
-       id="655"
-       group="1"
-       name="Head Size"
-	   label="Head Size"
-       wearable="shape"
-       edit_group="shape_head"
-       label_min="Small Head"
-       label_max="Big Head"
-       show_simple="true"
-       value_min="-.25"
-       value_max=".10">
-         <param_skeleton>
-				<bone name="mSkull" scale="1 1 1" offset="0 0 0.1" />
-				<bone name="mHead" scale="1 1 1" offset="0 0 0" />
-				<bone name="mEyeLeft" scale="1 1 1" offset="0 0 0" />
-				<bone name="mEyeRight" scale="1 1 1" offset="0 0 0" />
-         </param_skeleton>
-      </param>
-
-      <param
-       id="197"
-       group="1"
-       wearable="shoes"
-       name="Shoe_Heels"
-       edit_group="shoes"
-       label_min="No Heels"
-       label_max="High Heels"
-       value_min="0"
-       value_max="1">
-         <param_skeleton>
-				<bone name="mFootRight" scale="0 0 0" offset="0 0 -.08" />
-				<bone name="mFootLeft" scale="0 0 0" offset="0 0 -.08" />
-         </param_skeleton>
-      </param>
-
-      <param
-       id="502"
-       group="1"
-       wearable="shoes"
-       name="Shoe_Platform"
-       edit_group="shoes"
-       label_min="No Heels"
-       label_max="High Heels"
-       value_min="0"
-       value_max="1">
-         <param_skeleton>
-				<bone name="mFootRight" scale="0 0 0" offset="0 0 -.07" />
-				<bone name="mFootLeft" scale="0 0 0" offset="0 0 -.07" />
-         </param_skeleton>
-      </param>
-
-      <param
-       id="675"
-       group="0"
-       name="Hand Size"
-       wearable="shape"
-       edit_group="shape_torso"
-       edit_group_order="10"
-       label_min="Small Hands"
-       label_max="Large Hands"
-       value_min="-.3"
-       value_max=".3"
-       camera_elevation=".1"
-       camera_distance="1.4"
-       camera_angle="0">
-         <param_skeleton>
-				<bone name="mWristRight" scale="1 1 1" offset="0 0 0" />
-				<bone name="mWristLeft" scale="1 1 1" offset="0 0 0" />
-         </param_skeleton>
-      </param>
-
-      <param
-       id="683"
-       group="0"
-       name="Neck Thickness"
-       wearable="shape"
-       edit_group="shape_torso"
-       edit_group_order="2"
-       label_min="Skinny Neck"
-       label_max="Thick Neck"
-       value_min="-.4"
-       value_max=".2"
-       value_default="-.15"
-       camera_elevation=".3"
-       camera_distance=".8"
-       camera_angle="15">
-         <param_skeleton>
-				<bone name="mNeck" scale="1 1 0" offset="0 0 0" />
-         </param_skeleton>
-      </param>
-
-      <param
-       id="689"
-       group="1"
-       wearable="shape"
-       name="EyeBone_Big_Eyes"
-       edit_group="shape_eyes"
-       label_min="Eyes Back"
-       label_max="Eyes Forward"
-       value_min="-1"
-       value_max="1">
-         <param_skeleton>
-				<bone name="mEyeLeft" scale="0 0 0" offset="-.005 0 0" />
-				<bone name="mEyeRight" scale="0 0 0" offset="-.005 0 0" />
-         </param_skeleton>
-      </param>
-
-      <param
-       id="692"
-       group="0"
-       name="Leg Length"
-       wearable="shape"
-       edit_group="shape_legs"
-       edit_group_order="2"
-       label_min="Short Legs"
-       label_max="Long Legs"
-       value_min="-1"
-       value_max="1"
-       camera_distance="2.5">
-         <param_skeleton>
-				<bone name="mHipLeft" scale="0 0 .2" />
-				<bone name="mHipRight" scale="0 0 .2" />
-				<bone name="mKneeRight" scale="0 0 .2" />
-				<bone name="mKneeLeft" scale="0 0 .2" />
-         </param_skeleton>
-      </param>
-
-      <param
-       id="693"
-       group="0"
-       name="Arm Length"
-       wearable="shape"
-       edit_group="shape_torso"
-       edit_group_order="9"
-       label_min="Short Arms"
-       label_max="Long arms"
-       value_min="-1"
-       value_max="1"
-       value_default=".6"
-       camera_distance="1.5">
-         <param_skeleton>
-				<bone name="mShoulderLeft" scale="0 .2 0" />
-				<bone name="mShoulderRight" scale="0 .2 0" />
-				<bone name="mElbowRight" scale="0 .3 0" />
-				<bone name="mElbowLeft" scale="0 .3 0" />
-         </param_skeleton>
-      </param>
-
-      <param
-       id="756"
-       group="0"
-       name="Neck Length"
-       wearable="shape"
-       edit_group="shape_torso"
-       edit_group_order="3"
-       label_min="Short Neck"
-       label_max="Long Neck"
-       value_min="-1"
-       value_max="1"
-       value_default="0"
-       camera_elevation=".3"
-       camera_distance=".8"
-       camera_angle="15">
-         <param_skeleton>
-       		<bone name="mNeck" scale="0 0 .5" />
-         </param_skeleton>
-      </param>
-   </skeleton>
-
-   <mesh
-    type="hairMesh"
-	lod="0"
-    file_name="avatar_hair.llm"
-    min_pixel_width="320">
-<!-- begin morph targets -->
-      <param
-       id="180"
-       group="1"
-       name="Hair_Volume"
-       label="Hair Volume"
-	   show_simple="true"
-       wearable="hair"
-       clothing_morph="true"
-       edit_group="hair_style"
-       label_min="Less"
-       label_max="More"
-       value_min="0"
-       value_max="1.3"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="20">
-         <param_morph />
-      </param>
-
-      <param
-       id="761"
-       group="1"
-       name="Hair_Volume_Small"
-       label="Hair Volume"
-	   show_simple="true"
-       wearable="hair"
-       edit_group="hair_style"
-       label_min="Less"
-       label_max="More"
-       value_min="0"
-       value_max="1.3"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="20">
-         <param_morph />
-      </param>
-
-      <param
-       id="181"
-       group="0"
-       name="Hair_Big_Front"
-       label="Big Hair Front"
-       wearable="hair"
-       edit_group="hair_style"
-       edit_group_order="5"
-       label_min="Less"
-       label_max="More"
-       value_min="-1"
-       value_max="1"
-       value_default="0.14"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="90">
-         <param_morph />
-      </param>
-
-      <param
-       id="182"
-       group="0"
-       name="Hair_Big_Top"
-       label="Big Hair Top"
-       wearable="hair"
-       edit_group="hair_style"
-       edit_group_order="6"
-       label_min="Less"
-       label_max="More"
-       value_min="-1"
-       value_max="1"
-       value_default=".7"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="90">
-         <param_morph />
-      </param>
-
-      <param
-       id="183"
-       group="0"
-       name="Hair_Big_Back"
-       clothing_morph="true"
-       label="Big Hair Back"
-       wearable="hair"
-       edit_group="hair_style"
-       edit_group_order="7"
-       label_min="Less"
-       label_max="More"
-       value_min="-1"
-       value_max="1"
-       value_default="0.05"
-       camera_elevation=".1"
-       camera_distance=".7"
-       camera_angle="90">
-         <param_morph />
-      </param>
-
-      <param
-       id="184"
-       group="0"
-       name="Hair_Spiked"
-       label="Spiked Hair"
-	   show_simple="true"
-       wearable="hair"
-       clothing_morph="true"
-       edit_group="hair_style"
-       edit_group_order="15"
-       label_min="No Spikes"
-       label_max="Big Spikes"
-       value_min="0"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="20">
-         <param_morph />
-      </param>
-
-      <param
-       id="140"
-       group="0"
-       name="Hair_Part_Middle"
-       label="Middle Part"
-       wearable="hair"
-       edit_group="hair_style"
-       edit_group_order="17"
-       label_min="No Part"
-       label_max="Part"
-       value_min="0"
-       value_max="2"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="0">
-         <param_morph />
-      </param>
-
-      <param
-       id="141"
-       group="0"
-       name="Hair_Part_Right"
-       label="Right Part"
-       wearable="hair"
-       edit_group="hair_style"
-       edit_group_order="18"
-       label_min="No Part"
-       label_max="Part"
-       value_min="0"
-       value_max="2"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="0">
-         <param_morph />
-      </param>
-
-      <param
-       id="142"
-       group="0"
-       name="Hair_Part_Left"
-       label="Left Part"
-       wearable="hair"
-       edit_group="hair_style"
-       edit_group_order="19"
-       label_min="No Part"
-       label_max="Part"
-       value_min="0"
-       value_max="2"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="0">
-         <param_morph />
-      </param>
-
-      <param
-       id="143"
-       group="0"
-       name="Hair_Sides_Full"
-       label="Full Hair Sides"
-	   show_simple="true"
-       wearable="hair"
-       edit_group="hair_style"
-       edit_group_order="11"
-       label_min="Mowhawk"
-       label_max="Full Sides"
-       value_min="-4"
-       value_max="1.5"
-       value_default="0.125"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="20">
-         <param_morph />
-      </param>
-
-      <param
-       id="144"
-       group="1"
-       name="Bangs_Front_Up"
-       label="Front Bangs Up"
-       wearable="hair"
-       edit_group="hair_style"
-       label_min="Bangs"
-       label_max="Bangs Up"
-       value_min="0"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="20">
-         <param_morph />
-      </param>
-
-      <param
-       id="145"
-       group="1"
-       clothing_morph="true"
-       name="Bangs_Front_Down"
-       label="Front Bangs Down"
-       wearable="hair"
-       edit_group="hair_style"
-       label_min="Bangs"
-       label_max="Bangs Down"
-       value_min="0"
-       value_max="5"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="20">
-         <param_morph />
-      </param>
-
-      <param
-       id="146"
-       group="1"
-       name="Bangs_Sides_Up"
-       label="Side Bangs Up"
-       wearable="hair"
-       edit_group="hair_style"
-       label_min="Side Bangs"
-       label_max="Side Bangs Up"
-       value_min="0"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="20">
-         <param_morph />
-      </param>
-
-      <param
-       id="147"
-       group="1"
-       clothing_morph="true"
-       name="Bangs_Sides_Down"
-       label="Side Bangs Down"
-       wearable="hair"
-       edit_group="hair_style"
-       label_min="Side Bangs"
-       label_max="Side Bangs Down"
-       value_min="0"
-       value_max="2"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="20">
-         <param_morph />
-      </param>
-
-      <param
-       id="148"
-       group="1"
-       name="Bangs_Back_Up"
-       label="Back Bangs Up"
-       wearable="hair"
-       edit_group="hair_style"
-       label_min="Back Bangs"
-       label_max="Back Bangs Up"
-       value_min="0"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="150">
-         <param_morph />
-      </param>
-
-      <param
-       id="149"
-       group="1"
-       name="Bangs_Back_Down"
-       label="Back Bangs Down"
-       clothing_morph="true"
-       wearable="hair"
-       edit_group="hair_style"
-       label_min="Back Bangs"
-       label_max="Back Bangs Down"
-       value_min="0"
-       value_max="2"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="150">
-         <param_morph />
-      </param>
-
-      <param
-       id="171"
-       group="1"
-       name="Hair_Front_Down"
-       label="Front Hair Down"
-       wearable="hair"
-       edit_group="hair_style"
-       label_min="Front Hair"
-       label_max="Front Hair Down"
-       value_min="0"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="20">
-         <param_morph />
-      </param>
-
-      <param
-       id="172"
-       group="1"
-       name="Hair_Front_Up"
-       label="Front Hair Up"
-       wearable="hair"
-       edit_group="hair_style"
-       label_min="Front Hair"
-       label_max="Front Hair Up"
-       value_min="0"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="20">
-         <param_morph />
-      </param>
-
-      <param
-       id="173"
-       group="1"
-       name="Hair_Sides_Down"
-       label="Sides Hair Down"
-       wearable="hair"
-       edit_group="hair_style"
-       label_min="Sides Hair"
-       label_max="Sides Hair Down"
-       value_min="0"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="20">
-         <param_morph />
-      </param>
-
-      <param
-       id="174"
-       group="1"
-       name="Hair_Sides_Up"
-       label="Sides Hair Up"
-       wearable="hair"
-       edit_group="hair_style"
-       label_min="Sides Hair"
-       label_max="Sides Hair Up"
-       value_min="0"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="20">
-         <param_morph />
-      </param>
-
-      <param
-       id="175"
-       group="1"
-       name="Hair_Back_Down"
-       label="Back Hair Down"
-       clothing_morph="true"
-       wearable="hair"
-       edit_group="hair_style"
-       label_min="Back Hair"
-       label_max="Back Hair Down"
-       value_min="0"
-       value_max="3"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="150">
-         <param_morph />
-      </param>
-
-      <param
-       id="176"
-       group="1"
-       name="Hair_Back_Up"
-       label="Back Hair Up"
-       wearable="hair"
-       edit_group="hair_style"
-       label_min="Back Hair"
-       label_max="Back Hair Up"
-       value_min="0"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="150">
-         <param_morph />
-      </param>
-
-      <param
-       id="177"
-       group="0"
-       name="Hair_Rumpled"
-       label="Rumpled Hair"
-	   show_simple="true"
-       wearable="hair"
-       clothing_morph="true"
-       edit_group="hair_style"
-       edit_group_order="14.5"
-       label_min="Smooth Hair"
-       label_max="Rumpled Hair"
-       value_min="0"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="20">
-         <param_morph />
-      </param>
-
-      <param
-       id="178"
-       group="1"
-       name="Hair_Swept_Back"
-       label="Swept Back Hair"
-       wearable="hair"
-       edit_group="hair_style"
-       label_min="NotHair"
-       label_max="Swept Back"
-       value_min="0"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="90">
-         <param_morph />
-      </param>
-
-      <param
-       id="179"
-       group="1"
-       name="Hair_Swept_Forward"
-       label="Swept Forward Hair"
-       wearable="hair"
-       edit_group="hair_style"
-       label_min="Hair"
-       label_max="Swept Forward"
-       value_min="0"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="90">
-         <param_morph />
-      </param>
-
-      <param
-       id="190"
-       group="1"
-       name="Hair_Tilt_Right"
-       label="Hair Tilted Right"
-       wearable="hair"
-       edit_group="hair_style"
-       label_min="Hair"
-       label_max="Tilt Right"
-       value_min="0"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="0">
-         <param_morph />
-      </param>
-
-      <param
-       id="191"
-       group="1"
-       name="Hair_Tilt_Left"
-       label="Hair Tilted Left"
-       wearable="hair"
-       edit_group="hair_style"
-       label_min="Hair"
-       label_max="Tilt Left"
-       value_min="0"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="0">
-         <param_morph />
-      </param>
-
-      <param
-       id="192"
-       group="0"
-       name="Bangs_Part_Middle"
-       label="Part Bangs"
-       wearable="hair"
-       edit_group="hair_style"
-       edit_group_order="20"
-       label_min="No Part"
-       label_max="Part Bangs"
-       value_min="0"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="0">
-         <param_morph />
-      </param>
-
-      <param
-       id="640"
-       group="1"
-       name="Hair_Egg_Head"
-       wearable="hair"
-       edit_group="hair_style"
-       value_min="-1.3"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="641"
-       group="1"
-       name="Hair_Squash_Stretch_Head"
-       wearable="hair"
-       edit_group="hair_style"
-       value_min="-.5"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="642"
-       group="1"
-       name="Hair_Square_Head"
-       wearable="hair"
-       edit_group="hair_style"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="643"
-       group="1"
-       name="Hair_Round_Head"
-       wearable="hair"
-       edit_group="hair_style"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="644"
-       group="1"
-       name="Hair_Forehead_Round"
-       wearable="hair"
-       edit_group="hair_style"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="645"
-       group="1"
-       name="Hair_Forehead_Slant"
-       wearable="hair"
-       edit_group="hair_style"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="774"
-       group="1"
-       name="Shear_Head_Hair"
-       wearable="hair"
-       edit_group="hair_style"
-       value_min="-2"
-       value_max="2">
-         <param_morph />
-      </param>
-
-      <param
-       id="771"
-       group="1"
-       name="Elongate_Head_Hair"
-       wearable="hair"
-       edit_group="hair_style"
-       value_min="-1"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="674"
-       group="0"
-       name="Hair_Shear_Back"
-       wearable="hair"
-       edit_group="hair_style"
-       edit_group_order="12"
-       label="Shear Back"
-       label_min="Full Back"
-       label_max="Sheared Back"
-       value_min="-1"
-       value_max="2"
-       value_default="-0.3"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="100">
-         <param_morph />
-      </param>
-
-      <param
-       id="762"
-       group="0"
-       name="Hair_Shear_Front"
-       wearable="hair"
-       edit_group="hair_style"
-       edit_group_order="11.8"
-       label="Shear Front"
-	   show_simple="true"
-       label_min="Full Front"
-       label_max="Sheared Front"
-       value_min="0"
-       value_max="3"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="30">
-         <param_morph />
-      </param>
-
-      <param
-       id="754"
-       group="0"
-       name="Hair_Taper_Back"
-       wearable="hair"
-       edit_group="hair_style"
-       edit_group_order="14"
-       label="Taper Back"
-       label_min="Wide Back"
-       label_max="Narrow Back"
-       value_min="-1"
-       value_max="2"
-       value_default="0"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="160">
-         <param_morph />
-      </param>
-
-      <param
-       id="755"
-       group="0"
-       name="Hair_Taper_Front"
-       wearable="hair"
-       edit_group="hair_style"
-       edit_group_order="13"
-       label="Taper Front"
-       label_min="Wide Front"
-       label_max="Narrow Front"
-       value_min="-1.5"
-       value_max="1.5"
-       value_default="0.05"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="20">
-         <param_morph />
-      </param>
-
-      <param
-       id="782"
-       group="1"
-       clothing_morph="true"
-       name="Hair_Pigtails_Short"
-       wearable="hair"
-       edit_group="hair_style"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="783"
-       group="1"
-       clothing_morph="true"
-       name="Hair_Pigtails_Med"
-       wearable="hair"
-       edit_group="hair_style"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="790"
-       group="1"
-       clothing_morph="true"
-       name="Hair_Pigtails_Medlong"
-       wearable="hair"
-       edit_group="hair_style"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="784"
-       group="1"
-       clothing_morph="true"
-       name="Hair_Pigtails_Long"
-       wearable="hair"
-       edit_group="hair_style"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="786"
-       group="1"
-       name="Hair_Ponytail_Short"
-       wearable="hair"
-       edit_group="hair_style"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="787"
-       group="1"
-       name="Hair_Ponytail_Med"
-       wearable="hair"
-       edit_group="hair_style"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="788"
-       group="1"
-       name="Hair_Ponytail_Long"
-       clothing_morph="true"
-       wearable="hair"
-       edit_group="hair_style"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-<!-- #end morph targets -->
-   </mesh>
-
-   <mesh
-    type="hairMesh"
-	lod="1"
-    file_name="avatar_hair_1.llm"
-    min_pixel_width="160"
-    reference="avatar_hair.llm">
-   </mesh>
-
-   <mesh
-    type="hairMesh"
-	lod="2"
-    file_name="avatar_hair_2.llm"
-    min_pixel_width="80"
-    reference="avatar_hair.llm">
-   </mesh>
-
-   <mesh
-    type="hairMesh"
-	lod="3"
-    file_name="avatar_hair_3.llm"
-    min_pixel_width="40"
-    reference="avatar_hair.llm">
-   </mesh>
-
-   <mesh
-    type="hairMesh"
-	lod="4"
-    file_name="avatar_hair_4.llm"
-	min_pixel_width="20"
-    reference="avatar_hair.llm">
-   </mesh>
-
-   <mesh
-    type="hairMesh"
-	lod="5"
-    file_name="avatar_hair_5.llm"
-	min_pixel_width="0"
-    reference="avatar_hair.llm">
-   </mesh>
-
-   <mesh
-    type="headMesh"
-	lod="0"
-    file_name="avatar_head.llm"
-    min_pixel_width="320">
-<!-- 
-            begin morph targets
-            #############
-            tweakable morphs
-            ############# 
-  -->
-      <param
-       id="1"
-       group="0"
-       name="Big_Brow"
-       label="Brow Size"
-       wearable="shape"
-       edit_group="shape_head"
-       edit_group_order="7"
-       label_min="Small"
-       label_max="Large"
-       value_min="-.3"
-       value_max="2"
-       camera_elevation=".1"
-       camera_distance=".4"
-       camera_angle="45">
-         <param_morph />
-      </param>
-
-      <param
-       id="2"
-       group="0"
-       name="Nose_Big_Out"
-       label="Nose Size"
-       wearable="shape"
-       edit_group="shape_nose"
-       edit_group_order="1"
-       label_min="Small"
-       label_max="Large"
-       show_simple="true"
-       value_min="-0.8"
-       value_max="2.5"
-       camera_elevation=".1"
-       camera_distance=".35"
-       camera_angle="50">
-         <param_morph />
-      </param>
-
-      <param
-       id="4"
-       group="0"
-       name="Broad_Nostrils"
-       label="Nostril Width"
-       wearable="shape"
-       edit_group="shape_nose"
-       edit_group_order="3"
-       label_min="Narrow"
-       label_max="Broad"
-       value_min="-.5"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".3"
-       camera_angle="-20">
-         <param_morph />
-      </param>
-
-      <param
-       id="759"
-       group="0"
-       name="Low_Septum_Nose"
-       label="Nostril Division"
-       wearable="shape"
-       edit_group="shape_nose"
-       edit_group_order="3.5"
-       label_min="High"
-       label_max="Low"
-       value_min="-1"
-       value_max="1.5"
-       value_default="0.5"
-       camera_elevation=".1"
-       camera_distance=".3"
-       camera_angle="-20">
-         <param_morph />
-      </param>
-
-      <param
-       id="517"
-       group="0"
-       name="Wide_Nose"
-       label="Nose Width"
-       wearable="shape"
-       edit_group="shape_nose"
-       edit_group_order="2"
-       label_min="Narrow"
-       label_max="Wide"
-       show_simple="true"
-       value_min="-.5"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".3"
-       camera_angle="-20">
-         <param_morph />
-      </param>
-
-      <param
-       id="5"
-       group="0"
-       name="Cleft_Chin"
-       label="Chin Cleft"
-       wearable="shape"
-       edit_group="shape_chin"
-       edit_group_order="6"
-       label_min="Round"
-       label_max="Cleft"
-       value_min="-.1"
-       value_max="1"
-       camera_elevation="0"
-       camera_distance=".28"
-       camera_angle="-20">
-         <param_morph />
-      </param>
-
-      <param
-       id="6"
-       group="0"
-       name="Bulbous_Nose_Tip"
-       label="Nose Tip Shape"
-       wearable="shape"
-       edit_group="shape_nose"
-       edit_group_order="8"
-       label_min="Pointy"
-       label_max="Bulbous"
-       value_min="-.3"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".35"
-       camera_angle="15">
-         <param_morph />
-      </param>
-
-      <param
-       id="7"
-       group="0"
-       name="Weak_Chin"
-       label="Chin Angle"
-       wearable="shape"
-       edit_group="shape_chin"
-       edit_group_order="1"
-       label_min="Chin Out"
-       label_max="Chin In"
-       value_min="-.5"
-       value_max=".5"
-       camera_elevation=".1"
-       camera_distance=".4"
-       camera_angle="45">
-         <param_morph />
-      </param>
-
-      <param
-       id="8"
-       group="0"
-       name="Double_Chin"
-       label="Chin-Neck"
-       wearable="shape"
-       edit_group="shape_chin"
-       edit_group_order="8"
-       label_min="Tight Chin"
-       label_max="Double Chin"
-       value_min="-.5"
-       value_max="1.5"
-       camera_elevation="-.1"
-       camera_distance=".3"
-       camera_angle="60">
-         <param_morph />
-      </param>
-
-      <param
-       id="10"
-       group="0"
-       name="Sunken_Cheeks"
-       label="Lower Cheeks"
-       wearable="shape"
-       edit_group="shape_head"
-       edit_group_order="9"
-       label_min="Well-Fed"
-       label_max="Sunken"
-       show_simple="true"
-       value_min="-1.5"
-       value_max="3"
-       camera_elevation=".1"
-       camera_distance=".4"
-       camera_angle="5">
-         <param_morph />
-      </param>
-
-      <param
-       id="11"
-       group="0"
-       name="Noble_Nose_Bridge"
-       label="Upper Bridge"
-       wearable="shape"
-       edit_group="shape_nose"
-       edit_group_order="5"
-       label_min="Low"
-       label_max="High"
-       value_min="-.5"
-       value_max="1.5"
-       camera_elevation=".1"
-       camera_distance=".35"
-       camera_angle="70">
-         <param_morph />
-      </param>
-
-      <param
-       id="758"
-       group="0"
-       name="Lower_Bridge_Nose"
-       label="Lower Bridge"
-       wearable="shape"
-       edit_group="shape_nose"
-       edit_group_order="5.5"
-       label_min="Low"
-       label_max="High"
-       value_min="-1.5"
-       value_max="1.5"
-       camera_elevation=".1"
-       camera_distance=".35"
-       camera_angle="70">
-         <param_morph />
-      </param>
-
-      <param
-       id="12"
-       group="0"
-       name="Jowls"
-       wearable="shape"
-       edit_group="shape_chin"
-       edit_group_order="5"
-       label_min="Less"
-       label_max="More"
-       value_min="-.5"
-       value_max="2.5"
-       camera_elevation=".1"
-       camera_distance=".4"
-       camera_angle="0">
-         <param_morph />
-      </param>
-
-      <param
-       id="13"
-       group="0"
-       name="Cleft_Chin_Upper"
-       label="Upper Chin Cleft"
-       wearable="shape"
-       edit_group="shape_chin"
-       edit_group_order="7"
-       label_min="Round"
-       label_max="Cleft"
-       value_min="0"
-       value_max="1.5"
-       camera_elevation="0"
-       camera_distance=".28"
-       camera_angle="-20">
-         <param_morph />
-      </param>
-
-      <param
-       id="14"
-       group="0"
-       name="High_Cheek_Bones"
-       label="Cheek Bones"
-       wearable="shape"
-       edit_group="shape_head"
-       edit_group_order="10"
-       label_min="Low"
-       label_max="High"
-       value_min="-.5"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".3"
-       camera_angle="-20">
-         <param_morph />
-      </param>
-
-      <param
-       id="15"
-       group="0"
-       name="Ears_Out"
-       label="Ear Angle"
-       wearable="shape"
-       edit_group="shape_ears"
-       edit_group_order="2"
-       label_min="In"
-       label_max="Out"
-       value_min="-.5"
-       value_max="1.5"
-       camera_elevation=".1"
-       camera_distance=".3"
-       camera_angle="-20">
-         <param_morph />
-      </param>
-
-<!--Pointy eyebrows became a driver/driven param with new max value for backwards compatibility between 1.0 and 1.1-->
-      <param
-       id="870"
-       group="1"
-       name="Pointy_Eyebrows"
-       label="Eyebrow Points"
-       wearable="hair"
-       edit_group="hair_eyebrows"
-       edit_group_order="4"
-       label_min="Smooth"
-       label_max="Pointy"
-       value_min="-.5"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".3">
-         <param_morph />
-      </param>
-
-      <param
-       id="17"
-       group="0"
-       name="Square_Jaw"
-       label="Jaw Shape"
-       wearable="shape"
-       edit_group="shape_chin"
-       edit_group_order="2"
-       label_min="Pointy"
-       label_max="Square"
-       value_min="-.5"
-       value_max="1"
-       camera_distance=".3"
-       camera_elevation=".04"
-       camera_angle="-20">
-         <param_morph />
-      </param>
-
-      <param
-       id="18"
-       group="0"
-       name="Puffy_Upper_Cheeks"
-       label="Upper Cheeks"
-       wearable="shape"
-       edit_group="shape_head"
-       edit_group_order="8"
-       label_min="Thin"
-       label_max="Puffy"
-       value_min="-1.5"
-       value_max="2.5"
-       camera_elevation=".1"
-       camera_distance=".3"
-       camera_angle="-20">
-         <param_morph />
-      </param>
-
-      <param
-       id="19"
-       group="0"
-       name="Upturned_Nose_Tip"
-       label="Nose Tip Angle"
-       wearable="shape"
-       edit_group="shape_nose"
-       edit_group_order="7"
-       label_min="Downturned"
-       label_max="Upturned"
-       value_min="-1.5"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".35"
-       camera_angle="15">
-         <param_morph />
-      </param>
-
-      <param
-       id="20"
-       group="0"
-       name="Bulbous_Nose"
-       label="Nose Thickness"
-       wearable="shape"
-       edit_group="shape_nose"
-       edit_group_order="4"
-       label_min="Thin Nose"
-       label_max="Bulbous Nose"
-       show_simple="true"
-       value_min="-.5"
-       value_max="1.5"
-       camera_elevation=".1"
-       camera_distance=".3">
-         <param_morph />
-      </param>
-
-      <param
-       id="21"
-       group="0"
-       name="Upper_Eyelid_Fold"
-       label="Upper Eyelid Fold"
-       wearable="shape"
-       edit_group="shape_eyes"
-       edit_group_order="5"
-       label_min="Uncreased"
-       label_max="Creased"
-       value_min="-0.2"
-       value_max="1.3"
-       camera_elevation=".1"
-       camera_distance=".35">
-         <param_morph />
-      </param>
-
-      <param
-       id="22"
-       group="0"
-       name="Attached_Earlobes"
-       label="Attached Earlobes"
-       wearable="shape"
-       edit_group="shape_ears"
-       edit_group_order="3"
-       label_min="Unattached"
-       label_max="Attached"
-       value_min="0"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".3"
-       camera_angle="45">
-         <param_morph />
-      </param>
-
-      <param
-       id="23"
-       group="0"
-       name="Baggy_Eyes"
-       label="Eye Bags"
-       wearable="shape"
-       edit_group="shape_eyes"
-       edit_group_order="6"
-       label_min="Smooth"
-       label_max="Baggy"
-       value_min="-.5"
-       value_max="1.5"
-       camera_elevation=".1"
-       camera_distance=".35">
-         <param_morph />
-      </param>
-
-      <param
-       id="765"
-       group="0"
-       name="Puffy_Lower_Lids"
-       label="Puffy Eyelids"
-       wearable="shape"
-       edit_group="shape_eyes"
-       edit_group_order="6.1"
-       label_min="Flat"
-       label_max="Puffy"
-       value_min="-.3"
-       value_max="2.5"
-       camera_elevation=".1"
-       camera_distance=".35">
-         <param_morph />
-      </param>
-
-      <param
-       id="24"
-       group="0"
-       name="Wide_Eyes"
-       label="Eye Opening"
-       wearable="shape"
-       edit_group="shape_eyes"
-       edit_group_order="1.1"
-       label_min="Narrow"
-       label_max="Wide"
-       value_min="-1.5"
-       value_max="2"
-	   show_simple="true"
-       camera_elevation=".1"
-       camera_distance=".35">
-         <param_morph />
-      </param>
-
-      <param
-       id="25"
-       group="0"
-       name="Wide_Lip_Cleft"
-       label="Lip Cleft"
-       wearable="shape"
-       edit_group="shape_mouth"
-       edit_group_order="6"
-       label_min="Narrow"
-       label_max="Wide"
-       value_min="-.8"
-       value_max="1.5"
-       camera_elevation="0"
-       camera_distance=".28">
-         <param_morph />
-      </param>
-
-      <param
-       id="764"
-       group="0"
-       name="Lip_Cleft_Deep"
-       label="Lip Cleft Depth"
-       wearable="shape"
-       edit_group="shape_mouth"
-       edit_group_order="5.8"
-       label_min="Shallow"
-       label_max="Deep"
-       value_min="-.5"
-       value_max="1.2"
-       camera_elevation="0"
-       camera_distance=".28">
-         <param_morph />
-      </param>
-
-      <param
-       id="26"
-       group="1"
-       wearable="shape"
-       name="Lips_Thin"
-       edit_group="driven"
-       value_min="0"
-       value_max=".7">
-         <param_morph />
-      </param>
-
-      <param
-       id="27"
-       group="0"
-       name="Wide_Nose_Bridge"
-       label="Bridge Width"
-       wearable="shape"
-       edit_group="shape_nose"
-       edit_group_order="6"
-       label_min="Narrow"
-       label_max="Wide"
-       value_min="-1.3"
-       value_max="1.2"
-       camera_elevation=".1"
-       camera_distance=".3"
-       camera_angle="-20">
-         <param_morph />
-      </param>
-
-      <param
-       id="28"
-       group="1"
-       name="Lips_Fat"
-       wearable="shape"
-       edit_group="driven"
-       value_min="0"
-       value_max="2">
-         <param_morph />
-      </param>
-
-      <param
-       id="29"
-       group="1"
-       name="Wide_Upper_Lip"
-       wearable="shape"
-       edit_group="driven"
-       value_min="-.7"
-       value_max="1.3">
-         <param_morph />
-      </param>
-
-      <param
-       id="30"
-       group="1"
-       name="Wide_Lower_Lip"
-       wearable="shape"
-       edit_group="driven"
-       value_min="-.7"
-       value_max="1.3">
-         <param_morph />
-      </param>
-
-<!--Arced eyebrows became a driver/driven param with new max value for backwards compatibility between 1.0 and 1.1-->
-      <param
-       id="872"
-       group="1"
-       name="Arced_Eyebrows"
-       label="Eyebrow Arc"
-       wearable="hair"
-       edit_group="hair_eyebrows"
-       edit_group_order="3"
-       label_min="Flat"
-       label_max="Arced"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-<!--Lower eyebrows became a driver/driven param with new min value for backwards compatibility between 1.0 and 1.1-->
-      <param
-       id="871"
-       group="1"
-       name="Lower_Eyebrows"
-       label="Eyebrow Height"
-	   show_simple="true"
-       wearable="hair"
-       edit_group="hair_eyebrows"
-       edit_group_order="2.5"
-       label_min="Higher"
-       label_max="Lower"
-       value_min="-2"
-       value_max="2">
-         <param_morph />
-      </param>
-
-      <param
-       id="35"
-       group="0"
-       name="Big_Ears"
-       label="Ear Size"
-       wearable="shape"
-       edit_group="shape_ears"
-       edit_group_order="1"
-       label_min="Small"
-       label_max="Large"
-       value_min="-1"
-       value_max="2"
-       camera_elevation=".1"
-       camera_distance=".3"
-       camera_angle="45">
-         <param_morph />
-      </param>
-
-      <param
-       id="796"
-       group="0"
-       name="Pointy_Ears"
-       label="Ear Tips"
-       wearable="shape"
-       edit_group="shape_ears"
-       edit_group_order="4"
-       label_min="Flat"
-       label_max="Pointy"
-       value_min="-.4"
-       value_max="3"
-       camera_elevation=".1"
-       camera_distance=".3"
-       camera_angle="45">
-         <param_morph />
-      </param>
-
-      <param
-       id="185"
-       group="0"
-       name="Deep_Chin"
-       label="Chin Depth"
-       wearable="shape"
-       edit_group="shape_chin"
-       edit_group_order="3"
-       label_min="Shallow"
-       label_max="Deep"
-       value_min="-1"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".4"
-       camera_angle="30">
-         <param_morph />
-      </param>
-
-      <param
-       id="186"
-       group="1"
-       name="Egg_Head"
-       label="Egg Head"
-       wearable="shape"
-       edit_group="shape_head"
-       label_min="Chin Heavy"
-       label_max="Forehead Heavy"
-       value_min="-1.3"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="20">
-         <param_morph />
-      </param>
-
-      <param
-       id="187"
-       group="1"
-       name="Squash_Stretch_Head"
-       label="Squash/Stretch Head"
-       wearable="shape"
-       edit_group="shape_head"
-       label_min="Squash Head"
-       label_max="Stretch Head"
-       value_min="-.5"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="20">
-         <param_morph>
-			<volume_morph
-				name="HEAD"
-				scale="-0.008 -0.006 0.015"/>
-		 </param_morph>
-      </param>
-
-      <param
-       id="188"
-       group="1"
-       name="Square_Head"
-       wearable="shape"
-       label_min="Less Square"
-       label_max="More Square"
-       value_min="0"
-       value_max=".7"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="20">
-         <param_morph />
-      </param>
-
-      <param
-       id="189"
-       group="1"
-       wearable="shape"
-       name="Round_Head"
-       label_min="Less Round"
-       label_max="More Round"
-       value_min="0"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="20">
-         <param_morph />
-      </param>
-
-      <param
-       id="194"
-       group="1"
-       name="Eye_Spread"
-       wearable="shape"
-       edit_group="shape_eyes"
-       label_min="Eyes Together"
-       label_max="Eyes Spread"
-       value_min="-2"
-       value_max="2">
-         <param_morph />
-      </param>
-
-      <param
-       id="400"
-       sex="male"
-       group="1"
-       name="Displace_Hair_Facial"
-       label="Hair Thickess"
-       wearable="hair"
-       edit_group="hair_facial"
-       label_min="Cropped Hair"
-       label_max="Bushy Hair"
-       value_min="0"
-       value_max="2">
-         <param_morph />
-      </param>
-
-      <param
-       id="506"
-       group="0"
-       name="Mouth_Height"
-       wearable="shape"
-       label="Mouth Position"
-	   show_simple="true"
-       edit_group="shape_mouth"
-       edit_group_order="4"
-       label_min="High"
-       label_max="Low"
-       value_min="-2"
-       value_max="2"
-       camera_distance=".3"
-       camera_elevation=".04">
-         <param_morph />
-      </param>
-
-      <param
-       id="633"
-       group="1"
-       name="Fat_Head"
-       label="Fat Head"
-       wearable="shape"
-       edit_group="shape_body"
-       label_min="Skinny"
-       label_max="Fat"
-       value_min="0"
-       value_max="1"
-       camera_elevation=".3">
-         <param_morph/>
-      </param>
-
-      <param
-       id="630"
-       group="1"
-       name="Forehead_Round"
-       label="Round Forehead"
-       wearable="shape"
-       label_min="Less"
-       label_max="More"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="631"
-       group="1"
-       name="Forehead_Slant"
-       label="Slanted Forehead"
-       wearable="shape"
-       label_min="Less"
-       label_max="More"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="650"
-       group="0"
-       name="Eyelid_Corner_Up"
-       label="Outer Eye Corner"
-       wearable="shape"
-       edit_group="shape_eyes"
-       edit_group_order="4"
-       label_min="Corner Down"
-       label_max="Corner Up"
-       value_min="-1.3"
-       value_max="1.2"
-       camera_elevation=".1"
-       camera_distance=".30">
-         <param_morph />
-      </param>
-
-	  <param
-       id="880"
-       group="0"
-       name="Eyelid_Inner_Corner_Up"
-       label="Inner Eye Corner"
-       wearable="shape"
-       edit_group="shape_eyes"
-       edit_group_order="4.2"
-       label_min="Corner Down"
-       label_max="Corner Up"
-       value_min="-1.3"
-       value_max="1.2"
-       camera_elevation=".1"
-       camera_distance=".30">
-         <param_morph />
-      </param>
- 
-      <param
-       id="653"
-       group="0"
-       name="Tall_Lips"
-       wearable="shape"
-       label="Lip Fullness"
-	   show_simple="true"
-       edit_group="shape_mouth"
-       edit_group_order="2"
-       label_min="Less Full"
-       label_max="More Full"
-       value_min="-1"
-       value_max="2"
-       camera_distance=".3"
-       camera_elevation=".04">
-         <param_morph />
-      </param>
-
-      <param
-       id="656"
-       group="0"
-       name="Crooked_Nose"
-       wearable="shape"
-       label="Crooked Nose"
-       edit_group="shape_nose"
-       edit_group_order="9"
-       label_min="Nose Left"
-       label_max="Nose Right"
-       value_min="-2"
-       value_max="2"
-       camera_distance=".3"
-       camera_elevation=".04"
-       camera_angle="-20">
-         <param_morph />
-      </param>
-
-      <param
-       id="657"
-       group="1"
-       name="Smile_Mouth"
-       wearable="shape"
-       label="Mouth Corner"
-       edit_group="shape_mouth"
-       label_min="Corner Normal"
-       label_max="Corner Up"
-       value_min="0"
-       value_max="1.4"
-       camera_distance=".3"
-       camera_elevation=".04">
-         <param_morph />
-      </param>
-
-      <param
-       id="658"
-       group="1"
-       name="Frown_Mouth"
-       wearable="shape"
-       label="Mouth Corner"
-       edit_group="shape_mouth"
-       label_min="Corner Normal"
-       label_max="Corner Down"
-       value_min="0"
-       value_max="1.2"
-       camera_distance=".3"
-       camera_elevation=".04">
-         <param_morph />
-      </param>
-
-      <param
-       id="797"
-       group="1"
-       name="Fat_Upper_Lip"
-       wearable="shape"
-       label="Fat Upper Lip"
-       edit_group="shape_mouth"
-       label_min="Normal Upper"
-       label_max="Fat Upper"
-       value_min="0"
-       value_max="1.5"
-       camera_distance=".3"
-       camera_elevation=".04">
-         <param_morph />
-      </param>
-
-      <param
-       id="798"
-       group="1"
-       name="Fat_Lower_Lip"
-       wearable="shape"
-       label="Fat Lower Lip"
-       edit_group="shape_mouth"
-       label_min="Normal Lower"
-       label_max="Fat Lower"
-       value_min="0"
-       value_max="1.5"
-       camera_distance=".3"
-       camera_elevation=".04">
-         <param_morph />
-      </param>
-
-      <param
-       id="660"
-       group="1"
-       name="Shear_Head"
-       wearable="shape"
-       label="Shear Face"
-       edit_group="shape_head"
-       label_min="Shear Left"
-       label_max="Shear Right"
-       value_min="-2"
-       value_max="2"
-       value_default="0"
-       camera_distance=".5"
-       camera_elevation=".04">
-         <param_morph />
-      </param>
-
-      <param
-       id="770"
-       group="1"
-       name="Elongate_Head"
-       wearable="shape"
-       label="Shear Face"
-       edit_group="shape_head"
-       label_min="Flat Head"
-       label_max="Long Head"
-       value_min="-1"
-       value_max="1"
-       value_default="0"
-       camera_distance=".5"
-       camera_elevation=".04">
-         <param_morph>
-			<volume_morph
-				name="HEAD"
-				scale="0.02 0.0 0.0"/>
-		 </param_morph>
-      </param>
-
-      <param
-       id="663"
-       group="0"
-       name="Shift_Mouth"
-       wearable="shape"
-       label="Shift Mouth"
-       edit_group="shape_mouth"
-       edit_group_order="7"
-       label_min="Shift Left"
-       label_max="Shift Right"
-       value_min="-2"
-       value_max="2"
-       value_default="0"
-       camera_distance=".35"
-       camera_elevation=".04"
-       camera_angle="-20">
-         <param_morph />
-      </param>
-
-      <param
-       id="664"
-       group="0"
-       name="Pop_Eye"
-       wearable="shape"
-       label="Eye Pop"
-       edit_group="shape_eyes"
-       edit_group_order="8"
-       label_min="Pop Right Eye"
-       label_max="Pop Left Eye"
-       value_min="-1.3"
-       value_max="1.3"
-       value_default="0"
-       camera_elevation=".1"
-       camera_distance=".35">
-         <param_morph />
-      </param>
-
-      <param
-       id="760"
-       group="0"
-       name="Jaw_Angle"
-       wearable="shape"
-       label="Jaw Angle"
-       edit_group="shape_chin"
-       edit_group_order="3.5"
-       label_min="Low Jaw"
-       label_max="High Jaw"
-       value_min="-1.2"
-       value_max="2"
-       value_default="0"
-       camera_distance=".5"
-       camera_elevation=".04"
-       camera_angle="70">
-         <param_morph />
-      </param>
-
-      <param
-       id="665"
-       group="0"
-       name="Jaw_Jut"
-       wearable="shape"
-       label="Jaw Jut"
-       edit_group="shape_chin"
-       edit_group_order="4"
-       label_min="Overbite"
-       label_max="Underbite"
-       value_min="-2"
-       value_max="2"
-       value_default="0"
-       camera_distance=".5"
-       camera_elevation=".04"
-       camera_angle="70">
-         <param_morph />
-      </param>
-
-      <param
-       id="686"
-       group="1"
-       name="Head_Eyes_Big"
-       wearable="shape"
-       label="Eye Size"
-       edit_group="shape_eyes"
-       label_min="Beady Eyes"
-       label_max="Anime Eyes"
-       show_simple="true"
-       value_min="-2"
-       value_max="2"
-       value_default="0">
-         <param_morph />
-      </param>
-
-      <param
-       id="767"
-       group="1"
-       name="Bug_Eyed_Head"
-       wearable="shape"
-       label="Eye Depth"
-       edit_group="shape_eyes"
-       edit_group_order="4.5"
-       label_min="Sunken Eyes"
-       label_max="Bug Eyes"
-       value_min="-2"
-       value_max="2"
-       value_default="0">
-         <param_morph />
-      </param>
-
-<!--
-         #Fat_Lips = Fat_Lips 34 1 0 1
-         #Wide_Lips = Wide_Lips 35 1 0 1
-         #Wide_Nose = Wide_Nose 36 1 0 1
-   -->
-<!--
-        ##############
-        # Facial Expression morphs 
-        ##############
-        -->
-      <param
-       id="300"
-       group="1"
-       name="Express_Closed_Mouth"
-       value_default="1"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="301"
-       group="1"
-       name="Express_Tongue_Out"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="302"
-       group="1"
-       name="Express_Surprise_Emote"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="303"
-       group="1"
-       name="Express_Wink_Emote"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="304"
-       group="1"
-       name="Express_Embarrassed_Emote"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="305"
-       group="1"
-       name="Express_Shrug_Emote"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="306"
-       group="1"
-       name="Express_Kiss"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="307"
-       group="1"
-       name="Express_Bored_Emote"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="308"
-       group="1"
-       name="Express_Repulsed_Emote"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="309"
-       group="1"
-       name="Express_Disdain"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="310"
-       group="1"
-       name="Express_Afraid_Emote"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="311"
-       group="1"
-       name="Express_Worry_Emote"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="312"
-       group="1"
-       name="Express_Cry_Emote"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="313"
-       group="1"
-       name="Express_Sad_Emote"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="314"
-       group="1"
-       name="Express_Anger_Emote"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="315"
-       group="1"
-       name="Express_Frown"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="316"
-       group="1"
-       name="Express_Laugh_Emote"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="317"
-       group="1"
-       name="Express_Toothsmile"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="318"
-       group="1"
-       name="Express_Smile"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="632"
-       group="1"
-       name="Express_Open_Mouth"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-<!--
-        ##############
-        # Lipsync morphs
-        ##############
-        -->
-
-      <param
-       id="70"
-       group="1"
-       name="Lipsync_Aah"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="71"
-       group="1"
-       name="Lipsync_Ooh"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-<!--
-        ##############
-        # other morphs (not user controlled)
-        ##############
-        -->
-      <param
-       id="40"
-       group="1"
-       name="Male_Head"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="41"
-       group="1"
-       name="Old"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-<!--
-        ##############
-        # animatable morphs
-        ##############
-         -->
-      <param
-       id="51"
-       group="1"
-       name="Furrowed_Eyebrows"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="53"
-       group="1"
-       name="Surprised_Eyebrows"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="54"
-       group="1"
-       name="Worried_Eyebrows"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="55"
-       group="1"
-       name="Frown_Mouth"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="57"
-       group="1"
-       name="Smile_Mouth"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="58"
-       group="1"
-       name="Blink_Left"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="59"
-       group="1"
-       name="Blink_Right"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-<!--
-        #end morph targets
-         -->
-   </mesh>
-
-   <mesh
-    type="headMesh"
-	lod="1"
-    file_name="avatar_head_1.llm"
-    min_pixel_width="160"
-    reference="avatar_head.llm">
-   </mesh>
-
-   <mesh
-    type="headMesh"
-	lod="2"
-    file_name="avatar_head_2.llm"
-    min_pixel_width="80"
-    reference="avatar_head.llm">
-   </mesh>
-
-   <mesh
-    type="headMesh"
-	lod="3"
-    file_name="avatar_head_3.llm"
-    min_pixel_width="40"
-    reference="avatar_head.llm">
-   </mesh>
-
-   <mesh
-    type="headMesh"
-	lod="4"
-    file_name="avatar_head_4.llm"
-	min_pixel_width="0"
-    reference="avatar_head.llm">
-   </mesh>
-
-   <mesh
-    type="eyelashMesh"
-	lod="0"
-    file_name="avatar_eyelashes.llm"
-    min_pixel_width="320">
-      <param
-       shared="1"
-       id="660"
-       group="1"
-       name="Shear_Head"
-       wearable="shape"
-       label="Shear Face"
-       edit_group="shape_head"
-       label_min="Shear Left"
-       label_max="Shear Right"
-       value_min="-2"
-       value_max="2"
-       value_default="0"
-       camera_distance=".5"
-       camera_elevation=".04">
-         <param_morph />
-      </param>
-
-      <param
-       shared="1"
-       id="770"
-       group="1"
-       name="Elongate_Head"
-       wearable="shape"
-       label="Shear Face"
-       edit_group="shape_head"
-       label_min="Flat Head"
-       label_max="Long Head"
-       value_min="-1"
-       value_max="1"
-       value_default="0"
-       camera_distance=".5"
-       camera_elevation=".04">
-         <param_morph />
-      </param>
-
-      <param
-       shared="1"
-       id="664"
-       group="0"
-       name="Pop_Eye"
-       wearable="shape"
-       label="Eye Pop"
-       edit_group="shape_eyes"
-       edit_group_order="8"
-       label_min="Pop Right Eye"
-       label_max="Pop Left Eye"
-       value_min="-2"
-       value_max="2"
-       value_default="0"
-       camera_distance=".5"
-       camera_elevation=".04"
-       camera_angle="-20">
-         <param_morph />
-      </param>
-
-      <param
-       shared="1"
-       id="21"
-       group="0"
-       name="Upper_Eyelid_Fold"
-       label="Upper Eyelid Fold"
-       wearable="shape"
-       edit_group="shape_eyes"
-       label_min="Uncreased"
-       label_max="Creased"
-       value_min="-0.2"
-       value_max="1.3"
-       camera_elevation=".1"
-       camera_distance=".35">
-         <param_morph />
-      </param>
-
-      <param
-       shared="1"
-       id="24"
-       group="0"
-       name="Wide_Eyes"
-       label="Eye Opening"
-       wearable="shape"
-       edit_group="shape_eyes"
-       label_min="Narrow"
-       label_max="Wide"
-       show_simple="true"
-       value_min="-1.5"
-       value_max="2"
-       camera_elevation=".1"
-       camera_distance=".3">
-         <param_morph />
-      </param>
-
-      <param
-       shared="1"
-       id="186"
-       group="1"
-       name="Egg_Head"
-       label="Egg Head"
-       wearable="shape"
-       edit_group="shape_head"
-       label_min="Chin Heavy"
-       label_max="Forehead Heavy"
-       value_min="-1.3"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="20">
-         <param_morph />
-      </param>
-
-      <param
-       shared="1"
-       id="187"
-       group="1"
-       name="Squash_Stretch_Head"
-       label="Squash/Stretch Head"
-       wearable="shape"
-       edit_group="shape_head"
-       label_min="Squash Head"
-       label_max="Stretch Head"
-       value_min="-.5"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="20">
-         <param_morph />
-      </param>
-
-      <param
-       shared="1"
-       id="194"
-       group="1"
-       name="Eye_Spread"
-       edit_group="shape_eyes"
-       label_min="Eyes Together"
-       label_max="Eyes Spread"
-       value_min="-2"
-       value_max="2">
-         <param_morph />
-      </param>
-
-      <param
-       id="518"
-       group="0"
-       name="Eyelashes_Long"
-       wearable="shape"
-       label="Eyelash Length"
-       edit_group="shape_eyes"
-       edit_group_order="7"
-       label_min="Short"
-       label_max="Long"
-       value_min="-.3"
-       value_max="1.5"
-       camera_elevation=".1"
-       camera_distance=".30"
-       camera_angle="-20">
-         <param_morph />
-      </param>
-
-      <param
-       shared="1"
-       id="650"
-       group="0"
-       name="Eyelid_Corner_Up"
-       label="Outer Eye Corner"
-       wearable="shape"
-       edit_group="shape_eyes"
-       label_min="Corner Down"
-       label_max="Corner Up"
-       value_min="-1.3"
-       value_max="1.2"
-       camera_elevation=".1"
-       camera_distance=".3">
-         <param_morph />
-      </param>
-      
-      <param
-       shared="1"
-       id="880"
-       group="0"
-       name="Eyelid_Inner_Corner_Up"
-       label="Inner Eye Corner"
-       wearable="shape"
-       edit_group="shape_eyes"
-       label_min="Corner Down"
-       label_max="Corner Up"
-       value_min="-1.3"
-       value_max="1.2"
-       camera_elevation=".1"
-       camera_distance=".3">
-         <param_morph />
-      </param>
-
-      <param
-       shared="1"
-       id="686"
-       group="1"
-       name="Head_Eyes_Big"
-       wearable="shape"
-       label="Eye Size"
-       edit_group="shape_eyes"
-       label_min="Beady Eyes"
-       label_max="Anime Eyes"
-       value_min="-2"
-       value_max="2"
-	   show_simple="true"
-       value_default="0">
-         <param_morph />
-      </param>
-
-      <param
-       shared="1"
-       id="767"
-       group="1"
-       name="Bug_Eyed_Head"
-       wearable="shape"
-       label="Eye Depth"
-       edit_group="shape_eyes"
-       edit_group_order="4.5"
-       label_min="Sunken Eyes"
-       label_max="Bug Eyes"
-       value_min="-2"
-       value_max="2"
-       value_default="0">
-         <param_morph />
-      </param>
-
-<!--
-        ##############
-        # Facial Expression morphs 
-        ##############
-        -->
-      <param
-       shared="1"
-       id="301"
-       group="1"
-       name="Express_Tongue_Out"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       shared="1"
-       id="302"
-       group="1"
-       name="Express_Surprise_Emote"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       shared="1"
-       id="303"
-       group="1"
-       name="Express_Wink_Emote"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       shared="1"
-       id="304"
-       group="1"
-       name="Express_Embarrassed_Emote"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       shared="1"
-       id="305"
-       group="1"
-       name="Express_Shrug_Emote"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       shared="1"
-       id="306"
-       group="1"
-       name="Express_Kiss"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       shared="1"
-       id="307"
-       group="1"
-       name="Express_Bored_Emote"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       shared="1"
-       id="308"
-       group="1"
-       name="Express_Repulsed_Emote"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       shared="1"
-       id="309"
-       group="1"
-       name="Express_Disdain"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       shared="1"
-       id="310"
-       group="1"
-       name="Express_Afraid_Emote"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       shared="1"
-       id="312"
-       group="1"
-       name="Express_Cry_Emote"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       shared="1"
-       id="313"
-       group="1"
-       name="Express_Sad_Emote"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       shared="1"
-       id="314"
-       group="1"
-       name="Express_Anger_Emote"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       shared="1"
-       id="315"
-       group="1"
-       name="Express_Frown"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       shared="1"
-       id="316"
-       group="1"
-       name="Express_Laugh_Emote"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       shared="1"
-       id="317"
-       group="1"
-       name="Express_Toothsmile"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       shared="1"
-       id="318"
-       group="1"
-       name="Express_Smile"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-<!--
-        ##############
-        # other morphs (not user controlled)
-        ##############
-        -->
-      <param
-       shared="1"
-       id="41"
-       group="1"
-       name="Old"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-<!--
-        ##############
-        # animatable morphs
-        ##############
-         -->
-      <param
-       shared="1"
-       id="58"
-       group="1"
-       name="Blink_Left"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       shared="1"
-       id="59"
-       group="1"
-       name="Blink_Right"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-   </mesh>
-
-<!--
-    #headMesh2 =
-    #headMesh3 =
-    -->
-   <mesh
-    type="upperBodyMesh"
-	lod="0"
-    file_name="avatar_upper_body.llm"
-    min_pixel_width="320">
-<!--
-        #begin morph targets
-        #############
-        # tweakable morphs
-        #############
-        -->
-      <param
-       id="104"
-       group="1"
-       name="Big_Belly_Torso"
-       value_min="0"
-       value_max="1">
-         <param_morph>
-		 	<volume_morph
-				name="BELLY"
-				scale="0.075 0.04 0.03"
-				pos="0.07 0 -0.07"/>
-		</param_morph>
-      </param>
-
-      <param
-       id="626"
-       sex="female"
-       group="1"
-       name="Big_Chest"
-       label="Chest Size"
-       wearable="shape"
-       edit_group="shape_torso"
-       label_min="Small"
-       label_max="Large"
-       value_min="0"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance="1"
-       camera_angle="15">
-         <param_morph />
-      </param>
-
-      <param
-       id="627"
-       sex="female"
-       group="1"
-       name="Small_Chest"
-       label="Chest Size"
-       wearable="shape"
-       edit_group="shape_torso"
-       label_min="Large"
-       label_max="Small"
-       value_min="0"
-       value_max="1"
-       camera_elevation="0"
-       camera_distance=".28">
-         <param_morph />
-      </param>
-
-      <param
-       id="843"
-       sex="female"
-       group="1"
-       name="No_Chest"
-       label="Chest Size"
-       wearable="shape"
-       edit_group="shape_torso"
-       label_min="Some"
-       label_max="None"
-       value_min="0"
-       value_max="1"
-       camera_elevation="0"
-       camera_distance=".28">
-         <param_morph />
-      </param>
-
-      <param
-       id="106"
-       group="1"
-       name="Muscular_Torso"
-       label="Torso Muscles"
-	   show_simple="true"
-       wearable="shape"
-       edit_group="shape_torso"
-       label_min="Regular"
-       label_max="Muscular"
-       value_min="0"
-       value_max="1.4"
-       camera_elevation=".3"
-       camera_distance="1.2">
-         <param_morph>
-		 	<volume_morph
-				name="L_CLAVICLE"
-				scale="0.02 0.0 0.005"
-				pos="0.0 0 0.005"/>
-		 	<volume_morph
-				name="L_UPPER_ARM"
-				scale="0.015 0.0 0.005"
-				pos="0.015 0 0"/>
-		 	<volume_morph
-				name="L_LOWER_ARM"
-				scale="0.005 0.0 0.005"
-				pos="0.005 0 0"/>
-		 	<volume_morph
-				name="R_CLAVICLE"
-				scale="0.02 0.0 0.005"
-				pos="0.0 0 0.005"/>
-		 	<volume_morph
-				name="R_UPPER_ARM"
-				scale="0.015 0.0 0.005"
-				pos="0.015 0 0"/>
-		 	<volume_morph
-				name="R_LOWER_ARM"
-				scale="0.005 0.0 0.005"
-				pos="0.005 0 0"/>
-		 </param_morph>
-      </param>
-
-      <param
-       id="648"
-       group="1"
-       sex="female"
-       name="Scrawny_Torso"
-       label="Torso Muscles"
-	   show_simple="true"
-       wearable="shape"
-       edit_group="shape_torso"
-       label_min="Regular"
-       label_max="Scrawny"
-       value_min="0"
-       value_max="1.3"
-       camera_elevation=".3"
-       camera_distance="1.2">
-		<param_morph>
-		 	<volume_morph
-				name="BELLY"
-				scale="0.0 -0.01 0.0"
-				pos="0.0 0.0 0"/>
-		 	<volume_morph
-				name="CHEST"
-				scale="-0.01 -0.01 0.0"
-				pos="0.01 0.0 0"/>
-		 	<volume_morph
-				name="L_CLAVICLE"
-				scale="0.0 -0.03 -0.005"
-				pos="0.0 0 -0.005"/>
-		 	<volume_morph
-				name="L_UPPER_ARM"
-				scale="-0.01 -0.01 -0.02"
-				pos="0 0 0"/>
-		 	<volume_morph
-				name="L_LOWER_ARM"
-				scale="-0.005 0.0 -0.01"
-				pos="-0.005 0 0"/>
-		 	<volume_morph
-				name="R_CLAVICLE"
-				scale="0.0 -0.03 -0.005"
-				pos="0.0 0 -0.005"/>
-		 	<volume_morph
-				name="R_UPPER_ARM"
-				scale="-0.01 -0.01 -0.02"
-				pos="0 0 0"/>
-		 	<volume_morph
-				name="R_LOWER_ARM"
-				scale="-0.005 0.0 -0.01"
-				pos="-0.005 0 0"/>
-		</param_morph>
-	  </param>
-
-      <param
-       id="677"
-       group="1"
-       sex="male"
-       name="Scrawny_Torso_Male"
-       label="Torso Scrawny"
-       wearable="shape"
-       edit_group="shape_torso"
-       label_min="Regular"
-       label_max="Scrawny"
-       value_min="0"
-       value_max="1.3"
-       camera_elevation=".3"
-       camera_distance="1.2">
-		<param_morph>
-		 	<volume_morph
-				name="BELLY"
-				scale="-0.01 -0.01 0.0"
-				pos="0.01 0.0 0"/>
-		 	<volume_morph
-				name="CHEST"
-				scale="-0.02 -0.02 0.0"
-				pos="0.01 0.0 0"/>
-		 	<volume_morph
-				name="L_CLAVICLE"
-				scale="0.0 -0.03 -0.005"
-				pos="0.0 0 -0.005"/>
-		 	<volume_morph
-				name="L_UPPER_ARM"
-				scale="-0.01 -0.01 -0.02"
-				pos="0 0 0"/>
-		 	<volume_morph
-				name="L_LOWER_ARM"
-				scale="-0.005 0.0 -0.01"
-				pos="-0.005 0 0"/>
-		 	<volume_morph
-				name="R_CLAVICLE"
-				scale="0.0 -0.03 -0.005"
-				pos="0.0 0 -0.005"/>
-		 	<volume_morph
-				name="R_UPPER_ARM"
-				scale="-0.01 -0.01 -0.02"
-				pos="0 0 0"/>
-		 	<volume_morph
-				name="R_LOWER_ARM"
-				scale="-0.005 0.0 -0.01"
-				pos="-0.005 0 0"/>
-		</param_morph>
-	  </param>
-
-      <param
-       id="634"
-       group="1"
-       name="Fat_Torso"
-       label="Fat Torso"
-       wearable="shape"
-       edit_group="shape_body"
-       label_min="skinny"
-       label_max="fat"
-       value_min="0"
-       value_max="1"
-       camera_elevation=".3">
-         <param_morph>
-			<volume_morph
-				name="CHEST"
-				scale="0.02 0.03 0.03"
-				pos="0 0 -0.03"/>
-			<volume_morph
-				name="BELLY"
-				scale="0.09 0.08 0.07"
-				pos="0 0 -0.05"/>
-			<volume_morph
-				name="L_CLAVICLE"
-				scale="0.0 0.0 0.015"/>
-			<volume_morph
-				name="L_UPPER_ARM"
-				scale="0.02 0.0 0.02"
-				pos="0.0 0.0 -0.02"/>
-			<volume_morph
-				name="L_LOWER_ARM"
-				scale="0.01 0.0 0.01"
-				pos="0.0 0.0 -0.01"/>
-			<volume_morph
-				name="R_CLAVICLE"
-				scale="0.0 0.0 0.015"/>
-			<volume_morph
-				name="R_UPPER_ARM"
-				scale="0.02 0.0 0.02"
-				pos="0.0 0.0 -0.02"/>
-			<volume_morph
-				name="R_LOWER_ARM"
-				scale="0.01 0.0 0.01"
-				pos="0.0 0.0 -0.01"/>
-			<volume_morph
-				name="NECK"
-				scale="0.015 0.01 0.0"/>
-			<volume_morph
-				name="HEAD"
-				scale="0.0 0.0 0.01"
-				pos="0 0 -0.01"/>
-		 </param_morph>
-
-      </param>
-
-      <param
-       id="507"
-       group="0"
-       sex="female"
-       name="Breast_Gravity"
-       label="Breast Buoyancy"
-       wearable="shape"
-       edit_group="shape_torso"
-       edit_group_order="7"
-       label_min="Less Gravity"
-       label_max="More Gravity"
-       value_default="0"
-       value_min="-1.5"
-       value_max="2"
-       camera_elevation=".3"
-       camera_distance=".8">
-         <param_morph />
-      </param>
-
-      <param
-       id="628"
-       group="1"
-       name="Displace_Loose_Upperbody"
-       label="Shirt Fit"
-       wearable="shirt"
-       edit_group="driven"
-       clothing_morph="true"
-       value_min="0"
-       value_max="1"
-       value_default="0">
-         <param_morph />
-      </param>
-
-      <param
-       id="840"
-       group="0"
-       name="Shirtsleeve_flair"
-       label="Sleeve Looseness"
-	   show_simple="true"
-       wearable="shirt"
-       edit_group="shirt"
-       edit_group_order="6"
-       clothing_morph="true"
-       label_min="Tight Sleeves"
-       label_max="Loose Sleeves"
-       value_min="0"
-       value_max="1.5"
-       camera_distance="1.8"
-       camera_angle="30"
-       camera_elevation="-.3">
-         <param_morph />
-      </param>
-
-      <param
-       id="855"
-       group="1"
-       name="Love_Handles"
-       value_default="0"
-       value_min="-1"
-       value_max="2">
-         <param_morph>
-		 	<volume_morph
-				name="BELLY"
-				scale="0.0 0.02 0.0"/>
-		</param_morph>
-      </param>
-
-      <param
-       id="684"
-       group="0"
-       sex="female"
-       name="Breast_Female_Cleavage"
-       label="Breast Cleavage"
-       wearable="shape"
-       edit_group="shape_torso"
-       edit_group_order="8"
-       label_min="Separate"
-       label_max="Join"
-       value_default="0"
-       value_min="-.3"
-       value_max="1.3"
-       camera_elevation=".3"
-       camera_distance=".8">
-         <param_morph />
-      </param>
-
-      <param
-       id="685"
-       group="0"
-       sex="male"
-       name="Chest_Male_No_Pecs"
-       label="Pectorals"
-       wearable="shape"
-       edit_group="shape_torso"
-       edit_group_order="5"
-       label_min="Big Pectorals"
-       label_max="Sunken Chest"
-       value_default="0"
-       value_min="-.5"
-       value_max="1.1"
-       camera_elevation=".3"
-       camera_distance="1.2">
-         <param_morph />
-      </param>
-
-<!-- ############# # 
-  other morphs (not user controlled) 
-  ############# -->
-      <param
-       id="100"
-       group="1"
-       name="Male_Torso"
-       label_min="Male_Torso"
-       value_min="0"
-       value_max="1">
-        <param_morph>
-			<volume_morph
-				name="CHEST"
-				scale="0.03 0.04 0.02"
-				pos="-0.03 0 -0.01"/>
-			<volume_morph
-				name="BELLY"
-				scale="0.03 0.03 0.0"
-				pos="-0.03 0 0.02"/>
-			<volume_morph
-				name="L_CLAVICLE"
-				scale="0.02 0.0 0.01"
-				pos="-0.02 0 0"/>
-			<volume_morph
-				name="L_UPPER_ARM"
-				scale="0.01 0.0 0.01"
-				pos="0.0 0.0 -0.01"/>
-			<volume_morph
-				name="L_LOWER_ARM"
-				scale="0.005 0.0 0.005"
-				pos="0.0 0.0 -0.005"/>
-			<volume_morph
-				name="R_CLAVICLE"
-				scale="0.02 0.0 0.01"
-				pos="-0.02 0 0"/>
-			<volume_morph
-				name="R_UPPER_ARM"
-				scale="0.01 0.0 0.01"
-				pos="0.0 0.0 -0.01"/>
-			<volume_morph
-				name="R_LOWER_ARM"
-				scale="0.005 0.0 0.005"
-				pos="0.0 0.0 -0.005"/>
-			<volume_morph
-				name="NECK"
-				scale="0.015 0.01 0.0"/>
-			<volume_morph
-				name="HEAD"
-				scale="0.0 0.0 0.01"
-				pos="0 0 -0.01"/>
-		 </param_morph>
-	</param>
-
-<!--
-        ##############
-        # animatable morphs
-        ##############
-        -->
-      <param
-       id="101"
-       group="1"
-       name="Hands_Relaxed"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="102"
-       group="1"
-       name="Hands_Point"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="103"
-       group="1"
-       name="Hands_Fist"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="666"
-       group="1"
-       name="Hands_Relaxed_L"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="667"
-       group="1"
-       name="Hands_Point_L"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="668"
-       group="1"
-       name="Hands_Fist_L"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="669"
-       group="1"
-       name="Hands_Relaxed_R"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="670"
-       group="1"
-       name="Hands_Point_R"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="671"
-       group="1"
-       name="Hands_Fist_R"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="672"
-       group="1"
-       name="Hands_Typing"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="766"
-       group="1"
-       name="Hands_Salute_R"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="791"
-       group="1"
-       name="Hands_Peace_R"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="792"
-       group="1"
-       name="Hands_Spread_R"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-<!--
-     #end morph targets
-      -->
-   </mesh>
-
-   <mesh
-    type="upperBodyMesh"
-	lod="1"
-    file_name="avatar_upper_body_1.llm"
-    min_pixel_width="160"
-    reference="avatar_upper_body.llm">
-   </mesh>
-
-   <mesh
-    type="upperBodyMesh"
-	lod="2"
-    file_name="avatar_upper_body_2.llm"
-    min_pixel_width="80"
-    reference="avatar_upper_body.llm">
-   </mesh>
-
-   <mesh
-    type="upperBodyMesh"
-	lod="3"
-    file_name="avatar_upper_body_3.llm"
-    min_pixel_width="40"
-    reference="avatar_upper_body.llm">
-   </mesh>
-
-   <mesh
-    type="upperBodyMesh"
-	lod="4"
-    file_name="avatar_upper_body_4.llm"
-	min_pixel_width="0"
-    reference="avatar_upper_body.llm">
-   </mesh>
-
-<!--
-    #upperBodyMesh2 =
-    #upperBodyMesh3 =
-    -->
-   <mesh
-    type="lowerBodyMesh"
-	lod="0"
-    file_name="avatar_lower_body.llm"
-    min_pixel_width="320">
-<!--
-        #begin morph targets
-        #############
-        # tweakable morphs
-        #############
-        -->
-      <param
-       id="156"
-       group="1"
-       name="Big_Belly_Legs"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="151"
-       group="1"
-       name="Big_Butt_Legs"
-       label="Butt Size"
-       wearable="shape"
-       edit_group="shape_legs"
-       label_min="Regular"
-       label_max="Large"
-       value_min="0"
-       value_max="1">
-         <param_morph>
-		 	<volume_morph
-				name="PELVIS"
-				scale="0.03 0.0 0.02"
-				pos="-0.03 0 -0.025"/>
-		 </param_morph>
-      </param>
-
-      <param
-       id="794"
-       group="1"
-       name="Small_Butt"
-       label="Butt Size"
-       wearable="shape"
-       edit_group="shape_legs"
-       label_min="Regular"
-       label_max="Small"
-       value_min="0"
-       value_max="1">
-         <param_morph>
- 		 	<volume_morph
-				name="PELVIS"
-				scale="-0.01 0.0 0.0"
-				pos="0.01 0 0.0"/>
-		 </param_morph>
-      </param>
-
-      <param
-       id="152"
-       group="1"
-       name="Muscular_Legs"
-       label="Leg Muscles"
-	   show_simple="true"
-       wearable="shape"
-       edit_group="shape_legs"
-       label_min="Regular Muscles"
-       label_max="More Muscles"
-       value_min="0"
-       value_max="1.5"
-       camera_distance="1.3"
-       camera_elevation="-.5">
-         <param_morph>
-		 	<volume_morph
-				name="L_UPPER_LEG"
-				scale="0.015 0.015 0.0"
-				pos="0.0 0 0.0"/>
-		 	<volume_morph
-				name="L_LOWER_LEG"
-				scale="0.01 0.01 0.0"
-				pos="0.0 0 0.0"/>
-		 	<volume_morph
-				name="R_UPPER_LEG"
-				scale="0.015 0.015 0.0"
-				pos="0.0 0 0.0"/>
-		 	<volume_morph
-				name="R_LOWER_LEG"
-				scale="0.01 0.01 0.0"
-				pos="0.0 0 0.0"/>
-		 </param_morph>
-      </param>
-
-      <param
-       id="651"
-       group="1"
-       name="Scrawny_Legs"
-       label="Scrawny Leg"
-       wearable="shape"
-       edit_group="shape_legs"
-       label_min="Regular Muscles"
-       label_max="Less Muscles"
-       value_min="0"
-       value_max="1.5"
-       camera_distance="1.3"
-       camera_elevation="-.5">
-         <param_morph>
-		 	<volume_morph
-				name="L_UPPER_LEG"
-				scale="-0.03 -0.03 0.0"
-				pos="0.0 0 0.0"/>
-		 	<volume_morph
-				name="L_LOWER_LEG"
-				scale="-0.015 -0.015 0.0"
-				pos="0.0 0 0.0"/>
-		 	<volume_morph
-				name="R_UPPER_LEG"
-				scale="-0.03 -0.03 0.0"
-				pos="0.0 0 0.0"/>
-		 	<volume_morph
-				name="R_LOWER_LEG"
-				scale="-0.015 -0.015 0.0"
-				pos="0.0 0 0.0"/>
-		 </param_morph>
-		</param>
-
-      <param
-       id="853"
-       group="1"
-       name="Bowed_Legs"
-       label="Knee Angle"
-       wearable="shape"
-       value_min="-1"
-       value_max="1">
-         <param_morph>
-		 	<volume_morph
-				name="L_UPPER_LEG"
-				pos="0.0 0.03 0.0"/>
-		 	<volume_morph
-				name="L_LOWER_LEG"
-				pos="0.0 0.03 0.0"/>
-		 	<volume_morph
-				name="R_UPPER_LEG"
-				pos="0.0 -0.03 0.0"/>
-		 	<volume_morph
-				name="R_LOWER_LEG"
-				pos="0.0 -0.03 0.0"/>
-		 </param_morph>
-      </param>
-
-      <param
-       id="500"
-       group="1"
-       name="Shoe_Heel_Height"
-       label="Heel Height"
-       wearable="shoes"
-       edit_group="shoes"
-       label_min="Low Heels"
-       label_max="High Heels"
-       value_min="0"
-       value_max="1"
-       camera_distance="1.5"
-       camera_elevation="-.5">
-         <param_morph />
-      </param>
-
-      <param
-       id="501"
-       group="1"
-       name="Shoe_Platform_Height"
-       label="Platform Height"
-       wearable="shoes"
-       edit_group="shoes"
-       label_min="Low Platforms"
-       label_max="High Platforms"
-       value_min="0"
-       value_max="1"
-       camera_distance="1.5"
-       camera_elevation="-.5">
-         <param_morph />
-      </param>
-
-      <param
-       id="508"
-       group="0"
-       name="Shoe_Platform_Width"
-       label="Platform Width"
-       wearable="shoes"
-       edit_group="shoes"
-       edit_group_order="7"
-       label_min="Narrow"
-       label_max="Wide"
-       value_min="-1"
-       value_max="2"
-       camera_angle="15"
-       camera_distance="1.5"
-       camera_elevation="-1">
-         <param_morph />
-      </param>
-
-      <param
-       id="509"
-       group="1"
-       name="Shoe_Heel_Point"
-       label="Heel Shape"
-       wearable="shoes"
-       edit_group="shoes"
-       label_min="Default Heels"
-       label_max="Pointy Heels"
-       value_min="0"
-       value_max="1"
-       camera_distance="1.3"
-       camera_elevation="-.5">
-         <param_morph />
-      </param>
-
-      <param
-       id="510"
-       group="1"
-       name="Shoe_Heel_Thick"
-       label="Heel Shape"
-       wearable="shoes"
-       edit_group="shoes"
-       label_min="default Heels"
-       label_max="Thick Heels"
-       value_min="0"
-       value_max="1"
-       camera_distance="1.3"
-       camera_elevation="-.5">
-         <param_morph />
-      </param>
-
-      <param
-       id="511"
-       group="1"
-       name="Shoe_Toe_Point"
-       label="Toe Shape"
-       wearable="shoes"
-       edit_group="shoes"
-       label_min="Default Toe"
-       label_max="Pointy Toe"
-       value_min="0"
-       value_max="1"
-       camera_distance="1.3"
-       camera_elevation="-.5">
-         <param_morph />
-      </param>
-
-      <param
-       id="512"
-       group="1"
-       name="Shoe_Toe_Square"
-       label="Toe Shape"
-       wearable="shoes"
-       edit_group="shoes"
-       label_min="Default Toe"
-       label_max="Square Toe"
-       value_min="0"
-       value_max="1"
-       camera_distance="1.5"
-       camera_elevation="-.5">
-         <param_morph />
-      </param>
-
-      <param
-       id="654"
-       group="0"
-       name="Shoe_Toe_Thick"
-       label="Toe Thickness"
-       wearable="shoes"
-       edit_group="shoes"
-       edit_group_order="5"
-       label_min="Flat Toe"
-       label_max="Thick Toe"
-       value_min="0"
-       value_max="2"
-       camera_angle="15"
-       camera_distance="1.5"
-       camera_elevation="-1">
-         <param_morph />
-      </param>
-
-      <param
-       id="515"
-       group="0"
-       name="Foot_Size"
-       label="Foot Size"
-       wearable="shape"
-       edit_group="shape_legs"
-       edit_group_order="6"
-       label_min="Small"
-       label_max="Big"
-       value_min="-1"
-       value_max="3"
-       camera_angle="45"
-       camera_distance="1.1"
-       camera_elevation="-1">
-         <param_morph>
-		 	<volume_morph
-				name="L_FOOT"
-				scale="0.02 0.01 0.0"
-				pos="0.01 0 0"/>
-		 	<volume_morph
-				name="R_FOOT"
-				scale="0.02 0.01 0.0"
-				pos="0.01 0 0"/>
-		</param_morph>
-	  </param>
-
-      <param
-       id="516"
-       group="1"
-       name="Displace_Loose_Lowerbody"
-       label="Pants Fit"
-       wearable="pants"
-       edit_group="driven"
-       clothing_morph="true"
-       value_min="0"
-       value_max="1"
-       value_default="0">
-         <param_morph />
-      </param>
-
-      <param
-       id="625"
-       group="0"
-       name="Leg_Pantflair"
-       label="Cuff Flare"
-	   show_simple="true"
-       wearable="pants"
-       edit_group="pants"
-       edit_group_order="3"
-       clothing_morph="true"
-       label_min="Tight Cuffs"
-       label_max="Flared Cuffs"
-       value_min="0"
-       value_max="1.5"
-       camera_distance="1.8"
-       camera_angle="30"
-       camera_elevation="-.3">
-         <param_morph />
-      </param>
-
-      <param
-       id="793"
-       group="1"
-       name="Leg_Longcuffs"
-       label="Longcuffs"
-       wearable="pants"
-       edit_group="driven"
-       clothing_morph="true"
-       value_min="0"
-       value_max="3"
-       value_default="0">
-         <param_morph />
-      </param>
-
-      <param
-       id="638"
-       group="0"
-       name="Low_Crotch"
-       label="Pants Crotch"
-       wearable="pants"
-       clothing_morph="true"
-       edit_group="pants"
-       edit_group_order="4"
-       label_min="High and Tight"
-       label_max="Low and Loose"
-       value_min="0"
-       value_max="1.3"
-       camera_distance="1.2"
-       camera_angle="-20"
-       camera_elevation="-.3">
-         <param_morph />
-      </param>
-
-      <param
-       id="635"
-       group="1"
-       name="Fat_Legs"
-       label="Fat Torso"
-       wearable="shape"
-       edit_group="shape_body"
-       label_min="skinny"
-       label_max="fat"
-       value_min="0"
-       value_max="1">
-         <param_morph>
-			<volume_morph
-				name="PELVIS"
-				scale="0.03 0.06 0.0"/>
-		 	<volume_morph
-				name="R_UPPER_LEG"
-				scale="0.02 0.02 0.0"
-				pos="0.0 -0.02 0.0"/>
-			<volume_morph
-				name="R_LOWER_LEG"
-				scale="0.01 0.01 0.0"/>
-		 	<volume_morph
-				name="L_UPPER_LEG"
-				scale="0.02 0.02 0.0"
-				pos="0.0 0.02 0.0"/>
-			<volume_morph
-				name="L_LOWER_LEG"
-				scale="0.01 0.01 0.0"/>
-		</param_morph>
-      </param>
-
-      <param
-       id="854"
-       group="1"
-       name="Saddlebags"
-       value_min="-.5"
-       value_max="3">
-        <param_morph>
-		 	<volume_morph
-				name="PELVIS"
-				scale="0.0 0.025 0.0"/>
-		</param_morph>
-
-      </param>
-
-      <param
-       id="879"
-       group="0"
-       sex="male"
-       name="Male_Package"
-       label="Package"
-       wearable="shape"
-       edit_group="shape_legs"
-       edit_group_order="4.6"
-       label_min="Coin Purse"
-       label_max="Duffle Bag"
-       value_default="0"
-       value_min="-.5"
-       value_max="2"
-       camera_angle="60"
-       camera_distance=".6">
-         <param_morph />
-      </param>
-
-<!--
-        #############
-        # other morphs (not user controlled)
-        #############
-        -->
-      <param
-       id="153"
-       group="1"
-       name="Male_Legs"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-<!--
-        #end morph targets
-        -->
-   </mesh>
-
-   <mesh
-    type="lowerBodyMesh"
-	lod="1"
-    file_name="avatar_lower_body_1.llm"
-    min_pixel_width="160"
-    reference="avatar_lower_body.llm">
-   </mesh>
-
-   <mesh
-    type="lowerBodyMesh"
-	lod="2"
-    file_name="avatar_lower_body_2.llm"
-    min_pixel_width="80"
-    reference="avatar_lower_body.llm">
-   </mesh>
-
-   <mesh
-    type="lowerBodyMesh"
-	lod="3"
-    file_name="avatar_lower_body_3.llm"
-    min_pixel_width="40"
-    reference="avatar_lower_body.llm">
-   </mesh>
-
-   <mesh
-    type="lowerBodyMesh"
-	lod="4"
-    file_name="avatar_lower_body_4.llm"
-	min_pixel_width="0"
-    reference="avatar_lower_body.llm">
-   </mesh>
-
-<!--
-    #lowerBodyMesh2 =
-    #lowerBodyMesh3 =
-    -->
-<!--
-    #eyeLidLeftMesh =
-    -->
-   <mesh
-    type="eyeBallLeftMesh"
-	lod="0"
-    file_name="avatar_eye.llm"
-    min_pixel_width="320">
-<!-- begin morph_params -->
-      <param
-       id="679"
-       group="1"
-       name="Eyeball_Size"
-       label="Eyeball Size"
-       wearable="shape"
-       edit_group="shape_eyes"
-       label_min="small eye"
-       label_max="big eye"
-       value_min="-.25"
-       value_max=".10">
-         <param_morph />
-      </param>
-
-      <param
-       id="687"
-       group="1"
-       name="Eyeball_Size"
-       label="Big Eyeball"
-       wearable="shape"
-       edit_group="shape_eyes"
-       label_min="small eye"
-       label_max="big eye"
-       value_min="-.25"
-       value_max=".25">
-         <param_morph />
-      </param>
-   </mesh>
-
-   <mesh
-    type="eyeBallLeftMesh"
-	lod="1"
-    file_name="avatar_eye_1.llm"
-    min_pixel_width="80">
-<!-- begin morph_params -->
-      <param
-       id="694"
-       group="1"
-       name="Eyeball_Size"
-       label="Eyeball Size"
-       wearable="shape"
-       edit_group="shape_eyes"
-       label_min="small eye"
-       label_max="big eye"
-       value_min="-.25"
-       value_max=".10">
-         <param_morph />
-      </param>
-
-      <param
-       id="695"
-       group="1"
-       name="Eyeball_Size"
-       label="Big Eyeball"
-       wearable="shape"
-       edit_group="shape_eyes"
-       label_min="small eye"
-       label_max="big eye"
-       value_min="-.25"
-       value_max=".25">
-         <param_morph />
-      </param>
-   </mesh>
-
-<!--
-    #eyeLidRightMesh =
-    -->
-   <mesh
-    type="eyeBallRightMesh"
-	lod="0"
-    file_name="avatar_eye.llm"
-    min_pixel_width="320">
-<!-- begin morph_params -->
-      <param
-       id="680"
-       group="1"
-       name="Eyeball_Size"
-       label="Eyeball Size"
-       wearable="shape"
-       label_min="small eye"
-       label_max="big eye"
-       value_min="-.25"
-       value_max=".10">
-         <param_morph />
-      </param>
-
-      <param
-       id="688"
-       group="1"
-       name="Eyeball_Size"
-       label="Big Eyeball"
-       wearable="shape"
-       label_min="small eye"
-       label_max="big eye"
-       value_min="-.25"
-       value_max=".25">
-         <param_morph />
-      </param>
-   </mesh>
-
-   <mesh
-    type="eyeBallRightMesh"
-	lod="1"
-    file_name="avatar_eye_1.llm"
-    min_pixel_width="80">
-<!-- begin morph_params -->
-      <param
-       id="681"
-       group="1"
-       name="Eyeball_Size"
-       label="Eyeball Size"
-       wearable="shape"
-       edit_group="shape_eyes"
-       label_min="small eye"
-       label_max="big eye"
-       value_min="-.25"
-       value_max=".10">
-         <param_morph />
-      </param>
-
-      <param
-       id="691"
-       group="1"
-       name="Eyeball_Size"
-       label="Big Eyeball"
-       wearable="shape"
-       edit_group="shape_eyes"
-       label_min="small eye"
-       label_max="big eye"
-       value_min="-.25"
-       value_max=".25">
-         <param_morph />
-      </param>
-   </mesh>
-
-   <mesh
-    type="skirtMesh"
-	lod="0"
-    file_name="avatar_skirt.llm"
-    min_pixel_width="320">
-      <param
-       id="845"
-       group="1"
-       name="skirt_poofy"
-       label="poofy skirt"
-       clothing_morph="true"
-       wearable="skirt"
-       edit_group="skirt"
-       label_min="less poofy"
-       label_max="more poofy"
-       value_min="0"
-       value_max="1.5">
-         <param_morph />
-      </param>
-
-      <param
-       id="846"
-       group="1"
-       name="skirt_loose"
-       label="loose skirt"
-       clothing_morph="true"
-       wearable="skirt"
-       edit_group="skirt"
-       label_min="form fitting"
-       label_max="loose"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="866"
-       group="1"
-       name="skirt_tight"
-       label="tight skirt"
-       clothing_morph="true"
-       wearable="skirt"
-       edit_group="skirt"
-       label_min="form fitting"
-       label_max="loose"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="867"
-       group="1"
-       name="skirt_smallbutt"
-       label="tight skirt"
-       clothing_morph="false"
-       wearable="skirt"
-       edit_group="skirt"
-       label_min="form fitting"
-       label_max="loose"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="848"
-       group="0"
-       name="skirt_bustle"
-       label="bustle skirt"
-       clothing_morph="true"
-       wearable="skirt"
-       edit_group_order="3"
-       edit_group="skirt"
-       label_min="no bustle"
-       label_max="more bustle"
-       value_min="0"
-       value_max="2"
-       value_default=".2"
-       camera_angle="100"
-       camera_distance="1.3"
-       camera_elevation="-.5">
-         <param_morph />
-      </param>
-
-      <param
-       id="847"
-       group="1"
-       name="skirt_bowlegs"
-       label="legs skirt"
-       wearable="skirt"
-       value_min="-1"
-       value_max="1"
-       value_default="0">
-	     <param_morph />
-	  </param>
-
-      <param
-       id="852"
-       group="1"
-       name="skirt_bigbutt"
-       label="bigbutt skirt"
-       label_min="less"
-       label_max="more"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="849"
-       group="1"
-       name="skirt_belly"
-       label="big belly skirt"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-
-      <param
-       id="850"
-       group="1"
-       name="skirt_saddlebags"
-       value_min="-.5"
-       value_max="3">
-         <param_morph />
-      </param>
-
-      <param
-       id="851"
-       group="1"
-       name="skirt_chubby"
-       label_min="less"
-       label_max="more"
-       value_min="0"
-       value_max="1"
-       value_default="0">
-         <param_morph />
-      </param>
-
-      <param
-       id="856"
-       group="1"
-       name="skirt_lovehandles"
-       label_min="less"
-       label_max="more"
-       value_min="-1"
-       value_max="2"
-       value_default="0">
-         <param_morph />
-      </param>
-
-<!--
-        #############
-        # other morphs (not user controlled)
-        #############
-        -->
-      <param
-       id="857"
-       group="1"
-       name="skirt_male"
-       value_min="0"
-       value_max="1">
-         <param_morph />
-      </param>
-   </mesh>
-
-   <mesh
-    type="skirtMesh"
-	lod="1"
-    file_name="avatar_skirt_1.llm"
-    min_pixel_width="160"
-    reference="avatar_skirt.llm">
-   </mesh>
-
-   <mesh
-    type="skirtMesh"
-	lod="2"
-    file_name="avatar_skirt_2.llm"
-    min_pixel_width="80"
-    reference="avatar_skirt.llm">
-   </mesh>
-
-   <mesh
-    type="skirtMesh"
-	lod="3"
-    file_name="avatar_skirt_3.llm"
-    min_pixel_width="40"
-    reference="avatar_skirt.llm">
-   </mesh>
-
-   <mesh
-    type="skirtMesh"
-	lod="4"
-    file_name="avatar_skirt_4.llm"
-	min_pixel_width="0"
-    reference="avatar_skirt.llm">
-   </mesh>
-
-<!-- =========================================================== -->
-   <global_color
-    name="skin_color">
-      <param
-       id="111"
-       group="0"
-       wearable="skin"
-       edit_group="skin_color"
-       edit_group_order="1"
-       name="Pigment"
-	   show_simple="true"
-       label_min="Light"
-       label_max="Dark"
-       value_min="0"
-       value_max="1"
-       value_default=".5">
-         <param_color>
-            <value
-             color="252, 215, 200, 255" />
-
-            <value
-             color="240, 177, 112, 255" />
-
-            <value
-             color="90, 40, 16, 255" />
-
-            <value
-             color="29, 9, 6, 255" />
-         </param_color>
-      </param>
-
-      <param
-       id="110"
-       group="0"
-       wearable="skin"
-       edit_group="skin_color"
-       edit_group_order="2"
-       name="Red Skin"
-       label="Ruddiness"
-       label_min="Pale"
-       label_max="Ruddy"
-       value_min="0"
-       value_max="0.1">
-         <param_color
-          operation="blend">
-            <value
-             color="218, 41, 37, 255" />
-         </param_color>
-      </param>
-
-      <param
-       id="108"
-       group="0"
-       wearable="skin"
-       edit_group="skin_color"
-       edit_group_order="3"
-       name="Rainbow Color"
-	   show_simple="true"
-       label_min="None"
-       label_max="Wild"
-       value_min="0"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".5">
-         <param_color>
-            <value
-             color=" 0, 0, 0, 255" />
-
-            <value
-             color="255, 0, 255, 255" />
-
-            <value
-             color="255, 0, 0, 255" />
-
-            <value
-             color="255, 255, 0, 255" />
-
-            <value
-             color=" 0, 255, 0, 255" />
-
-            <value
-             color=" 0, 255, 255, 255" />
-
-            <value
-             color=" 0, 0, 255, 255" />
-
-            <value
-             color="255, 0, 255, 255" />
-         </param_color>
-      </param>
-   </global_color>
-
-<!-- =========================================================== -->
-   <global_color
-    name="hair_color">
-      <param
-       id="114"
-       group="0"
-       wearable="hair"
-       edit_group="hair_color"
-       edit_group_order="3"
-       name="Blonde Hair"
-	   show_simple="true"
-       label_min="Black"
-       label_max="Blonde"
-       value_min="0"
-       value_max="1"
-       value_default=".5"
-       camera_elevation=".1"
-       camera_distance=".5">
-         <param_color>
-            <value
-             color="0, 0, 0, 255" />
-
-            <value
-             color="22, 6, 6, 255" />
-
-            <value
-             color="29, 9, 6, 255" />
-
-            <value
-             color="45, 21, 11, 255" />
-
-            <value
-             color="78, 39, 11, 255" />
-
-            <value
-             color="90, 53, 16, 255" />
-
-            <value
-             color="136, 92, 21, 255" />
-
-            <value
-             color="150, 106, 33, 255" />
-
-            <value
-             color="198, 156, 74, 255" />
-
-            <value
-             color="233, 192, 103, 255" />
-
-            <value
-             color="238, 205, 136, 255" />
-         </param_color>
-      </param>
-
-      <param
-       id="113"
-       group="0"
-       wearable="hair"
-       edit_group="hair_color"
-       edit_group_order="4"
-       name="Red Hair"
-	   show_simple="true"
-       label_min="No Red"
-       label_max="Very Red"
-       value_min="0"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".5">
-         <param_color>
-            <value
-             color="0, 0, 0, 255" />
-
-            <value
-             color="118, 47, 19, 255" />
-         </param_color>
-      </param>
-
-      <param
-       id="115"
-       group="0"
-       wearable="hair"
-       edit_group="hair_color"
-       edit_group_order="1"
-       name="White Hair"
-	   show_simple="true"
-       label_min="No White"
-       label_max="All White"
-       value_min="0"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".5">
-         <param_color>
-            <value
-             color="0, 0, 0, 255" />
-
-            <value
-             color="255, 255, 255, 255" />
-         </param_color>
-      </param>
-
-      <param
-       id="112"
-       group="0"
-       wearable="hair"
-       edit_group="hair_color"
-       edit_group_order="2"
-       name="Rainbow Color"
-	   show_simple="true"
-       label_min="None"
-       label_max="Wild"
-       value_min="0"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".5">
-         <param_color>
-            <value
-             color=" 0, 0, 0, 255" />
-
-            <value
-             color="255, 0, 255, 255" />
-
-            <value
-             color="255, 0, 0, 255" />
-
-            <value
-             color="255, 255, 0, 255" />
-
-            <value
-             color=" 0, 255, 0, 255" />
-
-            <value
-             color=" 0, 255, 255, 255" />
-
-            <value
-             color=" 0, 0, 255, 255" />
-
-            <value
-             color="255, 0, 255, 255" />
-         </param_color>
-      </param>
-   </global_color>
-
-<!-- =========================================================== -->
-   <global_color
-    name="eye_color">
-      <param
-       id="99"
-       group="0"
-       wearable="eyes"
-       edit_group="eyes"
-       edit_group_order="1"
-       name="Eye Color"
-	   show_simple="true"
-       label_min="Natural"
-       label_max="Unnatural"
-       value_min="0"
-       value_max="1"
-       value_default="0"
-       camera_elevation=".1"
-       camera_distance=".3">
-<!-- default to natural brown eyes-->
-         <param_color>
-            <value
-             color="50, 25, 5, 255" />
-
-<!-- natural dark brown eyes-->
-            <value
-             color="109, 55, 15, 255" />
-
-<!-- natural brown eyes-->
-            <value
-             color="150, 93, 49, 255" />
-
-<!-- natural light brown eyes-->
-            <value
-             color="152, 118, 25, 255" />
-
-<!--natural hazel eyes-->
-            <value
-             color="95, 179, 107, 255" />
-
-<!--natural green eyes-->
-            <value
-             color="87, 192, 191, 255" />
-
-<!--natural aqua eyes-->
-            <value
-             color="95, 172, 179, 255" />
-
-<!--natural blue eyes-->
-            <value
-             color="128, 128, 128, 255" />
-
-<!--natural grey eyes-->
-            <value
-             color="0, 0, 0, 255" />
-
-<!--black eyes-->
-            <value
-             color="255, 255, 0, 255" />
-
-<!--bright yellow eyes-->
-            <value
-             color=" 0, 255, 0, 255" />
-
-<!-- bright green eyes-->
-            <value
-             color=" 0, 255, 255, 255" />
-
-<!-- bright cyan eyes-->
-            <value
-             color=" 0, 0, 255, 255" />
-
-<!--bright blue eyes-->
-            <value
-             color="255, 0, 255, 255" />
-
-<!-- bright violet eyes-->
-            <value
-             color="255, 0, 0, 255" />
-
-<!--bright red eyes-->
-         </param_color>
-      </param>
-
-      <param
-       id="98"
-       group="0"
-       wearable="eyes"
-       edit_group="eyes"
-       edit_group_order="2"
-       name="Eye Lightness"
-	   show_simple="true"
-       label_min="Darker"
-       label_max="Lighter"
-       value_min="0"
-       value_max="1"
-       camera_elevation=".1"
-       camera_distance=".3">
-         <param_color>
-            <value
-             color="0, 0, 0, 0" />
-
-            <value
-             color="255, 255, 255, 255" />
-         </param_color>
-      </param>
-   </global_color>
-
-<!-- =========================================================== -->
-  <layer_set
-    body_region="hair"
-    width="512"
-    height="512"
-    clear_alpha="false">
-    <layer
-      name="base"
-      global_color="hair_color"
-      write_all_channels="true">
-      <texture
-       local_texture="hair_grain" />
-    </layer>
-
-    <layer
-       name="hair texture alpha layer"
-       visibility_mask="TRUE">
-      <texture
-         local_texture="hair_grain" />
-    </layer>
-
-    <layer
-       name="hair alpha"
-       visibility_mask="TRUE">
-      <texture
-         local_texture="hair_alpha" />
-    </layer>
-  </layer_set>
-  <!-- =========================================================== -->
-
-  <layer_set
-    body_region="head"
-    width="512"
-    height="512">
-		<layer
-		   name="head bump base"
-		   fixed_color = "128,128,128,255"
-		   render_pass="bump">
-		</layer>
-
-      <layer
-       name="head bump definition"
-       render_pass="bump">
-         
-		 <texture
-          tga_file="bump_head_base.tga" 
-		  file_is_mask="FALSE"/>
-
-         <param
-          id="873"
-          group="1"
-          wearable="skin"
-          edit_group="driven"
-          edit_group_order="12"
-          name="Bump base"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             domain="0" />
-         </param>
-      </layer>
-
-      <layer
-       name="base"
-       global_color="skin_color">
-         <texture
-          tga_file="head_skingrain.tga" />
-      </layer>
-
-      <layer
-       name="headcolor">
-         <texture
-          tga_file="head_color.tga" />
-      </layer>
-
-      <layer
-       name="shadow">
-         <texture
-          tga_file="head_shading_alpha.tga"
-          file_is_mask="TRUE" />
-
-         <param
-          id="158"
-          group="1"
-          wearable="skin"
-          name="Shading"
-          value_min="0"
-          value_max="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 0" />
-
-               <value
-                color="0, 0, 0, 128" />
-            </param_color>
-         </param>
-      </layer>
-
-      <layer
-       name="highlight">
-                  <texture
-                    tga_file="head_highlights_alpha.tga"
-          file_is_mask="TRUE" />
-
-
-         <param
-                    id="159"
-                    group="1"
-                    name="Shading"
-                    wearable="skin"
-                    value_min="0"
-          value_max="1">
-                        <param_color>
-                              <value
-                color="255, 255, 255, 0" />
-
-
-               <value
-                color="255, 255, 255, 64" />
-                        </param_color>
-                  </param>
-            </layer>	  
-      <layer
-       name="rosyface">
-         <texture
-          tga_file="rosyface_alpha.tga"
-          file_is_mask="true" />
-
-         <param
-          id="116"
-          group="0"
-          wearable="skin"
-          edit_group="skin_facedetail"
-          edit_group_order="4"
-          name="Rosy Complexion"
-          label_min="Less Rosy"
-          label_max="More Rosy"
-          value_min="0"
-          value_max="1"
-          camera_distance=".3"
-          camera_elevation=".07">
-            <param_color>
-               <value
-                color="198, 71, 71, 0" />
-
-               <value
-                color="198, 71, 71, 255" />
-            </param_color>
-         </param>
-      </layer>
-
-	  <layer
-       name="lips">
-         <texture
-          tga_file="lips_mask.tga"
-          file_is_mask="true" />
-
-         <param
-          id="117"
-          group="0"
-          wearable="skin"
-          edit_group="skin_facedetail"
-          edit_group_order="5"
-          name="Lip Pinkness"
-          label_min="Darker"
-          label_max="Pinker"
-          value_min="0"
-          value_max="1"
-          camera_distance=".25">
-            <param_color>
-               <value
-                color="220, 115, 115, 0" />
-
-               <value
-                color="220, 115, 115, 128" />
-            </param_color>
-         </param>
-      </layer>
-
-      <layer
-       name="wrinkles_shading"
-       render_pass="bump"
-       fixed_color="0,0,0,100">
-         <param
-          id="118"
-          group="1"
-          wearable="skin"
-          name="Wrinkles"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             tga_file="bump_face_wrinkles.tga"
-             skip_if_zero="true"
-             domain="0.3" />
-         </param>
-      </layer>
-
-<!--<layer
-       name="wrinkles_highlights"
-       fixed_color="255,255,255,64">
-         <param
-          id="128"
-          group="1"
-          name="Wrinkles"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             tga_file="head_wrinkles_highlights_alpha.tga"
-             skip_if_zero="true"
-             domain="0.3" />
-         </param>
-      </layer>-->
-      <layer
-              name="freckles"
-       fixed_color="120,47,20,128">
-                  <param
-                    id="165"
-                    group="0"
-                    wearable="skin"
-                    edit_group="skin_facedetail"
-                    edit_group_order="2"
-                    name="Freckles"
-                    label_min="Less"
-                    label_max="More"
-                    value_min="0"
-                    value_max="1"
-                    camera_distance=".3"
-          camera_elevation=".07">
-                        <param_alpha
-                          tga_file="freckles_alpha.tga"
-                          skip_if_zero="true"
-             domain="0.5" />
-                  </param>
-            </layer>
-            <layer
-       name="eyebrowsbump"
-       render_pass="bump">
-         <texture
-          tga_file="head_hair.tga"
-          file_is_mask="false" />
-
-         <param
-          id="1000"
-          group="1"
-          wearable="hair"
-          edit_group="driven"
-          name="Eyebrow Size Bump"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             tga_file="eyebrows_alpha.tga"
-             domain="0.1" />
-         </param>
-
-         <param
-          id="1002"
-          group="1"
-          wearable="hair"
-          edit_group="driven"
-          name="Eyebrow Density Bump"
-          value_min="0"
-          value_max="1">
-            <param_color>
-               <value
-                color="255,255,255,0" />
-
-               <value
-                color="255,255,255,255" />
-            </param_color>
-         </param>
-      </layer>
-
-      <layer
-       name="eyebrows"
-       global_color="hair_color">
-         <texture
-          tga_file="head_hair.tga"
-          file_is_mask="false" />
-
-         <param
-          id="1001"
-          group="1"
-          wearable="hair"
-          edit_group="hair_eyebrows"
-          name="Eyebrow Size"
-		  show_simple="true"
-          value_min="0"
-          value_max="1"
-          value_default="0.5">
-            <param_alpha
-             tga_file="eyebrows_alpha.tga"
-             domain="0.1" />
-         </param>
-
-         <param
-          id="1003"
-          group="1"
-          edit_group="driven"
-          name="Eyebrow Density"
-          value_min="0"
-          value_max="1">
-            <param_color
-             operation="multiply">
-               <value
-                color="255,255,255,0" />
-
-               <value
-                color="255,255,255,255" />
-            </param_color>
-         </param>
-      </layer>
-
-      <layer
-       name="lipstick">
-         <param
-          id="700"
-          group="0"
-          wearable="skin"
-          edit_group="skin_makeup"
-          edit_group_order="2"
-          name="Lipstick Color"
-          label_min="Pink"
-          label_max="Black"
-          value_min="0"
-          value_max="1"
-          value_default=".25"
-          camera_distance=".25">
-            <param_color>
-               <value
-                color="245,161,177,200" />
-
-               <value
-                color="216,37,67,200" />
-
-               <value
-                color="178,48,76,200" />
-
-               <value
-                color="68,0,11,200" />
-
-               <value
-                color="252,207,184,200" />
-
-               <value
-                color="241,136,106,200" />
-
-               <value
-                color="208,110,85,200" />
-
-               <value
-                color="106,28,18,200" />
-
-               <value
-                color="58,26,49,200" />
-
-               <value
-                color="14,14,14,200" />
-            </param_color>
-         </param>
-
-         <param
-          id="701"
-          group="0"
-          wearable="skin"
-          edit_group="skin_makeup"
-          edit_group_order="1"
-          name="Lipstick"
-          label_min="No Lipstick"
-          label_max="More Lipstick"
-          value_min="0"
-          value_max=".9"
-          value_default="0.0"
-          camera_distance=".25">
-            <param_alpha
-             tga_file="lipstick_alpha.tga"
-             skip_if_zero="true"
-             domain="0.05" />
-         </param>
-      </layer>
-
-      <layer
-       name="lipgloss"
-       fixed_color="255,255,255,190">
-         <param
-          id="702"
-          name="Lipgloss"
-          label_min="No Lipgloss"
-          label_max="Glossy"
-          wearable="skin"
-          edit_group="skin_makeup"
-          edit_group_order="3"
-          group="0"
-          value_min="0"
-          value_max="1"
-          camera_distance=".25">
-            <param_alpha
-             tga_file="lipgloss_alpha.tga"
-             skip_if_zero="true"
-             domain="0.2" />
-         </param>
-      </layer>
-
-      <layer
-       name="blush">
-         <param
-          id="704"
-          group="0"
-          wearable="skin"
-          edit_group="skin_makeup"
-          edit_group_order="4"
-          name="Blush"
-          label_min="No Blush"
-          label_max="More Blush"
-          value_min="0"
-          value_max=".9"
-          value_default="0"
-          camera_distance=".3"
-          camera_elevation=".07"
-          camera_angle="20">
-            <param_alpha
-             tga_file="blush_alpha.tga"
-             skip_if_zero="true"
-             domain="0.3" />
-         </param>
-
-         <param
-          id="705"
-          group="0"
-          wearable="skin"
-          edit_group="skin_makeup"
-          edit_group_order="5"
-          name="Blush Color"
-          label_min="Pink"
-          label_max="Orange"
-          value_min="0"
-          value_max="1"
-          value_default=".5"
-          camera_distance=".3"
-          camera_elevation=".07"
-          camera_angle="20">
-            <param_color>
-               <value
-                color="253,162,193,200" />
-
-               <value
-                color="247,131,152,200" />
-
-               <value
-                color="213,122,140,200" />
-
-               <value
-                color="253,152,144,200" />
-
-               <value
-                color="236,138,103,200" />
-
-               <value
-                color="195,128,122,200" />
-
-               <value
-                color="148,103,100,200" />
-
-               <value
-                color="168,95,62,200" />
-            </param_color>
-         </param>
-
-         <param
-          id="711"
-          group="0"
-          wearable="skin"
-          edit_group="skin_makeup"
-          edit_group_order="6"
-          name="Blush Opacity"
-          label_min="Clear"
-          label_max="Opaque"
-          value_min="0"
-          value_max="1"
-          value_default=".5"
-          camera_distance=".3"
-          camera_elevation=".07"
-          camera_angle="20">
-            <param_color
-             operation="multiply">
-               <value
-                color="255,255,255,0" />
-
-               <value
-                color="255,255,255,255" />
-            </param_color>
-         </param>
-      </layer>
-
-      <layer
-       name="Outer Eye Shadow">
-         <param
-          id="708"
-          group="0"
-          wearable="skin"
-          edit_group="skin_makeup"
-          edit_group_order="11"
-          name="Out Shdw Color"
-          label_min="Light"
-          label_max="Dark"
-          value_min="0"
-          value_max="1"
-          camera_distance=".3"
-          camera_elevation=".14">
-            <param_color>
-               <value
-                color="252,247,246,255" />
-
-               <value
-                color="255,206,206,255" />
-
-               <value
-                color="233,135,149,255" />
-
-               <value
-                color="220,168,192,255" />
-
-               <value
-                color="228,203,232,255" />
-
-               <value
-                color="255,234,195,255" />
-
-               <value
-                color="230,157,101,255" />
-
-               <value
-                color="255,147,86,255" />
-
-               <value
-                color="228,110,89,255" />
-
-               <value
-                color="228,150,120,255" />
-
-               <value
-                color="223,227,213,255" />
-
-               <value
-                color="96,116,87,255" />
-
-               <value
-                color="88,143,107,255" />
-
-               <value
-                color="194,231,223,255" />
-
-               <value
-                color="207,227,234,255" />
-
-               <value
-                color="41,171,212,255" />
-
-               <value
-                color="180,137,130,255" />
-
-               <value
-                color="173,125,105,255" />
-
-               <value
-                color="144,95,98,255" />
-
-               <value
-                color="115,70,77,255" />
-
-               <value
-                color="155,78,47,255" />
-
-               <value
-                color="239,239,239,255" />
-
-               <value
-                color="194,194,194,255" />
-
-               <value
-                color="120,120,120,255" />
-
-               <value
-                color="10,10,10,255" />
-            </param_color>
-         </param>
-
-         <param
-          id="706"
-          group="0"
-          wearable="skin"
-          edit_group="skin_makeup"
-          edit_group_order="12"
-          name="Out Shdw Opacity"
-          label_min="Clear"
-          label_max="Opaque"
-          value_min=".2"
-          value_max="1"
-          value_default=".6"
-          camera_distance=".3"
-          camera_elevation=".14">
-            <param_color
-             operation="multiply">
-               <value
-                color="255,255,255,0" />
-
-               <value
-                color="255,255,255,255" />
-            </param_color>
-         </param>
-
-         <param
-          id="707"
-          group="0"
-          wearable="skin"
-          edit_group="skin_makeup"
-          edit_group_order="10"
-          name="Outer Shadow"
-          label_min="No Eyeshadow"
-          label_max="More Eyeshadow"
-          value_min="0"
-          value_max=".7"
-          camera_distance=".3"
-          camera_elevation=".14">
-            <param_alpha
-             tga_file="eyeshadow_outer_alpha.tga"
-             skip_if_zero="true"
-             domain="0.05" />
-         </param>
-      </layer>
-
-      <layer
-       name="Inner Eye Shadow">
-         <param
-          id="712"
-          group="0"
-          wearable="skin"
-          edit_group="skin_makeup"
-          edit_group_order="8"
-          name="In Shdw Color"
-          label_min="Light"
-          label_max="Dark"
-          value_min="0"
-          value_max="1"
-          camera_distance=".3"
-          camera_elevation=".14">
-            <param_color>
-               <value
-                color="252,247,246,255" />
-
-               <value
-                color="255,206,206,255" />
-
-               <value
-                color="233,135,149,255" />
-
-               <value
-                color="220,168,192,255" />
-
-               <value
-                color="228,203,232,255" />
-
-               <value
-                color="255,234,195,255" />
-
-               <value
-                color="230,157,101,255" />
-
-               <value
-                color="255,147,86,255" />
-
-               <value
-                color="228,110,89,255" />
-
-               <value
-                color="228,150,120,255" />
-
-               <value
-                color="223,227,213,255" />
-
-               <value
-                color="96,116,87,255" />
-
-               <value
-                color="88,143,107,255" />
-
-               <value
-                color="194,231,223,255" />
-
-               <value
-                color="207,227,234,255" />
-
-               <value
-                color="41,171,212,255" />
-
-               <value
-                color="180,137,130,255" />
-
-               <value
-                color="173,125,105,255" />
-
-               <value
-                color="144,95,98,255" />
-
-               <value
-                color="115,70,77,255" />
-
-               <value
-                color="155,78,47,255" />
-
-               <value
-                color="239,239,239,255" />
-
-               <value
-                color="194,194,194,255" />
-
-               <value
-                color="120,120,120,255" />
-
-               <value
-                color="10,10,10,255" />
-            </param_color>
-         </param>
-
-         <param
-          id="713"
-          group="0"
-          wearable="skin"
-          edit_group="skin_makeup"
-          edit_group_order="9"
-          name="In Shdw Opacity"
-          label_min="Clear"
-          label_max="Opaque"
-          value_min=".2"
-          value_max="1"
-          value_default=".7"
-          camera_distance=".3"
-          camera_elevation=".14">
-            <param_color
-             operation="multiply">
-               <value
-                color="255,255,255,0" />
-
-               <value
-                color="255,255,255,255" />
-            </param_color>
-         </param>
-
-         <param
-          id="709"
-          group="0"
-          wearable="skin"
-          edit_group="skin_makeup"
-          edit_group_order="7"
-          name="Inner Shadow"
-          label_min="No Eyeshadow"
-          label_max="More Eyeshadow"
-          value_min="0"
-          value_max="1"
-          value_default="0"
-          camera_distance=".3"
-          camera_elevation=".14">
-            <param_alpha
-             tga_file="eyeshadow_inner_alpha.tga"
-             skip_if_zero="true"
-             domain="0.2" />
-         </param>
-      </layer>
-
-      <layer
-       name="eyeliner"
-       fixed_color="0,0,0,200">
-         <param
-          id="703"
-          group="0"
-          wearable="skin"
-          edit_group="skin_makeup"
-          edit_group_order="13"
-          name="Eyeliner"
-          label_min="No Eyeliner"
-          label_max="Full Eyeliner"
-          value_min="0"
-          value_max="1"
-          value_default="0.0"
-          camera_distance=".3"
-          camera_elevation=".14">
-            <param_alpha
-             tga_file="eyeliner_alpha.tga"
-             skip_if_zero="true"
-             domain="0.1" />
-         </param>
-
-         <param
-          id="714"
-          group="0"
-          wearable="skin"
-          edit_group="skin_makeup"
-          edit_group_order="14"
-          name="Eyeliner Color"
-          label_min="Dark Green"
-          label_max="Black"
-          value_min="0"
-          value_max="1"
-          camera_distance=".3"
-          camera_elevation=".14">
-            <param_color>
-               <value
-                color="24,98,40,250" />
-
-<!-- dark green -->
-               <value
-                color="9,100,127,250" />
-
-<!-- lt.aqua  blue -->
-               <value
-                color="61,93,134,250" />
-
-<!-- aqua  -->
-               <value
-                color="70,29,27,250" />
-
-<!--    dark brown -->
-               <value
-                color="115,75,65,250" />
-
-<!-- lt. brown  blue -->
-               <value
-                color="100,100,100,250" />
-
-<!-- grey -->
-               <value
-                color="91,80,74,250" />
-
-<!-- grey/brown  -->
-               <value
-                color="112,42,76,250" />
-
-<!-- plum -->
-               <value
-                color="14,14,14,250" />
-
-<!-- black -->
-            </param_color>
-         </param>
-      </layer>
-
-      <layer
-       name="facialhair bump"
-       render_pass="bump">
-         <texture
-          tga_file="head_hair.tga"
-          file_is_mask="false" />
-
-         <param
-          id="1004"
-          sex="male"
-          group="1"
-          wearable="hair"
-          edit_group="driven"
-          name="Sideburns bump"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             tga_file="facehair_sideburns_alpha.tga"
-             skip_if_zero="true"
-             domain="0.05" />
-         </param>
-
-         <param
-          id="1006"
-          sex="male"
-          group="1"
-          wearable="hair"
-          edit_group="driven"
-          name="Moustache bump"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             tga_file="facehair_moustache_alpha.tga"
-             skip_if_zero="true"
-             domain="0.05" />
-         </param>
-
-         <param
-          id="1008"
-          sex="male"
-          group="1"
-          wearable="hair"
-          edit_group="driven"
-          name="Soulpatch bump"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             tga_file="facehair_soulpatch_alpha.tga"
-             skip_if_zero="true"
-             domain="0.1" />
-         </param>
-
-         <param
-          id="1010"
-          sex="male"
-          group="1"
-          edit_group="driven"
-          wearable="hair"
-          name="Chin Curtains bump"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             tga_file="facehair_chincurtains_alpha.tga"
-             skip_if_zero="true"
-             domain="0.03" />
-         </param>
-
-         <param
-          id="1012"
-          group="1"
-          sex="male"
-          wearable="hair"
-          edit_group="driven"
-          name="5 O'Clock Shadow bump"
-          value_min="0"
-          value_max="1">
-            <param_color>
-               <value
-                color="255,255,255,255" />
-
-               <value
-                color="255,255,255,0" />
-            </param_color>
-         </param>
-      </layer>
-
-      <layer
-       name="facialhair"
-       global_color="hair_color">
-         <morph_mask
-          morph_name="Displace_Hair_Facial" />
-
-         <texture
-          tga_file="head_hair.tga"
-          file_is_mask="false" />
-
-         <param
-          id="1005"
-          sex="male"
-          group="1"
-          edit_group="driven"
-          name="Sideburns"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             tga_file="facehair_sideburns_alpha.tga"
-             skip_if_zero="true"
-             domain="0.05" />
-         </param>
-
-         <param
-          id="1007"
-          sex="male"
-          group="1"
-          edit_group="driven"
-          name="Moustache"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             tga_file="facehair_moustache_alpha.tga"
-             skip_if_zero="true"
-             domain="0.05" />
-         </param>
-
-         <param
-          id="1009"
-          sex="male"
-          group="1"
-          edit_group="driven"
-          name="Soulpatch"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             tga_file="facehair_soulpatch_alpha.tga"
-             skip_if_zero="true"
-             domain="0.1" />
-         </param>
-
-         <param
-          id="1011"
-          sex="male"
-          group="1"
-          edit_group="driven"
-          name="Chin Curtains"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             tga_file="facehair_chincurtains_alpha.tga"
-             skip_if_zero="true"
-             domain="0.03" />
-         </param>
-
-         <param
-          id="751"
-          group="1"
-          wearable="hair"
-          sex="male"
-          edit_group="hair_facial"
-          name="5 O'Clock Shadow"
-          label_min="Dense hair"
-          label_max="Shadow hair"
-          value_min="0"
-          value_max="1"
-          value_default="0.7"
-          camera_elevation=".1"
-          camera_distance=".3">
-            <param_color
-             operation="multiply">
-               <value
-                color="255,255,255,255" />
-
-               <value
-                color="255,255,255,30" />
-            </param_color>
-         </param>
-      </layer>
-
-   <layer
-       name="head_bodypaint">
-         <texture
-          local_texture="head_bodypaint" />
-      </layer>
-    <layer
-	   name="eyelash alpha"
-	   visibility_mask="TRUE">
-         <texture
-	      tga_file="head_alpha.tga"
-	      file_is_mask="TRUE" />
-    </layer>
-    <layer
-       name="head alpha"
-       visibility_mask="TRUE">
-         <texture
-          local_texture="head_alpha" />
-    </layer>
-    <layer
-       name="head_tattoo">
-        <texture local_texture="head_tattoo" />
-		<param id="1062" group="1" edit_group="colorpicker_driven" wearable="tattoo" 
-			name="tattoo_head_red" value_min="0" value_max="1" value_default="1">
-			<param_color>
-				<value color="0, 0, 0, 255" />
-				<value color="255, 0, 0, 255" />
-			</param_color>
-		</param>
-
-		<param id="1063" group="1" edit_group="colorpicker_driven" wearable="tattoo" 
-			name="tattoo_head_green" value_min="0" value_max="1" value_default="1">
-			<param_color>
-				<value color="0, 0, 0, 255" />
-				<value color="0, 255, 0, 255" />
-			</param_color>
-		</param>
-
-		<param id="1064" group="1" edit_group="colorpicker_driven" wearable="tattoo" 
-			name="tattoo_head_blue" value_min="0" value_max="1" value_default="1">
-			<param_color>
-				<value color="0, 0, 0, 255" />
-				<value color="0, 0, 255, 255" />
-			</param_color>
-		</param>
-    </layer>
-</layer_set>
-
-<!-- =========================================================== -->
-   <layer_set
-    body_region="upper_body"
-    width="512"
-    height="512">
-      <layer
-       name="base_upperbody bump"
-       render_pass="bump"
-       fixed_color="128,128,128,255">
-      </layer>
-      <layer
-       name="upperbody bump definition"
-       render_pass="bump">
-   		 <texture
-          tga_file="bump_upperbody_base.tga" 
-		  file_is_mask="FALSE"/>
-
-         <param
-          id="874"
-          group="1"
-          wearable="skin"
-          edit_group="driven"
-          edit_group_order="20"
-          name="Bump upperdef"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             domain="0" />
-         </param>
-      </layer>
-
-      <layer
-       name="base"
-       global_color="skin_color">
-         <texture
-          tga_file="body_skingrain.tga" />
-      </layer>
-
-      <layer
-       name="nipples">
-         <texture
-          tga_file="upperbody_color.tga" />
-      </layer>
-
-      <layer
-       name="shadow">
-         <texture
-          tga_file="upperbody_shading_alpha.tga"
-          file_is_mask="TRUE" />
-
-         <param
-          id="125"
-          group="1"
-          name="Shading"
-          wearable="skin"
-          value_min="0"
-          value_max="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 0" />
-
-               <value
-                color="0, 0, 0, 128" />
-            </param_color>
-         </param>
-      </layer>
-
-      <layer
-       name="highlight">
-         <texture
-          tga_file="upperbody_highlights_alpha.tga"
-          file_is_mask="TRUE" />
-
-         <param
-          id="126"
-          group="1"
-          wearable="skin"
-          name="Shading"
-          value_min="0"
-          value_max="1">
-            <param_color>
-               <value
-                color="255, 255, 255, 0" />
-
-               <value
-                color="255, 255, 255, 64" />
-            </param_color>
-         </param>
-      </layer>
-
-      <layer
-       name="upper_bodypaint">
-         <texture
-          local_texture="upper_bodypaint" />
-      </layer>
-
-      <layer
-       name="freckles upper"
-       fixed_color="120,47,20,128">
-         <param
-          id="776"
-          group="1"
-          name="freckles upper"
-          wearable="skin"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             tga_file="upperbodyfreckles_alpha.tga"
-             skip_if_zero="true"
-             domain="0.6" />
-         </param>
-      </layer>
-
-      <layer name="upper_tattoo">
-        <texture local_texture="upper_tattoo" />
-		<param id="1065" group="1" edit_group="colorpicker_driven" wearable="tattoo" 
-			name="tattoo_upper_red" value_min="0" value_max="1" value_default="1">
-			<param_color>
-				<value color="0, 0, 0, 255" />
-				<value color="255, 0, 0, 255" />
-			</param_color>
-			</param>
-
-			<param id="1066" group="1" edit_group="colorpicker_driven" wearable="tattoo" 
-				name="tattoo_upper_green" value_min="0" value_max="1" value_default="1">
-				<param_color>
-					<value color="0, 0, 0, 255" />
-					<value color="0, 255, 0, 255" />
-				</param_color>
-			</param>
-
-			<param id="1067" group="1" edit_group="colorpicker_driven" wearable="tattoo" 
-				name="tattoo_upper_blue" value_min="0" value_max="1" value_default="1">
-				<param_color>
-					<value color="0, 0, 0, 255" />
-					<value color="0, 0, 255, 255" />
-				</param_color>
-			</param>
-      </layer>
-
-      <layer
-       name="upper_undershirt bump"
-       render_pass="bump"
-       fixed_color="128,128,128,255">
-         <texture
-          local_texture="upper_undershirt"
-          local_texture_alpha_only="true" />
-
-         <param
-          id="1043"
-          group="1"
-          wearable="undershirt"
-          edit_group="driven"
-          name="Sleeve Length bump"
-          value_min=".01"
-          value_max="1"
-          value_default=".4">
-            <param_alpha
-             tga_file="shirt_sleeve_alpha.tga"
-             multiply_blend="false"
-             domain="0.01" />
-         </param>
-
-         <param
-          id="1045"
-          group="1"
-          wearable="undershirt"
-          edit_group="undershirt"
-          edit_group_order="2"
-          name="Bottom bump"
-          value_min="0"
-          value_max="1"
-          value_default=".8">
-            <param_alpha
-             tga_file="shirt_bottom_alpha.tga"
-             multiply_blend="true"
-             domain="0.05" />
-         </param>
-
-         <param
-          id="1047"
-          group="1"
-          wearable="undershirt"
-          edit_group="driven"
-          name="Collar Front bump"
-          value_min="0"
-          value_max="1"
-          value_default=".8">
-            <param_alpha
-             tga_file="shirt_collar_alpha.tga"
-             multiply_blend="true"
-             domain="0.05" />
-         </param>
-
-         <param
-          id="1049"
-          group="1"
-          wearable="undershirt"
-          edit_group="driven"
-          name="Collar Back bump"
-          value_min="0"
-          value_max="1"
-          value_default=".8">
-            <param_alpha
-             tga_file="shirt_collar_back_alpha.tga"
-             multiply_blend="true"
-             domain="0.05" />
-         </param>
-      </layer>
-
-      <layer
-       name="upper_undershirt">
-         <texture
-          local_texture="upper_undershirt" />
-
-         <param
-          id="821"
-          group="0"
-          wearable="undershirt"
-          edit_group="colorpicker"
-          name="undershirt_red"
-          value_min="0"
-          value_max="1"
-          value_default="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 255" />
-
-               <value
-                color="255, 0, 0, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="822"
-          group="0"
-          wearable="undershirt"
-          edit_group="colorpicker"
-          name="undershirt_green"
-          value_min="0"
-          value_max="1"
-          value_default="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 255" />
-
-               <value
-                color="0, 255, 0, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="823"
-          group="0"
-          wearable="undershirt"
-          edit_group="colorpicker"
-          name="undershirt_blue"
-          value_min="0"
-          value_max="1"
-          value_default="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 255" />
-
-               <value
-                color="0, 0, 255, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="1042"
-          group="1"
-          wearable="undershirt"
-          edit_group="driven"
-          name="Sleeve Length"
-          value_min=".01"
-          value_max="1"
-          value_default=".4">
-            <param_alpha
-             tga_file="shirt_sleeve_alpha.tga"
-             multiply_blend="false"
-             domain="0.01" />
-         </param>
-
-         <param
-          id="1044"
-          group="1"
-          wearable="undershirt"
-          edit_group="driven"
-          name="Bottom"
-          value_min="0"
-          value_max="1"
-          value_default=".8">
-            <param_alpha
-             tga_file="shirt_bottom_alpha.tga"
-             multiply_blend="true"
-             domain="0.05" />
-         </param>
-
-         <param
-          id="1046"
-          group="1"
-          wearable="undershirt"
-          edit_group="driven"
-          name="Collar Front"
-          value_min="0"
-          value_max="1"
-          value_default=".8">
-            <param_alpha
-             tga_file="shirt_collar_alpha.tga"
-             multiply_blend="true"
-             domain="0.05" />
-         </param>
-
-         <param
-          id="1048"
-          group="1"
-          wearable="undershirt"
-          edit_group="driven"
-          name="Collar Back"
-          label_min="Low"
-          label_max="High"
-          value_min="0"
-          value_max="1"
-          value_default=".8">
-            <param_alpha
-             tga_file="shirt_collar_back_alpha.tga"
-             multiply_blend="true"
-             domain="0.05" />
-         </param>
-      </layer>
-
-      <layer
-       name="Nail Polish">
-         <param
-          id="710"
-          group="0"
-          wearable="skin"
-          edit_group="skin_makeup"
-          edit_group_order="15"
-          name="Nail Polish"
-          label_min="No Polish"
-          label_max="Painted Nails"
-          value_min="0"
-          value_max="1"
-          value_default="0.0"
-          camera_distance="1.6"
-          camera_elevation="-.4"
-          camera_angle="70">
-            <param_alpha
-             tga_file="nailpolish_alpha.tga"
-             skip_if_zero="true"
-             domain="0.1" />
-         </param>
-
-         <param
-          id="715"
-          group="0"
-          wearable="skin"
-          edit_group="skin_makeup"
-          edit_group_order="16"
-          name="Nail Polish Color"
-          label_min="Pink"
-          label_max="Black"
-          value_min="0"
-          value_max="1"
-          camera_distance="1.6"
-          camera_elevation="-.4"
-          camera_angle="70">
-            <param_color>
-               <value
-                color="255,187,200,255" />
-
-               <value
-                color="194,102,127,255" />
-
-               <value
-                color="227,34,99,255" />
-
-               <value
-                color="168,41,60,255" />
-
-               <value
-                color="97,28,59,255" />
-
-               <value
-                color="234,115,93,255" />
-
-               <value
-                color="142,58,47,255" />
-
-               <value
-                color="114,30,46,255" />
-
-               <value
-                color="14,14,14,255" />
-            </param_color>
-         </param>
-      </layer>
-
-      <layer
-       name="upper_gloves bump"
-       render_pass="bump"
-       fixed_color="128,128,128,255">
-         <texture
-          local_texture="upper_gloves"
-          local_texture_alpha_only="true" />
-
-         <param
-          id="1059"
-          group="1"
-          wearable="gloves"
-          edit_group="driven"
-          name="Glove Length bump"
-          value_min=".01"
-          value_max="1"
-          value_default=".8">
-            <param_alpha
-             tga_file="glove_length_alpha.tga"
-             domain="0.01" />
-         </param>
-
-         <param
-          id="1061"
-          group="1"
-          wearable="gloves"
-          edit_group="driven"
-          name="Glove Fingers bump"
-          value_min=".01"
-          value_max="1"
-          value_default="1">
-            <param_alpha
-             tga_file="gloves_fingers_alpha.tga"
-             multiply_blend="true"
-             domain="0.01" />
-         </param>
-      </layer>
-
-      <layer
-       name="upper_gloves">
-         <texture
-          local_texture="upper_gloves" />
-
-         <param
-          id="827"
-          group="0"
-          wearable="gloves"
-          edit_group="colorpicker"
-          name="gloves_red"
-          value_min="0"
-          value_max="1"
-          value_default="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 255" />
-
-               <value
-                color="255, 0, 0, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="829"
-          group="0"
-          wearable="gloves"
-          edit_group="colorpicker"
-          name="gloves_green"
-          value_min="0"
-          value_max="1"
-          value_default="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 255" />
-
-               <value
-                color="0, 255, 0, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="830"
-          group="0"
-          wearable="gloves"
-          edit_group="colorpicker"
-          name="gloves_blue"
-          value_min="0"
-          value_max="1"
-          value_default="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 255" />
-
-               <value
-                color="0, 0, 255, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="1058"
-          group="1"
-          wearable="gloves"
-          edit_group="driven"
-          name="Glove Length"
-          value_min=".01"
-          value_max="1"
-          value_default=".8">
-            <param_alpha
-             tga_file="glove_length_alpha.tga"
-             domain="0.01" />
-         </param>
-
-         <param
-          id="1060"
-          group="1"
-          wearable="gloves"
-          edit_group="driven"
-          name="Glove Fingers"
-          value_min=".01"
-          value_max="1"
-          value_default="1">
-            <param_alpha
-             tga_file="gloves_fingers_alpha.tga"
-             multiply_blend="true"
-             domain="0.01" />
-         </param>
-      </layer>
-
-      <layer
-       name="upper_clothes_shadow">
-         <texture
-          local_texture="upper_shirt" />
-
-         <param
-          id="899"
-          group="1"
-          edit_group="driven"
-          wearable="shirt"
-          name="Upper Clothes Shading"
-          value_min="0"
-          value_max="1"
-          value_default="0">
-            <param_color>
-               <value
-                color="0, 0, 0, 0" />
-
-               <value
-                color="0, 0, 0, 80" />
-            </param_color>
-         </param>
-
-         <param
-          id="900"
-          group="1"
-          wearable="shirt"
-          edit_group="driven"
-          name="Sleeve Length Shadow"
-          value_min="0.02"
-          value_max=".87"
-          value_default="0.02">
-            <param_alpha
-             multiply_blend="false"
-             tga_file="shirt_sleeve_alpha.tga"
-             skip_if_zero="true"
-             domain="0.03" />
-         </param>
-
-         <param
-          id="901"
-          group="1"
-          wearable="shirt"
-          edit_group="driven"
-          name="Shirt Shadow Bottom"
-          value_min="0.02"
-          value_max="1">
-            <param_alpha
-             multiply_blend="true"
-             tga_file="shirt_bottom_alpha.tga"
-             skip_if_zero="true"
-             domain="0.05" />
-         </param>
-
-         <param
-          id="902"
-          group="1"
-          wearable="shirt"
-          edit_group="driven"
-          name="Collar Front Shadow Height"
-          value_min="0.02"
-          value_max="1">
-            <param_alpha
-             multiply_blend="true"
-             tga_file="shirt_collar_alpha.tga"
-             skip_if_zero="true"
-             domain="0.02" />
-         </param>
-
-         <param
-          id="903"
-          group="1"
-          wearable="shirt"
-          edit_group="driven"
-          name="Collar Back Shadow Height"
-          value_min="0.02"
-          value_max="1">
-            <param_alpha
-             multiply_blend="true"
-             tga_file="shirt_collar_back_alpha.tga"
-             skip_if_zero="true"
-             domain="0.02" />
-         </param>
-      </layer>
-
-      <layer
-       name="upper_shirt base bump"
-       render_pass="bump"
-       fixed_color="128,128,128,255">
-         <texture
-          local_texture="upper_shirt"
-          local_texture_alpha_only="true" />
-
-         <param
-          id="1029"
-          group="1"
-          wearable="shirt"
-          edit_group="driven"
-          name="Sleeve Length Cloth"
-          value_min="0"
-          value_max="0.85">
-            <param_alpha
-             multiply_blend="false"
-             tga_file="shirt_sleeve_alpha.tga"
-             domain="0.01" />
-         </param>
-
-         <param
-          id="1030"
-          group="1"
-          wearable="shirt"
-          edit_group="driven"
-          name="Shirt Bottom Cloth"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             multiply_blend="true"
-             tga_file="shirt_bottom_alpha.tga"
-             domain="0.05" />
-         </param>
-
-         <param
-          id="1031"
-          group="1"
-          wearable="shirt"
-          edit_group="driven"
-          name="Collar Front Height Cloth"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             multiply_blend="true"
-             tga_file="shirt_collar_alpha.tga"
-             domain="0.05" />
-         </param>
-
-         <param
-          id="1032"
-          group="1"
-          wearable="shirt"
-          edit_group="driven"
-          name="Collar Back Height Cloth"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             multiply_blend="true"
-             tga_file="shirt_collar_back_alpha.tga"
-             domain="0.05" />
-         </param>
-      </layer>
-
-      <layer
-       name="upper_clothes bump"
-       render_pass="bump">
-         <texture
-          tga_file="bump_shirt_wrinkles.tga" />
-
-         <texture
-          local_texture="upper_shirt"
-          local_texture_alpha_only="true" />
-
-         <param
-          id="868"
-          group="0"
-          wearable="shirt"
-          edit_group="shirt"
-          edit_group_order="8"
-          name="Shirt Wrinkles"
-          value_min="0"
-          value_max="1"
-          value_default="0">
-            <param_color>
-               <value
-                color="255, 255, 255, 0" />
-
-               <value
-                color="255, 255, 255, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="1013"
-          group="1"
-          wearable="shirt"
-          edit_group="driven"
-          name="Sleeve Length Cloth"
-          value_min="0"
-          value_max="0.85">
-            <param_alpha
-             multiply_blend="false"
-             tga_file="shirt_sleeve_alpha.tga"
-             domain="0.01" />
-         </param>
-
-         <param
-          id="1014"
-          group="1"
-          wearable="shirt"
-          edit_group="driven"
-          name="Shirt Bottom Cloth"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             multiply_blend="true"
-             tga_file="shirt_bottom_alpha.tga"
-             domain="0.05" />
-         </param>
-
-         <param
-          id="1015"
-          group="1"
-          wearable="shirt"
-          edit_group="driven"
-          name="Collar Front Height Cloth"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             multiply_blend="true"
-             tga_file="shirt_collar_alpha.tga"
-             domain="0.05" />
-         </param>
-
-         <param
-          id="1016"
-          group="1"
-          wearable="shirt"
-          edit_group="driven"
-          name="Collar Back Height Cloth"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             multiply_blend="true"
-             tga_file="shirt_collar_back_alpha.tga"
-             domain="0.05" />
-         </param>
-      </layer>
-
-      <layer
-       name="upper_clothes">
-         <texture
-          local_texture="upper_shirt" />
-
-         <morph_mask
-          morph_name="Displace_Loose_Upperbody" />
-
-         <morph_mask
-          morph_name="Shirtsleeve_flair" />
-
-         <param
-          id="803"
-          group="0"
-          wearable="shirt"
-          edit_group="colorpicker"
-          name="shirt_red"
-          value_min="0"
-          value_max="1"
-          value_default="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 255" />
-
-               <value
-                color="255, 0, 0, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="804"
-          group="0"
-          wearable="shirt"
-          edit_group="colorpicker"
-          name="shirt_green"
-          value_min="0"
-          value_max="1"
-          value_default="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 255" />
-
-               <value
-                color="0, 255, 0, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="805"
-          group="0"
-          wearable="shirt"
-          edit_group="colorpicker"
-          name="shirt_blue"
-          value_min="0"
-          value_max="1"
-          value_default="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 255" />
-
-               <value
-                color="0, 0, 255, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="600"
-          group="1"
-          wearable="shirt"
-          edit_group="driven"
-          name="Sleeve Length Cloth"
-          value_min="0"
-          value_max="0.85"
-          value_default=".7">
-            <param_alpha
-             multiply_blend="false"
-             tga_file="shirt_sleeve_alpha.tga"
-             domain="0.01" />
-         </param>
-
-         <param
-          id="601"
-          group="1"
-          wearable="shirt"
-          edit_group="driven"
-          name="Shirt Bottom Cloth"
-          value_min="0"
-          value_max="1"
-          value_default=".8">
-            <param_alpha
-             multiply_blend="true"
-             tga_file="shirt_bottom_alpha.tga"
-             domain="0.05" />
-         </param>
-
-         <param
-          id="602"
-          group="1"
-          wearable="shirt"
-          edit_group="driven"
-          name="Collar Front Height Cloth"
-          value_min="0"
-          value_max="1"
-          value_default=".8">
-            <param_alpha
-             multiply_blend="true"
-             tga_file="shirt_collar_alpha.tga"
-             domain="0.05" />
-         </param>
-
-         <param
-          id="778"
-          group="1"
-          wearable="shirt"
-          edit_group="driven"
-          name="Collar Back Height Cloth"
-          value_min="0"
-          value_max="1"
-          value_default=".8">
-            <param_alpha
-             multiply_blend="true"
-             tga_file="shirt_collar_back_alpha.tga"
-             domain="0.05" />
-         </param>
-      </layer>
-
-      <layer
-       name="upper_jacket base bump"
-       render_pass="bump"
-       fixed_color="128,128,128,255">
-         <texture
-          local_texture="upper_jacket"
-          local_texture_alpha_only="true" />
-
-         <param
-          id="1039"
-          group="1"
-          wearable="jacket"
-          edit_group="driven"
-          edit_group_order="1"
-          name="Jacket Sleeve Length bump"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             multiply_blend="false"
-             tga_file="shirt_sleeve_alpha.tga"
-             domain="0.01" />
-         </param>
-
-         <param
-          id="1040"
-          group="1"
-          wearable="jacket"
-          edit_group="driven"
-          name="Jacket Collar Front bump"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             multiply_blend="true"
-             tga_file="shirt_collar_alpha.tga"
-             domain="0.05" />
-         </param>
-
-         <param
-          id="1041"
-          group="1"
-          wearable="jacket"
-          edit_group="driven"
-          edit_group_order="3.5"
-          name="Jacket Collar Back bump"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             multiply_blend="true"
-             tga_file="shirt_collar_back_alpha.tga"
-             domain="0.05" />
-         </param>
-
-         <param
-          id="1037"
-          group="1"
-          wearable="jacket"
-          edit_group="driven"
-          name="jacket bottom length upper bump"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             multiply_blend="true"
-             tga_file="jacket_length_upper_alpha.tga"
-             domain="0.01" />
-         </param>
-
-         <param
-          id="1038"
-          group="1"
-          wearable="jacket"
-          edit_group="driven"
-          name="jacket open upper bump"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             multiply_blend="true"
-             tga_file="jacket_open_upper_alpha.tga"
-             domain="0.01" />
-         </param>
-      </layer>
-
-      <layer
-       name="upper_jacket bump"
-       render_pass="bump">
-         <texture
-          tga_file="bump_shirt_wrinkles.tga" />
-
-         <texture
-          local_texture="upper_jacket"
-          local_texture_alpha_only="true" />
-          
-          <param
-          id="875"
-          group="1"
-          wearable="jacket"
-          name="jacket upper Wrinkles"
-          value_min="0"
-          value_max="1"
-          value_default="0">
-            <param_color>
-               <value
-                color="255, 255, 255, 0" />
-
-               <value
-                color="255, 255, 255, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="1019"
-          group="1"
-          wearable="jacket"
-          edit_group="driven"
-          edit_group_order="1"
-          name="Jacket Sleeve Length bump"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             multiply_blend="false"
-             tga_file="shirt_sleeve_alpha.tga"
-             domain="0.01" />
-         </param>
-
-         <param
-          id="1021"
-          group="1"
-          wearable="jacket"
-          edit_group="driven"
-          name="Jacket Collar Front bump"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             multiply_blend="true"
-             tga_file="shirt_collar_alpha.tga"
-             domain="0.05" />
-         </param>
-
-         <param
-          id="1023"
-          group="1"
-          wearable="jacket"
-          edit_group="driven"
-          edit_group_order="3.5"
-          name="Jacket Collar Back bump"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             multiply_blend="true"
-             tga_file="shirt_collar_back_alpha.tga"
-             domain="0.05" />
-         </param>
-
-         <param
-          id="1025"
-          group="1"
-          wearable="jacket"
-          edit_group="driven"
-          name="jacket bottom length upper bump"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             multiply_blend="true"
-             tga_file="jacket_length_upper_alpha.tga"
-             domain="0.01" />
-         </param>
-
-         <param
-          id="1026"
-          group="1"
-          wearable="jacket"
-          edit_group="driven"
-          name="jacket open upper bump"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             multiply_blend="true"
-             tga_file="jacket_open_upper_alpha.tga"
-             domain="0.01" />
-         </param>
-      </layer>
-
-      <layer
-       name="upper_jacket">
-         <texture
-          local_texture="upper_jacket" />
-
-         <param
-          id="831"
-          group="1"
-          edit_group="colorpicker_driven"
-          wearable="jacket"
-          name="upper_jacket_red"
-          value_min="0"
-          value_max="1"
-          value_default="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 255" />
-
-               <value
-                color="255, 0, 0, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="832"
-          group="1"
-          edit_group="colorpicker_driven"
-          wearable="jacket"
-          name="upper_jacket_green"
-          value_min="0"
-          value_max="1"
-          value_default="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 255" />
-
-               <value
-                color="0, 255, 0, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="833"
-          group="1"
-          edit_group="colorpicker_driven"
-          wearable="jacket"
-          name="upper_jacket_blue"
-          value_min="0"
-          value_max="1"
-          value_default="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 255" />
-
-               <value
-                color="0, 0, 255, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="1020"
-          group="1"
-          edit_group="driven"
-          name="jacket Sleeve Length"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             multiply_blend="false"
-             tga_file="shirt_sleeve_alpha.tga"
-             domain="0.01" />
-         </param>
-
-         <param
-          id="1022"
-          group="1"
-          edit_group="driven"
-          name="jacket Collar Front"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             multiply_blend="true"
-             tga_file="shirt_collar_alpha.tga"
-             domain="0.05" />
-         </param>
-
-         <param
-          id="1024"
-          group="1"
-          edit_group="driven"
-          edit_group_order="3.5"
-          name="jacket Collar Back"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             multiply_blend="true"
-             tga_file="shirt_collar_back_alpha.tga"
-             domain="0.05" />
-         </param>
-
-         <param
-          id="620"
-          group="1"
-          wearable="jacket"
-          edit_group="jacket"
-          name="bottom length upper"
-          label_min="hi cut"
-          label_max="low cut"
-          value_min="0"
-          value_max="1"
-          value_default=".8"
-          camera_distance="1.2"
-          camera_angle="30"
-          camera_elevation=".2">
-            <param_alpha
-             multiply_blend="true"
-             tga_file="jacket_length_upper_alpha.tga"
-             domain="0.01" />
-         </param>
-
-         <param
-          id="622"
-          group="1"
-          wearable="jacket"
-          edit_group="jacket"
-          name="open upper"
-          label_min="closed"
-          label_max="open"
-          value_min="0"
-          value_max="1"
-          value_default=".8"
-          camera_distance="1.2"
-          camera_angle="30"
-          camera_elevation=".2">
-            <param_alpha
-             multiply_blend="true"
-             tga_file="jacket_open_upper_alpha.tga"
-             domain="0.01" />
-         </param>
-      </layer>
-
-      <layer
-       name="upper alpha"
-       visibility_mask="TRUE">
-        <texture
-         local_texture="upper_alpha" />
-      </layer>
-
-   </layer_set>
-
-<!-- =========================================================== -->
-   <layer_set
-    body_region="lower_body"
-    width="512"
-    height="512">
-		<layer
-		   name="lower body bump base"
-		   fixed_color = "128,128,128,255"
-		   render_pass="bump">
-		</layer>
-      <layer
-       name="base_lowerbody bump"
-       render_pass="bump">
-         <texture
-          tga_file="bump_lowerbody_base.tga"
-		  file_is_mask="FALSE" />
-
-         <param
-          id="878"
-          group="1"
-          wearable="skin"
-          edit_group="driven"
-          edit_group_order="20"
-          name="Bump upperdef"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             domain="0" />
-         </param>
-      </layer>
-
-      <layer
-       name="base"
-       global_color="skin_color">
-         <texture
-          tga_file="body_skingrain.tga" />
-      </layer>
-
-      <layer
-       name="shadow">
-         <texture
-          tga_file="lowerbody_shading_alpha.tga"
-          file_is_mask="TRUE" />
-
-         <param
-          id="160"
-          group="1"
-          name="Shading"
-          wearable="pants"
-          value_min="0"
-          value_max="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 0" />
-
-               <value
-                color="0, 0, 0, 128" />
-            </param_color>
-         </param>
-      </layer>
-
-      <layer
-       name="highlight">
-         <texture
-          tga_file="lowerbody_highlights_alpha.tga"
-          file_is_mask="TRUE" />
-
-         <param
-          id="161"
-          group="1"
-          name="Shading"
-          wearable="skin"
-          value_min="0"
-          value_max="1">
-            <param_color>
-               <value
-                color="255, 255, 255, 0" />
-
-               <value
-                color="255, 255, 255, 64" />
-            </param_color>
-         </param>
-      </layer>
-
-	  <layer
-       name="toenails">
-         <texture
-          tga_file="lowerbody_color.tga" />
-      </layer>
-
-      <layer
-       name="lower_bodypaint">
-         <texture
-          local_texture="lower_bodypaint" />
-      </layer>
-
-      <layer
-       name="freckles lower"
-       fixed_color="120,47,20,128">
-         <param
-          id="777"
-          group="1"
-          name="freckles lower"
-          wearable="skin"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             tga_file="bodyfreckles_alpha.tga"
-             skip_if_zero="true"
-             domain="0.6" />
-         </param>
-      </layer>
-
-      <layer
-       name="lower_tattoo">
-         <texture local_texture="lower_tattoo" />
-		 <param id="1068" group="1" edit_group="colorpicker_driven" wearable="tattoo" 
-			name="tattoo_lower_red" value_min="0" value_max="1" value_default="1">
-			<param_color>
-				<value color="0, 0, 0, 255" />
-				<value color="255, 0, 0, 255" />
-			</param_color>
-			</param>
-
-			<param id="1069" group="1" edit_group="colorpicker_driven" wearable="tattoo" 
-				name="tattoo_lower_green" value_min="0" value_max="1" value_default="1">
-				<param_color>
-					<value color="0, 0, 0, 255" />
-					<value color="0, 255, 0, 255" />
-				</param_color>
-			</param>
-
-			<param id="1070" group="1" edit_group="colorpicker_driven" wearable="tattoo" 
-				name="tattoo_lower_blue" value_min="0" value_max="1" value_default="1">
-				<param_color>
-					<value color="0, 0, 0, 255" />
-					<value color="0, 0, 255, 255" />
-				</param_color>
-			</param>
-      </layer>
-
-      <layer
-       name="lower_underpants bump"
-       render_pass="bump"
-       fixed_color="128,128,128,255">
-         <texture
-          local_texture="lower_underpants"
-          local_texture_alpha_only="true" />
-
-         <param
-          id="1055"
-          group="1"
-          wearable="underpants"
-          edit_group="underpants"
-          name="Pants Length"
-          value_min="0"
-          value_max="1"
-          value_default=".3">
-            <param_alpha
-             tga_file="pants_length_alpha.tga"
-             domain="0.01" />
-         </param>
-
-         <param
-          id="1057"
-          group="1"
-          wearable="underpants"
-          edit_group="underpants"
-          name="Pants Waist"
-          value_min="0"
-          value_max="1"
-          value_default=".8">
-            <param_alpha
-             tga_file="pants_waist_alpha.tga"
-             domain="0.05" />
-         </param>
-      </layer>
-
-      <layer
-       name="lower_underpants">
-         <texture
-          local_texture="lower_underpants" />
-
-         <param
-          id="824"
-          group="0"
-          wearable="underpants"
-          edit_group="colorpicker"
-          name="underpants_red"
-          value_min="0"
-          value_max="1"
-          value_default="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 255" />
-
-               <value
-                color="255, 0, 0, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="825"
-          group="0"
-          wearable="underpants"
-          edit_group="colorpicker"
-          name="underpants_green"
-          value_min="0"
-          value_max="1"
-          value_default="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 255" />
-
-               <value
-                color="0, 255, 0, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="826"
-          group="0"
-          wearable="underpants"
-          edit_group="colorpicker"
-          name="underpants_blue"
-          value_min="0"
-          value_max="1"
-          value_default="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 255" />
-
-               <value
-                color="0, 0, 255, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="1054"
-          group="1"
-          wearable="underpants"
-          edit_group="driven"
-          name="Pants Length"
-          value_min="0"
-          value_max="1"
-          value_default=".3"
-          camera_distance="1.2"
-          camera_angle="30"
-          camera_elevation="-.3">
-            <param_alpha
-             tga_file="pants_length_alpha.tga"
-             domain="0.01" />
-         </param>
-
-         <param
-          id="1056"
-          group="1"
-          wearable="underpants"
-          edit_group="driven"
-          name="Pants Waist"
-          value_min="0"
-          value_max="1"
-          value_default=".8">
-            <param_alpha
-             tga_file="pants_waist_alpha.tga"
-             domain="0.05" />
-         </param>
-      </layer>
-
-      <layer
-       name="lower_socks bump"
-       render_pass="bump"
-       fixed_color="128,128,128,255">
-         <texture
-          local_texture="lower_socks"
-          local_texture_alpha_only="true" />
-
-         <param
-          id="1051"
-          group="1"
-          wearable="socks"
-          edit_group="driven"
-          name="Socks Length bump"
-          value_min="0"
-          value_max="1"
-          value_default="0.35">
-            <param_alpha
-             tga_file="shoe_height_alpha.tga"
-             domain="0.01" />
-         </param>
-      </layer>
-
-      <layer
-       name="lower_socks">
-         <texture
-          local_texture="lower_socks" />
-
-         <param
-          id="818"
-          group="0"
-          wearable="socks"
-          edit_group="colorpicker"
-          name="socks_red"
-          value_min="0"
-          value_max="1"
-          value_default="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 255" />
-
-               <value
-                color="255, 0, 0, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="819"
-          group="0"
-          wearable="socks"
-          edit_group="colorpicker"
-          name="socks_green"
-          value_min="0"
-          value_max="1"
-          value_default="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 255" />
-
-               <value
-                color="0, 255, 0, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="820"
-          group="0"
-          wearable="socks"
-          edit_group="colorpicker"
-          name="socks_blue"
-          value_min="0"
-          value_max="1"
-          value_default="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 255" />
-
-               <value
-                color="0, 0, 255, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="1050"
-          group="1"
-          wearable="socks"
-          edit_group="driven"
-          name="Socks Length bump"
-          value_min="0"
-          value_max="1"
-          value_default="0.35">
-            <param_alpha
-             tga_file="shoe_height_alpha.tga"
-             domain="0.01" />
-         </param>
-      </layer>
-
-      <layer
-       name="lower_shoes bump"
-       render_pass="bump"
-       fixed_color="128,128,128,255">
-         <texture
-          local_texture="lower_shoes"
-          local_texture_alpha_only="true" />
-
-         <param
-          id="1053"
-          group="1"
-          wearable="shoes"
-          edit_group="driven"
-          name="Shoe Height bump"
-          value_min="0"
-          value_max="1"
-          value_default="0.1">
-            <param_alpha
-             tga_file="shoe_height_alpha.tga"
-             domain="0.01" />
-         </param>
-      </layer>
-
-      <layer
-       name="lower_shoes">
-         <texture
-          local_texture="lower_shoes" />
-
-         <param
-          id="812"
-          group="0"
-          wearable="shoes"
-          edit_group="colorpicker"
-          name="shoes_red"
-          value_min="0"
-          value_max="1"
-          value_default="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 255" />
-
-               <value
-                color="255, 0, 0, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="813"
-          group="0"
-          wearable="shoes"
-          edit_group="colorpicker"
-          name="shoes_green"
-          value_min="0"
-          value_max="1"
-          value_default="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 255" />
-
-               <value
-                color="0, 255, 0, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="817"
-          group="0"
-          wearable="shoes"
-          edit_group="colorpicker"
-          name="shoes_blue"
-          value_min="0"
-          value_max="1"
-          value_default="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 255" />
-
-               <value
-                color="0, 0, 255, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="1052"
-          group="1"
-          wearable="shoes"
-          edit_group="driven"
-          name="Shoe Height"
-          value_min="0"
-          value_max="1"
-          value_default="0.1">
-            <param_alpha
-             tga_file="shoe_height_alpha.tga"
-             domain="0.01" />
-         </param>
-      </layer>
-
-      <layer
-       name="lower_clothes_shadow">
-         <texture
-          local_texture="lower_pants" />
-
-         <param
-          id="913"
-          group="1"
-          edit_group="driven"
-          wearable="pants"
-          name="Lower Clothes Shading"
-          value_min="0"
-          value_max="1"
-          value_default="0">
-            <param_color>
-               <value
-                color="0, 0, 0, 0" />
-
-               <value
-                color="0, 0, 0, 80" />
-            </param_color>
-         </param>
-
-         <param
-          id="914"
-          group="1"
-          edit_group="driven"
-          wearable="pants"
-          name="Waist Height Shadow"
-          value_min="0.02"
-          value_max="1">
-            <param_alpha
-             tga_file="pants_waist_alpha.tga"
-             skip_if_zero="true"
-             domain="0.04" />
-         </param>
-
-         <param
-          id="915"
-          group="1"
-          edit_group="driven"
-          wearable="pants"
-          name="Pants Length Shadow"
-          value_min="0.02"
-          value_max="1">
-            <param_alpha
-             tga_file="pants_length_alpha.tga"
-             skip_if_zero="true"
-             domain="0.03" />
-         </param>
-      </layer>
-
-      <layer
-       name="lower_pants base bump"
-       render_pass="bump"
-       fixed_color="128,128,128,255">
-         <texture
-          local_texture="lower_pants"
-          local_texture_alpha_only="true" />
-
-         <param
-          id="1035"
-          group="1"
-          edit_group="driven"
-          wearable="pants"
-          name="Waist Height Cloth"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             tga_file="pants_waist_alpha.tga"
-             domain="0.05" />
-         </param>
-
-         <param
-          id="1036"
-          group="1"
-          edit_group="driven"
-          wearable="pants"
-          name="Pants Length Cloth"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             tga_file="pants_length_alpha.tga"
-             domain="0.01" />
-         </param>
-      </layer>
-
-      <layer
-       name="lower_pants bump"
-       render_pass="bump">
-         <texture
-          tga_file="bump_pants_wrinkles.tga" />
-
-         <texture
-          local_texture="lower_pants"
-          local_texture_alpha_only="true" />
-
-         <param
-          id="869"
-          group="0"
-          wearable="pants"
-          edit_group="pants"
-          edit_group_order="6"
-          name="Pants Wrinkles"
-          value_min="0"
-          value_max="1"
-          value_default="0">
-            <param_color>
-               <value
-                color="255, 255, 255, 0" />
-
-               <value
-                color="255, 255, 255, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="1017"
-          group="1"
-          edit_group="driven"
-          wearable="pants"
-          name="Waist Height Cloth"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             tga_file="pants_waist_alpha.tga"
-             domain="0.05" />
-         </param>
-
-         <param
-          id="1018"
-          group="1"
-          edit_group="driven"
-          wearable="pants"
-          name="Pants Length Cloth"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             tga_file="pants_length_alpha.tga"
-             domain="0.01" />
-         </param>
-      </layer>
-
-      <layer
-       name="lower_pants">
-         <texture
-          local_texture="lower_pants" />
-
-         <morph_mask
-          morph_name="Displace_Loose_Lowerbody" />
-
-         <morph_mask
-          morph_name="Leg_Pantflair" />
-
-         <morph_mask
-          morph_name="Low_Crotch" />
-
-         <morph_mask
-          morph_name="Leg_Longcuffs" />
-
-         <param
-          id="806"
-          group="0"
-          wearable="pants"
-          edit_group="colorpicker"
-          name="pants_red"
-          value_min="0"
-          value_max="1"
-          value_default="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 255" />
-
-               <value
-                color="255, 0, 0, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="807"
-          group="0"
-          wearable="pants"
-          edit_group="colorpicker"
-          name="pants_green"
-          value_min="0"
-          value_max="1"
-          value_default="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 255" />
-
-               <value
-                color="0, 255, 0, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="808"
-          group="0"
-          wearable="pants"
-          edit_group="colorpicker"
-          name="pants_blue"
-          value_min="0"
-          value_max="1"
-          value_default="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 255" />
-
-               <value
-                color="0, 0, 255, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="614"
-          group="1"
-          edit_group="driven"
-          wearable="pants"
-          name="Waist Height Cloth"
-          value_min="0"
-          value_max="1"
-          value_default=".8">
-            <param_alpha
-             tga_file="pants_waist_alpha.tga"
-             domain="0.05" />
-         </param>
-
-         <param
-          id="615"
-          group="1"
-          edit_group="driven"
-          wearable="pants"
-          name="Pants Length Cloth"
-          value_min="0"
-          value_max="1"
-          value_default=".8">
-            <param_alpha
-             tga_file="pants_length_alpha.tga"
-             domain="0.01" />
-         </param>
-      </layer>
-
-      <layer
-       name="lower_jacket base bump"
-       render_pass="bump"
-       fixed_color="128,128,128,255">
-         <texture
-          local_texture="lower_jacket"
-          local_texture_alpha_only="true" />
-
-         <param
-          id="1033"
-          group="1"
-          wearable="jacket"
-          edit_group="driven"
-          name="jacket bottom length lower bump"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             multiply_blend="false"
-             tga_file="jacket_length_lower_alpha.tga"
-             domain="0.01" />
-         </param>
-
-         <param
-          id="1034"
-          group="1"
-          wearable="jacket"
-          edit_group="driven"
-          name="jacket open lower bump"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             multiply_blend="true"
-             tga_file="jacket_open_lower_alpha.tga"
-             domain="0.01" />
-         </param>
-      </layer>
-
-      <layer
-       name="lower_jacket bump"
-       render_pass="bump">
-         <texture
-          tga_file="bump_pants_wrinkles.tga" />
-
-         <texture
-          local_texture="lower_jacket"
-          local_texture_alpha_only="true" />
-          
-         <param
-          id="876"
-          group="1"
-          wearable="jacket"
-          name="jacket upper Wrinkles"
-          value_min="0"
-          value_max="1"
-          value_default="0">
-            <param_color>
-               <value
-                color="255, 255, 255, 0" />
-
-               <value
-                color="255, 255, 255, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="1027"
-          group="1"
-          wearable="jacket"
-          edit_group="driven"
-          name="jacket bottom length lower bump"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             multiply_blend="false"
-             tga_file="jacket_length_lower_alpha.tga"
-             domain="0.01" />
-         </param>
-
-         <param
-          id="1028"
-          group="1"
-          wearable="jacket"
-          edit_group="driven"
-          name="jacket open lower bump"
-          value_min="0"
-          value_max="1">
-            <param_alpha
-             multiply_blend="true"
-             tga_file="jacket_open_lower_alpha.tga"
-             domain="0.01" />
-         </param>
-      </layer>
-
-      <layer
-       name="lower_jacket">
-         <texture
-          local_texture="lower_jacket" />
-
-         <param
-          id="809"
-          group="1"
-          edit_group="colorpicker_driven"
-          wearable="jacket"
-          name="lower_jacket_red"
-          value_min="0"
-          value_max="1"
-          value_default="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 255" />
-
-               <value
-                color="255, 0, 0, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="810"
-          group="1"
-          edit_group="colorpicker_driven"
-          wearable="jacket"
-          name="lower_jacket_green"
-          value_min="0"
-          value_max="1"
-          value_default="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 255" />
-
-               <value
-                color="0, 255, 0, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="811"
-          group="1"
-          edit_group="colorpicker_driven"
-          wearable="jacket"
-          name="lower_jacket_blue"
-          value_min="0"
-          value_max="1"
-          value_default="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 255" />
-
-               <value
-                color="0, 0, 255, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="621"
-          group="1"
-          wearable="jacket"
-          edit_group="jacket"
-          name="bottom length lower"
-          label_min="hi cut"
-          label_max="low cut"
-          value_min="0"
-          value_max="1"
-          value_default=".8"
-          camera_distance="1.2"
-          camera_angle="30"
-          camera_elevation=".2">
-            <param_alpha
-             multiply_blend="false"
-             tga_file="jacket_length_lower_alpha.tga"
-             domain="0.01" />
-         </param>
-
-         <param
-          id="623"
-          group="1"
-          wearable="jacket"
-          edit_group="jacket"
-          name="open lower"
-          label_min="open"
-          label_max="closed"
-          value_min="0"
-          value_max="1"
-          value_default=".8"
-          camera_distance="1.2"
-          camera_angle="30"
-          camera_elevation=".2">
-            <param_alpha
-             multiply_blend="true"
-             tga_file="jacket_open_lower_alpha.tga"
-             domain="0.01" />
-         </param>
-      </layer>
-
-      <layer
-       name="lower alpha"
-       visibility_mask="TRUE">
-         <texture
-          local_texture="lower_alpha" />
-      </layer>
-
-   </layer_set>
-
-<!-- =========================================================== -->
-   <layer_set
-    body_region="eyes"
-    width="128"
-    height="128">
-      <layer
-       name="whites">
-         <texture
-          tga_file="eyewhite.tga" />
-      </layer>
-
-      <layer
-       name="iris"
-       global_color="eye_color">
-         <texture
-          local_texture="eyes_iris" />
-      </layer>
-
-      <layer
-       name="eyes alpha"
-       visibility_mask="TRUE">
-         <texture
-          local_texture="eyes_alpha" />
-      </layer>
-
-   </layer_set>
-
-<!-- =========================================================== -->
-   <layer_set
-    body_region="skirt"
-    width="512"
-    height="512"
-    clear_alpha="false">
-      <layer
-       name="skirt_fabric"
-       write_all_channels="true">
-         <texture
-          local_texture="skirt" />
-
-         <param
-          id="921"
-          group="0"
-          wearable="skirt"
-          edit_group="colorpicker"
-          name="skirt_red"
-          value_min="0"
-          value_max="1"
-          value_default="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 255" />
-
-               <value
-                color="255, 0, 0, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="922"
-          group="0"
-          wearable="skirt"
-          edit_group="colorpicker"
-          name="skirt_green"
-          value_min="0"
-          value_max="1"
-          value_default="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 255" />
-
-               <value
-                color="0, 255, 0, 255" />
-            </param_color>
-         </param>
-
-         <param
-          id="923"
-          group="0"
-          wearable="skirt"
-          edit_group="colorpicker"
-          name="skirt_blue"
-          value_min="0"
-          value_max="1"
-          value_default="1">
-            <param_color>
-               <value
-                color="0, 0, 0, 255" />
-
-               <value
-                color="0, 0, 255, 255" />
-            </param_color>
-         </param>
-      </layer>
-
-      <layer
-       name="skirt_fabric_alpha">
-         <param
-          id="858"
-          group="0"
-          wearable="skirt"
-          edit_group="skirt"
-          edit_group_order="1"
-          name="Skirt Length"
-		  show_simple="true"
-          label_min="Short"
-          label_max="Long"
-          value_min=".01"
-          value_max="1"
-          value_default=".4"
-		  simple_percent_min="40"
-		  simple_percent_max="100"
-          camera_distance="1.3"
-          camera_elevation="-.5"
-          camera_angle="30">
-            <param_alpha
-             tga_file="skirt_length_alpha.tga"
-             domain="0"
-             multiply_blend="true" />
-         </param>
-
-         <param
-          id="859"
-          group="0"
-          wearable="skirt"
-          edit_group="skirt"
-          edit_group_order="4"
-          name="Slit Front"
-          label_min="Open Front"
-          label_max="Closed Front"
-          value_min="0"
-          value_max="1"
-          value_default="1"
-          camera_distance="1.3"
-          camera_elevation="-.5"
-          camera_angle="30">
-            <param_alpha
-             tga_file="skirt_slit_front_alpha.tga"
-             multiply_blend="true"
-             domain="0" />
-         </param>
-
-         <param
-          id="860"
-          group="0"
-          wearable="skirt"
-          edit_group="skirt"
-          edit_group_order="5"
-          name="Slit Back"
-          label_min="Open Back"
-          label_max="Closed Back"
-          value_min="0"
-          value_max="1"
-          value_default="1"
-          camera_distance="1.3"
-          camera_elevation="-.5"
-          camera_angle="160">
-            <param_alpha
-             tga_file="skirt_slit_back_alpha.tga"
-             multiply_blend="true"
-             domain="0" />
-         </param>
-
-         <param
-          id="861"
-          group="0"
-          wearable="skirt"
-          edit_group="skirt"
-          edit_group_order="6"
-          name="Slit Left"
-          label_min="Open Left"
-          label_max="Closed Left"
-          value_min="0"
-          value_max="1"
-          value_default="1"
-          camera_distance="1.3"
-          camera_elevation="-.5"
-          camera_angle="30">
-            <param_alpha
-             tga_file="skirt_slit_left_alpha.tga"
-             multiply_blend="true"
-             domain="0" />
-         </param>
-
-         <param
-          id="862"
-          group="0"
-          wearable="skirt"
-          edit_group="skirt"
-          edit_group_order="7"
-          name="Slit Right"
-          label_min="Open Right"
-          label_max="Closed Right"
-          value_min="0"
-          value_max="1"
-          value_default="1"
-          camera_distance="1.3"
-          camera_elevation="-.5"
-          camera_angle="-30">
-            <param_alpha
-             tga_file="skirt_slit_right_alpha.tga"
-             multiply_blend="true"
-             domain="0" />
-         </param>
-      </layer>
-   </layer_set>
-
-<!-- =========================================================== -->
-   <driver_parameters>
-      <param
-       id="828"
-       group="0"
-       name="Loose Upper Clothing"
-       label="Shirt Fit"
-	   show_simple="true"
-       wearable="shirt"
-       edit_group="shirt"
-       edit_group_order="4"
-       label_min="Tight Shirt"
-       label_max="Loose Shirt"
-       value_min="0"
-       value_max="1"
-       camera_distance="1.2"
-       camera_angle="30"
-       camera_elevation=".2">
-         <param_driver>
-            <driven
-             id="628" />
-
-            <driven
-             id="899"
-             min1="0.1"
-             max1="0.5"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="816"
-       group="0"
-       name="Loose Lower Clothing"
-       label="Pants Fit"
-	   show_simple="true"
-       wearable="pants"
-       edit_group="pants"
-       edit_group_order="2.5"
-       label_min="Tight Pants"
-       label_max="Loose Pants"
-       value_min="0"
-       value_max="1"
-       camera_distance="1.8"
-       camera_angle="30"
-       camera_elevation="-.3">
-         <param_driver>
-            <driven
-             id="516" />
-
-            <driven
-             id="913"
-             min1="0.1"
-             max1="0.5"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="814"
-       group="0"
-       wearable="pants"
-       edit_group="pants"
-       edit_group_order="2"
-       name="Waist Height"
-       label_min="Low"
-       label_max="High"
-       value_min="0"
-       value_max="1"
-       value_default="1"
-       camera_distance="1.2"
-       camera_angle="30"
-       camera_elevation="-.3">
-         <param_driver>
-            <driven
-             id="614" />
-
-            <driven
-             id="1017" />
-
-            <driven
-             id="1033" />
-
-            <driven
-             id="914"
-             min1="0"
-             max1=".98"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="815"
-       group="0"
-       wearable="pants"
-       edit_group="pants"
-       edit_group_order="1"
-       name="Pants Length"
-	   show_simple="true"
-       label_min="Short"
-       label_max="Long"
-       value_min="0"
-       value_max="1"
-       value_default=".8"
-	   simple_percent_min="20"
-	   simple_percent_max="100"
-       camera_distance="1.8"
-       camera_angle="30"
-       camera_elevation="-.3">
-         <param_driver>
-            <driven
-             id="615"
-             min1="0"
-             max1=".9"
-             max2="1"
-             min2="1" />
-
-            <driven
-             id="1018"
-             min1="0"
-             max1=".9"
-             max2="1"
-             min2="1" />
-
-            <driven
-             id="1036"
-             min1="0"
-             max1=".9"
-             max2="1"
-             min2="1" />
-
-            <driven
-             id="793"
-             min1=".9"
-             max1="1"
-             max2="1"
-             min2="1" />
-
-            <driven
-             id="915"
-             min1="0"
-             max1=".882"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="800"
-       group="0"
-       wearable="shirt"
-       edit_group="shirt"
-       edit_group_order="1"
-       name="Sleeve Length"
-	   show_simple="true"
-       label_min="Short"
-       label_max="Long"
-       value_min="0"
-       value_max="1"
-       value_default=".89"
-	   simple_percent_min="15"
-	   simple_percent_max="100"
-       camera_distance="1.2"
-       camera_angle="30"
-       camera_elevation=".2">
-         <param_driver>
-            <driven
-             id="600" />
-
-            <driven
-             id="1013" />
-
-            <driven
-             id="1029" />
-
-            <driven
-             id="900"
-             min1="0"
-             max1="1"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="801"
-       group="0"
-       wearable="shirt"
-       edit_group="shirt"
-       edit_group_order="2"
-       name="Shirt Bottom"
-       label_min="Short"
-       label_max="Long"
-       value_min="0"
-       value_max="1"
-       value_default="1"
-       camera_distance="1.2"
-       camera_angle="30"
-       camera_elevation=".2">
-         <param_driver>
-            <driven
-             id="601" />
-
-            <driven
-             id="1014" />
-
-            <driven
-             id="1030" />
-
-            <driven
-             id="901"
-             min1="0"
-             max1=".98"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="802"
-       group="0"
-       wearable="shirt"
-       edit_group="shirt"
-       edit_group_order="3"
-       name="Collar Front"
-	   show_simple="true"
-       label_min="Low"
-       label_max="High"
-       value_min="0"
-       value_max="1"
-       value_default=".78"
-	   simple_percent_min="40"
-	   simple_percent_max="100"
-       camera_distance="1.2"
-       camera_angle="15"
-       camera_elevation=".2">
-         <param_driver>
-            <driven
-             id="602" />
-
-            <driven
-             id="1015" />
-
-            <driven
-             id="1031" />
-
-            <driven
-             id="902"
-             min1="0"
-             max1=".98"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="781"
-       group="0"
-       wearable="shirt"
-       edit_group="shirt"
-       edit_group_order="3.1"
-       name="Collar Back"
-       label_min="Low"
-       label_max="High"
-       value_min="0"
-       value_max="1"
-       value_default=".78"
-       camera_distance="1.2"
-       camera_angle="195"
-       camera_elevation=".2">
-         <param_driver>
-            <driven
-             id="778" />
-
-            <driven
-             id="1016" />
-
-            <driven
-             id="1032" />
-
-            <driven
-             id="903"
-             min1="0"
-             max1=".98"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="150"
-       group="0"
-       wearable="skin"
-       edit_group="skin_bodydetail"
-       name="Body Definition"
-       label_min="Less"
-       label_max="More"
-       value_min="0"
-       value_max="1"
-       value_default="0"
-       camera_distance="1.4"
-       camera_elevation="-.2">
-         <param_driver>
-            <driven
-             id="125" />
-
-            <driven
-             id="126" />
-
-            <driven
-             id="160" />
-
-            <driven
-             id="161" />
-
-            <driven
-             id="874" />
-
-            <driven
-             id="878" />
-
-         </param_driver>
-      </param>
-
-      <param
-       id="775"
-       group="0"
-       wearable="skin"
-       edit_group="skin_bodydetail"
-       name="Body Freckles"
-       label_min="Less Freckles"
-       label_max="More Freckles"
-       value_min="0"
-       value_max="1"
-       value_default="0"
-       camera_distance="1.4"
-       camera_elevation="-.2">
-         <param_driver>
-            <driven
-             id="776" />
-
-            <driven
-             id="777" />
-         </param_driver>
-      </param>
-
-      <param
-       id="162"
-       group="0"
-       wearable="skin"
-       edit_group="skin_facedetail"
-       edit_group_order="1"
-       name="Facial Definition"
-       label_min="Less"
-       label_max="More"
-       value_min="0"
-       value_max="1"
-       camera_distance=".3"
-       camera_elevation=".07"
-       value_default="0">
-         <param_driver>
-            <driven
-             id="158" />
-
-            <driven
-             id="159" />
-
-			<driven
-             id="873" />
-         </param_driver>
-      </param>
-
-      <param
-       id="163"
-       group="0"
-       wearable="skin"
-       edit_group="skin_facedetail"
-       edit_group_order="3"
-       name="wrinkles"
-       label_min="Less"
-       label_max="More"
-       value_min="0"
-       value_max="1"
-       camera_distance=".3"
-       camera_elevation=".07"
-       value_default="0">
-         <param_driver>
-<!--<driven
-             id="128" />-->
-            <driven
-             id="118" />
-         </param_driver>
-      </param>
-
-      <param
-       id="505"
-       group="0"
-       wearable="shape"
-       edit_group="shape_mouth"
-       edit_group_order="3"
-       name="Lip Thickness"
-       label_min="Thin Lips"
-       label_max="Fat Lips"
-       value_min="0"
-       value_max="1"
-       value_default=".5"
-       camera_distance=".3"
-       camera_elevation=".04"
-       camera_angle="20">
-         <param_driver>
-            <driven
-             id="26"
-             min1="0"
-             max1="0"
-             max2="0"
-             min2=".5" />
-
-            <driven
-             id="28"
-             min1=".5"
-             max1="1"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="799"
-       group="0"
-       wearable="shape"
-       edit_group="shape_mouth"
-       edit_group_order="3.2"
-       name="Lip Ratio"
-	   label="Lip Ratio"
-	   show_simple="true"
-       label_min="More Upper Lip"
-       label_max="More Lower Lip"
-       value_min="0"
-       value_max="1"
-       value_default=".5"
-       camera_distance=".3"
-       camera_elevation=".04"
-       camera_angle="20">
-         <param_driver>
-            <driven
-             id="797"
-             min1="0"
-             max1="0"
-             max2="0"
-             min2=".5" />
-
-            <driven
-             id="798"
-             min1=".5"
-             max1="1"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="155"
-       group="0"
-       wearable="shape"
-       edit_group="shape_mouth"
-       edit_group_order="1"
-       name="Lip Width"
-	   label="Lip Width"
-       label_min="Narrow Lips"
-       label_max="Wide Lips"
-       show_simple="true"
-       value_min="-0.9"
-       value_max="1.3"
-       camera_distance=".3"
-       camera_elevation=".04"
-       value_default="0">
-         <param_driver>
-            <driven
-             id="29" />
-
-            <driven
-             id="30" />
-         </param_driver>
-      </param>
-
-      <param
-       id="196"
-       group="0"
-       wearable="shape"
-       edit_group="shape_eyes"
-       edit_group_order="2"
-       name="Eye Spacing"
-	   label="Eye Spacing"
-       label_min="Close Set Eyes"
-       label_max="Far Set Eyes"
-       show_simple="true"
-       value_min="-2"
-       value_max="1"
-       value_default="0"
-       camera_elevation=".1"
-       camera_distance=".35"
-       camera_angle="5">
-         <param_driver>
-            <driven
-             id="194" />
-
-            <driven
-             id="195" />
-         </param_driver>
-      </param>
-
-      <param
-       id="769"
-       group="0"
-       wearable="shape"
-       edit_group="shape_eyes"
-       edit_group_order="4.5"
-       name="Eye Depth"
-       label_min="Sunken Eyes"
-       label_max="Bugged Eyes"
-       value_min="0"
-       value_max="1"
-       value_default=".5"
-       camera_elevation=".1"
-       camera_distance=".3"
-       camera_angle="75">
-         <param_driver>
-            <driven
-             id="767" />
-
-            <driven
-             id="768" />
-         </param_driver>
-      </param>
-
-      <param
-       id="198"
-       group="0"
-       wearable="shoes"
-       edit_group="shoes"
-       edit_group_order="2"
-       name="Heel Height"
-       label_min="Low Heels"
-       label_max="High Heels"
-       value_min="0"
-       value_max="1"
-       value_default="0"
-       camera_angle="45"
-       camera_distance=".8"
-       camera_elevation="-1">
-         <param_driver>
-            <driven
-             id="197" />
-
-            <driven
-             id="500" />
-         </param_driver>
-      </param>
-
-      <param
-       id="513"
-       group="0"
-       wearable="shoes"
-       edit_group="shoes"
-       edit_group_order="3"
-       name="Heel Shape"
-       label_min="Pointy Heels"
-       label_max="Thick Heels"
-       value_min="0"
-       value_max="1"
-       value_default=".5"
-       camera_angle="45"
-       camera_distance="1.5"
-       camera_elevation="-1">
-         <param_driver>
-            <driven
-             id="509"
-             min1="0"
-             max1="0"
-             max2="0"
-             min2=".5" />
-
-            <driven
-             id="510"
-             min1=".5"
-             max1="1"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="514"
-       group="0"
-       wearable="shoes"
-       edit_group="shoes"
-       edit_group_order="4"
-       name="Toe Shape"
-       label_min="Pointy"
-       label_max="Square"
-       value_min="0"
-       value_max="1"
-       value_default=".5"
-       camera_angle="5"
-       camera_distance=".8"
-       camera_elevation="-.8">
-         <param_driver>
-            <driven
-             id="511"
-             min1="0"
-             max1="0"
-             max2="0"
-             min2=".5" />
-
-            <driven
-             id="512"
-             min1=".5"
-             max1="1"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="503"
-       group="0"
-       wearable="shoes"
-       edit_group="shoes"
-       edit_group_order="6"
-       name="Platform Height"
-       label_min="Low Platforms"
-       label_max="High Platforms"
-       value_min="0"
-       value_max="1"
-       value_default="0"
-       camera_angle="45"
-       camera_distance=".5"
-       camera_elevation="-1">
-         <param_driver>
-            <driven
-             id="501" />
-
-            <driven
-             id="502" />
-         </param_driver>
-      </param>
-
-      <param
-       id="193"
-       group="0"
-       wearable="shape"
-       edit_group="shape_head"
-       edit_group_order="3"
-       name="Head Shape"
-	   label="Head Shape"
-       label_min="More Square"
-       label_max="More Round"
-       show_simple="true"
-       value_min="0"
-       value_max="1"
-       value_default=".5"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="20">
-         <param_driver>
-            <driven
-             id="188"
-             min1="0"
-             max1="0"
-             max2="0"
-             min2=".5" />
-
-            <driven
-             id="642"
-             min1="0"
-             max1="0"
-             max2="0"
-             min2=".5" />
-
-            <driven
-             id="189"
-             min1=".5"
-             max1="1"
-             max2="1"
-             min2="1" />
-
-            <driven
-             id="643"
-             min1=".5"
-             max1="1"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="157"
-       group="0"
-       wearable="shape"
-       edit_group="shape_torso"
-       edit_group_order="13"
-       name="Belly Size"
-       label_min="Small"
-       label_max="Big"
-       value_min="0"
-       value_max="1"
-       value_default="0"
-       camera_distance="1.4"
-       camera_angle="30"
-       camera_elevation=".2">
-         <param_driver>
-            <driven
-             id="104" />
-
-            <driven
-             id="156" />
-
-            <driven
-             id="849" />
-         </param_driver>
-      </param>
-
-      <param
-       id="637"
-       group="0"
-       wearable="shape"
-       edit_group="shape_body"
-       edit_group_order="3"
-       name="Body Fat"
-       label_min="Less Body Fat"
-       label_max="More Body Fat"
-       value_min="0"
-       value_max="1"
-       value_default="0"
-       camera_distance="1.8">
-         <param_driver>
-            <driven
-             id="633" />
-
-            <driven
-             id="634" />
-
-            <driven
-             id="635" />
-
-            <driven
-             id="851" />
-         </param_driver>
-      </param>
-
-      <param
-       id="130"
-       group="0"
-       wearable="hair"
-       edit_group="hair_style"
-       edit_group_order="8"
-       name="Front Fringe"
-       label_min="Short"
-       label_max="Long"
-       value_min="0"
-       value_max="1"
-       value_default=".45"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="20">
-         <param_driver>
-            <driven
-             id="144"
-             min1="0"
-             max1="0"
-             max2="0"
-             min2=".5" />
-
-            <driven
-             id="145"
-             min1=".5"
-             max1="1"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="131"
-       group="0"
-       wearable="hair"
-       edit_group="hair_style"
-       edit_group_order="9"
-       name="Side Fringe"
-       label_min="Short"
-       label_max="Long"
-       value_min="0"
-       value_max="1"
-       value_default=".5"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="90">
-         <param_driver>
-            <driven
-             id="146"
-             min1="0"
-             max1="0"
-             max2="0"
-             min2=".5" />
-
-            <driven
-             id="147"
-             min1=".5"
-             max1="1"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="132"
-       group="0"
-       wearable="hair"
-       edit_group="hair_style"
-       edit_group_order="10"
-       name="Back Fringe"
-       label_min="Short"
-       label_max="Long"
-       value_min="0"
-       value_max="1"
-       value_default=".39"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="160">
-         <param_driver>
-            <driven
-             id="148"
-             min1="0"
-             max1="0"
-             max2="0"
-             min2=".5" />
-
-            <driven
-             id="149"
-             min1=".5"
-             max1="1"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="133"
-       group="0"
-       wearable="hair"
-       edit_group="hair_style"
-       edit_group_order="2"
-       name="Hair Front"
-       label_min="Short"
-       label_max="Long"
-       value_min="0"
-       value_max="1"
-       value_default=".25"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="20">
-         <param_driver>
-            <driven
-             id="172"
-             min1="0"
-             max1="0"
-             max2="0"
-             min2=".5" />
-
-            <driven
-             id="171"
-             min1=".5"
-             max1="1"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="134"
-       group="0"
-       wearable="hair"
-       edit_group="hair_style"
-       edit_group_order="3"
-       name="Hair Sides"
-       label_min="Short"
-       label_max="Long"
-       value_min="0"
-       value_max="1"
-       value_default=".5"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="90">
-         <param_driver>
-            <driven
-             id="174"
-             min1="0"
-             max1="0"
-             max2="0"
-             min2=".5" />
-
-            <driven
-             id="173"
-             min1=".5"
-             max1="1"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="135"
-       group="0"
-       wearable="hair"
-       edit_group="hair_style"
-       edit_group_order="4"
-       name="Hair Back"
-	   show_simple="true"
-       label_min="Short"
-       label_max="Long"
-       value_min="0"
-       value_max="1"
-       value_default=".55"
-       camera_elevation="-.1"
-       camera_distance=".8"
-       camera_angle="160">
-         <param_driver>
-            <driven
-             id="176"
-             min1="0"
-             max1="0"
-             max2="0"
-             min2=".5" />
-
-            <driven
-             id="175"
-             min1=".5"
-             max1="1"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="136"
-       group="0"
-       wearable="hair"
-       edit_group="hair_style"
-       edit_group_order="11.5"
-       name="Hair Sweep"
-       label_min="Sweep Forward"
-       label_max="Sweep Back"
-       value_min="0"
-       value_max="1"
-       value_default=".5"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="90">
-         <param_driver>
-            <driven
-             id="179"
-             min1="0"
-             max1="0"
-             max2="0"
-             min2=".5" />
-
-            <driven
-             id="178"
-             min1=".5"
-             max1="1"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="137"
-       group="0"
-       wearable="hair"
-       edit_group="hair_style"
-       edit_group_order="16"
-       name="Hair Tilt"
-       label_min="Left"
-       label_max="Right"
-       value_min="0"
-       value_max="1"
-       value_default=".5"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="0">
-         <param_driver>
-            <driven
-             id="190"
-             min1="0"
-             max1="0"
-             max2="0"
-             min2=".5" />
-
-            <driven
-             id="191"
-             min1=".5"
-             max1="1"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="608"
-       group="0"
-       wearable="jacket"
-       edit_group="jacket"
-       edit_group_order="2"
-       name="bottom length lower"
-       label="Jacket Length"
-       label_min="Short"
-       label_max="Long"
-       value_min="0"
-       value_max="1"
-       value_default=".8"
-       camera_distance="1.4"
-       camera_angle="30"
-       camera_elevation=".2">
-         <param_driver>
-            <driven
-             id="620" />
-
-            <driven
-             id="1025" />
-
-            <driven
-             id="1037" />
-
-            <driven
-             id="621" />
-
-            <driven
-             id="1027" />
-
-            <driven
-             id="1033" />
-         </param_driver>
-      </param>
-
-      <param
-       id="609"
-       group="0"
-       wearable="jacket"
-       edit_group="jacket"
-       edit_group_order="4"
-       name="open jacket"
-       label="Open Front"
-       label_min="Open"
-       label_max="Closed"
-       value_min="0"
-       value_max="1"
-       value_default=".2"
-       camera_distance="1.4"
-       camera_angle="30"
-       camera_elevation=".2">
-         <param_driver>
-            <driven
-             id="622" />
-
-            <driven
-             id="1026" />
-
-            <driven
-             id="1038" />
-
-            <driven
-             id="623" />
-
-            <driven
-             id="1028" />
-
-            <driven
-             id="1034" />
-         </param_driver>
-      </param>
-
-      <param
-       id="105"
-       group="0"
-       sex="female"
-       wearable="shape"
-       edit_group="shape_torso"
-       edit_group_order="6"
-       name="Breast Size"
-       label_min="Small"
-       label_max="Large"
-       value_min="0"
-       value_max="1"
-       value_default=".5"
-       camera_elevation=".3"
-       camera_distance="1.2"
-       camera_angle="30">
-         <param_driver>
-            <driven
-             id="843"
-             min1="0"
-             max1="0"
-             max2="0"
-             min2=".01" />
-
-            <driven
-             id="627"
-             min1="0"
-             max1="0.01"
-             max2="0.01"
-             min2=".5" />
-
-            <driven
-             id="626"
-             min1=".5"
-             max1="1"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="629"
-       group="0"
-       wearable="shape"
-       edit_group="shape_head"
-       edit_group_order="6"
-       name="Forehead Angle"
-       label_min="More Vertical"
-       label_max="More Sloped"
-       value_min="0"
-       value_max="1"
-       value_default=".5"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="70">
-         <param_driver>
-            <driven
-             id="630"
-             min1="0"
-             max1="0"
-             max2="0"
-             min2=".5" />
-
-            <driven
-             id="644"
-             min1="0"
-             max1="0"
-             max2="0"
-             min2=".5" />
-
-            <driven
-             id="631"
-             min1=".5"
-             max1="1"
-             max2="1"
-             min2="1" />
-
-            <driven
-             id="645"
-             min1=".5"
-             max1="1"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="646"
-       group="0"
-       name="Egg_Head"
-       label="Egg Head"
-       wearable="shape"
-       edit_group="shape_head"
-       edit_group_order="4"
-       label_min="Chin Heavy"
-       label_max="Forehead Heavy"
-       show_simple="true"
-       value_min="-1.3"
-       value_max="1"
-       value_default="0"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="20">
-         <param_driver>
-            <driven
-             id="640" />
-
-            <driven
-             id="186" />
-         </param_driver>
-      </param>
-
-      <param
-       id="647"
-       group="0"
-       name="Squash_Stretch_Head"
-       label="Head Stretch"
-       wearable="shape"
-       edit_group="shape_head"
-       edit_group_order="2"
-       show_simple="true"
-       label_min="Squash Head"
-       label_max="Stretch Head"
-       value_min="-0.5"
-       value_max="1"
-       value_default="0"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="20">
-         <param_driver>
-            <driven
-             id="641" />
-
-            <driven
-             id="187" />
-         </param_driver>
-      </param>
-
-      <param
-       id="649"
-       group="0"
-       sex="female"
-       wearable="shape"
-       edit_group="shape_torso"
-       edit_group_order="1.1"
-       name="Torso Muscles"
-	   label="Torso Muscles"
-	   show_simple="true"
-       label_min="Less Muscular"
-       label_max="More Muscular"
-       value_min="0"
-       value_max="1"
-       value_default=".5"
-       camera_elevation=".1"
-       camera_distance="1"
-       camera_angle="15">
-         <param_driver>
-            <driven
-             id="648"
-             min1="0"
-             max1="0"
-             max2="0"
-             min2=".5" />
-
-            <driven
-             id="106"
-             min1=".5"
-             max1="1"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="678"
-       group="0"
-       sex="male"
-       wearable="shape"
-       edit_group="shape_torso"
-       edit_group_order="1"
-       name="Torso Muscles"
-       show_simple="true"
-	   label_min="Less Muscular"
-       label_max="More Muscular"
-       value_min="0"
-       value_max="1"
-       value_default=".5"
-       camera_elevation=".1"
-       camera_distance="1.2"
-       camera_angle="0">
-         <param_driver>
-            <driven
-             id="677"
-             min1="0"
-             max1="0"
-             max2="0"
-             min2=".5" />
-
-            <driven
-             id="106"
-             min1=".5"
-             max1="1"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="652"
-       group="0"
-       wearable="shape"
-       edit_group="shape_legs"
-       edit_group_order="1"
-       name="Leg Muscles"
-       label_min="Less Muscular"
-       label_max="More Muscular"
-       show_simple="true"
-       value_min="0"
-       value_max="1"
-       value_default=".5"
-       camera_distance="1.3"
-       camera_elevation="-.5"
-       camera_angle="15">
-         <param_driver>
-            <driven
-             id="651"
-             min1="0"
-             max1="0"
-             max2="0"
-             min2=".5" />
-
-            <driven
-             id="152"
-             min1=".5"
-             max1="1"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="80"
-       name="male"
-       group="0"
-       edit_group="dummy"
-       wearable="shape"
-       value_min="0"
-       value_max="1">
-         <param_driver>
-            <driven
-             id="32" />
-
-            <driven
-             id="153" />
-
-            <driven
-             id="40" />
-
-            <driven
-             id="100" />
-
-            <driven
-             id="857" />
-         </param_driver>
-      </param>
-
-      <param
-       id="659"
-       group="0"
-       wearable="shape"
-       edit_group="shape_mouth"
-       edit_group_order="5"
-       name="Mouth Corner"
-       label_min="Corner Down"
-       label_max="Corner Up"
-       value_min="0"
-       value_max="1"
-       value_default=".5"
-       camera_elevation="0"
-       camera_distance=".28">
-         <param_driver>
-            <driven
-             id="658"
-             min1="0"
-             max1="0"
-             max2="0"
-             min2=".5" />
-
-            <driven
-             id="657"
-             min1=".5"
-             max1="1"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="662"
-       group="0"
-       wearable="shape"
-       edit_group="shape_head"
-       edit_group_order="5"
-       name="Face Shear"
-       label_min="Shear Right Up"
-       label_max="Shear Left Up"
-       value_min="0"
-       value_max="1"
-       value_default=".5"
-       camera_elevation=".1"
-       camera_distance=".5">
-         <param_driver>
-            <driven
-             id="660" />
-
-            <driven
-             id="661" />
-
-            <driven
-             id="774" />
-         </param_driver>
-      </param>
-
-      <param
-       id="773"
-       group="0"
-       wearable="shape"
-       edit_group="shape_head"
-       edit_group_order="4.5"
-       name="Head Length"
-       label_min="Flat Head"
-       label_max="Long Head"
-       value_min="0"
-       value_max="1"
-       value_default=".5"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="75">
-         <param_driver>
-            <driven
-             id="770" />
-
-            <driven
-             id="771" />
-
-            <driven
-             id="772" />
-         </param_driver>
-      </param>
-
-      <param
-       id="682"
-       group="0"
-       wearable="shape"
-       edit_group="shape_head"
-       edit_group_order="1"
-       name="Head Size"
-	   label="Head Size"
-       label_min="Small Head"
-       label_max="Big Head"
-       show_simple="true"
-       value_min="0"
-       value_max="1"
-       value_default=".5"
-       camera_elevation=".1"
-       camera_distance=".5">
-         <param_driver>
-            <driven
-             id="679" />
-
-            <driven
-             id="694" />
-
-            <driven
-             id="680" />
-
-            <driven
-             id="681" />
-
-            <driven
-             id="655" />
-         </param_driver>
-      </param>
-
-      <param
-       id="690"
-       group="0"
-       wearable="shape"
-       edit_group="shape_eyes"
-       edit_group_order="1"
-       name="Eye Size"
-	   label="Eye Size"
-       label_min="Beady Eyes"
-       label_max="Anime Eyes"
-       value_min="0"
-       value_max="1"
-       value_default=".5"
-	   show_simple="true"
-       camera_elevation=".1"
-       camera_distance=".35">
-         <param_driver>
-            <driven
-             id="686" />
-
-            <driven
-             id="687" />
-
-            <driven
-             id="695" />
-
-            <driven
-             id="688" />
-
-            <driven
-             id="691" />
-
-            <driven
-             id="689" />
-         </param_driver>
-      </param>
-
-      <param
-       id="752"
-       group="0"
-       sex="male"
-       wearable="hair"
-       edit_group="hair_facial"
-       edit_group_order="1"
-       name="Hair Thickness"
-       label_min="5 O'Clock Shadow"
-       label_max="Bushy Hair"
-       value_min="0"
-       value_max="1"
-       value_default=".5"
-       camera_elevation="0"
-       camera_distance=".28">
-         <param_driver>
-            <driven
-             id="751"
-             min1="0"
-             max1="0"
-             max2="0"
-             min2=".2" />
-
-            <driven
-             id="1012"
-             min1="0"
-             max1="0"
-             max2=".2"
-             min2=".6" />
-
-            <driven
-             id="400"
-             min1=".2"
-             max1="1"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="763"
-       group="0"
-       wearable="hair"
-       edit_group="hair_style"
-       edit_group_order="1"
-       name="Hair Volume"
-	   show_simple="true"
-       label_min="Less Volume"
-       label_max="More Volume"
-       value_min="0"
-       value_max="1"
-       value_default=".55"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="20">
-         <param_driver>
-            <driven
-             id="761"
-             min1="0"
-             max1="0"
-             max2="0"
-             min2=".5" />
-
-            <driven
-             id="180"
-             min1=".5"
-             max1="1"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="834"
-       group="0"
-       wearable="jacket"
-       edit_group="colorpicker"
-       name="jacket_red"
-       value_min="0"
-       value_max="1"
-       value_default="1">
-         <param_driver>
-            <driven
-             id="809"
-             min1="0"
-             max1="1"
-             max2="1"
-             min2="1" />
-
-            <driven
-             id="831"
-             min1="0"
-             max1="1"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="835"
-       group="0"
-       wearable="jacket"
-       edit_group="colorpicker"
-       name="jacket_green"
-       value_min="0"
-       value_max="1"
-       value_default="1">
-         <param_driver>
-            <driven
-             id="810"
-             min1="0"
-             max1="1"
-             max2="1"
-             min2="1" />
-
-            <driven
-             id="832"
-             min1="0"
-             max1="1"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="836"
-       group="0"
-       wearable="jacket"
-       edit_group="colorpicker"
-       name="jacket_blue"
-       value_min="0"
-       value_max="1"
-       value_default="1">
-         <param_driver>
-            <driven
-             id="811"
-             min1="0"
-             max1="1"
-             max2="1"
-             min2="1" />
-
-            <driven
-             id="833"
-             min1="0"
-             max1="1"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="785"
-       group="0"
-       wearable="hair"
-       edit_group="hair_style"
-       edit_group_order="14.6"
-       name="Pigtails"
-	   show_simple="true"
-       label_min="Short Pigtails"
-       label_max="Long Pigtails"
-       value_min="0"
-       value_max="1"
-       value_default="0"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="15">
-         <param_driver>
-            <driven
-             id="782"
-             min1="0"
-             max1=".10"
-             max2=".10"
-             min2=".5" />
-
-            <driven
-             id="783"
-             min1=".10"
-             max1=".5"
-             max2=".5"
-             min2=".75" />
-
-            <driven
-             id="790"
-             min1=".5"
-             max1=".75"
-             max2=".75"
-             min2="1" />
-
-            <driven
-             id="784"
-             min1=".75"
-             max1="1"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="789"
-       group="0"
-       wearable="hair"
-       edit_group="hair_style"
-       edit_group_order="14.7"
-       name="Ponytail"
-       label_min="Short Ponytail"
-       label_max="Long Ponytail"
-       value_min="0"
-       value_max="1"
-       value_default="0"
-       camera_elevation=".1"
-       camera_distance=".5"
-       camera_angle="180">
-         <param_driver>
-            <driven
-             id="786"
-             min1="0"
-             max1=".10"
-             max2=".10"
-             min2=".66" />
-
-            <driven
-             id="787"
-             min1=".10"
-             max1=".66"
-             max2=".66"
-             min2="1" />
-
-            <driven
-             id="788"
-             min1=".66"
-             max1="1"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="795"
-       group="0"
-       name="Butt Size"
-       label="Butt Size"
-       wearable="shape"
-       edit_group="shape_legs"
-       edit_group_order="4"
-       label_min="Flat Butt"
-       label_max="Big Butt"
-       value_min="0"
-       value_max="1"
-       value_default=".25"
-       camera_angle="180"
-       camera_distance=".6">
-         <param_driver>
-            <driven
-             id="867"
-             min1="0"
-             max1="0"
-             max2="0"
-             min2=".3" />
-
-            <driven
-             id="794"
-             min1="0"
-             max1="0"
-             max2="0"
-             min2=".3" />
-
-            <driven
-             id="151"
-             min1=".3"
-             max1="1"
-             max2="1"
-             min2="1" />
-
-            <driven
-             id="852"
-             min1=".3"
-             max1="1"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="841"
-       group="0"
-       name="Bowed_Legs"
-       label="Knee Angle"
-       wearable="shape"
-       edit_group_order="5.5"
-       edit_group="shape_legs"
-       label_min="Knock Kneed"
-       label_max="Bow Legged"
-       value_min="-1"
-       value_max="1"
-       value_default="0"
-       camera_distance="1.3"
-       camera_elevation="-.5">
-         <param_driver>
-            <driven
-             id="853" />
-
-            <driven
-             id="847" />
-         </param_driver>
-      </param>
-
-      <param
-       id="753"
-       group="0"
-       name="Saddlebags"
-       label="Saddle Bags"
-       wearable="shape"
-       edit_group="shape_legs"
-       edit_group_order="5"
-       label_min="Less Saddle"
-       label_max="More Saddle"
-       value_min="-0.5"
-       value_max="3"
-       value_default="0"
-       camera_angle="0"
-       camera_distance="1.2">
-         <param_driver>
-            <driven
-             id="850" />
-
-            <driven
-             id="854" />
-         </param_driver>
-      </param>
-
-      <param
-       id="676"
-       group="0"
-       name="Love_Handles"
-       label="Love Handles"
-       wearable="shape"
-       edit_group="shape_torso"
-       edit_group_order="12"
-       label_min="Less Love"
-       label_max="More Love"
-       value_min="-1"
-       value_max="2"
-       value_default="0"
-       camera_elevation=".3"
-       camera_distance=".9">
-         <param_driver>
-            <driven
-             id="855" />
-
-            <driven
-             id="856" />
-         </param_driver>
-      </param>
-
-      <param
-       id="863"
-       group="0"
-       name="skirt_looseness"
-       label="Skirt Fit"
-	   show_simple="true"
-       clothing_morph="true"
-       wearable="skirt"
-       edit_group_order="2"
-       edit_group="skirt"
-       label_min="Tight Skirt"
-       label_max="Poofy Skirt"
-       value_min="0"
-       value_max="1"
-       value_default=".333"
-       camera_distance="1.3"
-       camera_elevation="-.5">
-         <param_driver>
-            <driven
-             id="866"
-             min1="0"
-             max1="0"
-             max2="0"
-             min2=".2" />
-
-            <driven
-             id="846"
-             min1="0"
-             max1=".5"
-             max2=".5"
-             min2="1" />
-
-            <driven
-             id="845"
-             min1=".5"
-             max1="1"
-             max2="1"
-             min2="1" />
-         </param_driver>
-      </param>
-
-      <param
-       id="119"
-       group="0"
-       wearable="hair"
-       edit_group="hair_eyebrows"
-       edit_group_order="1"
-       name="Eyebrow Size"
-	   show_simple="true"
-       label_min="Thin Eyebrows"
-       label_max="Bushy Eyebrows"
-       value_min="0"
-       value_max="1"
-       value_default="0.5"
-       camera_elevation=".1"
-       camera_distance=".3">
-         <param_driver>
-            <driven
-             id="1000" />
-
-            <driven
-             id="1001" />
-         </param_driver>
-      </param>
-
-      <param
-       id="750"
-       group="0"
-       wearable="hair"
-       edit_group="hair_eyebrows"
-       edit_group_order="2"
-       name="Eyebrow Density"
-       label_min="Sparse"
-       label_max="Dense"
-       value_min="0"
-       value_max="1"
-       value_default="0.7"
-       camera_elevation=".1"
-       camera_distance=".3">
-         <param_driver>
-            <driven
-             id="1002" />
-
-            <driven
-             id="1003" />
-         </param_driver>
-      </param>
-
-      <param
-       id="166"
-       sex="male"
-       group="0"
-       wearable="hair"
-       edit_group="hair_facial"
-       edit_group_order="2"
-       name="Sideburns"
-	   show_simple="true"
-       label_min="Short Sideburns"
-       label_max="Mutton Chops"
-       value_min="0"
-       value_max="1"
-       value_default="0.0"
-       camera_elevation=".1"
-       camera_distance=".3"
-       camera_angle="30">
-         <param_driver>
-            <driven
-             id="1004" />
-
-            <driven
-             id="1005" />
-         </param_driver>
-      </param>
-
-      <param
-       id="167"
-       sex="male"
-       group="0"
-       wearable="hair"
-       edit_group="hair_facial"
-       edit_group_order="3"
-       name="Moustache"
-	   show_simple="true"
-       label_min="Chaplin"
-       label_max="Handlebars"
-       value_min="0"
-       value_max="1"
-       value_default="0.0"
-       camera_elevation=".1"
-       camera_distance=".3"
-       camera_angle="30">
-         <param_driver>
-            <driven
-             id="1006" />
-
-            <driven
-             id="1007" />
-         </param_driver>
-      </param>
-
-      <param
-       id="168"
-       sex="male"
-       group="0"
-       wearable="hair"
-       edit_group="hair_facial"
-       edit_group_order="5"
-       name="Soulpatch"
-	   show_simple="true"
-       label_min="Less soul"
-       label_max="More soul"
-       value_min="0"
-       value_max="1"
-       value_default="0.0"
-       camera_elevation="-.1"
-       camera_distance=".3"
-       camera_angle="0">
-         <param_driver>
-            <driven
-             id="1008" />
-
-            <driven
-             id="1009" />
-         </param_driver>
-      </param>
-
-      <param
-       id="169"
-       sex="male"
-       group="0"
-       wearable="hair"
-       edit_group="hair_facial"
-       edit_group_order="4"
-       name="Chin Curtains"
-	   show_simple="true"
-       label_min="Less Curtains"
-       label_max="More Curtains"
-       value_min="0"
-       value_max="1"
-       value_default="0.0"
-       camera_elevation="-.1"
-       camera_distance=".3"
-       camera_angle="45">
-         <param_driver>
-            <driven
-             id="1010" />
-
-            <driven
-             id="1011" />
-         </param_driver>
-      </param>
-
-      <param
-       id="606"
-       group="0"
-       wearable="jacket"
-       edit_group="jacket"
-       edit_group_order="1"
-       name="Sleeve Length"
-       label_min="Short"
-       label_max="Long"
-       value_min="0"
-       value_max="1"
-       value_default=".8"
-       camera_distance="1.2"
-       camera_angle="30"
-       camera_elevation=".2">
-         <param_driver>
-            <driven
-             id="1019" />
-
-            <driven
-             id="1039" />
-
-            <driven
-             id="1020" />
-         </param_driver>
-      </param>
-
-      <param
-       id="607"
-       group="0"
-       wearable="jacket"
-       edit_group="jacket"
-       edit_group_order="3"
-       name="Collar Front"
-       label_min="Low"
-       label_max="High"
-       value_min="0"
-       value_max="1"
-       value_default=".8"
-       camera_distance="1.2"
-       camera_angle="15"
-       camera_elevation=".2">
-         <param_driver>
-            <driven
-             id="1021" />
-
-            <driven
-             id="1040" />
-
-            <driven
-             id="1022" />
-         </param_driver>
-      </param>
-
-      <param
-       id="780"
-       group="0"
-       wearable="jacket"
-       edit_group="jacket"
-       edit_group_order="3.5"
-       name="Collar Back"
-       label_min="Low"
-       label_max="High"
-       value_min="0"
-       value_max="1"
-       value_default=".8"
-       camera_distance="1.2"
-       camera_angle="195"
-       camera_elevation=".2">
-         <param_driver>
-            <driven
-             id="1023" />
-
-            <driven
-             id="1041" />
-
-            <driven
-             id="1024" />
-         </param_driver>
-      </param>
-
-      <param
-       id="603"
-       group="0"
-       wearable="undershirt"
-       edit_group="undershirt"
-       edit_group_order="1"
-       name="Sleeve Length"
-       label_min="Short"
-       label_max="Long"
-       value_min=".01"
-       value_max="1"
-       value_default=".4"
-       camera_distance="1.2"
-       camera_angle="30"
-       camera_elevation=".2">
-         <param_driver>
-            <driven
-             id="1042" />
-
-            <driven
-             id="1043" />
-         </param_driver>
-      </param>
-
-      <param
-       id="604"
-       group="0"
-       wearable="undershirt"
-       edit_group="undershirt"
-       edit_group_order="2"
-       name="Bottom"
-       label_min="Short"
-       label_max="Long"
-       value_min="0"
-       value_max="1"
-       value_default=".85"
-       camera_distance="1.2"
-       camera_angle="30"
-       camera_elevation=".2">
-         <param_driver>
-            <driven
-             id="1044" />
-
-            <driven
-             id="1045" />
-         </param_driver>
-      </param>
-
-      <param
-       id="605"
-       group="0"
-       wearable="undershirt"
-       edit_group="undershirt"
-       edit_group_order="3"
-       name="Collar Front"
-       label_min="Low"
-       label_max="High"
-       value_min="0"
-       value_max="1"
-       value_default=".84"
-       camera_distance=".8"
-       camera_angle="15"
-       camera_elevation=".2">
-         <param_driver>
-            <driven
-             id="1046" />
-
-            <driven
-             id="1047" />
-         </param_driver>
-      </param>
-
-      <param
-       id="779"
-       group="0"
-       wearable="undershirt"
-       edit_group="undershirt"
-       edit_group_order="4"
-       name="Collar Back"
-       label_min="Low"
-       label_max="High"
-       value_min="0"
-       value_max="1"
-       value_default=".84"
-       camera_distance=".8"
-       camera_angle="195"
-       camera_elevation=".2">
-         <param_driver>
-            <driven
-             id="1048" />
-
-            <driven
-             id="1049" />
-         </param_driver>
-      </param>
-
-      <param
-       id="617"
-       group="0"
-       wearable="socks"
-       edit_group="socks"
-       name="Socks Length"
-       label_min="Short"
-       label_max="Long"
-       value_min="0"
-       value_max="1"
-       value_default="0.35"
-       camera_distance=".95"
-       camera_angle="30"
-       camera_elevation="-.75">
-         <param_driver>
-            <driven
-             id="1050" />
-
-            <driven
-             id="1051" />
-         </param_driver>
-      </param>
-
-      <param
-       id="616"
-       group="0"
-       wearable="shoes"
-       edit_group="shoes"
-       edit_group_order="1"
-       name="Shoe Height"
-       label_min="Short"
-       label_max="Tall"
-       value_min="0"
-       value_max="1"
-       value_default="0.1"
-       camera_distance="1.2"
-       camera_angle="30"
-       camera_elevation="-.75">
-         <param_driver>
-            <driven
-             id="1052" />
-
-            <driven
-             id="1053" />
-         </param_driver>
-      </param>
-
-      <param
-       id="619"
-       group="0"
-       wearable="underpants"
-       edit_group="underpants"
-       name="Pants Length"
-       label_min="Short"
-       label_max="Long"
-       value_min="0"
-       value_max="1"
-       value_default=".3"
-       camera_distance="1.2"
-       camera_angle="30"
-       camera_elevation="-.3">
-         <param_driver>
-            <driven
-             id="1054" />
-
-            <driven
-             id="1055" />
-         </param_driver>
-      </param>
-
-      <param
-       id="624"
-       group="0"
-       wearable="underpants"
-       edit_group="underpants"
-       name="Pants Waist"
-       label_min="Low"
-       label_max="High"
-       value_min="0"
-       value_max="1"
-       value_default=".8"
-       camera_distance="1.2"
-       camera_angle="30"
-       camera_elevation="-.3">
-         <param_driver>
-            <driven
-             id="1056" />
-
-            <driven
-             id="1057" />
-         </param_driver>
-      </param>
-
-      <param
-       id="93"
-       group="0"
-       wearable="gloves"
-       edit_group="gloves"
-       name="Glove Length"
-       label_min="Short"
-       label_max="Long"
-       value_min=".01"
-       value_max="1"
-       value_default=".8"
-       camera_distance="1.2"
-       camera_angle="30"
-       camera_elevation=".2">
-         <param_driver>
-            <driven
-             id="1058" />
-
-            <driven
-             id="1059" />
-         </param_driver>
-      </param>
-
-      <param
-       id="844"
-       group="0"
-       wearable="gloves"
-       edit_group="gloves"
-       name="Glove Fingers"
-       label_min="Fingerless"
-       label_max="Fingers"
-       value_min=".01"
-       value_max="1"
-       value_default="1"
-       camera_distance="1.2"
-       camera_angle="30"
-       camera_elevation=".2">
-         <param_driver>
-            <driven
-             id="1060" />
-
-            <driven
-             id="1061" />
-         </param_driver>
-      </param>
-
-<!--Pointy eyebrows became a driver/driven param with new max value for backwards compatibility between 1.0 and 1.1-->
-      <param
-       id="16"
-       group="0"
-       name="Pointy_Eyebrows"
-       label="Eyebrow Points"
-       wearable="hair"
-       edit_group="hair_eyebrows"
-       edit_group_order="4"
-       label_min="Smooth"
-       label_max="Pointy"
-       value_min="-.5"
-       value_max="3"
-       camera_elevation=".1"
-       camera_distance=".3">
-         <param_driver>
-            <driven
-             id="870" />
-         </param_driver>
-      </param>
-
-<!--Lower eyebrows became a driver/driven param with new min value for backwards compatibility between 1.0 and 1.1-->
-      <param
-       id="757"
-       group="0"
-       name="Lower_Eyebrows"
-       label="Eyebrow Height"
-	   show_simple="true"
-       wearable="hair"
-       edit_group="hair_eyebrows"
-       edit_group_order="2.5"
-       label_min="Higher"
-       label_max="Lower"
-       value_min="-4"
-       value_max="2"
-       value_default="-1"
-       camera_elevation=".1"
-       camera_distance=".3">
-         <param_driver>
-            <driven
-             id="871" />
-         </param_driver>
-      </param>
-
-<!--Arced eyebrows became a driver/driven param with new max value for backwards compatibility between 1.0 and 1.1-->
-      <param
-       id="31"
-       group="0"
-       name="Arced_Eyebrows"
-       label="Eyebrow Arc"
-       wearable="hair"
-       edit_group="hair_eyebrows"
-       edit_group_order="3"
-       label_min="Flat"
-       label_max="Arced"
-       value_min="0"
-       value_max="2"
-       value_default=".5"
-       camera_elevation=".1"
-       camera_distance=".3">
-         <param_driver>
-            <driven
-             id="872" />
-         </param_driver>
-      </param>
-      
-      <param
-       id="877"
-       group="0"
-       name="Jacket Wrinkles"
-       label="Jacket Wrinkles"
-       wearable="jacket"
-       edit_group="jacket"
-       edit_group_order="20"
-       label_min="No Wrinkles"
-       label_max="Wrinkles"
-       value_min="0"
-       value_max="1"
-       value_default="0"
-       camera_elevation=".1"
-       camera_distance=".3">
-         <param_driver>
-            <driven
-             id="875" />
-             
-             <driven
-             id="876" />
-         </param_driver>
-      </param>
-		<param id="1071" group="2" wearable="tattoo" edit_group="colorpicker" name="tattoo_red" 
-			value_min="0" value_max="1" value_default="1">
-			<param_driver>
-				<driven id="1062" min1="0" max1="1" max2="1" min2="1" />
-				<driven id="1065" min1="0" max1="1" max2="1" min2="1" />
-				<driven id="1068" min1="0" max1="1" max2="1" min2="1" />
-			</param_driver>
-		</param>
-		<param id="1072" group="2" wearable="tattoo" edit_group="colorpicker" name="tattoo_green" 
-			value_min="0" value_max="1" value_default="1">
-			<param_driver>
-				<driven id="1063" min1="0" max1="1" max2="1" min2="1" />
-				<driven id="1066" min1="0" max1="1" max2="1" min2="1" />  
-				<driven id="1069" min1="0" max1="1" max2="1" min2="1" />
-			</param_driver>
-		</param>
-		<param id="1073" group="2" wearable="tattoo" edit_group="colorpicker" name="tattoo_blue" 
-			value_min="0" value_max="1" value_default="1">
-			<param_driver>
-				<driven id="1064" min1="0" max1="1" max2="1" min2="1" />
-				<driven id="1067" min1="0" max1="1" max2="1" min2="1" />  
-				<driven id="1070" min1="0" max1="1" max2="1" min2="1" />
-			</param_driver>
-		</param>
-      
-	</driver_parameters>
-</linden_avatar>
-
diff --git a/linden/indra/newview/character/attentions.xml b/linden/indra/newview/character/attentions.xml
new file mode 100644
index 0000000..be9a2b2
--- /dev/null
+++ b/linden/indra/newview/character/attentions.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="US-ASCII" standalone="yes"?>
+<!--
+Default values for "Look At" controls.
+Various events compete for avatar attention. I.E. control where the
+user's avatar looks.
+The avatar's head will turn to look towards the source of those events
+as much as is possible. 
+If the head cannot turn due to an animation override, the eyes will still
+track those events.
+Avatar attention will be taken by events of equal of greater priorities
+and will last for timeout number of seconds before reverting to idle.
+Negative timeout values indicate attentions that never time out.
+Avatar sex determines which set of attention settings are used.
+Within each set, the following named attentions relate to the indicated events:
+
+IDLE: Tracks the mouse pointer movement.
+AUTO LISTEN: Tracks nearby chat.
+FREELOOK: Tracks "target objects" and a case of mouse moved in 3rd person mode.
+RESPOND: Tracks the beginning of typing.
+HOVER: Tracks objects the mouse lingers over when "show hover tooltips" is on.
+CONVERSATION: Tracks avatars and other objects clicked on.
+SEOECT: Tracks objects grabbed and being moved.
+FOCUS: Freezes during avatar customization and when focused on object or point.
+MOUSELOOK: Tracks center of view when in mouselook view mode.
+-->
+
+<linden_attentions version="1.0">
+   <gender name="Masculine">
+      <param attention="idle"         priority="1.0" timeout="3.0"  />
+      <param attention="auto_listen"  priority="3.0" timeout="4.0"  />
+      <param attention="freelook"     priority="2.0" timeout="2.0"  />
+      <param attention="respond"      priority="3.0" timeout="4.0"  />
+      <param attention="hover"        priority="4.0" timeout="1.0"  />
+      <param attention="conversation" priority="0.0" timeout="-1"   />
+      <param attention="select"       priority="6.0" timeout="-1"   />
+      <param attention="focus"        priority="6.0" timeout="-1"   />
+      <param attention="mouselook"    priority="7.0" timeout="-1"   />
+   </gender>
+   <gender name="Feminine">
+      <param attention="idle"         priority="1.0" timeout="3.0"  />
+      <param attention="auto_listen"  priority="3.0" timeout="4.0"  />
+      <param attention="freelook"     priority="2.0" timeout="2.0"  />
+      <param attention="respond"      priority="3.0" timeout="4.0"  />
+      <param attention="hover"        priority="4.0" timeout="1.0"  />
+      <param attention="conversation" priority="0.0" timeout="-1"   />
+      <param attention="select"       priority="6.0" timeout="-1"   />
+      <param attention="focus"        priority="6.0" timeout="-1"   />
+      <param attention="mouselook"    priority="7.0" timeout="-1"   />
+   </gender>
+</linden_attentions>
+
diff --git a/linden/indra/newview/character/attentionsN.xml b/linden/indra/newview/character/attentionsN.xml
new file mode 100644
index 0000000..e7d9bb6
--- /dev/null
+++ b/linden/indra/newview/character/attentionsN.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="US-ASCII" standalone="yes"?>
+<!--
+Default values for "Look At" controls.
+Various events compete for avatar attention. I.E. control where the
+user's avatar looks.
+The avatar's head will turn to look towards the source of those events
+as much as is possible. 
+If the head cannot turn due to an animation override, the eyes will still
+track those events.
+Avatar attention will be taken by events of equal of greater priorities
+and will last for timeout number of seconds before reverting to idle.
+Negative timeout values indicate attentions that never time out.
+Avatar sex determines which set of attention settings are used.
+Within each set, the following named attentions relate to the indicated events:
+
+IDLE: Tracks the mouse pointer movement.
+AUTO LISTEN: Tracks nearby chat.
+FREELOOK: Tracks "target objects" and a case of mouse moved in 3rd person mode.
+RESPOND: Tracks the beginning of typing.
+HOVER: Tracks objects the mouse lingers over when "show hover tooltips" is on.
+CONVERSATION: Tracks avatars and other objects clicked on.
+SEOECT: Tracks objects grabbed and being moved.
+FOCUS: Freezes during avatar customization and when focused on object or point.
+MOUSELOOK: Tracks center of view when in mouselook view mode.
+-->
+
+<linden_attentions version="1.0">
+   <gender name="Masculine">
+      <param attention="idle"         priority="1.0" timeout="3.0"  />
+      <param attention="auto_listen"  priority="3.0" timeout="4.0"  />
+      <param attention="freelook"     priority="2.0" timeout="2.0"  />
+      <param attention="respond"      priority="3.0" timeout="3.0"  />
+      <param attention="hover"        priority="4.0" timeout="1.0"  />
+      <param attention="conversation" priority="5.0" timeout="3.0"  />
+      <param attention="select"       priority="3.5" timeout="-1"   />
+      <param attention="focus"        priority="3.5" timeout="20.0" />
+      <param attention="mouselook"    priority="7.0" timeout="-1"   />
+   </gender>
+   <gender name="Feminine">
+      <param attention="idle"         priority="1.0" timeout="3.0"  />
+      <param attention="auto_listen"  priority="3.0" timeout="4.0"  />
+      <param attention="freelook"     priority="2.0" timeout="2.0"  />
+      <param attention="respond"      priority="3.0" timeout="6.0"  />
+      <param attention="hover"        priority="4.0" timeout="1.0"  />
+      <param attention="conversation" priority="5.0" timeout="6.0"  />
+      <param attention="select"       priority="2.5" timeout="-1"   />
+      <param attention="focus"        priority="2.5" timeout="10.0" />
+      <param attention="mouselook"    priority="7.0" timeout="-1"   />
+   </gender>
+</linden_attentions>
+
diff --git a/linden/indra/newview/character/avatar_eye.llm b/linden/indra/newview/character/avatar_eye.llm
new file mode 100644
index 0000000..8c6e74e
Binary files /dev/null and b/linden/indra/newview/character/avatar_eye.llm differ
diff --git a/linden/indra/newview/character/avatar_eye_1.llm b/linden/indra/newview/character/avatar_eye_1.llm
new file mode 100644
index 0000000..7a3b0d6
Binary files /dev/null and b/linden/indra/newview/character/avatar_eye_1.llm differ
diff --git a/linden/indra/newview/character/avatar_eyelashes.llm b/linden/indra/newview/character/avatar_eyelashes.llm
new file mode 100644
index 0000000..99995b5
Binary files /dev/null and b/linden/indra/newview/character/avatar_eyelashes.llm differ
diff --git a/linden/indra/newview/character/avatar_hair.llm b/linden/indra/newview/character/avatar_hair.llm
new file mode 100644
index 0000000..df99de8
Binary files /dev/null and b/linden/indra/newview/character/avatar_hair.llm differ
diff --git a/linden/indra/newview/character/avatar_hair_1.llm b/linden/indra/newview/character/avatar_hair_1.llm
new file mode 100644
index 0000000..6de31fd
Binary files /dev/null and b/linden/indra/newview/character/avatar_hair_1.llm differ
diff --git a/linden/indra/newview/character/avatar_hair_2.llm b/linden/indra/newview/character/avatar_hair_2.llm
new file mode 100644
index 0000000..47d02ba
Binary files /dev/null and b/linden/indra/newview/character/avatar_hair_2.llm differ
diff --git a/linden/indra/newview/character/avatar_hair_3.llm b/linden/indra/newview/character/avatar_hair_3.llm
new file mode 100644
index 0000000..107f9e2
Binary files /dev/null and b/linden/indra/newview/character/avatar_hair_3.llm differ
diff --git a/linden/indra/newview/character/avatar_hair_4.llm b/linden/indra/newview/character/avatar_hair_4.llm
new file mode 100644
index 0000000..1b9a12a
Binary files /dev/null and b/linden/indra/newview/character/avatar_hair_4.llm differ
diff --git a/linden/indra/newview/character/avatar_hair_5.llm b/linden/indra/newview/character/avatar_hair_5.llm
new file mode 100644
index 0000000..1b9a12a
Binary files /dev/null and b/linden/indra/newview/character/avatar_hair_5.llm differ
diff --git a/linden/indra/newview/character/avatar_head.llm b/linden/indra/newview/character/avatar_head.llm
new file mode 100644
index 0000000..8d8b5e0
Binary files /dev/null and b/linden/indra/newview/character/avatar_head.llm differ
diff --git a/linden/indra/newview/character/avatar_head_1.llm b/linden/indra/newview/character/avatar_head_1.llm
new file mode 100644
index 0000000..26291e6
Binary files /dev/null and b/linden/indra/newview/character/avatar_head_1.llm differ
diff --git a/linden/indra/newview/character/avatar_head_2.llm b/linden/indra/newview/character/avatar_head_2.llm
new file mode 100644
index 0000000..c2b808b
Binary files /dev/null and b/linden/indra/newview/character/avatar_head_2.llm differ
diff --git a/linden/indra/newview/character/avatar_head_3.llm b/linden/indra/newview/character/avatar_head_3.llm
new file mode 100644
index 0000000..a0676b1
Binary files /dev/null and b/linden/indra/newview/character/avatar_head_3.llm differ
diff --git a/linden/indra/newview/character/avatar_head_4.llm b/linden/indra/newview/character/avatar_head_4.llm
new file mode 100644
index 0000000..5035585
Binary files /dev/null and b/linden/indra/newview/character/avatar_head_4.llm differ
diff --git a/linden/indra/newview/character/avatar_lad.xml b/linden/indra/newview/character/avatar_lad.xml
new file mode 100644
index 0000000..e9c9f0a
--- /dev/null
+++ b/linden/indra/newview/character/avatar_lad.xml
@@ -0,0 +1,11417 @@
+<?xml version="1.0" encoding="US-ASCII" standalone="yes"?>
+<linden_avatar
+ version="1.0"
+ wearable_definition_version="22">  
+ <!-- The wearable_definition_version is checked during asset upload. -->
+ <!-- If you increment it, check indra/lib/python/indra/assetutil.py.  -->
+   <skeleton
+    file_name="avatar_skeleton.xml">
+      <attachment_point
+       id="1"
+       group="6"
+       pie_slice="2"
+       name="Chest"
+       joint="mChest"
+       position="0.15 0 -0.1"
+       rotation="0 90 90"
+	   visible_in_first_person="true" />
+
+      <attachment_point
+       id="2"
+       group="2"
+       pie_slice="2"
+       name="Skull"
+       joint="mHead"
+       position="0 0 0.15"
+       rotation="0 0 90"
+       visible_in_first_person="false" />
+
+      <attachment_point
+       id="3"
+       group="3"
+       pie_slice="3"
+       name="Left Shoulder"
+       joint="mCollarLeft"
+       position="0 0 0.08"
+       rotation="0 0 0"
+	   visible_in_first_person="true" />
+
+      <attachment_point
+       id="4"
+       group="1"
+       pie_slice="1"
+       name="Right Shoulder"
+       joint="mCollarRight"
+       position="0 0 0.08"
+       rotation="0 0 0" 
+	   visible_in_first_person="true"/>
+
+      <attachment_point
+       id="5"
+       group="4"
+       name="Left Hand"
+       joint="mWristLeft"
+       position="0 0.08 -0.02"
+       rotation="0 0 0"
+       visible_in_first_person="true"
+       max_attachment_offset="1.5" />
+
+      <attachment_point
+       id="6"
+       group="0"
+       name="Right Hand"
+       joint="mWristRight"
+       position="0 -0.08 -0.02"
+       rotation="0 0 0"
+       visible_in_first_person="true"
+       max_attachment_offset="1.5" />
+
+      <attachment_point
+       id="7"
+       group="5"
+       pie_slice="6"
+       name="Left Foot"
+       joint="mFootLeft"
+       position="0 0.0 0.0"
+       rotation="0 0 0" 
+	   visible_in_first_person="true"/>
+
+      <attachment_point
+       id="8"
+       group="7"
+       pie_slice="6"
+       name="Right Foot"
+       joint="mFootRight"
+       position="0 0.0 0.0"
+       rotation="0 0 0" 
+	   visible_in_first_person="true"/>
+
+      <attachment_point
+       id="9"
+       group="6"
+       pie_slice="7"
+       name="Spine"
+       joint="mChest"
+       position="-0.15 0 -0.1"
+       rotation="0 -90 90"
+	   visible_in_first_person="true" />
+
+      <attachment_point
+       id="10"
+       group="6"
+       pie_slice="6"
+       name="Pelvis"
+       joint="mPelvis"
+       position="0 0 -0.15"
+       rotation="0 0 0"
+	   visible_in_first_person="true" />
+
+      <attachment_point
+       id="11"
+       group="2"
+       pie_slice="6"
+       name="Mouth"
+       joint="mHead"
+       position="0.12 0 0.001"
+       rotation="0 0 0" 
+	   visible_in_first_person="false"/>
+
+      <attachment_point
+       id="12"
+       group="2"
+       pie_slice="7"
+       name="Chin"
+       joint="mHead"
+       position="0.12 0 -0.04"
+       rotation="0 0 0"
+	   visible_in_first_person="false" />
+
+      <attachment_point
+       id="13"
+       group="2"
+       pie_slice="4"
+       name="Left Ear"
+       joint="mHead"
+       position="0.015 0.08 0.017"
+       rotation="0 0 0"
+	   visible_in_first_person="false" />
+
+      <attachment_point
+       id="14"
+       group="2"
+       pie_slice="0"
+       name="Right Ear"
+       joint="mHead"
+       position="0.015 -0.08 0.017"
+       rotation="0 0 0"
+	   visible_in_first_person="false" />
+
+      <attachment_point
+       id="15"
+       group="2"
+       pie_slice="3"
+       name="Left Eyeball"
+       joint="mEyeLeft"
+       position="0 0 0"
+       rotation="0 0 0" 
+	   visible_in_first_person="false"/>
+
+      <attachment_point
+       id="16"
+       group="2"
+       pie_slice="1"
+       name="Right Eyeball"
+       joint="mEyeRight"
+       position="0 0 0"
+       rotation="0 0 0"
+	   visible_in_first_person="false" />
+
+      <attachment_point
+       id="17"
+       group="2"
+       pie_slice="5"
+       name="Nose"
+       joint="mHead"
+       position="0.1 0 0.05"
+       rotation="0 0 0" 
+	   visible_in_first_person="false"/>
+
+      <attachment_point
+       id="18"
+       group="1"
+       pie_slice="0"
+       name="R Upper Arm"
+       joint="mShoulderRight"
+       position="0.01 -0.13 0.01"
+       rotation="0 0 0"
+	   visible_in_first_person="true" />
+
+      <attachment_point
+       id="19"
+       group="1"
+       pie_slice="7"
+       name="R Forearm"
+       joint="mElbowRight"
+       position="0 -0.12 0"
+       rotation="0 0 0"
+	   visible_in_first_person="true"/>
+
+      <attachment_point
+       id="20"
+       group="3"
+       pie_slice="4"
+       name="L Upper Arm"
+       joint="mShoulderLeft"
+       position="0.01 0.15 -0.01"
+       rotation="0 0 0"
+	   visible_in_first_person="true" />
+
+      <attachment_point
+       id="21"
+       group="3"
+       pie_slice="5"
+       name="L Forearm"
+       joint="mElbowLeft"
+       position="0 0.113 0"
+       rotation="0 0 0"
+	   visible_in_first_person="true" />
+
+      <attachment_point
+       id="22"
+       group="7"
+       pie_slice="1"
+       name="Right Hip"
+       joint="mHipRight"
+       position="0 0 0"
+       rotation="0 0 0"
+	   visible_in_first_person="true" />
+
+      <attachment_point
+       id="23"
+       group="7"
+       pie_slice="0"
+       name="R Upper Leg"
+       joint="mHipRight"
+       position="-0.017 0.041 -0.310"
+       rotation="0 0 0"
+	   visible_in_first_person="true" />
+
+      <attachment_point
+       id="24"
+       group="7"
+       pie_slice="7"
+       name="R Lower Leg"
+       joint="mKneeRight"
+       position="-0.044 -0.007 -0.262"
+       rotation="0 0 0"
+	   visible_in_first_person="true" />
+
+      <attachment_point
+       id="25"
+       group="5"
+       pie_slice="3"
+       name="Left Hip"
+       joint="mHipLeft"
+       position="0 0 0"
+       rotation="0 0 0"
+	   visible_in_first_person="true" />
+
+      <attachment_point
+       id="26"
+       group="5"
+       pie_slice="4"
+       name="L Upper Leg"
+       joint="mHipLeft"
+       position="-0.019 -0.034 -0.310"
+       rotation="0 0 0" 
+	   visible_in_first_person="true"/>
+
+      <attachment_point
+       id="27"
+       group="5"
+       pie_slice="5"
+       name="L Lower Leg"
+       joint="mKneeLeft"
+       position="-0.044 -0.007 -0.261"
+       rotation="0 0 0"
+	   visible_in_first_person="true" />
+
+      <attachment_point
+       id="28"
+       group="6"
+       pie_slice="5"
+       name="Stomach"
+       joint="mPelvis"
+       position="0.092 0.0 0.088"
+       rotation="0 0 0"
+	   visible_in_first_person="true" />
+
+      <attachment_point
+       id="29"
+       group="6"
+       pie_slice="3"
+       name="Left Pec"
+       joint="mTorso"
+       position="0.104 0.082 0.247"
+       rotation="0 0 0"
+	   visible_in_first_person="true" />
+
+      <attachment_point
+       id="30"
+       group="6"
+       pie_slice="1"
+       name="Right Pec"
+       joint="mTorso"
+       position="0.104 -0.082 0.247"
+       rotation="0 0 0"
+	   visible_in_first_person="true" />
+
+    <attachment_point
+       id="31"
+       group="8"
+       name="Center 2"
+       joint="mScreen"
+       position="0 0 0"
+       rotation="0 0 0"
+       hud="true"
+       max_attachment_offset="2.0"
+       visible_in_first_person="true" />
+
+    <attachment_point
+       id="32"
+       group="8"
+       name="Top Right"
+       joint="mScreen"
+       position="0 -0.5 0.5"
+       rotation="0 0 0"
+       hud="true"
+       max_attachment_offset="2.0"
+       visible_in_first_person="true" />
+
+    <attachment_point
+       id="33"
+       group="8"
+       name="Top"
+       joint="mScreen"
+       position="0 0 0.5"
+       rotation="0 0 0"
+       hud="true"
+       max_attachment_offset="2.0"
+       visible_in_first_person="true" />
+
+    <attachment_point
+       id="34"
+       group="8"
+       name="Top Left"
+       joint="mScreen"
+       position="0 0.5 0.5"
+       rotation="0 0 0"
+       hud="true"
+       max_attachment_offset="2.0"
+       visible_in_first_person="true" />
+
+    <attachment_point
+       id="35"
+       group="8"
+       name="Center"
+       joint="mScreen"
+       position="0 0 0"
+       rotation="0 0 0"
+       hud="true"
+       max_attachment_offset="2.0"
+       visible_in_first_person="true" />
+
+    <attachment_point
+       id="36"
+       group="8"
+       name="Bottom Left"
+       joint="mScreen"
+       position="0 0.5 -0.5"
+       rotation="0 0 0"
+       hud="true"
+       max_attachment_offset="2.0"
+       visible_in_first_person="true" />
+
+    <attachment_point
+       id="37"
+       group="8"
+       name="Bottom"
+       joint="mScreen"
+       position="0 0 -0.5"
+       rotation="0 0 0"
+       hud="true"
+       max_attachment_offset="2.0"
+       visible_in_first_person="true" />
+
+    <attachment_point
+       id="38"
+       group="8"
+       name="Bottom Right"
+       joint="mScreen"
+       position="0 -0.5 -0.5"
+       rotation="0 0 0"
+       hud="true"
+       max_attachment_offset="2.0"
+       visible_in_first_person="true" />
+
+    <param
+       id="32"
+       group="1"
+       wearable="shape"
+       name="Male_Skeleton"
+       label_min="Female"
+       label_max="Male"
+       value_min="0"
+       value_max="1">
+         <param_skeleton>
+            <bone
+             name="mNeck"
+             scale="0 0 .2" />
+
+            <bone
+             name="mCollarLeft"
+             scale="0 .4 0" />
+
+            <bone
+             name="mCollarRight"
+             scale="0 .4 0" />
+
+            <bone
+             name="mShoulderLeft"
+             scale="0 .35 0" />
+
+            <bone
+             name="mShoulderRight"
+             scale="0 .35 0" />
+
+            <bone
+             name="mElbowLeft"
+             scale="0 .1 0" />
+
+            <bone
+             name="mElbowRight"
+             scale="0 .1 0" />
+
+            <bone
+             name="mChest"
+             scale=".05 .05 .05" />
+
+            <bone
+             name="mTorso"
+             scale="0 0 .05" />
+
+            <bone
+             name="mPelvis"
+             scale="0 0 0" />
+
+            <bone
+             name="mHipLeft"
+             scale=".05 .05 0" />
+
+            <bone
+             name="mHipRight"
+             scale=".05 .05 0" />
+
+            <bone
+             name="mKneeLeft"
+             scale=".05 .05 .1" />
+
+            <bone
+             name="mKneeRight"
+             scale=".05 .05 .1" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="33"
+       group="0"
+       name="Height"
+       label="Height"
+       wearable="shape"
+       edit_group="shape_body"
+       edit_group_order="1"
+       label_min="Short"
+       label_max="Tall"
+       show_simple="true"
+       value_min="-2.3"
+       value_max="2"
+       camera_distance="2.2">
+         <param_skeleton>
+            <bone
+             name="mNeck"
+             scale="0 0 .02" />
+
+            <bone
+             name="mCollarLeft"
+             scale="0 0 0" />
+
+            <bone
+             name="mCollarRight"
+             scale="0 0 0" />
+
+            <bone
+             name="mShoulderLeft"
+             scale="0 0.08 0" />
+
+            <bone
+             name="mShoulderRight"
+             scale="0 0.08 0" />
+
+            <bone
+             name="mElbowLeft"
+             scale="0 0.06 0" />
+
+            <bone
+             name="mElbowRight"
+             scale="0 0.06 0" />
+
+            <bone
+             name="mChest"
+             scale="0 0 0.05" />
+
+            <bone
+             name="mTorso"
+             scale="0 0 0.05" />
+
+            <bone
+             name="mPelvis"
+             scale="0 0 0" />
+
+            <bone
+             name="mHipLeft"
+             scale="0 0 0.1" />
+
+            <bone
+             name="mHipRight"
+             scale="0 0 0.1" />
+
+            <bone
+             name="mKneeLeft"
+             scale="0 0 0.1" />
+
+            <bone
+             name="mKneeRight"
+             scale="0 0 0.1" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="34"
+       group="0"
+       name="Thickness"
+       label="Body Thickness"
+       wearable="shape"
+       edit_group="shape_body"
+       edit_group_order="2"
+       label_min="Body Thin"
+       label_max="Body Thick"
+       show_simple="true"
+       value_min="-0.7"
+       value_max="1.5"
+       camera_distance="1.8">
+         <param_skeleton>
+            <bone
+             name="mNeck"
+             scale="0.1 0.1 0" />
+
+            <bone
+             name="mCollarLeft"
+             scale="0 0.2 0" />
+
+            <bone
+             name="mCollarRight"
+             scale="0 0.2 0" />
+
+            <bone
+             name="mShoulderLeft"
+             scale="0.1 0 0.1" />
+
+            <bone
+             name="mShoulderRight"
+             scale="0.1 0 0.1" />
+
+            <bone
+             name="mElbowLeft"
+             scale="0.1 0 0.1" />
+
+            <bone
+             name="mElbowRight"
+             scale="0.1 0 0.1" />
+
+            <bone
+             name="mChest"
+             scale="0.1 0.1 0" />
+
+            <bone
+             name="mTorso"
+             scale="0.1 0.1 0" />
+
+            <bone
+             name="mPelvis"
+             scale="0.1 0.1 0" />
+
+            <bone
+             name="mHipLeft"
+             scale="0.13 0.13 0" />
+
+            <bone
+             name="mHipRight"
+             scale="0.13 0.13 0" />
+
+            <bone
+             name="mKneeLeft"
+             scale="0.12 0.12 0" />
+
+            <bone
+             name="mKneeRight"
+             scale="0.12 0.12 0" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="36"
+       group="0"
+       name="Shoulders"
+	   label="Shoulders"
+       wearable="shape"
+       edit_group="shape_torso"
+       edit_group_order="4"
+       label_min="Narrow"
+       label_max="Broad"
+       show_simple="true"
+       value_min="-1.8"
+       value_max="1.4"
+       value_default="-0.5"
+       camera_elevation=".1"
+       camera_distance="1.2"
+       camera_angle="0">
+         <param_skeleton>
+            <bone
+             name="mNeck"
+             scale="0.01 0.03 0" />
+
+            <bone
+             name="mCollarLeft"
+             scale="0 0 0"
+             offset="0 .02 0" />
+
+            <bone
+             name="mCollarRight"
+             scale="0 0 0"
+             offset="0 -.02 0" />
+
+            <bone
+             name="mChest"
+             scale="0.02 0.08 0" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="37"
+       group="0"
+       name="Hip Width"
+	   label="Hip Width"
+       wearable="shape"
+       edit_group="shape_legs"
+       edit_group_order="3"
+       label_min="Narrow"
+       label_max="Wide"
+       show_simple="true"
+       value_min="-3.2"
+       value_max="2.8"
+       camera_distance="1.8">
+         <param_skeleton>
+            <bone
+             name="mPelvis"
+             scale="0 0.1 0" />
+
+            <bone
+             name="mHipLeft"
+             scale="0 0 0"
+             offset="0 .004 0" />
+
+            <bone
+             name="mHipRight"
+             scale="0 0 0"
+             offset="0 -.004 0" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="842"
+       group="0"
+       name="Hip Length"
+       wearable="shape"
+       edit_group="shape_legs"
+       edit_group_order="3.2"
+       label_min="Short hips"
+       label_max="Long Hips"
+       value_min="-1"
+       value_max="1"
+       camera_distance="1.8">
+         <param_skeleton>
+            <bone
+             name="mPelvis"
+             scale="0 0 0.3" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="38"
+       group="0"
+       name="Torso Length"
+       wearable="shape"
+       edit_group="shape_torso"
+       edit_group_order="11"
+       label_min="Short Torso"
+       label_max="Long Torso"
+       value_min="-1"
+       value_max="1"
+       camera_distance="1.8">
+         <param_skeleton>
+            <bone
+             name="mTorso"
+             scale="0 0 .3" />
+
+            <bone
+             name="mPelvis"
+             scale="0 0 .1" />
+
+            <bone
+             name="mHipLeft"
+             scale="0 0 -.1" />
+
+            <bone
+             name="mHipRight"
+             scale="0 0 -.1" />
+
+            <bone
+             name="mKneeRight"
+             scale="0 0 -.05" />
+
+            <bone
+             name="mKneeLeft"
+             scale="0 0 -.05" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="195"
+       group="1"
+       name="EyeBone_Spread"
+       wearable="shape"
+       edit_group="shape_eyes"
+       label_min="Eyes Together"
+       label_max="Eyes Spread"
+       value_min="-1"
+       value_max="1">
+         <param_skeleton>
+            <bone
+             name="mEyeLeft"
+             scale="0 0 0"
+             offset="0 .009 0" />
+
+            <bone
+             name="mEyeRight"
+             scale="0 0 0"
+             offset="0 -.009 0" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="661"
+       group="1"
+       name="EyeBone_Head_Shear"
+       wearable="shape"
+       edit_group="shape_eyes"
+       label_min="Eyes Shear Left Up"
+       label_max="Eyes Shear Right Up"
+       value_min="-2"
+       value_max="2">
+         <param_skeleton>
+            <bone
+             name="mEyeLeft"
+             scale="0 0 0"
+             offset="0 0 .004" />
+
+            <bone
+             name="mEyeRight"
+             scale="0 0 0"
+             offset="0 0 -.004" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="772"
+       group="1"
+       name="EyeBone_Head_Elongate"
+       wearable="shape"
+       edit_group="shape_eyes"
+       label_min="Eyes Short Head"
+       label_max="Eyes Long Head"
+       value_min="-1"
+       value_max="1">
+         <param_skeleton>
+            <bone
+             name="mEyeLeft"
+             scale="0 0 0"
+             offset=".016 0 0" />
+
+            <bone
+             name="mEyeRight"
+             scale="0 0 0"
+             offset=".016 0 0" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="768"
+       group="1"
+       name="EyeBone_Bug"
+       wearable="shape"
+       edit_group="shape_eyes"
+       label_min="Eyes Sunken"
+       label_max="Eyes Bugged"
+       value_min="-2"
+       value_max="2">
+         <param_skeleton>
+            <bone
+             name="mEyeLeft"
+             scale="0 0 0"
+             offset=".005 0 0" />
+
+            <bone
+             name="mEyeRight"
+             scale="0 0 0"
+             offset=".005 0 0" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="655"
+       group="1"
+       name="Head Size"
+	   label="Head Size"
+       wearable="shape"
+       edit_group="shape_head"
+       label_min="Small Head"
+       label_max="Big Head"
+       show_simple="true"
+       value_min="-.25"
+       value_max=".10">
+         <param_skeleton>
+            <bone
+             name="mSkull"
+             scale="1 1 1"
+             offset="0 0 0.1" />
+
+            <bone
+             name="mHead"
+             scale="1 1 1"
+             offset="0 0 0" />
+
+            <bone
+             name="mEyeLeft"
+             scale="1 1 1"
+             offset="0 0 0" />
+
+            <bone
+             name="mEyeRight"
+             scale="1 1 1"
+             offset="0 0 0" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="197"
+       group="1"
+       wearable="shoes"
+       name="Shoe_Heels"
+       edit_group="shoes"
+       label_min="No Heels"
+       label_max="High Heels"
+       value_min="0"
+       value_max="1">
+         <param_skeleton>
+            <bone
+             name="mFootRight"
+             scale="0 0 0"
+             offset="0 0 -.08" />
+
+            <bone
+             name="mFootLeft"
+             scale="0 0 0"
+             offset="0 0 -.08" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="502"
+       group="1"
+       wearable="shoes"
+       name="Shoe_Platform"
+       edit_group="shoes"
+       label_min="No Heels"
+       label_max="High Heels"
+       value_min="0"
+       value_max="1">
+         <param_skeleton>
+            <bone
+             name="mFootRight"
+             scale="0 0 0"
+             offset="0 0 -.07" />
+
+            <bone
+             name="mFootLeft"
+             scale="0 0 0"
+             offset="0 0 -.07" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="675"
+       group="0"
+       name="Hand Size"
+       wearable="shape"
+       edit_group="shape_torso"
+       edit_group_order="10"
+       label_min="Small Hands"
+       label_max="Large Hands"
+       value_min="-.3"
+       value_max=".3"
+       camera_elevation=".1"
+       camera_distance="1.4"
+       camera_angle="0">
+         <param_skeleton>
+            <bone
+             name="mWristRight"
+             scale="1 1 1"
+             offset="0 0 0" />
+
+            <bone
+             name="mWristLeft"
+             scale="1 1 1"
+             offset="0 0 0" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="683"
+       group="0"
+       name="Neck Thickness"
+       wearable="shape"
+       edit_group="shape_torso"
+       edit_group_order="2"
+       label_min="Skinny Neck"
+       label_max="Thick Neck"
+       value_min="-.4"
+       value_max=".2"
+       value_default="-.15"
+       camera_elevation=".3"
+       camera_distance=".8"
+       camera_angle="15">
+         <param_skeleton>
+            <bone
+             name="mNeck"
+             scale="1 1 0"
+             offset="0 0 0" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="689"
+       group="1"
+       wearable="shape"
+       name="EyeBone_Big_Eyes"
+       edit_group="shape_eyes"
+       label_min="Eyes Back"
+       label_max="Eyes Forward"
+       value_min="-1"
+       value_max="1">
+         <param_skeleton>
+            <bone
+             name="mEyeLeft"
+             scale="0 0 0"
+             offset="-.005 0 0" />
+
+            <bone
+             name="mEyeRight"
+             scale="0 0 0"
+             offset="-.005 0 0" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="692"
+       group="0"
+       name="Leg Length"
+       wearable="shape"
+       edit_group="shape_legs"
+       edit_group_order="2"
+       label_min="Short Legs"
+       label_max="Long Legs"
+       value_min="-1"
+       value_max="1"
+       camera_distance="2.5">
+         <param_skeleton>
+            <bone
+             name="mHipLeft"
+             scale="0 0 .2" />
+
+            <bone
+             name="mHipRight"
+             scale="0 0 .2" />
+
+            <bone
+             name="mKneeRight"
+             scale="0 0 .2" />
+
+            <bone
+             name="mKneeLeft"
+             scale="0 0 .2" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="693"
+       group="0"
+       name="Arm Length"
+       wearable="shape"
+       edit_group="shape_torso"
+       edit_group_order="9"
+       label_min="Short Arms"
+       label_max="Long arms"
+       value_min="-1"
+       value_max="1"
+       value_default=".6"
+       camera_distance="1.5">
+         <param_skeleton>
+            <bone
+             name="mShoulderLeft"
+             scale="0 .2 0" />
+
+            <bone
+             name="mShoulderRight"
+             scale="0 .2 0" />
+
+            <bone
+             name="mElbowRight"
+             scale="0 .3 0" />
+
+            <bone
+             name="mElbowLeft"
+             scale="0 .3 0" />
+         </param_skeleton>
+      </param>
+
+      <param
+       id="756"
+       group="0"
+       name="Neck Length"
+       wearable="shape"
+       edit_group="shape_torso"
+       edit_group_order="3"
+       label_min="Short Neck"
+       label_max="Long Neck"
+       value_min="-1"
+       value_max="1"
+       value_default="0"
+       camera_elevation=".3"
+       camera_distance=".8"
+       camera_angle="15">
+         <param_skeleton>
+            <bone
+             name="mNeck"
+             scale="0 0 .5" />
+         </param_skeleton>
+      </param>
+   </skeleton>
+
+   <mesh
+    type="hairMesh"
+	lod="0"
+    file_name="avatar_hair.llm"
+    min_pixel_width="320">
+<!-- begin morph targets -->
+      <param
+       id="180"
+       group="1"
+       name="Hair_Volume"
+       label="Hair Volume"
+	   show_simple="true"
+       wearable="hair"
+       clothing_morph="true"
+       edit_group="hair_style"
+       label_min="Less"
+       label_max="More"
+       value_min="0"
+       value_max="1.3"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="761"
+       group="1"
+       name="Hair_Volume_Small"
+       label="Hair Volume"
+	   show_simple="true"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Less"
+       label_max="More"
+       value_min="0"
+       value_max="1.3"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="181"
+       group="0"
+       name="Hair_Big_Front"
+       label="Big Hair Front"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="5"
+       label_min="Less"
+       label_max="More"
+       value_min="-1"
+       value_max="1"
+       value_default="0.14"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="90">
+         <param_morph />
+      </param>
+
+      <param
+       id="182"
+       group="0"
+       name="Hair_Big_Top"
+       label="Big Hair Top"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="6"
+       label_min="Less"
+       label_max="More"
+       value_min="-1"
+       value_max="1"
+       value_default=".7"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="90">
+         <param_morph />
+      </param>
+
+      <param
+       id="183"
+       group="0"
+       name="Hair_Big_Back"
+       clothing_morph="true"
+       label="Big Hair Back"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="7"
+       label_min="Less"
+       label_max="More"
+       value_min="-1"
+       value_max="1"
+       value_default="0.05"
+       camera_elevation=".1"
+       camera_distance=".7"
+       camera_angle="90">
+         <param_morph />
+      </param>
+
+      <param
+       id="184"
+       group="0"
+       name="Hair_Spiked"
+       label="Spiked Hair"
+	   show_simple="true"
+       wearable="hair"
+       clothing_morph="true"
+       edit_group="hair_style"
+       edit_group_order="15"
+       label_min="No Spikes"
+       label_max="Big Spikes"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="140"
+       group="0"
+       name="Hair_Part_Middle"
+       label="Middle Part"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="17"
+       label_min="No Part"
+       label_max="Part"
+       value_min="0"
+       value_max="2"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="0">
+         <param_morph />
+      </param>
+
+      <param
+       id="141"
+       group="0"
+       name="Hair_Part_Right"
+       label="Right Part"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="18"
+       label_min="No Part"
+       label_max="Part"
+       value_min="0"
+       value_max="2"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="0">
+         <param_morph />
+      </param>
+
+      <param
+       id="142"
+       group="0"
+       name="Hair_Part_Left"
+       label="Left Part"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="19"
+       label_min="No Part"
+       label_max="Part"
+       value_min="0"
+       value_max="2"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="0">
+         <param_morph />
+      </param>
+
+      <param
+       id="143"
+       group="0"
+       name="Hair_Sides_Full"
+       label="Full Hair Sides"
+	   show_simple="true"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="11"
+       label_min="Mowhawk"
+       label_max="Full Sides"
+       value_min="-4"
+       value_max="1.5"
+       value_default="0.125"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="144"
+       group="1"
+       name="Bangs_Front_Up"
+       label="Front Bangs Up"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Bangs"
+       label_max="Bangs Up"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="145"
+       group="1"
+       clothing_morph="true"
+       name="Bangs_Front_Down"
+       label="Front Bangs Down"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Bangs"
+       label_max="Bangs Down"
+       value_min="0"
+       value_max="5"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="146"
+       group="1"
+       name="Bangs_Sides_Up"
+       label="Side Bangs Up"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Side Bangs"
+       label_max="Side Bangs Up"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="147"
+       group="1"
+       clothing_morph="true"
+       name="Bangs_Sides_Down"
+       label="Side Bangs Down"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Side Bangs"
+       label_max="Side Bangs Down"
+       value_min="0"
+       value_max="2"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="148"
+       group="1"
+       name="Bangs_Back_Up"
+       label="Back Bangs Up"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Back Bangs"
+       label_max="Back Bangs Up"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="150">
+         <param_morph />
+      </param>
+
+      <param
+       id="149"
+       group="1"
+       name="Bangs_Back_Down"
+       label="Back Bangs Down"
+       clothing_morph="true"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Back Bangs"
+       label_max="Back Bangs Down"
+       value_min="0"
+       value_max="2"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="150">
+         <param_morph />
+      </param>
+
+      <param
+       id="171"
+       group="1"
+       name="Hair_Front_Down"
+       label="Front Hair Down"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Front Hair"
+       label_max="Front Hair Down"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="172"
+       group="1"
+       name="Hair_Front_Up"
+       label="Front Hair Up"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Front Hair"
+       label_max="Front Hair Up"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="173"
+       group="1"
+       name="Hair_Sides_Down"
+       label="Sides Hair Down"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Sides Hair"
+       label_max="Sides Hair Down"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="174"
+       group="1"
+       name="Hair_Sides_Up"
+       label="Sides Hair Up"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Sides Hair"
+       label_max="Sides Hair Up"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="175"
+       group="1"
+       name="Hair_Back_Down"
+       label="Back Hair Down"
+       clothing_morph="true"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Back Hair"
+       label_max="Back Hair Down"
+       value_min="0"
+       value_max="3"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="150">
+         <param_morph />
+      </param>
+
+      <param
+       id="176"
+       group="1"
+       name="Hair_Back_Up"
+       label="Back Hair Up"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Back Hair"
+       label_max="Back Hair Up"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="150">
+         <param_morph />
+      </param>
+
+      <param
+       id="177"
+       group="0"
+       name="Hair_Rumpled"
+       label="Rumpled Hair"
+	   show_simple="true"
+       wearable="hair"
+       clothing_morph="true"
+       edit_group="hair_style"
+       edit_group_order="14.5"
+       label_min="Smooth Hair"
+       label_max="Rumpled Hair"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="178"
+       group="1"
+       name="Hair_Swept_Back"
+       label="Swept Back Hair"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="NotHair"
+       label_max="Swept Back"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="90">
+         <param_morph />
+      </param>
+
+      <param
+       id="179"
+       group="1"
+       name="Hair_Swept_Forward"
+       label="Swept Forward Hair"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Hair"
+       label_max="Swept Forward"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="90">
+         <param_morph />
+      </param>
+
+      <param
+       id="190"
+       group="1"
+       name="Hair_Tilt_Right"
+       label="Hair Tilted Right"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Hair"
+       label_max="Tilt Right"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="0">
+         <param_morph />
+      </param>
+
+      <param
+       id="191"
+       group="1"
+       name="Hair_Tilt_Left"
+       label="Hair Tilted Left"
+       wearable="hair"
+       edit_group="hair_style"
+       label_min="Hair"
+       label_max="Tilt Left"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="0">
+         <param_morph />
+      </param>
+
+      <param
+       id="192"
+       group="0"
+       name="Bangs_Part_Middle"
+       label="Part Bangs"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="20"
+       label_min="No Part"
+       label_max="Part Bangs"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="0">
+         <param_morph />
+      </param>
+
+      <param
+       id="640"
+       group="1"
+       name="Hair_Egg_Head"
+       wearable="hair"
+       edit_group="hair_style"
+       value_min="-1.3"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="641"
+       group="1"
+       name="Hair_Squash_Stretch_Head"
+       wearable="hair"
+       edit_group="hair_style"
+       value_min="-.5"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="642"
+       group="1"
+       name="Hair_Square_Head"
+       wearable="hair"
+       edit_group="hair_style"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="643"
+       group="1"
+       name="Hair_Round_Head"
+       wearable="hair"
+       edit_group="hair_style"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="644"
+       group="1"
+       name="Hair_Forehead_Round"
+       wearable="hair"
+       edit_group="hair_style"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="645"
+       group="1"
+       name="Hair_Forehead_Slant"
+       wearable="hair"
+       edit_group="hair_style"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="774"
+       group="1"
+       name="Shear_Head_Hair"
+       wearable="hair"
+       edit_group="hair_style"
+       value_min="-2"
+       value_max="2">
+         <param_morph />
+      </param>
+
+      <param
+       id="771"
+       group="1"
+       name="Elongate_Head_Hair"
+       wearable="hair"
+       edit_group="hair_style"
+       value_min="-1"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="674"
+       group="0"
+       name="Hair_Shear_Back"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="12"
+       label="Shear Back"
+       label_min="Full Back"
+       label_max="Sheared Back"
+       value_min="-1"
+       value_max="2"
+       value_default="-0.3"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="100">
+         <param_morph />
+      </param>
+
+      <param
+       id="762"
+       group="0"
+       name="Hair_Shear_Front"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="11.8"
+       label="Shear Front"
+	   show_simple="true"
+       label_min="Full Front"
+       label_max="Sheared Front"
+       value_min="0"
+       value_max="3"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="30">
+         <param_morph />
+      </param>
+
+      <param
+       id="754"
+       group="0"
+       name="Hair_Taper_Back"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="14"
+       label="Taper Back"
+       label_min="Wide Back"
+       label_max="Narrow Back"
+       value_min="-1"
+       value_max="2"
+       value_default="0"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="160">
+         <param_morph />
+      </param>
+
+      <param
+       id="755"
+       group="0"
+       name="Hair_Taper_Front"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="13"
+       label="Taper Front"
+       label_min="Wide Front"
+       label_max="Narrow Front"
+       value_min="-1.5"
+       value_max="1.5"
+       value_default="0.05"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="782"
+       group="1"
+       clothing_morph="true"
+       name="Hair_Pigtails_Short"
+       wearable="hair"
+       edit_group="hair_style"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="783"
+       group="1"
+       clothing_morph="true"
+       name="Hair_Pigtails_Med"
+       wearable="hair"
+       edit_group="hair_style"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="790"
+       group="1"
+       clothing_morph="true"
+       name="Hair_Pigtails_Medlong"
+       wearable="hair"
+       edit_group="hair_style"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="784"
+       group="1"
+       clothing_morph="true"
+       name="Hair_Pigtails_Long"
+       wearable="hair"
+       edit_group="hair_style"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="786"
+       group="1"
+       name="Hair_Ponytail_Short"
+       wearable="hair"
+       edit_group="hair_style"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="787"
+       group="1"
+       name="Hair_Ponytail_Med"
+       wearable="hair"
+       edit_group="hair_style"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="788"
+       group="1"
+       name="Hair_Ponytail_Long"
+       clothing_morph="true"
+       wearable="hair"
+       edit_group="hair_style"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+<!-- #end morph targets -->
+   </mesh>
+
+   <mesh
+    type="hairMesh"
+	lod="1"
+    file_name="avatar_hair_1.llm"
+    min_pixel_width="160"
+    reference="avatar_hair.llm">
+   </mesh>
+
+   <mesh
+    type="hairMesh"
+	lod="2"
+    file_name="avatar_hair_2.llm"
+    min_pixel_width="80"
+    reference="avatar_hair.llm">
+   </mesh>
+
+   <mesh
+    type="hairMesh"
+	lod="3"
+    file_name="avatar_hair_3.llm"
+    min_pixel_width="40"
+    reference="avatar_hair.llm">
+   </mesh>
+
+   <mesh
+    type="hairMesh"
+	lod="4"
+    file_name="avatar_hair_4.llm"
+	min_pixel_width="20"
+    reference="avatar_hair.llm">
+   </mesh>
+
+   <mesh
+    type="hairMesh"
+	lod="5"
+    file_name="avatar_hair_5.llm"
+	min_pixel_width="0"
+    reference="avatar_hair.llm">
+   </mesh>
+
+   <mesh
+    type="headMesh"
+	lod="0"
+    file_name="avatar_head.llm"
+    min_pixel_width="320">
+<!-- 
+            begin morph targets
+            #############
+            tweakable morphs
+            ############# 
+  -->
+      <param
+       id="1"
+       group="0"
+       name="Big_Brow"
+       label="Brow Size"
+       wearable="shape"
+       edit_group="shape_head"
+       edit_group_order="7"
+       label_min="Small"
+       label_max="Large"
+       value_min="-.3"
+       value_max="2"
+       camera_elevation=".1"
+       camera_distance=".4"
+       camera_angle="45">
+         <param_morph />
+      </param>
+
+      <param
+       id="2"
+       group="0"
+       name="Nose_Big_Out"
+       label="Nose Size"
+       wearable="shape"
+       edit_group="shape_nose"
+       edit_group_order="1"
+       label_min="Small"
+       label_max="Large"
+       show_simple="true"
+       value_min="-0.8"
+       value_max="2.5"
+       camera_elevation=".1"
+       camera_distance=".35"
+       camera_angle="50">
+         <param_morph />
+      </param>
+
+      <param
+       id="4"
+       group="0"
+       name="Broad_Nostrils"
+       label="Nostril Width"
+       wearable="shape"
+       edit_group="shape_nose"
+       edit_group_order="3"
+       label_min="Narrow"
+       label_max="Broad"
+       value_min="-.5"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".3"
+       camera_angle="-20">
+         <param_morph />
+      </param>
+
+      <param
+       id="759"
+       group="0"
+       name="Low_Septum_Nose"
+       label="Nostril Division"
+       wearable="shape"
+       edit_group="shape_nose"
+       edit_group_order="3.5"
+       label_min="High"
+       label_max="Low"
+       value_min="-1"
+       value_max="1.5"
+       value_default="0.5"
+       camera_elevation=".1"
+       camera_distance=".3"
+       camera_angle="-20">
+         <param_morph />
+      </param>
+
+      <param
+       id="517"
+       group="0"
+       name="Wide_Nose"
+       label="Nose Width"
+       wearable="shape"
+       edit_group="shape_nose"
+       edit_group_order="2"
+       label_min="Narrow"
+       label_max="Wide"
+       show_simple="true"
+       value_min="-.5"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".3"
+       camera_angle="-20">
+         <param_morph />
+      </param>
+
+      <param
+       id="5"
+       group="0"
+       name="Cleft_Chin"
+       label="Chin Cleft"
+       wearable="shape"
+       edit_group="shape_chin"
+       edit_group_order="6"
+       label_min="Round"
+       label_max="Cleft"
+       value_min="-.1"
+       value_max="1"
+       camera_elevation="0"
+       camera_distance=".28"
+       camera_angle="-20">
+         <param_morph />
+      </param>
+
+      <param
+       id="6"
+       group="0"
+       name="Bulbous_Nose_Tip"
+       label="Nose Tip Shape"
+       wearable="shape"
+       edit_group="shape_nose"
+       edit_group_order="8"
+       label_min="Pointy"
+       label_max="Bulbous"
+       value_min="-.3"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".35"
+       camera_angle="15">
+         <param_morph />
+      </param>
+
+      <param
+       id="7"
+       group="0"
+       name="Weak_Chin"
+       label="Chin Angle"
+       wearable="shape"
+       edit_group="shape_chin"
+       edit_group_order="1"
+       label_min="Chin Out"
+       label_max="Chin In"
+       value_min="-.5"
+       value_max=".5"
+       camera_elevation=".1"
+       camera_distance=".4"
+       camera_angle="45">
+         <param_morph />
+      </param>
+
+      <param
+       id="8"
+       group="0"
+       name="Double_Chin"
+       label="Chin-Neck"
+       wearable="shape"
+       edit_group="shape_chin"
+       edit_group_order="8"
+       label_min="Tight Chin"
+       label_max="Double Chin"
+       value_min="-.5"
+       value_max="1.5"
+       camera_elevation="-.1"
+       camera_distance=".3"
+       camera_angle="60">
+         <param_morph />
+      </param>
+
+      <param
+       id="10"
+       group="0"
+       name="Sunken_Cheeks"
+       label="Lower Cheeks"
+       wearable="shape"
+       edit_group="shape_head"
+       edit_group_order="9"
+       label_min="Well-Fed"
+       label_max="Sunken"
+       show_simple="true"
+       value_min="-1.5"
+       value_max="3"
+       camera_elevation=".1"
+       camera_distance=".4"
+       camera_angle="5">
+         <param_morph />
+      </param>
+
+      <param
+       id="11"
+       group="0"
+       name="Noble_Nose_Bridge"
+       label="Upper Bridge"
+       wearable="shape"
+       edit_group="shape_nose"
+       edit_group_order="5"
+       label_min="Low"
+       label_max="High"
+       value_min="-.5"
+       value_max="1.5"
+       camera_elevation=".1"
+       camera_distance=".35"
+       camera_angle="70">
+         <param_morph />
+      </param>
+
+      <param
+       id="758"
+       group="0"
+       name="Lower_Bridge_Nose"
+       label="Lower Bridge"
+       wearable="shape"
+       edit_group="shape_nose"
+       edit_group_order="5.5"
+       label_min="Low"
+       label_max="High"
+       value_min="-1.5"
+       value_max="1.5"
+       camera_elevation=".1"
+       camera_distance=".35"
+       camera_angle="70">
+         <param_morph />
+      </param>
+
+      <param
+       id="12"
+       group="0"
+       name="Jowls"
+       wearable="shape"
+       edit_group="shape_chin"
+       edit_group_order="5"
+       label_min="Less"
+       label_max="More"
+       value_min="-.5"
+       value_max="2.5"
+       camera_elevation=".1"
+       camera_distance=".4"
+       camera_angle="0">
+         <param_morph />
+      </param>
+
+      <param
+       id="13"
+       group="0"
+       name="Cleft_Chin_Upper"
+       label="Upper Chin Cleft"
+       wearable="shape"
+       edit_group="shape_chin"
+       edit_group_order="7"
+       label_min="Round"
+       label_max="Cleft"
+       value_min="0"
+       value_max="1.5"
+       camera_elevation="0"
+       camera_distance=".28"
+       camera_angle="-20">
+         <param_morph />
+      </param>
+
+      <param
+       id="14"
+       group="0"
+       name="High_Cheek_Bones"
+       label="Cheek Bones"
+       wearable="shape"
+       edit_group="shape_head"
+       edit_group_order="10"
+       label_min="Low"
+       label_max="High"
+       value_min="-.5"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".3"
+       camera_angle="-20">
+         <param_morph />
+      </param>
+
+      <param
+       id="15"
+       group="0"
+       name="Ears_Out"
+       label="Ear Angle"
+       wearable="shape"
+       edit_group="shape_ears"
+       edit_group_order="2"
+       label_min="In"
+       label_max="Out"
+       value_min="-.5"
+       value_max="1.5"
+       camera_elevation=".1"
+       camera_distance=".3"
+       camera_angle="-20">
+         <param_morph />
+      </param>
+
+<!--Pointy eyebrows became a driver/driven param with new max value for backwards compatibility between 1.0 and 1.1-->
+      <param
+       id="870"
+       group="1"
+       name="Pointy_Eyebrows"
+       label="Eyebrow Points"
+       wearable="hair"
+       edit_group="hair_eyebrows"
+       edit_group_order="4"
+       label_min="Smooth"
+       label_max="Pointy"
+       value_min="-.5"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".3">
+         <param_morph />
+      </param>
+
+      <param
+       id="17"
+       group="0"
+       name="Square_Jaw"
+       label="Jaw Shape"
+       wearable="shape"
+       edit_group="shape_chin"
+       edit_group_order="2"
+       label_min="Pointy"
+       label_max="Square"
+       value_min="-.5"
+       value_max="1"
+       camera_distance=".3"
+       camera_elevation=".04"
+       camera_angle="-20">
+         <param_morph />
+      </param>
+
+      <param
+       id="18"
+       group="0"
+       name="Puffy_Upper_Cheeks"
+       label="Upper Cheeks"
+       wearable="shape"
+       edit_group="shape_head"
+       edit_group_order="8"
+       label_min="Thin"
+       label_max="Puffy"
+       value_min="-1.5"
+       value_max="2.5"
+       camera_elevation=".1"
+       camera_distance=".3"
+       camera_angle="-20">
+         <param_morph />
+      </param>
+
+      <param
+       id="19"
+       group="0"
+       name="Upturned_Nose_Tip"
+       label="Nose Tip Angle"
+       wearable="shape"
+       edit_group="shape_nose"
+       edit_group_order="7"
+       label_min="Downturned"
+       label_max="Upturned"
+       value_min="-1.5"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".35"
+       camera_angle="15">
+         <param_morph />
+      </param>
+
+      <param
+       id="20"
+       group="0"
+       name="Bulbous_Nose"
+       label="Nose Thickness"
+       wearable="shape"
+       edit_group="shape_nose"
+       edit_group_order="4"
+       label_min="Thin Nose"
+       label_max="Bulbous Nose"
+       show_simple="true"
+       value_min="-.5"
+       value_max="1.5"
+       camera_elevation=".1"
+       camera_distance=".3">
+         <param_morph />
+      </param>
+
+      <param
+       id="21"
+       group="0"
+       name="Upper_Eyelid_Fold"
+       label="Upper Eyelid Fold"
+       wearable="shape"
+       edit_group="shape_eyes"
+       edit_group_order="5"
+       label_min="Uncreased"
+       label_max="Creased"
+       value_min="-0.2"
+       value_max="1.3"
+       camera_elevation=".1"
+       camera_distance=".35">
+         <param_morph />
+      </param>
+
+      <param
+       id="22"
+       group="0"
+       name="Attached_Earlobes"
+       label="Attached Earlobes"
+       wearable="shape"
+       edit_group="shape_ears"
+       edit_group_order="3"
+       label_min="Unattached"
+       label_max="Attached"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".3"
+       camera_angle="45">
+         <param_morph />
+      </param>
+
+      <param
+       id="23"
+       group="0"
+       name="Baggy_Eyes"
+       label="Eye Bags"
+       wearable="shape"
+       edit_group="shape_eyes"
+       edit_group_order="6"
+       label_min="Smooth"
+       label_max="Baggy"
+       value_min="-.5"
+       value_max="1.5"
+       camera_elevation=".1"
+       camera_distance=".35">
+         <param_morph />
+      </param>
+
+      <param
+       id="765"
+       group="0"
+       name="Puffy_Lower_Lids"
+       label="Puffy Eyelids"
+       wearable="shape"
+       edit_group="shape_eyes"
+       edit_group_order="6.1"
+       label_min="Flat"
+       label_max="Puffy"
+       value_min="-.3"
+       value_max="2.5"
+       camera_elevation=".1"
+       camera_distance=".35">
+         <param_morph />
+      </param>
+
+      <param
+       id="24"
+       group="0"
+       name="Wide_Eyes"
+       label="Eye Opening"
+       wearable="shape"
+       edit_group="shape_eyes"
+       edit_group_order="1.1"
+       label_min="Narrow"
+       label_max="Wide"
+       value_min="-1.5"
+       value_max="2"
+	   show_simple="true"
+       camera_elevation=".1"
+       camera_distance=".35">
+         <param_morph />
+      </param>
+
+      <param
+       id="25"
+       group="0"
+       name="Wide_Lip_Cleft"
+       label="Lip Cleft"
+       wearable="shape"
+       edit_group="shape_mouth"
+       edit_group_order="6"
+       label_min="Narrow"
+       label_max="Wide"
+       value_min="-.8"
+       value_max="1.5"
+       camera_elevation="0"
+       camera_distance=".28">
+         <param_morph />
+      </param>
+
+      <param
+       id="764"
+       group="0"
+       name="Lip_Cleft_Deep"
+       label="Lip Cleft Depth"
+       wearable="shape"
+       edit_group="shape_mouth"
+       edit_group_order="5.8"
+       label_min="Shallow"
+       label_max="Deep"
+       value_min="-.5"
+       value_max="1.2"
+       camera_elevation="0"
+       camera_distance=".28">
+         <param_morph />
+      </param>
+
+      <param
+       id="26"
+       group="1"
+       wearable="shape"
+       name="Lips_Thin"
+       edit_group="driven"
+       value_min="0"
+       value_max=".7">
+         <param_morph />
+      </param>
+
+      <param
+       id="27"
+       group="0"
+       name="Wide_Nose_Bridge"
+       label="Bridge Width"
+       wearable="shape"
+       edit_group="shape_nose"
+       edit_group_order="6"
+       label_min="Narrow"
+       label_max="Wide"
+       value_min="-1.3"
+       value_max="1.2"
+       camera_elevation=".1"
+       camera_distance=".3"
+       camera_angle="-20">
+         <param_morph />
+      </param>
+
+      <param
+       id="28"
+       group="1"
+       name="Lips_Fat"
+       wearable="shape"
+       edit_group="driven"
+       value_min="0"
+       value_max="2">
+         <param_morph />
+      </param>
+
+      <param
+       id="29"
+       group="1"
+       name="Wide_Upper_Lip"
+       wearable="shape"
+       edit_group="driven"
+       value_min="-.7"
+       value_max="1.3">
+         <param_morph />
+      </param>
+
+      <param
+       id="30"
+       group="1"
+       name="Wide_Lower_Lip"
+       wearable="shape"
+       edit_group="driven"
+       value_min="-.7"
+       value_max="1.3">
+         <param_morph />
+      </param>
+
+<!--Arced eyebrows became a driver/driven param with new max value for backwards compatibility between 1.0 and 1.1-->
+      <param
+       id="872"
+       group="1"
+       name="Arced_Eyebrows"
+       label="Eyebrow Arc"
+       wearable="hair"
+       edit_group="hair_eyebrows"
+       edit_group_order="3"
+       label_min="Flat"
+       label_max="Arced"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+<!--Lower eyebrows became a driver/driven param with new min value for backwards compatibility between 1.0 and 1.1-->
+      <param
+       id="871"
+       group="1"
+       name="Lower_Eyebrows"
+       label="Eyebrow Height"
+	   show_simple="true"
+       wearable="hair"
+       edit_group="hair_eyebrows"
+       edit_group_order="2.5"
+       label_min="Higher"
+       label_max="Lower"
+       value_min="-2"
+       value_max="2">
+         <param_morph />
+      </param>
+
+      <param
+       id="35"
+       group="0"
+       name="Big_Ears"
+       label="Ear Size"
+       wearable="shape"
+       edit_group="shape_ears"
+       edit_group_order="1"
+       label_min="Small"
+       label_max="Large"
+       value_min="-1"
+       value_max="2"
+       camera_elevation=".1"
+       camera_distance=".3"
+       camera_angle="45">
+         <param_morph />
+      </param>
+
+      <param
+       id="796"
+       group="0"
+       name="Pointy_Ears"
+       label="Ear Tips"
+       wearable="shape"
+       edit_group="shape_ears"
+       edit_group_order="4"
+       label_min="Flat"
+       label_max="Pointy"
+       value_min="-.4"
+       value_max="3"
+       camera_elevation=".1"
+       camera_distance=".3"
+       camera_angle="45">
+         <param_morph />
+      </param>
+
+      <param
+       id="185"
+       group="0"
+       name="Deep_Chin"
+       label="Chin Depth"
+       wearable="shape"
+       edit_group="shape_chin"
+       edit_group_order="3"
+       label_min="Shallow"
+       label_max="Deep"
+       value_min="-1"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".4"
+       camera_angle="30">
+         <param_morph />
+      </param>
+
+      <param
+       id="186"
+       group="1"
+       name="Egg_Head"
+       label="Egg Head"
+       wearable="shape"
+       edit_group="shape_head"
+       label_min="Chin Heavy"
+       label_max="Forehead Heavy"
+       value_min="-1.3"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="187"
+       group="1"
+       name="Squash_Stretch_Head"
+       label="Squash/Stretch Head"
+       wearable="shape"
+       edit_group="shape_head"
+       label_min="Squash Head"
+       label_max="Stretch Head"
+       value_min="-.5"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph>
+			<volume_morph
+				name="HEAD"
+				scale="-0.008 -0.006 0.015"/>
+		 </param_morph>
+      </param>
+
+      <param
+       id="188"
+       group="1"
+       name="Square_Head"
+       wearable="shape"
+       label_min="Less Square"
+       label_max="More Square"
+       value_min="0"
+       value_max=".7"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="189"
+       group="1"
+       wearable="shape"
+       name="Round_Head"
+       label_min="Less Round"
+       label_max="More Round"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       id="194"
+       group="1"
+       name="Eye_Spread"
+       wearable="shape"
+       edit_group="shape_eyes"
+       label_min="Eyes Together"
+       label_max="Eyes Spread"
+       value_min="-2"
+       value_max="2">
+         <param_morph />
+      </param>
+
+      <param
+       id="400"
+       sex="male"
+       group="1"
+       name="Displace_Hair_Facial"
+       label="Hair Thickess"
+       wearable="hair"
+       edit_group="hair_facial"
+       label_min="Cropped Hair"
+       label_max="Bushy Hair"
+       value_min="0"
+       value_max="2">
+         <param_morph />
+      </param>
+
+      <param
+       id="506"
+       group="0"
+       name="Mouth_Height"
+       wearable="shape"
+       label="Mouth Position"
+	   show_simple="true"
+       edit_group="shape_mouth"
+       edit_group_order="4"
+       label_min="High"
+       label_max="Low"
+       value_min="-2"
+       value_max="2"
+       camera_distance=".3"
+       camera_elevation=".04">
+         <param_morph />
+      </param>
+
+      <param
+       id="633"
+       group="1"
+       name="Fat_Head"
+       label="Fat Head"
+       wearable="shape"
+       edit_group="shape_body"
+       label_min="Skinny"
+       label_max="Fat"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".3">
+         <param_morph/>
+      </param>
+
+      <param
+       id="630"
+       group="1"
+       name="Forehead_Round"
+       label="Round Forehead"
+       wearable="shape"
+       label_min="Less"
+       label_max="More"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="631"
+       group="1"
+       name="Forehead_Slant"
+       label="Slanted Forehead"
+       wearable="shape"
+       label_min="Less"
+       label_max="More"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="650"
+       group="0"
+       name="Eyelid_Corner_Up"
+       label="Outer Eye Corner"
+       wearable="shape"
+       edit_group="shape_eyes"
+       edit_group_order="4"
+       label_min="Corner Down"
+       label_max="Corner Up"
+       value_min="-1.3"
+       value_max="1.2"
+       camera_elevation=".1"
+       camera_distance=".30">
+         <param_morph />
+      </param>
+
+	  <param
+       id="880"
+       group="0"
+       name="Eyelid_Inner_Corner_Up"
+       label="Inner Eye Corner"
+       wearable="shape"
+       edit_group="shape_eyes"
+       edit_group_order="4.2"
+       label_min="Corner Down"
+       label_max="Corner Up"
+       value_min="-1.3"
+       value_max="1.2"
+       camera_elevation=".1"
+       camera_distance=".30">
+         <param_morph />
+      </param>
+ 
+      <param
+       id="653"
+       group="0"
+       name="Tall_Lips"
+       wearable="shape"
+       label="Lip Fullness"
+	   show_simple="true"
+       edit_group="shape_mouth"
+       edit_group_order="2"
+       label_min="Less Full"
+       label_max="More Full"
+       value_min="-1"
+       value_max="2"
+       camera_distance=".3"
+       camera_elevation=".04">
+         <param_morph />
+      </param>
+
+      <param
+       id="656"
+       group="0"
+       name="Crooked_Nose"
+       wearable="shape"
+       label="Crooked Nose"
+       edit_group="shape_nose"
+       edit_group_order="9"
+       label_min="Nose Left"
+       label_max="Nose Right"
+       value_min="-2"
+       value_max="2"
+       camera_distance=".3"
+       camera_elevation=".04"
+       camera_angle="-20">
+         <param_morph />
+      </param>
+
+      <param
+       id="657"
+       group="1"
+       name="Smile_Mouth"
+       wearable="shape"
+       label="Mouth Corner"
+       edit_group="shape_mouth"
+       label_min="Corner Normal"
+       label_max="Corner Up"
+       value_min="0"
+       value_max="1.4"
+       camera_distance=".3"
+       camera_elevation=".04">
+         <param_morph />
+      </param>
+
+      <param
+       id="658"
+       group="1"
+       name="Frown_Mouth"
+       wearable="shape"
+       label="Mouth Corner"
+       edit_group="shape_mouth"
+       label_min="Corner Normal"
+       label_max="Corner Down"
+       value_min="0"
+       value_max="1.2"
+       camera_distance=".3"
+       camera_elevation=".04">
+         <param_morph />
+      </param>
+
+      <param
+       id="797"
+       group="1"
+       name="Fat_Upper_Lip"
+       wearable="shape"
+       label="Fat Upper Lip"
+       edit_group="shape_mouth"
+       label_min="Normal Upper"
+       label_max="Fat Upper"
+       value_min="0"
+       value_max="1.5"
+       camera_distance=".3"
+       camera_elevation=".04">
+         <param_morph />
+      </param>
+
+      <param
+       id="798"
+       group="1"
+       name="Fat_Lower_Lip"
+       wearable="shape"
+       label="Fat Lower Lip"
+       edit_group="shape_mouth"
+       label_min="Normal Lower"
+       label_max="Fat Lower"
+       value_min="0"
+       value_max="1.5"
+       camera_distance=".3"
+       camera_elevation=".04">
+         <param_morph />
+      </param>
+
+      <param
+       id="660"
+       group="1"
+       name="Shear_Head"
+       wearable="shape"
+       label="Shear Face"
+       edit_group="shape_head"
+       label_min="Shear Left"
+       label_max="Shear Right"
+       value_min="-2"
+       value_max="2"
+       value_default="0"
+       camera_distance=".5"
+       camera_elevation=".04">
+         <param_morph />
+      </param>
+
+      <param
+       id="770"
+       group="1"
+       name="Elongate_Head"
+       wearable="shape"
+       label="Shear Face"
+       edit_group="shape_head"
+       label_min="Flat Head"
+       label_max="Long Head"
+       value_min="-1"
+       value_max="1"
+       value_default="0"
+       camera_distance=".5"
+       camera_elevation=".04">
+         <param_morph>
+			<volume_morph
+				name="HEAD"
+				scale="0.02 0.0 0.0"/>
+		 </param_morph>
+      </param>
+
+      <param
+       id="663"
+       group="0"
+       name="Shift_Mouth"
+       wearable="shape"
+       label="Shift Mouth"
+       edit_group="shape_mouth"
+       edit_group_order="7"
+       label_min="Shift Left"
+       label_max="Shift Right"
+       value_min="-2"
+       value_max="2"
+       value_default="0"
+       camera_distance=".35"
+       camera_elevation=".04"
+       camera_angle="-20">
+         <param_morph />
+      </param>
+
+      <param
+       id="664"
+       group="0"
+       name="Pop_Eye"
+       wearable="shape"
+       label="Eye Pop"
+       edit_group="shape_eyes"
+       edit_group_order="8"
+       label_min="Pop Right Eye"
+       label_max="Pop Left Eye"
+       value_min="-1.3"
+       value_max="1.3"
+       value_default="0"
+       camera_elevation=".1"
+       camera_distance=".35">
+         <param_morph />
+      </param>
+
+      <param
+       id="760"
+       group="0"
+       name="Jaw_Angle"
+       wearable="shape"
+       label="Jaw Angle"
+       edit_group="shape_chin"
+       edit_group_order="3.5"
+       label_min="Low Jaw"
+       label_max="High Jaw"
+       value_min="-1.2"
+       value_max="2"
+       value_default="0"
+       camera_distance=".5"
+       camera_elevation=".04"
+       camera_angle="70">
+         <param_morph />
+      </param>
+
+      <param
+       id="665"
+       group="0"
+       name="Jaw_Jut"
+       wearable="shape"
+       label="Jaw Jut"
+       edit_group="shape_chin"
+       edit_group_order="4"
+       label_min="Overbite"
+       label_max="Underbite"
+       value_min="-2"
+       value_max="2"
+       value_default="0"
+       camera_distance=".5"
+       camera_elevation=".04"
+       camera_angle="70">
+         <param_morph />
+      </param>
+
+      <param
+       id="686"
+       group="1"
+       name="Head_Eyes_Big"
+       wearable="shape"
+       label="Eye Size"
+       edit_group="shape_eyes"
+       label_min="Beady Eyes"
+       label_max="Anime Eyes"
+       show_simple="true"
+       value_min="-2"
+       value_max="2"
+       value_default="0">
+         <param_morph />
+      </param>
+
+      <param
+       id="767"
+       group="1"
+       name="Bug_Eyed_Head"
+       wearable="shape"
+       label="Eye Depth"
+       edit_group="shape_eyes"
+       edit_group_order="4.5"
+       label_min="Sunken Eyes"
+       label_max="Bug Eyes"
+       value_min="-2"
+       value_max="2"
+       value_default="0">
+         <param_morph />
+      </param>
+
+<!--
+         #Fat_Lips = Fat_Lips 34 1 0 1
+         #Wide_Lips = Wide_Lips 35 1 0 1
+         #Wide_Nose = Wide_Nose 36 1 0 1
+   -->
+<!--
+        ##############
+        # Facial Expression morphs 
+        ##############
+        -->
+      <param
+       id="300"
+       group="1"
+       name="Express_Closed_Mouth"
+       value_default="1"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="301"
+       group="1"
+       name="Express_Tongue_Out"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="302"
+       group="1"
+       name="Express_Surprise_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="303"
+       group="1"
+       name="Express_Wink_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="304"
+       group="1"
+       name="Express_Embarrassed_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="305"
+       group="1"
+       name="Express_Shrug_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="306"
+       group="1"
+       name="Express_Kiss"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="307"
+       group="1"
+       name="Express_Bored_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="308"
+       group="1"
+       name="Express_Repulsed_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="309"
+       group="1"
+       name="Express_Disdain"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="310"
+       group="1"
+       name="Express_Afraid_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="311"
+       group="1"
+       name="Express_Worry_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="312"
+       group="1"
+       name="Express_Cry_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="313"
+       group="1"
+       name="Express_Sad_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="314"
+       group="1"
+       name="Express_Anger_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="315"
+       group="1"
+       name="Express_Frown"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="316"
+       group="1"
+       name="Express_Laugh_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="317"
+       group="1"
+       name="Express_Toothsmile"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="318"
+       group="1"
+       name="Express_Smile"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="632"
+       group="1"
+       name="Express_Open_Mouth"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+<!--
+        ##############
+        # Lipsync morphs
+        ##############
+        -->
+
+      <param
+       id="70"
+       group="1"
+       name="Lipsync_Aah"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="71"
+       group="1"
+       name="Lipsync_Ooh"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+<!--
+        ##############
+        # other morphs (not user controlled)
+        ##############
+        -->
+      <param
+       id="40"
+       group="1"
+       name="Male_Head"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="41"
+       group="1"
+       name="Old"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+<!--
+        ##############
+        # animatable morphs
+        ##############
+         -->
+      <param
+       id="51"
+       group="1"
+       name="Furrowed_Eyebrows"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="53"
+       group="1"
+       name="Surprised_Eyebrows"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="54"
+       group="1"
+       name="Worried_Eyebrows"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="55"
+       group="1"
+       name="Frown_Mouth"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="57"
+       group="1"
+       name="Smile_Mouth"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="58"
+       group="1"
+       name="Blink_Left"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="59"
+       group="1"
+       name="Blink_Right"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+<!--
+        #end morph targets
+         -->
+   </mesh>
+
+   <mesh
+    type="headMesh"
+	lod="1"
+    file_name="avatar_head_1.llm"
+    min_pixel_width="160"
+    reference="avatar_head.llm">
+   </mesh>
+
+   <mesh
+    type="headMesh"
+	lod="2"
+    file_name="avatar_head_2.llm"
+    min_pixel_width="80"
+    reference="avatar_head.llm">
+   </mesh>
+
+   <mesh
+    type="headMesh"
+	lod="3"
+    file_name="avatar_head_3.llm"
+    min_pixel_width="40"
+    reference="avatar_head.llm">
+   </mesh>
+
+   <mesh
+    type="headMesh"
+	lod="4"
+    file_name="avatar_head_4.llm"
+	min_pixel_width="0"
+    reference="avatar_head.llm">
+   </mesh>
+
+   <mesh
+    type="eyelashMesh"
+	lod="0"
+    file_name="avatar_eyelashes.llm"
+    min_pixel_width="320">
+      <param
+       shared="1"
+       id="660"
+       group="1"
+       name="Shear_Head"
+       wearable="shape"
+       label="Shear Face"
+       edit_group="shape_head"
+       label_min="Shear Left"
+       label_max="Shear Right"
+       value_min="-2"
+       value_max="2"
+       value_default="0"
+       camera_distance=".5"
+       camera_elevation=".04">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="770"
+       group="1"
+       name="Elongate_Head"
+       wearable="shape"
+       label="Shear Face"
+       edit_group="shape_head"
+       label_min="Flat Head"
+       label_max="Long Head"
+       value_min="-1"
+       value_max="1"
+       value_default="0"
+       camera_distance=".5"
+       camera_elevation=".04">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="664"
+       group="0"
+       name="Pop_Eye"
+       wearable="shape"
+       label="Eye Pop"
+       edit_group="shape_eyes"
+       edit_group_order="8"
+       label_min="Pop Right Eye"
+       label_max="Pop Left Eye"
+       value_min="-2"
+       value_max="2"
+       value_default="0"
+       camera_distance=".5"
+       camera_elevation=".04"
+       camera_angle="-20">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="21"
+       group="0"
+       name="Upper_Eyelid_Fold"
+       label="Upper Eyelid Fold"
+       wearable="shape"
+       edit_group="shape_eyes"
+       label_min="Uncreased"
+       label_max="Creased"
+       value_min="-0.2"
+       value_max="1.3"
+       camera_elevation=".1"
+       camera_distance=".35">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="24"
+       group="0"
+       name="Wide_Eyes"
+       label="Eye Opening"
+       wearable="shape"
+       edit_group="shape_eyes"
+       label_min="Narrow"
+       label_max="Wide"
+       show_simple="true"
+       value_min="-1.5"
+       value_max="2"
+       camera_elevation=".1"
+       camera_distance=".3">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="186"
+       group="1"
+       name="Egg_Head"
+       label="Egg Head"
+       wearable="shape"
+       edit_group="shape_head"
+       label_min="Chin Heavy"
+       label_max="Forehead Heavy"
+       value_min="-1.3"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="187"
+       group="1"
+       name="Squash_Stretch_Head"
+       label="Squash/Stretch Head"
+       wearable="shape"
+       edit_group="shape_head"
+       label_min="Squash Head"
+       label_max="Stretch Head"
+       value_min="-.5"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="194"
+       group="1"
+       name="Eye_Spread"
+       edit_group="shape_eyes"
+       label_min="Eyes Together"
+       label_max="Eyes Spread"
+       value_min="-2"
+       value_max="2">
+         <param_morph />
+      </param>
+
+      <param
+       id="518"
+       group="0"
+       name="Eyelashes_Long"
+       wearable="shape"
+       label="Eyelash Length"
+       edit_group="shape_eyes"
+       edit_group_order="7"
+       label_min="Short"
+       label_max="Long"
+       value_min="-.3"
+       value_max="1.5"
+       camera_elevation=".1"
+       camera_distance=".30"
+       camera_angle="-20">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="650"
+       group="0"
+       name="Eyelid_Corner_Up"
+       label="Outer Eye Corner"
+       wearable="shape"
+       edit_group="shape_eyes"
+       label_min="Corner Down"
+       label_max="Corner Up"
+       value_min="-1.3"
+       value_max="1.2"
+       camera_elevation=".1"
+       camera_distance=".3">
+         <param_morph />
+      </param>
+      
+      <param
+       shared="1"
+       id="880"
+       group="0"
+       name="Eyelid_Inner_Corner_Up"
+       label="Inner Eye Corner"
+       wearable="shape"
+       edit_group="shape_eyes"
+       label_min="Corner Down"
+       label_max="Corner Up"
+       value_min="-1.3"
+       value_max="1.2"
+       camera_elevation=".1"
+       camera_distance=".3">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="686"
+       group="1"
+       name="Head_Eyes_Big"
+       wearable="shape"
+       label="Eye Size"
+       edit_group="shape_eyes"
+       label_min="Beady Eyes"
+       label_max="Anime Eyes"
+       value_min="-2"
+       value_max="2"
+	   show_simple="true"
+       value_default="0">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="767"
+       group="1"
+       name="Bug_Eyed_Head"
+       wearable="shape"
+       label="Eye Depth"
+       edit_group="shape_eyes"
+       edit_group_order="4.5"
+       label_min="Sunken Eyes"
+       label_max="Bug Eyes"
+       value_min="-2"
+       value_max="2"
+       value_default="0">
+         <param_morph />
+      </param>
+
+<!--
+        ##############
+        # Facial Expression morphs 
+        ##############
+        -->
+      <param
+       shared="1"
+       id="301"
+       group="1"
+       name="Express_Tongue_Out"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="302"
+       group="1"
+       name="Express_Surprise_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="303"
+       group="1"
+       name="Express_Wink_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="304"
+       group="1"
+       name="Express_Embarrassed_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="305"
+       group="1"
+       name="Express_Shrug_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="306"
+       group="1"
+       name="Express_Kiss"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="307"
+       group="1"
+       name="Express_Bored_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="308"
+       group="1"
+       name="Express_Repulsed_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="309"
+       group="1"
+       name="Express_Disdain"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="310"
+       group="1"
+       name="Express_Afraid_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="312"
+       group="1"
+       name="Express_Cry_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="313"
+       group="1"
+       name="Express_Sad_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="314"
+       group="1"
+       name="Express_Anger_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="315"
+       group="1"
+       name="Express_Frown"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="316"
+       group="1"
+       name="Express_Laugh_Emote"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="317"
+       group="1"
+       name="Express_Toothsmile"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="318"
+       group="1"
+       name="Express_Smile"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+<!--
+        ##############
+        # other morphs (not user controlled)
+        ##############
+        -->
+      <param
+       shared="1"
+       id="41"
+       group="1"
+       name="Old"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+<!--
+        ##############
+        # animatable morphs
+        ##############
+         -->
+      <param
+       shared="1"
+       id="58"
+       group="1"
+       name="Blink_Left"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       shared="1"
+       id="59"
+       group="1"
+       name="Blink_Right"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+   </mesh>
+
+<!--
+    #headMesh2 =
+    #headMesh3 =
+    -->
+   <mesh
+    type="upperBodyMesh"
+	lod="0"
+    file_name="avatar_upper_body.llm"
+    min_pixel_width="320">
+<!--
+        #begin morph targets
+        #############
+        # tweakable morphs
+        #############
+        -->
+      <param
+       id="104"
+       group="1"
+       name="Big_Belly_Torso"
+       value_min="0"
+       value_max="1">
+         <param_morph>
+		 	<volume_morph
+				name="BELLY"
+				scale="0.075 0.04 0.03"
+				pos="0.07 0 -0.07"/>
+		</param_morph>
+      </param>
+
+      <param
+       id="626"
+       sex="female"
+       group="1"
+       name="Big_Chest"
+       label="Chest Size"
+       wearable="shape"
+       edit_group="shape_torso"
+       label_min="Small"
+       label_max="Large"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance="1"
+       camera_angle="15">
+         <param_morph />
+      </param>
+
+      <param
+       id="627"
+       sex="female"
+       group="1"
+       name="Small_Chest"
+       label="Chest Size"
+       wearable="shape"
+       edit_group="shape_torso"
+       label_min="Large"
+       label_max="Small"
+       value_min="0"
+       value_max="1"
+       camera_elevation="0"
+       camera_distance=".28">
+         <param_morph />
+      </param>
+
+      <param
+       id="843"
+       sex="female"
+       group="1"
+       name="No_Chest"
+       label="Chest Size"
+       wearable="shape"
+       edit_group="shape_torso"
+       label_min="Some"
+       label_max="None"
+       value_min="0"
+       value_max="1"
+       camera_elevation="0"
+       camera_distance=".28">
+         <param_morph />
+      </param>
+
+      <param
+       id="106"
+       group="1"
+       name="Muscular_Torso"
+       label="Torso Muscles"
+	   show_simple="true"
+       wearable="shape"
+       edit_group="shape_torso"
+       label_min="Regular"
+       label_max="Muscular"
+       value_min="0"
+       value_max="1.4"
+       camera_elevation=".3"
+       camera_distance="1.2">
+         <param_morph>
+		 	<volume_morph
+				name="L_CLAVICLE"
+				scale="0.02 0.0 0.005"
+				pos="0.0 0 0.005"/>
+		 	<volume_morph
+				name="L_UPPER_ARM"
+				scale="0.015 0.0 0.005"
+				pos="0.015 0 0"/>
+		 	<volume_morph
+				name="L_LOWER_ARM"
+				scale="0.005 0.0 0.005"
+				pos="0.005 0 0"/>
+		 	<volume_morph
+				name="R_CLAVICLE"
+				scale="0.02 0.0 0.005"
+				pos="0.0 0 0.005"/>
+		 	<volume_morph
+				name="R_UPPER_ARM"
+				scale="0.015 0.0 0.005"
+				pos="0.015 0 0"/>
+		 	<volume_morph
+				name="R_LOWER_ARM"
+				scale="0.005 0.0 0.005"
+				pos="0.005 0 0"/>
+		 </param_morph>
+      </param>
+
+      <param
+       id="648"
+       group="1"
+       sex="female"
+       name="Scrawny_Torso"
+       label="Torso Muscles"
+	   show_simple="true"
+       wearable="shape"
+       edit_group="shape_torso"
+       label_min="Regular"
+       label_max="Scrawny"
+       value_min="0"
+       value_max="1.3"
+       camera_elevation=".3"
+       camera_distance="1.2">
+		<param_morph>
+		 	<volume_morph
+				name="BELLY"
+				scale="0.0 -0.01 0.0"
+				pos="0.0 0.0 0"/>
+		 	<volume_morph
+				name="CHEST"
+				scale="-0.01 -0.01 0.0"
+				pos="0.01 0.0 0"/>
+		 	<volume_morph
+				name="L_CLAVICLE"
+				scale="0.0 -0.03 -0.005"
+				pos="0.0 0 -0.005"/>
+		 	<volume_morph
+				name="L_UPPER_ARM"
+				scale="-0.01 -0.01 -0.02"
+				pos="0 0 0"/>
+		 	<volume_morph
+				name="L_LOWER_ARM"
+				scale="-0.005 0.0 -0.01"
+				pos="-0.005 0 0"/>
+		 	<volume_morph
+				name="R_CLAVICLE"
+				scale="0.0 -0.03 -0.005"
+				pos="0.0 0 -0.005"/>
+		 	<volume_morph
+				name="R_UPPER_ARM"
+				scale="-0.01 -0.01 -0.02"
+				pos="0 0 0"/>
+		 	<volume_morph
+				name="R_LOWER_ARM"
+				scale="-0.005 0.0 -0.01"
+				pos="-0.005 0 0"/>
+		</param_morph>
+	  </param>
+
+      <param
+       id="677"
+       group="1"
+       sex="male"
+       name="Scrawny_Torso_Male"
+       label="Torso Scrawny"
+       wearable="shape"
+       edit_group="shape_torso"
+       label_min="Regular"
+       label_max="Scrawny"
+       value_min="0"
+       value_max="1.3"
+       camera_elevation=".3"
+       camera_distance="1.2">
+		<param_morph>
+		 	<volume_morph
+				name="BELLY"
+				scale="-0.01 -0.01 0.0"
+				pos="0.01 0.0 0"/>
+		 	<volume_morph
+				name="CHEST"
+				scale="-0.02 -0.02 0.0"
+				pos="0.01 0.0 0"/>
+		 	<volume_morph
+				name="L_CLAVICLE"
+				scale="0.0 -0.03 -0.005"
+				pos="0.0 0 -0.005"/>
+		 	<volume_morph
+				name="L_UPPER_ARM"
+				scale="-0.01 -0.01 -0.02"
+				pos="0 0 0"/>
+		 	<volume_morph
+				name="L_LOWER_ARM"
+				scale="-0.005 0.0 -0.01"
+				pos="-0.005 0 0"/>
+		 	<volume_morph
+				name="R_CLAVICLE"
+				scale="0.0 -0.03 -0.005"
+				pos="0.0 0 -0.005"/>
+		 	<volume_morph
+				name="R_UPPER_ARM"
+				scale="-0.01 -0.01 -0.02"
+				pos="0 0 0"/>
+		 	<volume_morph
+				name="R_LOWER_ARM"
+				scale="-0.005 0.0 -0.01"
+				pos="-0.005 0 0"/>
+		</param_morph>
+	  </param>
+
+      <param
+       id="634"
+       group="1"
+       name="Fat_Torso"
+       label="Fat Torso"
+       wearable="shape"
+       edit_group="shape_body"
+       label_min="skinny"
+       label_max="fat"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".3">
+         <param_morph>
+			<volume_morph
+				name="CHEST"
+				scale="0.02 0.03 0.03"
+				pos="0 0 -0.03"/>
+			<volume_morph
+				name="BELLY"
+				scale="0.09 0.08 0.07"
+				pos="0 0 -0.05"/>
+			<volume_morph
+				name="L_CLAVICLE"
+				scale="0.0 0.0 0.015"/>
+			<volume_morph
+				name="L_UPPER_ARM"
+				scale="0.02 0.0 0.02"
+				pos="0.0 0.0 -0.02"/>
+			<volume_morph
+				name="L_LOWER_ARM"
+				scale="0.01 0.0 0.01"
+				pos="0.0 0.0 -0.01"/>
+			<volume_morph
+				name="R_CLAVICLE"
+				scale="0.0 0.0 0.015"/>
+			<volume_morph
+				name="R_UPPER_ARM"
+				scale="0.02 0.0 0.02"
+				pos="0.0 0.0 -0.02"/>
+			<volume_morph
+				name="R_LOWER_ARM"
+				scale="0.01 0.0 0.01"
+				pos="0.0 0.0 -0.01"/>
+			<volume_morph
+				name="NECK"
+				scale="0.015 0.01 0.0"/>
+			<volume_morph
+				name="HEAD"
+				scale="0.0 0.0 0.01"
+				pos="0 0 -0.01"/>
+		 </param_morph>
+
+      </param>
+
+      <param
+       id="507"
+       group="0"
+       sex="female"
+       name="Breast_Gravity"
+       label="Breast Buoyancy"
+       wearable="shape"
+       edit_group="shape_torso"
+       edit_group_order="7"
+       label_min="Less Gravity"
+       label_max="More Gravity"
+       value_default="0"
+       value_min="-1.5"
+       value_max="2"
+       camera_elevation=".3"
+       camera_distance=".8">
+         <param_morph />
+      </param>
+
+      <param
+       id="628"
+       group="1"
+       name="Displace_Loose_Upperbody"
+       label="Shirt Fit"
+       wearable="shirt"
+       edit_group="driven"
+       clothing_morph="true"
+       value_min="0"
+       value_max="1"
+       value_default="0">
+         <param_morph />
+      </param>
+
+      <param
+       id="840"
+       group="0"
+       name="Shirtsleeve_flair"
+       label="Sleeve Looseness"
+	   show_simple="true"
+       wearable="shirt"
+       edit_group="shirt"
+       edit_group_order="6"
+       clothing_morph="true"
+       label_min="Tight Sleeves"
+       label_max="Loose Sleeves"
+       value_min="0"
+       value_max="1.5"
+       camera_distance="1.8"
+       camera_angle="30"
+       camera_elevation="-.3">
+         <param_morph />
+      </param>
+
+      <param
+       id="855"
+       group="1"
+       name="Love_Handles"
+       value_default="0"
+       value_min="-1"
+       value_max="2">
+         <param_morph>
+		 	<volume_morph
+				name="BELLY"
+				scale="0.0 0.02 0.0"/>
+		</param_morph>
+      </param>
+
+      <param
+       id="684"
+       group="0"
+       sex="female"
+       name="Breast_Female_Cleavage"
+       label="Breast Cleavage"
+       wearable="shape"
+       edit_group="shape_torso"
+       edit_group_order="8"
+       label_min="Separate"
+       label_max="Join"
+       value_default="0"
+       value_min="-.3"
+       value_max="1.3"
+       camera_elevation=".3"
+       camera_distance=".8">
+         <param_morph />
+      </param>
+
+      <param
+       id="685"
+       group="0"
+       sex="male"
+       name="Chest_Male_No_Pecs"
+       label="Pectorals"
+       wearable="shape"
+       edit_group="shape_torso"
+       edit_group_order="5"
+       label_min="Big Pectorals"
+       label_max="Sunken Chest"
+       value_default="0"
+       value_min="-.5"
+       value_max="1.1"
+       camera_elevation=".3"
+       camera_distance="1.2">
+         <param_morph />
+      </param>
+
+<!-- ############# # 
+  other morphs (not user controlled) 
+  ############# -->
+      <param
+       id="100"
+       group="1"
+       name="Male_Torso"
+       label_min="Male_Torso"
+       value_min="0"
+       value_max="1">
+        <param_morph>
+			<volume_morph
+				name="CHEST"
+				scale="0.03 0.04 0.02"
+				pos="-0.03 0 -0.01"/>
+			<volume_morph
+				name="BELLY"
+				scale="0.03 0.03 0.0"
+				pos="-0.03 0 0.02"/>
+			<volume_morph
+				name="L_CLAVICLE"
+				scale="0.02 0.0 0.01"
+				pos="-0.02 0 0"/>
+			<volume_morph
+				name="L_UPPER_ARM"
+				scale="0.01 0.0 0.01"
+				pos="0.0 0.0 -0.01"/>
+			<volume_morph
+				name="L_LOWER_ARM"
+				scale="0.005 0.0 0.005"
+				pos="0.0 0.0 -0.005"/>
+			<volume_morph
+				name="R_CLAVICLE"
+				scale="0.02 0.0 0.01"
+				pos="-0.02 0 0"/>
+			<volume_morph
+				name="R_UPPER_ARM"
+				scale="0.01 0.0 0.01"
+				pos="0.0 0.0 -0.01"/>
+			<volume_morph
+				name="R_LOWER_ARM"
+				scale="0.005 0.0 0.005"
+				pos="0.0 0.0 -0.005"/>
+			<volume_morph
+				name="NECK"
+				scale="0.015 0.01 0.0"/>
+			<volume_morph
+				name="HEAD"
+				scale="0.0 0.0 0.01"
+				pos="0 0 -0.01"/>
+		 </param_morph>
+	</param>
+
+<!--
+        ##############
+        # animatable morphs
+        ##############
+        -->
+      <param
+       id="101"
+       group="1"
+       name="Hands_Relaxed"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="102"
+       group="1"
+       name="Hands_Point"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="103"
+       group="1"
+       name="Hands_Fist"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="666"
+       group="1"
+       name="Hands_Relaxed_L"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="667"
+       group="1"
+       name="Hands_Point_L"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="668"
+       group="1"
+       name="Hands_Fist_L"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="669"
+       group="1"
+       name="Hands_Relaxed_R"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="670"
+       group="1"
+       name="Hands_Point_R"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="671"
+       group="1"
+       name="Hands_Fist_R"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="672"
+       group="1"
+       name="Hands_Typing"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="766"
+       group="1"
+       name="Hands_Salute_R"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="791"
+       group="1"
+       name="Hands_Peace_R"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="792"
+       group="1"
+       name="Hands_Spread_R"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+<!--
+     #end morph targets
+      -->
+   </mesh>
+
+   <mesh
+    type="upperBodyMesh"
+	lod="1"
+    file_name="avatar_upper_body_1.llm"
+    min_pixel_width="160"
+    reference="avatar_upper_body.llm">
+   </mesh>
+
+   <mesh
+    type="upperBodyMesh"
+	lod="2"
+    file_name="avatar_upper_body_2.llm"
+    min_pixel_width="80"
+    reference="avatar_upper_body.llm">
+   </mesh>
+
+   <mesh
+    type="upperBodyMesh"
+	lod="3"
+    file_name="avatar_upper_body_3.llm"
+    min_pixel_width="40"
+    reference="avatar_upper_body.llm">
+   </mesh>
+
+   <mesh
+    type="upperBodyMesh"
+	lod="4"
+    file_name="avatar_upper_body_4.llm"
+	min_pixel_width="0"
+    reference="avatar_upper_body.llm">
+   </mesh>
+
+<!--
+    #upperBodyMesh2 =
+    #upperBodyMesh3 =
+    -->
+   <mesh
+    type="lowerBodyMesh"
+	lod="0"
+    file_name="avatar_lower_body.llm"
+    min_pixel_width="320">
+<!--
+        #begin morph targets
+        #############
+        # tweakable morphs
+        #############
+        -->
+      <param
+       id="156"
+       group="1"
+       name="Big_Belly_Legs"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="151"
+       group="1"
+       name="Big_Butt_Legs"
+       label="Butt Size"
+       wearable="shape"
+       edit_group="shape_legs"
+       label_min="Regular"
+       label_max="Large"
+       value_min="0"
+       value_max="1">
+         <param_morph>
+		 	<volume_morph
+				name="PELVIS"
+				scale="0.03 0.0 0.02"
+				pos="-0.03 0 -0.025"/>
+		 </param_morph>
+      </param>
+
+      <param
+       id="794"
+       group="1"
+       name="Small_Butt"
+       label="Butt Size"
+       wearable="shape"
+       edit_group="shape_legs"
+       label_min="Regular"
+       label_max="Small"
+       value_min="0"
+       value_max="1">
+         <param_morph>
+ 		 	<volume_morph
+				name="PELVIS"
+				scale="-0.01 0.0 0.0"
+				pos="0.01 0 0.0"/>
+		 </param_morph>
+      </param>
+
+      <param
+       id="152"
+       group="1"
+       name="Muscular_Legs"
+       label="Leg Muscles"
+	   show_simple="true"
+       wearable="shape"
+       edit_group="shape_legs"
+       label_min="Regular Muscles"
+       label_max="More Muscles"
+       value_min="0"
+       value_max="1.5"
+       camera_distance="1.3"
+       camera_elevation="-.5">
+         <param_morph>
+		 	<volume_morph
+				name="L_UPPER_LEG"
+				scale="0.015 0.015 0.0"
+				pos="0.0 0 0.0"/>
+		 	<volume_morph
+				name="L_LOWER_LEG"
+				scale="0.01 0.01 0.0"
+				pos="0.0 0 0.0"/>
+		 	<volume_morph
+				name="R_UPPER_LEG"
+				scale="0.015 0.015 0.0"
+				pos="0.0 0 0.0"/>
+		 	<volume_morph
+				name="R_LOWER_LEG"
+				scale="0.01 0.01 0.0"
+				pos="0.0 0 0.0"/>
+		 </param_morph>
+      </param>
+
+      <param
+       id="651"
+       group="1"
+       name="Scrawny_Legs"
+       label="Scrawny Leg"
+       wearable="shape"
+       edit_group="shape_legs"
+       label_min="Regular Muscles"
+       label_max="Less Muscles"
+       value_min="0"
+       value_max="1.5"
+       camera_distance="1.3"
+       camera_elevation="-.5">
+         <param_morph>
+		 	<volume_morph
+				name="L_UPPER_LEG"
+				scale="-0.03 -0.03 0.0"
+				pos="0.0 0 0.0"/>
+		 	<volume_morph
+				name="L_LOWER_LEG"
+				scale="-0.015 -0.015 0.0"
+				pos="0.0 0 0.0"/>
+		 	<volume_morph
+				name="R_UPPER_LEG"
+				scale="-0.03 -0.03 0.0"
+				pos="0.0 0 0.0"/>
+		 	<volume_morph
+				name="R_LOWER_LEG"
+				scale="-0.015 -0.015 0.0"
+				pos="0.0 0 0.0"/>
+		 </param_morph>
+		</param>
+
+      <param
+       id="853"
+       group="1"
+       name="Bowed_Legs"
+       label="Knee Angle"
+       wearable="shape"
+       value_min="-1"
+       value_max="1">
+         <param_morph>
+		 	<volume_morph
+				name="L_UPPER_LEG"
+				pos="0.0 0.03 0.0"/>
+		 	<volume_morph
+				name="L_LOWER_LEG"
+				pos="0.0 0.03 0.0"/>
+		 	<volume_morph
+				name="R_UPPER_LEG"
+				pos="0.0 -0.03 0.0"/>
+		 	<volume_morph
+				name="R_LOWER_LEG"
+				pos="0.0 -0.03 0.0"/>
+		 </param_morph>
+      </param>
+
+      <param
+       id="500"
+       group="1"
+       name="Shoe_Heel_Height"
+       label="Heel Height"
+       wearable="shoes"
+       edit_group="shoes"
+       label_min="Low Heels"
+       label_max="High Heels"
+       value_min="0"
+       value_max="1"
+       camera_distance="1.5"
+       camera_elevation="-.5">
+         <param_morph />
+      </param>
+
+      <param
+       id="501"
+       group="1"
+       name="Shoe_Platform_Height"
+       label="Platform Height"
+       wearable="shoes"
+       edit_group="shoes"
+       label_min="Low Platforms"
+       label_max="High Platforms"
+       value_min="0"
+       value_max="1"
+       camera_distance="1.5"
+       camera_elevation="-.5">
+         <param_morph />
+      </param>
+
+      <param
+       id="508"
+       group="0"
+       name="Shoe_Platform_Width"
+       label="Platform Width"
+       wearable="shoes"
+       edit_group="shoes"
+       edit_group_order="7"
+       label_min="Narrow"
+       label_max="Wide"
+       value_min="-1"
+       value_max="2"
+       camera_angle="15"
+       camera_distance="1.5"
+       camera_elevation="-1">
+         <param_morph />
+      </param>
+
+      <param
+       id="509"
+       group="1"
+       name="Shoe_Heel_Point"
+       label="Heel Shape"
+       wearable="shoes"
+       edit_group="shoes"
+       label_min="Default Heels"
+       label_max="Pointy Heels"
+       value_min="0"
+       value_max="1"
+       camera_distance="1.3"
+       camera_elevation="-.5">
+         <param_morph />
+      </param>
+
+      <param
+       id="510"
+       group="1"
+       name="Shoe_Heel_Thick"
+       label="Heel Shape"
+       wearable="shoes"
+       edit_group="shoes"
+       label_min="default Heels"
+       label_max="Thick Heels"
+       value_min="0"
+       value_max="1"
+       camera_distance="1.3"
+       camera_elevation="-.5">
+         <param_morph />
+      </param>
+
+      <param
+       id="511"
+       group="1"
+       name="Shoe_Toe_Point"
+       label="Toe Shape"
+       wearable="shoes"
+       edit_group="shoes"
+       label_min="Default Toe"
+       label_max="Pointy Toe"
+       value_min="0"
+       value_max="1"
+       camera_distance="1.3"
+       camera_elevation="-.5">
+         <param_morph />
+      </param>
+
+      <param
+       id="512"
+       group="1"
+       name="Shoe_Toe_Square"
+       label="Toe Shape"
+       wearable="shoes"
+       edit_group="shoes"
+       label_min="Default Toe"
+       label_max="Square Toe"
+       value_min="0"
+       value_max="1"
+       camera_distance="1.5"
+       camera_elevation="-.5">
+         <param_morph />
+      </param>
+
+      <param
+       id="654"
+       group="0"
+       name="Shoe_Toe_Thick"
+       label="Toe Thickness"
+       wearable="shoes"
+       edit_group="shoes"
+       edit_group_order="5"
+       label_min="Flat Toe"
+       label_max="Thick Toe"
+       value_min="0"
+       value_max="2"
+       camera_angle="15"
+       camera_distance="1.5"
+       camera_elevation="-1">
+         <param_morph />
+      </param>
+
+      <param
+       id="515"
+       group="0"
+       name="Foot_Size"
+       label="Foot Size"
+       wearable="shape"
+       edit_group="shape_legs"
+       edit_group_order="6"
+       label_min="Small"
+       label_max="Big"
+       value_min="-1"
+       value_max="3"
+       camera_angle="45"
+       camera_distance="1.1"
+       camera_elevation="-1">
+         <param_morph>
+		 	<volume_morph
+				name="L_FOOT"
+				scale="0.02 0.01 0.0"
+				pos="0.01 0 0"/>
+		 	<volume_morph
+				name="R_FOOT"
+				scale="0.02 0.01 0.0"
+				pos="0.01 0 0"/>
+		</param_morph>
+	  </param>
+
+      <param
+       id="516"
+       group="1"
+       name="Displace_Loose_Lowerbody"
+       label="Pants Fit"
+       wearable="pants"
+       edit_group="driven"
+       clothing_morph="true"
+       value_min="0"
+       value_max="1"
+       value_default="0">
+         <param_morph />
+      </param>
+
+      <param
+       id="625"
+       group="0"
+       name="Leg_Pantflair"
+       label="Cuff Flare"
+	   show_simple="true"
+       wearable="pants"
+       edit_group="pants"
+       edit_group_order="3"
+       clothing_morph="true"
+       label_min="Tight Cuffs"
+       label_max="Flared Cuffs"
+       value_min="0"
+       value_max="1.5"
+       camera_distance="1.8"
+       camera_angle="30"
+       camera_elevation="-.3">
+         <param_morph />
+      </param>
+
+      <param
+       id="793"
+       group="1"
+       name="Leg_Longcuffs"
+       label="Longcuffs"
+       wearable="pants"
+       edit_group="driven"
+       clothing_morph="true"
+       value_min="0"
+       value_max="3"
+       value_default="0">
+         <param_morph />
+      </param>
+
+      <param
+       id="638"
+       group="0"
+       name="Low_Crotch"
+       label="Pants Crotch"
+       wearable="pants"
+       clothing_morph="true"
+       edit_group="pants"
+       edit_group_order="4"
+       label_min="High and Tight"
+       label_max="Low and Loose"
+       value_min="0"
+       value_max="1.3"
+       camera_distance="1.2"
+       camera_angle="-20"
+       camera_elevation="-.3">
+         <param_morph />
+      </param>
+
+      <param
+       id="635"
+       group="1"
+       name="Fat_Legs"
+       label="Fat Torso"
+       wearable="shape"
+       edit_group="shape_body"
+       label_min="skinny"
+       label_max="fat"
+       value_min="0"
+       value_max="1">
+         <param_morph>
+			<volume_morph
+				name="PELVIS"
+				scale="0.03 0.06 0.0"/>
+		 	<volume_morph
+				name="R_UPPER_LEG"
+				scale="0.02 0.02 0.0"
+				pos="0.0 -0.02 0.0"/>
+			<volume_morph
+				name="R_LOWER_LEG"
+				scale="0.01 0.01 0.0"/>
+		 	<volume_morph
+				name="L_UPPER_LEG"
+				scale="0.02 0.02 0.0"
+				pos="0.0 0.02 0.0"/>
+			<volume_morph
+				name="L_LOWER_LEG"
+				scale="0.01 0.01 0.0"/>
+		</param_morph>
+      </param>
+
+      <param
+       id="854"
+       group="1"
+       name="Saddlebags"
+       value_min="-.5"
+       value_max="3">
+        <param_morph>
+		 	<volume_morph
+				name="PELVIS"
+				scale="0.0 0.025 0.0"/>
+		</param_morph>
+
+      </param>
+
+      <param
+       id="879"
+       group="0"
+       sex="male"
+       name="Male_Package"
+       label="Package"
+       wearable="shape"
+       edit_group="shape_legs"
+       edit_group_order="4.6"
+       label_min="Coin Purse"
+       label_max="Duffle Bag"
+       value_default="0"
+       value_min="-.5"
+       value_max="2"
+       camera_angle="60"
+       camera_distance=".6">
+         <param_morph />
+      </param>
+
+<!--
+        #############
+        # other morphs (not user controlled)
+        #############
+        -->
+      <param
+       id="153"
+       group="1"
+       name="Male_Legs"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+<!--
+        #end morph targets
+        -->
+   </mesh>
+
+   <mesh
+    type="lowerBodyMesh"
+	lod="1"
+    file_name="avatar_lower_body_1.llm"
+    min_pixel_width="160"
+    reference="avatar_lower_body.llm">
+   </mesh>
+
+   <mesh
+    type="lowerBodyMesh"
+	lod="2"
+    file_name="avatar_lower_body_2.llm"
+    min_pixel_width="80"
+    reference="avatar_lower_body.llm">
+   </mesh>
+
+   <mesh
+    type="lowerBodyMesh"
+	lod="3"
+    file_name="avatar_lower_body_3.llm"
+    min_pixel_width="40"
+    reference="avatar_lower_body.llm">
+   </mesh>
+
+   <mesh
+    type="lowerBodyMesh"
+	lod="4"
+    file_name="avatar_lower_body_4.llm"
+	min_pixel_width="0"
+    reference="avatar_lower_body.llm">
+   </mesh>
+
+<!--
+    #lowerBodyMesh2 =
+    #lowerBodyMesh3 =
+    -->
+<!--
+    #eyeLidLeftMesh =
+    -->
+   <mesh
+    type="eyeBallLeftMesh"
+	lod="0"
+    file_name="avatar_eye.llm"
+    min_pixel_width="320">
+<!-- begin morph_params -->
+      <param
+       id="679"
+       group="1"
+       name="Eyeball_Size"
+       label="Eyeball Size"
+       wearable="shape"
+       edit_group="shape_eyes"
+       label_min="small eye"
+       label_max="big eye"
+       value_min="-.25"
+       value_max=".10">
+         <param_morph />
+      </param>
+
+      <param
+       id="687"
+       group="1"
+       name="Eyeball_Size"
+       label="Big Eyeball"
+       wearable="shape"
+       edit_group="shape_eyes"
+       label_min="small eye"
+       label_max="big eye"
+       value_min="-.25"
+       value_max=".25">
+         <param_morph />
+      </param>
+   </mesh>
+
+   <mesh
+    type="eyeBallLeftMesh"
+	lod="1"
+    file_name="avatar_eye_1.llm"
+    min_pixel_width="80">
+<!-- begin morph_params -->
+      <param
+       id="694"
+       group="1"
+       name="Eyeball_Size"
+       label="Eyeball Size"
+       wearable="shape"
+       edit_group="shape_eyes"
+       label_min="small eye"
+       label_max="big eye"
+       value_min="-.25"
+       value_max=".10">
+         <param_morph />
+      </param>
+
+      <param
+       id="695"
+       group="1"
+       name="Eyeball_Size"
+       label="Big Eyeball"
+       wearable="shape"
+       edit_group="shape_eyes"
+       label_min="small eye"
+       label_max="big eye"
+       value_min="-.25"
+       value_max=".25">
+         <param_morph />
+      </param>
+   </mesh>
+
+<!--
+    #eyeLidRightMesh =
+    -->
+   <mesh
+    type="eyeBallRightMesh"
+	lod="0"
+    file_name="avatar_eye.llm"
+    min_pixel_width="320">
+<!-- begin morph_params -->
+      <param
+       id="680"
+       group="1"
+       name="Eyeball_Size"
+       label="Eyeball Size"
+       wearable="shape"
+       label_min="small eye"
+       label_max="big eye"
+       value_min="-.25"
+       value_max=".10">
+         <param_morph />
+      </param>
+
+      <param
+       id="688"
+       group="1"
+       name="Eyeball_Size"
+       label="Big Eyeball"
+       wearable="shape"
+       label_min="small eye"
+       label_max="big eye"
+       value_min="-.25"
+       value_max=".25">
+         <param_morph />
+      </param>
+   </mesh>
+
+   <mesh
+    type="eyeBallRightMesh"
+	lod="1"
+    file_name="avatar_eye_1.llm"
+    min_pixel_width="80">
+<!-- begin morph_params -->
+      <param
+       id="681"
+       group="1"
+       name="Eyeball_Size"
+       label="Eyeball Size"
+       wearable="shape"
+       edit_group="shape_eyes"
+       label_min="small eye"
+       label_max="big eye"
+       value_min="-.25"
+       value_max=".10">
+         <param_morph />
+      </param>
+
+      <param
+       id="691"
+       group="1"
+       name="Eyeball_Size"
+       label="Big Eyeball"
+       wearable="shape"
+       edit_group="shape_eyes"
+       label_min="small eye"
+       label_max="big eye"
+       value_min="-.25"
+       value_max=".25">
+         <param_morph />
+      </param>
+   </mesh>
+
+   <mesh
+    type="skirtMesh"
+	lod="0"
+    file_name="avatar_skirt.llm"
+    min_pixel_width="320">
+      <param
+       id="845"
+       group="1"
+       name="skirt_poofy"
+       label="poofy skirt"
+       clothing_morph="true"
+       wearable="skirt"
+       edit_group="skirt"
+       label_min="less poofy"
+       label_max="more poofy"
+       value_min="0"
+       value_max="1.5">
+         <param_morph />
+      </param>
+
+      <param
+       id="846"
+       group="1"
+       name="skirt_loose"
+       label="loose skirt"
+       clothing_morph="true"
+       wearable="skirt"
+       edit_group="skirt"
+       label_min="form fitting"
+       label_max="loose"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="866"
+       group="1"
+       name="skirt_tight"
+       label="tight skirt"
+       clothing_morph="true"
+       wearable="skirt"
+       edit_group="skirt"
+       label_min="form fitting"
+       label_max="loose"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="867"
+       group="1"
+       name="skirt_smallbutt"
+       label="tight skirt"
+       clothing_morph="false"
+       wearable="skirt"
+       edit_group="skirt"
+       label_min="form fitting"
+       label_max="loose"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="848"
+       group="0"
+       name="skirt_bustle"
+       label="bustle skirt"
+       clothing_morph="true"
+       wearable="skirt"
+       edit_group_order="3"
+       edit_group="skirt"
+       label_min="no bustle"
+       label_max="more bustle"
+       value_min="0"
+       value_max="2"
+       value_default=".2"
+       camera_angle="100"
+       camera_distance="1.3"
+       camera_elevation="-.5">
+         <param_morph />
+      </param>
+
+      <param
+       id="847"
+       group="1"
+       name="skirt_bowlegs"
+       label="legs skirt"
+       wearable="skirt"
+       value_min="-1"
+       value_max="1"
+       value_default="0">
+	     <param_morph />
+	  </param>
+
+      <param
+       id="852"
+       group="1"
+       name="skirt_bigbutt"
+       label="bigbutt skirt"
+       label_min="less"
+       label_max="more"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="849"
+       group="1"
+       name="skirt_belly"
+       label="big belly skirt"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+
+      <param
+       id="850"
+       group="1"
+       name="skirt_saddlebags"
+       value_min="-.5"
+       value_max="3">
+         <param_morph />
+      </param>
+
+      <param
+       id="851"
+       group="1"
+       name="skirt_chubby"
+       label_min="less"
+       label_max="more"
+       value_min="0"
+       value_max="1"
+       value_default="0">
+         <param_morph />
+      </param>
+
+      <param
+       id="856"
+       group="1"
+       name="skirt_lovehandles"
+       label_min="less"
+       label_max="more"
+       value_min="-1"
+       value_max="2"
+       value_default="0">
+         <param_morph />
+      </param>
+
+<!--
+        #############
+        # other morphs (not user controlled)
+        #############
+        -->
+      <param
+       id="857"
+       group="1"
+       name="skirt_male"
+       value_min="0"
+       value_max="1">
+         <param_morph />
+      </param>
+   </mesh>
+
+   <mesh
+    type="skirtMesh"
+	lod="1"
+    file_name="avatar_skirt_1.llm"
+    min_pixel_width="160"
+    reference="avatar_skirt.llm">
+   </mesh>
+
+   <mesh
+    type="skirtMesh"
+	lod="2"
+    file_name="avatar_skirt_2.llm"
+    min_pixel_width="80"
+    reference="avatar_skirt.llm">
+   </mesh>
+
+   <mesh
+    type="skirtMesh"
+	lod="3"
+    file_name="avatar_skirt_3.llm"
+    min_pixel_width="40"
+    reference="avatar_skirt.llm">
+   </mesh>
+
+   <mesh
+    type="skirtMesh"
+	lod="4"
+    file_name="avatar_skirt_4.llm"
+	min_pixel_width="0"
+    reference="avatar_skirt.llm">
+   </mesh>
+
+<!-- =========================================================== -->
+   <global_color
+    name="skin_color">
+      <param
+       id="111"
+       group="0"
+       wearable="skin"
+       edit_group="skin_color"
+       edit_group_order="1"
+       name="Pigment"
+	   show_simple="true"
+       label_min="Light"
+       label_max="Dark"
+       value_min="0"
+       value_max="1"
+       value_default=".5">
+         <param_color>
+            <value
+             color="252, 215, 200, 255" />
+
+            <value
+             color="240, 177, 112, 255" />
+
+            <value
+             color="90, 40, 16, 255" />
+
+            <value
+             color="29, 9, 6, 255" />
+         </param_color>
+      </param>
+
+      <param
+       id="110"
+       group="0"
+       wearable="skin"
+       edit_group="skin_color"
+       edit_group_order="2"
+       name="Red Skin"
+       label="Ruddiness"
+       label_min="Pale"
+       label_max="Ruddy"
+       value_min="0"
+       value_max="0.1">
+         <param_color
+          operation="blend">
+            <value
+             color="218, 41, 37, 255" />
+         </param_color>
+      </param>
+
+      <param
+       id="108"
+       group="0"
+       wearable="skin"
+       edit_group="skin_color"
+       edit_group_order="3"
+       name="Rainbow Color"
+	   show_simple="true"
+       label_min="None"
+       label_max="Wild"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5">
+         <param_color>
+            <value
+             color=" 0, 0, 0, 255" />
+
+            <value
+             color="255, 0, 255, 255" />
+
+            <value
+             color="255, 0, 0, 255" />
+
+            <value
+             color="255, 255, 0, 255" />
+
+            <value
+             color=" 0, 255, 0, 255" />
+
+            <value
+             color=" 0, 255, 255, 255" />
+
+            <value
+             color=" 0, 0, 255, 255" />
+
+            <value
+             color="255, 0, 255, 255" />
+         </param_color>
+      </param>
+   </global_color>
+
+<!-- =========================================================== -->
+   <global_color
+    name="hair_color">
+      <param
+       id="114"
+       group="0"
+       wearable="hair"
+       edit_group="hair_color"
+       edit_group_order="3"
+       name="Blonde Hair"
+	   show_simple="true"
+       label_min="Black"
+       label_max="Blonde"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation=".1"
+       camera_distance=".5">
+         <param_color>
+            <value
+             color="0, 0, 0, 255" />
+
+            <value
+             color="22, 6, 6, 255" />
+
+            <value
+             color="29, 9, 6, 255" />
+
+            <value
+             color="45, 21, 11, 255" />
+
+            <value
+             color="78, 39, 11, 255" />
+
+            <value
+             color="90, 53, 16, 255" />
+
+            <value
+             color="136, 92, 21, 255" />
+
+            <value
+             color="150, 106, 33, 255" />
+
+            <value
+             color="198, 156, 74, 255" />
+
+            <value
+             color="233, 192, 103, 255" />
+
+            <value
+             color="238, 205, 136, 255" />
+         </param_color>
+      </param>
+
+      <param
+       id="113"
+       group="0"
+       wearable="hair"
+       edit_group="hair_color"
+       edit_group_order="4"
+       name="Red Hair"
+	   show_simple="true"
+       label_min="No Red"
+       label_max="Very Red"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5">
+         <param_color>
+            <value
+             color="0, 0, 0, 255" />
+
+            <value
+             color="118, 47, 19, 255" />
+         </param_color>
+      </param>
+
+      <param
+       id="115"
+       group="0"
+       wearable="hair"
+       edit_group="hair_color"
+       edit_group_order="1"
+       name="White Hair"
+	   show_simple="true"
+       label_min="No White"
+       label_max="All White"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5">
+         <param_color>
+            <value
+             color="0, 0, 0, 255" />
+
+            <value
+             color="255, 255, 255, 255" />
+         </param_color>
+      </param>
+
+      <param
+       id="112"
+       group="0"
+       wearable="hair"
+       edit_group="hair_color"
+       edit_group_order="2"
+       name="Rainbow Color"
+	   show_simple="true"
+       label_min="None"
+       label_max="Wild"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".5">
+         <param_color>
+            <value
+             color=" 0, 0, 0, 255" />
+
+            <value
+             color="255, 0, 255, 255" />
+
+            <value
+             color="255, 0, 0, 255" />
+
+            <value
+             color="255, 255, 0, 255" />
+
+            <value
+             color=" 0, 255, 0, 255" />
+
+            <value
+             color=" 0, 255, 255, 255" />
+
+            <value
+             color=" 0, 0, 255, 255" />
+
+            <value
+             color="255, 0, 255, 255" />
+         </param_color>
+      </param>
+   </global_color>
+
+<!-- =========================================================== -->
+   <global_color
+    name="eye_color">
+      <param
+       id="99"
+       group="0"
+       wearable="eyes"
+       edit_group="eyes"
+       edit_group_order="1"
+       name="Eye Color"
+	   show_simple="true"
+       label_min="Natural"
+       label_max="Unnatural"
+       value_min="0"
+       value_max="1"
+       value_default="0"
+       camera_elevation=".1"
+       camera_distance=".3">
+<!-- default to natural brown eyes-->
+         <param_color>
+            <value
+             color="50, 25, 5, 255" />
+
+<!-- natural dark brown eyes-->
+            <value
+             color="109, 55, 15, 255" />
+
+<!-- natural brown eyes-->
+            <value
+             color="150, 93, 49, 255" />
+
+<!-- natural light brown eyes-->
+            <value
+             color="152, 118, 25, 255" />
+
+<!--natural hazel eyes-->
+            <value
+             color="95, 179, 107, 255" />
+
+<!--natural green eyes-->
+            <value
+             color="87, 192, 191, 255" />
+
+<!--natural aqua eyes-->
+            <value
+             color="95, 172, 179, 255" />
+
+<!--natural blue eyes-->
+            <value
+             color="128, 128, 128, 255" />
+
+<!--natural grey eyes-->
+            <value
+             color="0, 0, 0, 255" />
+
+<!--black eyes-->
+            <value
+             color="255, 255, 0, 255" />
+
+<!--bright yellow eyes-->
+            <value
+             color=" 0, 255, 0, 255" />
+
+<!-- bright green eyes-->
+            <value
+             color=" 0, 255, 255, 255" />
+
+<!-- bright cyan eyes-->
+            <value
+             color=" 0, 0, 255, 255" />
+
+<!--bright blue eyes-->
+            <value
+             color="255, 0, 255, 255" />
+
+<!-- bright violet eyes-->
+            <value
+             color="255, 0, 0, 255" />
+
+<!--bright red eyes-->
+         </param_color>
+      </param>
+
+      <param
+       id="98"
+       group="0"
+       wearable="eyes"
+       edit_group="eyes"
+       edit_group_order="2"
+       name="Eye Lightness"
+	   show_simple="true"
+       label_min="Darker"
+       label_max="Lighter"
+       value_min="0"
+       value_max="1"
+       camera_elevation=".1"
+       camera_distance=".3">
+         <param_color>
+            <value
+             color="0, 0, 0, 0" />
+
+            <value
+             color="255, 255, 255, 255" />
+         </param_color>
+      </param>
+   </global_color>
+
+<!-- =========================================================== -->
+  <layer_set
+    body_region="hair"
+    width="512"
+    height="512"
+    clear_alpha="false">
+    <layer
+      name="base"
+      global_color="hair_color"
+      write_all_channels="true">
+      <texture
+       local_texture="hair_grain" />
+    </layer>
+
+    <layer
+       name="hair texture alpha layer"
+       visibility_mask="TRUE">
+      <texture
+         local_texture="hair_grain" />
+    </layer>
+
+    <layer
+       name="hair alpha"
+       visibility_mask="TRUE">
+      <texture
+         local_texture="hair_alpha" />
+    </layer>
+  </layer_set>
+  <!-- =========================================================== -->
+
+  <layer_set
+    body_region="head"
+    width="512"
+    height="512">
+		<layer
+		   name="head bump base"
+		   fixed_color = "128,128,128,255"
+		   render_pass="bump">
+		</layer>
+
+      <layer
+       name="head bump definition"
+       render_pass="bump">
+         
+		 <texture
+          tga_file="bump_head_base.tga" 
+		  file_is_mask="FALSE"/>
+
+         <param
+          id="873"
+          group="1"
+          wearable="skin"
+          edit_group="driven"
+          edit_group_order="12"
+          name="Bump base"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             domain="0" />
+         </param>
+      </layer>
+
+      <layer
+       name="base"
+       global_color="skin_color">
+         <texture
+          tga_file="head_skingrain.tga" />
+      </layer>
+
+      <layer
+       name="headcolor">
+         <texture
+          tga_file="head_color.tga" />
+      </layer>
+
+      <layer
+       name="shadow">
+         <texture
+          tga_file="head_shading_alpha.tga"
+          file_is_mask="TRUE" />
+
+         <param
+          id="158"
+          group="1"
+          wearable="skin"
+          name="Shading"
+          value_min="0"
+          value_max="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 0" />
+
+               <value
+                color="0, 0, 0, 128" />
+            </param_color>
+         </param>
+      </layer>
+
+      <layer
+       name="highlight">
+                  <texture
+                    tga_file="head_highlights_alpha.tga"
+          file_is_mask="TRUE" />
+
+
+         <param
+                    id="159"
+                    group="1"
+                    name="Shading"
+                    wearable="skin"
+                    value_min="0"
+          value_max="1">
+                        <param_color>
+                              <value
+                color="255, 255, 255, 0" />
+
+
+               <value
+                color="255, 255, 255, 64" />
+                        </param_color>
+                  </param>
+            </layer>	  
+      <layer
+       name="rosyface">
+         <texture
+          tga_file="rosyface_alpha.tga"
+          file_is_mask="true" />
+
+         <param
+          id="116"
+          group="0"
+          wearable="skin"
+          edit_group="skin_facedetail"
+          edit_group_order="4"
+          name="Rosy Complexion"
+          label_min="Less Rosy"
+          label_max="More Rosy"
+          value_min="0"
+          value_max="1"
+          camera_distance=".3"
+          camera_elevation=".07">
+            <param_color>
+               <value
+                color="198, 71, 71, 0" />
+
+               <value
+                color="198, 71, 71, 255" />
+            </param_color>
+         </param>
+      </layer>
+
+	  <layer
+       name="lips">
+         <texture
+          tga_file="lips_mask.tga"
+          file_is_mask="true" />
+
+         <param
+          id="117"
+          group="0"
+          wearable="skin"
+          edit_group="skin_facedetail"
+          edit_group_order="5"
+          name="Lip Pinkness"
+          label_min="Darker"
+          label_max="Pinker"
+          value_min="0"
+          value_max="1"
+          camera_distance=".25">
+            <param_color>
+               <value
+                color="220, 115, 115, 0" />
+
+               <value
+                color="220, 115, 115, 128" />
+            </param_color>
+         </param>
+      </layer>
+
+      <layer
+       name="wrinkles_shading"
+       render_pass="bump"
+       fixed_color="0,0,0,100">
+         <param
+          id="118"
+          group="1"
+          wearable="skin"
+          name="Wrinkles"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="bump_face_wrinkles.tga"
+             skip_if_zero="true"
+             domain="0.3" />
+         </param>
+      </layer>
+
+<!--<layer
+       name="wrinkles_highlights"
+       fixed_color="255,255,255,64">
+         <param
+          id="128"
+          group="1"
+          name="Wrinkles"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="head_wrinkles_highlights_alpha.tga"
+             skip_if_zero="true"
+             domain="0.3" />
+         </param>
+      </layer>-->
+      <layer
+              name="freckles"
+       fixed_color="120,47,20,128">
+                  <param
+                    id="165"
+                    group="0"
+                    wearable="skin"
+                    edit_group="skin_facedetail"
+                    edit_group_order="2"
+                    name="Freckles"
+                    label_min="Less"
+                    label_max="More"
+                    value_min="0"
+                    value_max="1"
+                    camera_distance=".3"
+          camera_elevation=".07">
+                        <param_alpha
+                          tga_file="freckles_alpha.tga"
+                          skip_if_zero="true"
+             domain="0.5" />
+                  </param>
+            </layer>
+            <layer
+       name="eyebrowsbump"
+       render_pass="bump">
+         <texture
+          tga_file="head_hair.tga"
+          file_is_mask="false" />
+
+         <param
+          id="1000"
+          group="1"
+          wearable="hair"
+          edit_group="driven"
+          name="Eyebrow Size Bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="eyebrows_alpha.tga"
+             domain="0.1" />
+         </param>
+
+         <param
+          id="1002"
+          group="1"
+          wearable="hair"
+          edit_group="driven"
+          name="Eyebrow Density Bump"
+          value_min="0"
+          value_max="1">
+            <param_color>
+               <value
+                color="255,255,255,0" />
+
+               <value
+                color="255,255,255,255" />
+            </param_color>
+         </param>
+      </layer>
+
+      <layer
+       name="eyebrows"
+       global_color="hair_color">
+         <texture
+          tga_file="head_hair.tga"
+          file_is_mask="false" />
+
+         <param
+          id="1001"
+          group="1"
+          wearable="hair"
+          edit_group="hair_eyebrows"
+          name="Eyebrow Size"
+		  show_simple="true"
+          value_min="0"
+          value_max="1"
+          value_default="0.5">
+            <param_alpha
+             tga_file="eyebrows_alpha.tga"
+             domain="0.1" />
+         </param>
+
+         <param
+          id="1003"
+          group="1"
+          edit_group="driven"
+          name="Eyebrow Density"
+          value_min="0"
+          value_max="1">
+            <param_color
+             operation="multiply">
+               <value
+                color="255,255,255,0" />
+
+               <value
+                color="255,255,255,255" />
+            </param_color>
+         </param>
+      </layer>
+
+      <layer
+       name="lipstick">
+         <param
+          id="700"
+          group="0"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="2"
+          name="Lipstick Color"
+          label_min="Pink"
+          label_max="Black"
+          value_min="0"
+          value_max="1"
+          value_default=".25"
+          camera_distance=".25">
+            <param_color>
+               <value
+                color="245,161,177,200" />
+
+               <value
+                color="216,37,67,200" />
+
+               <value
+                color="178,48,76,200" />
+
+               <value
+                color="68,0,11,200" />
+
+               <value
+                color="252,207,184,200" />
+
+               <value
+                color="241,136,106,200" />
+
+               <value
+                color="208,110,85,200" />
+
+               <value
+                color="106,28,18,200" />
+
+               <value
+                color="58,26,49,200" />
+
+               <value
+                color="14,14,14,200" />
+            </param_color>
+         </param>
+
+         <param
+          id="701"
+          group="0"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="1"
+          name="Lipstick"
+          label_min="No Lipstick"
+          label_max="More Lipstick"
+          value_min="0"
+          value_max=".9"
+          value_default="0.0"
+          camera_distance=".25">
+            <param_alpha
+             tga_file="lipstick_alpha.tga"
+             skip_if_zero="true"
+             domain="0.05" />
+         </param>
+      </layer>
+
+      <layer
+       name="lipgloss"
+       fixed_color="255,255,255,190">
+         <param
+          id="702"
+          name="Lipgloss"
+          label_min="No Lipgloss"
+          label_max="Glossy"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="3"
+          group="0"
+          value_min="0"
+          value_max="1"
+          camera_distance=".25">
+            <param_alpha
+             tga_file="lipgloss_alpha.tga"
+             skip_if_zero="true"
+             domain="0.2" />
+         </param>
+      </layer>
+
+      <layer
+       name="blush">
+         <param
+          id="704"
+          group="0"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="4"
+          name="Blush"
+          label_min="No Blush"
+          label_max="More Blush"
+          value_min="0"
+          value_max=".9"
+          value_default="0"
+          camera_distance=".3"
+          camera_elevation=".07"
+          camera_angle="20">
+            <param_alpha
+             tga_file="blush_alpha.tga"
+             skip_if_zero="true"
+             domain="0.3" />
+         </param>
+
+         <param
+          id="705"
+          group="0"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="5"
+          name="Blush Color"
+          label_min="Pink"
+          label_max="Orange"
+          value_min="0"
+          value_max="1"
+          value_default=".5"
+          camera_distance=".3"
+          camera_elevation=".07"
+          camera_angle="20">
+            <param_color>
+               <value
+                color="253,162,193,200" />
+
+               <value
+                color="247,131,152,200" />
+
+               <value
+                color="213,122,140,200" />
+
+               <value
+                color="253,152,144,200" />
+
+               <value
+                color="236,138,103,200" />
+
+               <value
+                color="195,128,122,200" />
+
+               <value
+                color="148,103,100,200" />
+
+               <value
+                color="168,95,62,200" />
+            </param_color>
+         </param>
+
+         <param
+          id="711"
+          group="0"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="6"
+          name="Blush Opacity"
+          label_min="Clear"
+          label_max="Opaque"
+          value_min="0"
+          value_max="1"
+          value_default=".5"
+          camera_distance=".3"
+          camera_elevation=".07"
+          camera_angle="20">
+            <param_color
+             operation="multiply">
+               <value
+                color="255,255,255,0" />
+
+               <value
+                color="255,255,255,255" />
+            </param_color>
+         </param>
+      </layer>
+
+      <layer
+       name="Outer Eye Shadow">
+         <param
+          id="708"
+          group="0"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="11"
+          name="Out Shdw Color"
+          label_min="Light"
+          label_max="Dark"
+          value_min="0"
+          value_max="1"
+          camera_distance=".3"
+          camera_elevation=".14">
+            <param_color>
+               <value
+                color="252,247,246,255" />
+
+               <value
+                color="255,206,206,255" />
+
+               <value
+                color="233,135,149,255" />
+
+               <value
+                color="220,168,192,255" />
+
+               <value
+                color="228,203,232,255" />
+
+               <value
+                color="255,234,195,255" />
+
+               <value
+                color="230,157,101,255" />
+
+               <value
+                color="255,147,86,255" />
+
+               <value
+                color="228,110,89,255" />
+
+               <value
+                color="228,150,120,255" />
+
+               <value
+                color="223,227,213,255" />
+
+               <value
+                color="96,116,87,255" />
+
+               <value
+                color="88,143,107,255" />
+
+               <value
+                color="194,231,223,255" />
+
+               <value
+                color="207,227,234,255" />
+
+               <value
+                color="41,171,212,255" />
+
+               <value
+                color="180,137,130,255" />
+
+               <value
+                color="173,125,105,255" />
+
+               <value
+                color="144,95,98,255" />
+
+               <value
+                color="115,70,77,255" />
+
+               <value
+                color="155,78,47,255" />
+
+               <value
+                color="239,239,239,255" />
+
+               <value
+                color="194,194,194,255" />
+
+               <value
+                color="120,120,120,255" />
+
+               <value
+                color="10,10,10,255" />
+            </param_color>
+         </param>
+
+         <param
+          id="706"
+          group="0"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="12"
+          name="Out Shdw Opacity"
+          label_min="Clear"
+          label_max="Opaque"
+          value_min=".2"
+          value_max="1"
+          value_default=".6"
+          camera_distance=".3"
+          camera_elevation=".14">
+            <param_color
+             operation="multiply">
+               <value
+                color="255,255,255,0" />
+
+               <value
+                color="255,255,255,255" />
+            </param_color>
+         </param>
+
+         <param
+          id="707"
+          group="0"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="10"
+          name="Outer Shadow"
+          label_min="No Eyeshadow"
+          label_max="More Eyeshadow"
+          value_min="0"
+          value_max=".7"
+          camera_distance=".3"
+          camera_elevation=".14">
+            <param_alpha
+             tga_file="eyeshadow_outer_alpha.tga"
+             skip_if_zero="true"
+             domain="0.05" />
+         </param>
+      </layer>
+
+      <layer
+       name="Inner Eye Shadow">
+         <param
+          id="712"
+          group="0"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="8"
+          name="In Shdw Color"
+          label_min="Light"
+          label_max="Dark"
+          value_min="0"
+          value_max="1"
+          camera_distance=".3"
+          camera_elevation=".14">
+            <param_color>
+               <value
+                color="252,247,246,255" />
+
+               <value
+                color="255,206,206,255" />
+
+               <value
+                color="233,135,149,255" />
+
+               <value
+                color="220,168,192,255" />
+
+               <value
+                color="228,203,232,255" />
+
+               <value
+                color="255,234,195,255" />
+
+               <value
+                color="230,157,101,255" />
+
+               <value
+                color="255,147,86,255" />
+
+               <value
+                color="228,110,89,255" />
+
+               <value
+                color="228,150,120,255" />
+
+               <value
+                color="223,227,213,255" />
+
+               <value
+                color="96,116,87,255" />
+
+               <value
+                color="88,143,107,255" />
+
+               <value
+                color="194,231,223,255" />
+
+               <value
+                color="207,227,234,255" />
+
+               <value
+                color="41,171,212,255" />
+
+               <value
+                color="180,137,130,255" />
+
+               <value
+                color="173,125,105,255" />
+
+               <value
+                color="144,95,98,255" />
+
+               <value
+                color="115,70,77,255" />
+
+               <value
+                color="155,78,47,255" />
+
+               <value
+                color="239,239,239,255" />
+
+               <value
+                color="194,194,194,255" />
+
+               <value
+                color="120,120,120,255" />
+
+               <value
+                color="10,10,10,255" />
+            </param_color>
+         </param>
+
+         <param
+          id="713"
+          group="0"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="9"
+          name="In Shdw Opacity"
+          label_min="Clear"
+          label_max="Opaque"
+          value_min=".2"
+          value_max="1"
+          value_default=".7"
+          camera_distance=".3"
+          camera_elevation=".14">
+            <param_color
+             operation="multiply">
+               <value
+                color="255,255,255,0" />
+
+               <value
+                color="255,255,255,255" />
+            </param_color>
+         </param>
+
+         <param
+          id="709"
+          group="0"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="7"
+          name="Inner Shadow"
+          label_min="No Eyeshadow"
+          label_max="More Eyeshadow"
+          value_min="0"
+          value_max="1"
+          value_default="0"
+          camera_distance=".3"
+          camera_elevation=".14">
+            <param_alpha
+             tga_file="eyeshadow_inner_alpha.tga"
+             skip_if_zero="true"
+             domain="0.2" />
+         </param>
+      </layer>
+
+      <layer
+       name="eyeliner"
+       fixed_color="0,0,0,200">
+         <param
+          id="703"
+          group="0"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="13"
+          name="Eyeliner"
+          label_min="No Eyeliner"
+          label_max="Full Eyeliner"
+          value_min="0"
+          value_max="1"
+          value_default="0.0"
+          camera_distance=".3"
+          camera_elevation=".14">
+            <param_alpha
+             tga_file="eyeliner_alpha.tga"
+             skip_if_zero="true"
+             domain="0.1" />
+         </param>
+
+         <param
+          id="714"
+          group="0"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="14"
+          name="Eyeliner Color"
+          label_min="Dark Green"
+          label_max="Black"
+          value_min="0"
+          value_max="1"
+          camera_distance=".3"
+          camera_elevation=".14">
+            <param_color>
+               <value
+                color="24,98,40,250" />
+
+<!-- dark green -->
+               <value
+                color="9,100,127,250" />
+
+<!-- lt.aqua  blue -->
+               <value
+                color="61,93,134,250" />
+
+<!-- aqua  -->
+               <value
+                color="70,29,27,250" />
+
+<!--    dark brown -->
+               <value
+                color="115,75,65,250" />
+
+<!-- lt. brown  blue -->
+               <value
+                color="100,100,100,250" />
+
+<!-- grey -->
+               <value
+                color="91,80,74,250" />
+
+<!-- grey/brown  -->
+               <value
+                color="112,42,76,250" />
+
+<!-- plum -->
+               <value
+                color="14,14,14,250" />
+
+<!-- black -->
+            </param_color>
+         </param>
+      </layer>
+
+      <layer
+       name="facialhair bump"
+       render_pass="bump">
+         <texture
+          tga_file="head_hair.tga"
+          file_is_mask="false" />
+
+         <param
+          id="1004"
+          sex="male"
+          group="1"
+          wearable="hair"
+          edit_group="driven"
+          name="Sideburns bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="facehair_sideburns_alpha.tga"
+             skip_if_zero="true"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1006"
+          sex="male"
+          group="1"
+          wearable="hair"
+          edit_group="driven"
+          name="Moustache bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="facehair_moustache_alpha.tga"
+             skip_if_zero="true"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1008"
+          sex="male"
+          group="1"
+          wearable="hair"
+          edit_group="driven"
+          name="Soulpatch bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="facehair_soulpatch_alpha.tga"
+             skip_if_zero="true"
+             domain="0.1" />
+         </param>
+
+         <param
+          id="1010"
+          sex="male"
+          group="1"
+          edit_group="driven"
+          wearable="hair"
+          name="Chin Curtains bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="facehair_chincurtains_alpha.tga"
+             skip_if_zero="true"
+             domain="0.03" />
+         </param>
+
+         <param
+          id="1012"
+          group="1"
+          sex="male"
+          wearable="hair"
+          edit_group="driven"
+          name="5 O'Clock Shadow bump"
+          value_min="0"
+          value_max="1">
+            <param_color>
+               <value
+                color="255,255,255,255" />
+
+               <value
+                color="255,255,255,0" />
+            </param_color>
+         </param>
+      </layer>
+
+      <layer
+       name="facialhair"
+       global_color="hair_color">
+         <morph_mask
+          morph_name="Displace_Hair_Facial" />
+
+         <texture
+          tga_file="head_hair.tga"
+          file_is_mask="false" />
+
+         <param
+          id="1005"
+          sex="male"
+          group="1"
+          edit_group="driven"
+          name="Sideburns"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="facehair_sideburns_alpha.tga"
+             skip_if_zero="true"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1007"
+          sex="male"
+          group="1"
+          edit_group="driven"
+          name="Moustache"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="facehair_moustache_alpha.tga"
+             skip_if_zero="true"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1009"
+          sex="male"
+          group="1"
+          edit_group="driven"
+          name="Soulpatch"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="facehair_soulpatch_alpha.tga"
+             skip_if_zero="true"
+             domain="0.1" />
+         </param>
+
+         <param
+          id="1011"
+          sex="male"
+          group="1"
+          edit_group="driven"
+          name="Chin Curtains"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="facehair_chincurtains_alpha.tga"
+             skip_if_zero="true"
+             domain="0.03" />
+         </param>
+
+         <param
+          id="751"
+          group="1"
+          wearable="hair"
+          sex="male"
+          edit_group="hair_facial"
+          name="5 O'Clock Shadow"
+          label_min="Dense hair"
+          label_max="Shadow hair"
+          value_min="0"
+          value_max="1"
+          value_default="0.7"
+          camera_elevation=".1"
+          camera_distance=".3">
+            <param_color
+             operation="multiply">
+               <value
+                color="255,255,255,255" />
+
+               <value
+                color="255,255,255,30" />
+            </param_color>
+         </param>
+      </layer>
+
+   <layer
+       name="head_bodypaint">
+         <texture
+          local_texture="head_bodypaint" />
+      </layer>
+    <layer
+	   name="eyelash alpha"
+	   visibility_mask="TRUE">
+         <texture
+	      tga_file="head_alpha.tga"
+	      file_is_mask="TRUE" />
+    </layer>
+    <layer
+       name="head alpha"
+       visibility_mask="TRUE">
+         <texture
+          local_texture="head_alpha" />
+    </layer>
+    <layer
+       name="head_tattoo">
+        <texture local_texture="head_tattoo" />
+		<param id="1062" group="1" edit_group="colorpicker_driven" wearable="tattoo" 
+			name="tattoo_head_red" value_min="0" value_max="1" value_default="1">
+			<param_color>
+				<value color="0, 0, 0, 255" />
+				<value color="255, 0, 0, 255" />
+			</param_color>
+		</param>
+
+		<param id="1063" group="1" edit_group="colorpicker_driven" wearable="tattoo" 
+			name="tattoo_head_green" value_min="0" value_max="1" value_default="1">
+			<param_color>
+				<value color="0, 0, 0, 255" />
+				<value color="0, 255, 0, 255" />
+			</param_color>
+		</param>
+
+		<param id="1064" group="1" edit_group="colorpicker_driven" wearable="tattoo" 
+			name="tattoo_head_blue" value_min="0" value_max="1" value_default="1">
+			<param_color>
+				<value color="0, 0, 0, 255" />
+				<value color="0, 0, 255, 255" />
+			</param_color>
+		</param>
+    </layer>
+   </layer_set>
+
+<!-- =========================================================== -->
+   <layer_set
+    body_region="upper_body"
+    width="512"
+    height="512">
+      <layer
+       name="base_upperbody bump"
+       render_pass="bump"
+       fixed_color="128,128,128,255">
+      </layer>
+      <layer
+       name="upperbody bump definition"
+       render_pass="bump">
+   		 <texture
+          tga_file="bump_upperbody_base.tga" 
+		  file_is_mask="FALSE"/>
+
+         <param
+          id="874"
+          group="1"
+          wearable="skin"
+          edit_group="driven"
+          edit_group_order="20"
+          name="Bump upperdef"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             domain="0" />
+         </param>
+      </layer>
+
+      <layer
+       name="base"
+       global_color="skin_color">
+         <texture
+          tga_file="body_skingrain.tga" />
+      </layer>
+
+      <layer
+       name="nipples">
+         <texture
+          tga_file="upperbody_color.tga" />
+      </layer>
+
+      <layer
+       name="shadow">
+         <texture
+          tga_file="upperbody_shading_alpha.tga"
+          file_is_mask="TRUE" />
+
+         <param
+          id="125"
+          group="1"
+          name="Shading"
+          wearable="skin"
+          value_min="0"
+          value_max="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 0" />
+
+               <value
+                color="0, 0, 0, 128" />
+            </param_color>
+         </param>
+      </layer>
+
+      <layer
+       name="highlight">
+         <texture
+          tga_file="upperbody_highlights_alpha.tga"
+          file_is_mask="TRUE" />
+
+         <param
+          id="126"
+          group="1"
+          wearable="skin"
+          name="Shading"
+          value_min="0"
+          value_max="1">
+            <param_color>
+               <value
+                color="255, 255, 255, 0" />
+
+               <value
+                color="255, 255, 255, 64" />
+            </param_color>
+         </param>
+      </layer>
+
+      <layer
+       name="upper_bodypaint">
+         <texture
+          local_texture="upper_bodypaint" />
+      </layer>
+
+      <layer
+       name="freckles upper"
+       fixed_color="120,47,20,128">
+         <param
+          id="776"
+          group="1"
+          name="freckles upper"
+          wearable="skin"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="upperbodyfreckles_alpha.tga"
+             skip_if_zero="true"
+             domain="0.6" />
+         </param>
+      </layer>
+
+      <layer name="upper_tattoo">
+        <texture local_texture="upper_tattoo" />
+		<param id="1065" group="1" edit_group="colorpicker_driven" wearable="tattoo" 
+			name="tattoo_upper_red" value_min="0" value_max="1" value_default="1">
+			<param_color>
+				<value color="0, 0, 0, 255" />
+				<value color="255, 0, 0, 255" />
+			</param_color>
+			</param>
+
+			<param id="1066" group="1" edit_group="colorpicker_driven" wearable="tattoo" 
+				name="tattoo_upper_green" value_min="0" value_max="1" value_default="1">
+				<param_color>
+					<value color="0, 0, 0, 255" />
+					<value color="0, 255, 0, 255" />
+				</param_color>
+			</param>
+
+			<param id="1067" group="1" edit_group="colorpicker_driven" wearable="tattoo" 
+				name="tattoo_upper_blue" value_min="0" value_max="1" value_default="1">
+				<param_color>
+					<value color="0, 0, 0, 255" />
+					<value color="0, 0, 255, 255" />
+				</param_color>
+			</param>
+      </layer>
+
+      <layer
+       name="upper_undershirt bump"
+       render_pass="bump"
+       fixed_color="128,128,128,255">
+         <texture
+          local_texture="upper_undershirt"
+          local_texture_alpha_only="true" />
+
+         <param
+          id="1043"
+          group="1"
+          wearable="undershirt"
+          edit_group="driven"
+          name="Sleeve Length bump"
+          value_min=".01"
+          value_max="1"
+          value_default=".4">
+            <param_alpha
+             tga_file="shirt_sleeve_alpha.tga"
+             multiply_blend="false"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="1045"
+          group="1"
+          wearable="undershirt"
+          edit_group="undershirt"
+          edit_group_order="2"
+          name="Bottom bump"
+          value_min="0"
+          value_max="1"
+          value_default=".8">
+            <param_alpha
+             tga_file="shirt_bottom_alpha.tga"
+             multiply_blend="true"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1047"
+          group="1"
+          wearable="undershirt"
+          edit_group="driven"
+          name="Collar Front bump"
+          value_min="0"
+          value_max="1"
+          value_default=".8">
+            <param_alpha
+             tga_file="shirt_collar_alpha.tga"
+             multiply_blend="true"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1049"
+          group="1"
+          wearable="undershirt"
+          edit_group="driven"
+          name="Collar Back bump"
+          value_min="0"
+          value_max="1"
+          value_default=".8">
+            <param_alpha
+             tga_file="shirt_collar_back_alpha.tga"
+             multiply_blend="true"
+             domain="0.05" />
+         </param>
+      </layer>
+
+      <layer
+       name="upper_undershirt">
+         <texture
+          local_texture="upper_undershirt" />
+
+         <param
+          id="821"
+          group="0"
+          wearable="undershirt"
+          edit_group="colorpicker"
+          name="undershirt_red"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="255, 0, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="822"
+          group="0"
+          wearable="undershirt"
+          edit_group="colorpicker"
+          name="undershirt_green"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 255, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="823"
+          group="0"
+          wearable="undershirt"
+          edit_group="colorpicker"
+          name="undershirt_blue"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 0, 255, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="1042"
+          group="1"
+          wearable="undershirt"
+          edit_group="driven"
+          name="Sleeve Length"
+          value_min=".01"
+          value_max="1"
+          value_default=".4">
+            <param_alpha
+             tga_file="shirt_sleeve_alpha.tga"
+             multiply_blend="false"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="1044"
+          group="1"
+          wearable="undershirt"
+          edit_group="driven"
+          name="Bottom"
+          value_min="0"
+          value_max="1"
+          value_default=".8">
+            <param_alpha
+             tga_file="shirt_bottom_alpha.tga"
+             multiply_blend="true"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1046"
+          group="1"
+          wearable="undershirt"
+          edit_group="driven"
+          name="Collar Front"
+          value_min="0"
+          value_max="1"
+          value_default=".8">
+            <param_alpha
+             tga_file="shirt_collar_alpha.tga"
+             multiply_blend="true"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1048"
+          group="1"
+          wearable="undershirt"
+          edit_group="driven"
+          name="Collar Back"
+          label_min="Low"
+          label_max="High"
+          value_min="0"
+          value_max="1"
+          value_default=".8">
+            <param_alpha
+             tga_file="shirt_collar_back_alpha.tga"
+             multiply_blend="true"
+             domain="0.05" />
+         </param>
+      </layer>
+
+      <layer
+       name="Nail Polish">
+         <param
+          id="710"
+          group="0"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="15"
+          name="Nail Polish"
+          label_min="No Polish"
+          label_max="Painted Nails"
+          value_min="0"
+          value_max="1"
+          value_default="0.0"
+          camera_distance="1.6"
+          camera_elevation="-.4"
+          camera_angle="70">
+            <param_alpha
+             tga_file="nailpolish_alpha.tga"
+             skip_if_zero="true"
+             domain="0.1" />
+         </param>
+
+         <param
+          id="715"
+          group="0"
+          wearable="skin"
+          edit_group="skin_makeup"
+          edit_group_order="16"
+          name="Nail Polish Color"
+          label_min="Pink"
+          label_max="Black"
+          value_min="0"
+          value_max="1"
+          camera_distance="1.6"
+          camera_elevation="-.4"
+          camera_angle="70">
+            <param_color>
+               <value
+                color="255,187,200,255" />
+
+               <value
+                color="194,102,127,255" />
+
+               <value
+                color="227,34,99,255" />
+
+               <value
+                color="168,41,60,255" />
+
+               <value
+                color="97,28,59,255" />
+
+               <value
+                color="234,115,93,255" />
+
+               <value
+                color="142,58,47,255" />
+
+               <value
+                color="114,30,46,255" />
+
+               <value
+                color="14,14,14,255" />
+            </param_color>
+         </param>
+      </layer>
+
+      <layer
+       name="upper_gloves bump"
+       render_pass="bump"
+       fixed_color="128,128,128,255">
+         <texture
+          local_texture="upper_gloves"
+          local_texture_alpha_only="true" />
+
+         <param
+          id="1059"
+          group="1"
+          wearable="gloves"
+          edit_group="driven"
+          name="Glove Length bump"
+          value_min=".01"
+          value_max="1"
+          value_default=".8">
+            <param_alpha
+             tga_file="glove_length_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="1061"
+          group="1"
+          wearable="gloves"
+          edit_group="driven"
+          name="Glove Fingers bump"
+          value_min=".01"
+          value_max="1"
+          value_default="1">
+            <param_alpha
+             tga_file="gloves_fingers_alpha.tga"
+             multiply_blend="true"
+             domain="0.01" />
+         </param>
+      </layer>
+
+      <layer
+       name="upper_gloves">
+         <texture
+          local_texture="upper_gloves" />
+
+         <param
+          id="827"
+          group="0"
+          wearable="gloves"
+          edit_group="colorpicker"
+          name="gloves_red"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="255, 0, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="829"
+          group="0"
+          wearable="gloves"
+          edit_group="colorpicker"
+          name="gloves_green"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 255, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="830"
+          group="0"
+          wearable="gloves"
+          edit_group="colorpicker"
+          name="gloves_blue"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 0, 255, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="1058"
+          group="1"
+          wearable="gloves"
+          edit_group="driven"
+          name="Glove Length"
+          value_min=".01"
+          value_max="1"
+          value_default=".8">
+            <param_alpha
+             tga_file="glove_length_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="1060"
+          group="1"
+          wearable="gloves"
+          edit_group="driven"
+          name="Glove Fingers"
+          value_min=".01"
+          value_max="1"
+          value_default="1">
+            <param_alpha
+             tga_file="gloves_fingers_alpha.tga"
+             multiply_blend="true"
+             domain="0.01" />
+         </param>
+      </layer>
+
+      <layer
+       name="upper_clothes_shadow">
+         <texture
+          local_texture="upper_shirt" />
+
+         <param
+          id="899"
+          group="1"
+          edit_group="driven"
+          wearable="shirt"
+          name="Upper Clothes Shading"
+          value_min="0"
+          value_max="1"
+          value_default="0">
+            <param_color>
+               <value
+                color="0, 0, 0, 0" />
+
+               <value
+                color="0, 0, 0, 80" />
+            </param_color>
+         </param>
+
+         <param
+          id="900"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Sleeve Length Shadow"
+          value_min="0.02"
+          value_max=".87"
+          value_default="0.02">
+            <param_alpha
+             multiply_blend="false"
+             tga_file="shirt_sleeve_alpha.tga"
+             skip_if_zero="true"
+             domain="0.03" />
+         </param>
+
+         <param
+          id="901"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Shirt Shadow Bottom"
+          value_min="0.02"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_bottom_alpha.tga"
+             skip_if_zero="true"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="902"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Collar Front Shadow Height"
+          value_min="0.02"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_collar_alpha.tga"
+             skip_if_zero="true"
+             domain="0.02" />
+         </param>
+
+         <param
+          id="903"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Collar Back Shadow Height"
+          value_min="0.02"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_collar_back_alpha.tga"
+             skip_if_zero="true"
+             domain="0.02" />
+         </param>
+      </layer>
+
+      <layer
+       name="upper_shirt base bump"
+       render_pass="bump"
+       fixed_color="128,128,128,255">
+         <texture
+          local_texture="upper_shirt"
+          local_texture_alpha_only="true" />
+
+         <param
+          id="1029"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Sleeve Length Cloth"
+          value_min="0"
+          value_max="0.85">
+            <param_alpha
+             multiply_blend="false"
+             tga_file="shirt_sleeve_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="1030"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Shirt Bottom Cloth"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_bottom_alpha.tga"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1031"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Collar Front Height Cloth"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_collar_alpha.tga"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1032"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Collar Back Height Cloth"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_collar_back_alpha.tga"
+             domain="0.05" />
+         </param>
+      </layer>
+
+      <layer
+       name="upper_clothes bump"
+       render_pass="bump">
+         <texture
+          tga_file="bump_shirt_wrinkles.tga" />
+
+         <texture
+          local_texture="upper_shirt"
+          local_texture_alpha_only="true" />
+
+         <param
+          id="868"
+          group="0"
+          wearable="shirt"
+          edit_group="shirt"
+          edit_group_order="8"
+          name="Shirt Wrinkles"
+          value_min="0"
+          value_max="1"
+          value_default="0">
+            <param_color>
+               <value
+                color="255, 255, 255, 0" />
+
+               <value
+                color="255, 255, 255, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="1013"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Sleeve Length Cloth"
+          value_min="0"
+          value_max="0.85">
+            <param_alpha
+             multiply_blend="false"
+             tga_file="shirt_sleeve_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="1014"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Shirt Bottom Cloth"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_bottom_alpha.tga"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1015"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Collar Front Height Cloth"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_collar_alpha.tga"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1016"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Collar Back Height Cloth"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_collar_back_alpha.tga"
+             domain="0.05" />
+         </param>
+      </layer>
+
+      <layer
+       name="upper_clothes">
+         <texture
+          local_texture="upper_shirt" />
+
+         <morph_mask
+          morph_name="Displace_Loose_Upperbody" />
+
+         <morph_mask
+          morph_name="Shirtsleeve_flair" />
+
+         <param
+          id="803"
+          group="0"
+          wearable="shirt"
+          edit_group="colorpicker"
+          name="shirt_red"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="255, 0, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="804"
+          group="0"
+          wearable="shirt"
+          edit_group="colorpicker"
+          name="shirt_green"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 255, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="805"
+          group="0"
+          wearable="shirt"
+          edit_group="colorpicker"
+          name="shirt_blue"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 0, 255, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="600"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Sleeve Length Cloth"
+          value_min="0"
+          value_max="0.85"
+          value_default=".7">
+            <param_alpha
+             multiply_blend="false"
+             tga_file="shirt_sleeve_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="601"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Shirt Bottom Cloth"
+          value_min="0"
+          value_max="1"
+          value_default=".8">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_bottom_alpha.tga"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="602"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Collar Front Height Cloth"
+          value_min="0"
+          value_max="1"
+          value_default=".8">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_collar_alpha.tga"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="778"
+          group="1"
+          wearable="shirt"
+          edit_group="driven"
+          name="Collar Back Height Cloth"
+          value_min="0"
+          value_max="1"
+          value_default=".8">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_collar_back_alpha.tga"
+             domain="0.05" />
+         </param>
+      </layer>
+
+      <layer
+       name="upper_jacket base bump"
+       render_pass="bump"
+       fixed_color="128,128,128,255">
+         <texture
+          local_texture="upper_jacket"
+          local_texture_alpha_only="true" />
+
+         <param
+          id="1039"
+          group="1"
+          wearable="jacket"
+          edit_group="driven"
+          edit_group_order="1"
+          name="Jacket Sleeve Length bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="false"
+             tga_file="shirt_sleeve_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="1040"
+          group="1"
+          wearable="jacket"
+          edit_group="driven"
+          name="Jacket Collar Front bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_collar_alpha.tga"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1041"
+          group="1"
+          wearable="jacket"
+          edit_group="driven"
+          edit_group_order="3.5"
+          name="Jacket Collar Back bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_collar_back_alpha.tga"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1037"
+          group="1"
+          wearable="jacket"
+          edit_group="driven"
+          name="jacket bottom length upper bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="jacket_length_upper_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="1038"
+          group="1"
+          wearable="jacket"
+          edit_group="driven"
+          name="jacket open upper bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="jacket_open_upper_alpha.tga"
+             domain="0.01" />
+         </param>
+      </layer>
+
+      <layer
+       name="upper_jacket bump"
+       render_pass="bump">
+         <texture
+          tga_file="bump_shirt_wrinkles.tga" />
+
+         <texture
+          local_texture="upper_jacket"
+          local_texture_alpha_only="true" />
+          
+          <param
+          id="875"
+          group="1"
+          wearable="jacket"
+          name="jacket upper Wrinkles"
+          value_min="0"
+          value_max="1"
+          value_default="0">
+            <param_color>
+               <value
+                color="255, 255, 255, 0" />
+
+               <value
+                color="255, 255, 255, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="1019"
+          group="1"
+          wearable="jacket"
+          edit_group="driven"
+          edit_group_order="1"
+          name="Jacket Sleeve Length bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="false"
+             tga_file="shirt_sleeve_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="1021"
+          group="1"
+          wearable="jacket"
+          edit_group="driven"
+          name="Jacket Collar Front bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_collar_alpha.tga"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1023"
+          group="1"
+          wearable="jacket"
+          edit_group="driven"
+          edit_group_order="3.5"
+          name="Jacket Collar Back bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_collar_back_alpha.tga"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1025"
+          group="1"
+          wearable="jacket"
+          edit_group="driven"
+          name="jacket bottom length upper bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="jacket_length_upper_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="1026"
+          group="1"
+          wearable="jacket"
+          edit_group="driven"
+          name="jacket open upper bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="jacket_open_upper_alpha.tga"
+             domain="0.01" />
+         </param>
+      </layer>
+
+      <layer
+       name="upper_jacket">
+         <texture
+          local_texture="upper_jacket" />
+
+         <param
+          id="831"
+          group="1"
+          edit_group="colorpicker_driven"
+          wearable="jacket"
+          name="upper_jacket_red"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="255, 0, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="832"
+          group="1"
+          edit_group="colorpicker_driven"
+          wearable="jacket"
+          name="upper_jacket_green"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 255, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="833"
+          group="1"
+          edit_group="colorpicker_driven"
+          wearable="jacket"
+          name="upper_jacket_blue"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 0, 255, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="1020"
+          group="1"
+          edit_group="driven"
+          name="jacket Sleeve Length"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="false"
+             tga_file="shirt_sleeve_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="1022"
+          group="1"
+          edit_group="driven"
+          name="jacket Collar Front"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_collar_alpha.tga"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1024"
+          group="1"
+          edit_group="driven"
+          edit_group_order="3.5"
+          name="jacket Collar Back"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="shirt_collar_back_alpha.tga"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="620"
+          group="1"
+          wearable="jacket"
+          edit_group="jacket"
+          name="bottom length upper"
+          label_min="hi cut"
+          label_max="low cut"
+          value_min="0"
+          value_max="1"
+          value_default=".8"
+          camera_distance="1.2"
+          camera_angle="30"
+          camera_elevation=".2">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="jacket_length_upper_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="622"
+          group="1"
+          wearable="jacket"
+          edit_group="jacket"
+          name="open upper"
+          label_min="closed"
+          label_max="open"
+          value_min="0"
+          value_max="1"
+          value_default=".8"
+          camera_distance="1.2"
+          camera_angle="30"
+          camera_elevation=".2">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="jacket_open_upper_alpha.tga"
+             domain="0.01" />
+         </param>
+      </layer>
+
+      <layer
+       name="upper alpha"
+       visibility_mask="TRUE">
+        <texture
+         local_texture="upper_alpha" />
+      </layer>
+
+   </layer_set>
+
+<!-- =========================================================== -->
+   <layer_set
+    body_region="lower_body"
+    width="512"
+    height="512">
+		<layer
+		   name="lower body bump base"
+		   fixed_color = "128,128,128,255"
+		   render_pass="bump">
+		</layer>
+      <layer
+       name="base_lowerbody bump"
+       render_pass="bump">
+         <texture
+          tga_file="bump_lowerbody_base.tga"
+		  file_is_mask="FALSE" />
+
+         <param
+          id="878"
+          group="1"
+          wearable="skin"
+          edit_group="driven"
+          edit_group_order="20"
+          name="Bump upperdef"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             domain="0" />
+         </param>
+      </layer>
+
+      <layer
+       name="base"
+       global_color="skin_color">
+         <texture
+          tga_file="body_skingrain.tga" />
+      </layer>
+
+      <layer
+       name="shadow">
+         <texture
+          tga_file="lowerbody_shading_alpha.tga"
+          file_is_mask="TRUE" />
+
+         <param
+          id="160"
+          group="1"
+          name="Shading"
+          wearable="pants"
+          value_min="0"
+          value_max="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 0" />
+
+               <value
+                color="0, 0, 0, 128" />
+            </param_color>
+         </param>
+      </layer>
+
+      <layer
+       name="highlight">
+         <texture
+          tga_file="lowerbody_highlights_alpha.tga"
+          file_is_mask="TRUE" />
+
+         <param
+          id="161"
+          group="1"
+          name="Shading"
+          wearable="skin"
+          value_min="0"
+          value_max="1">
+            <param_color>
+               <value
+                color="255, 255, 255, 0" />
+
+               <value
+                color="255, 255, 255, 64" />
+            </param_color>
+         </param>
+      </layer>
+
+	  <layer
+       name="toenails">
+         <texture
+          tga_file="lowerbody_color.tga" />
+      </layer>
+
+      <layer
+       name="lower_bodypaint">
+         <texture
+          local_texture="lower_bodypaint" />
+      </layer>
+
+      <layer
+       name="freckles lower"
+       fixed_color="120,47,20,128">
+         <param
+          id="777"
+          group="1"
+          name="freckles lower"
+          wearable="skin"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="bodyfreckles_alpha.tga"
+             skip_if_zero="true"
+             domain="0.6" />
+         </param>
+      </layer>
+
+      <layer
+       name="lower_tattoo">
+         <texture local_texture="lower_tattoo" />
+		 <param id="1068" group="1" edit_group="colorpicker_driven" wearable="tattoo" 
+			name="tattoo_lower_red" value_min="0" value_max="1" value_default="1">
+			<param_color>
+				<value color="0, 0, 0, 255" />
+				<value color="255, 0, 0, 255" />
+			</param_color>
+			</param>
+
+			<param id="1069" group="1" edit_group="colorpicker_driven" wearable="tattoo" 
+				name="tattoo_lower_green" value_min="0" value_max="1" value_default="1">
+				<param_color>
+					<value color="0, 0, 0, 255" />
+					<value color="0, 255, 0, 255" />
+				</param_color>
+			</param>
+
+			<param id="1070" group="1" edit_group="colorpicker_driven" wearable="tattoo" 
+				name="tattoo_lower_blue" value_min="0" value_max="1" value_default="1">
+				<param_color>
+					<value color="0, 0, 0, 255" />
+					<value color="0, 0, 255, 255" />
+				</param_color>
+			</param>
+      </layer>
+
+      <layer
+       name="lower_underpants bump"
+       render_pass="bump"
+       fixed_color="128,128,128,255">
+         <texture
+          local_texture="lower_underpants"
+          local_texture_alpha_only="true" />
+
+         <param
+          id="1055"
+          group="1"
+          wearable="underpants"
+          edit_group="underpants"
+          name="Pants Length"
+          value_min="0"
+          value_max="1"
+          value_default=".3">
+            <param_alpha
+             tga_file="pants_length_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="1057"
+          group="1"
+          wearable="underpants"
+          edit_group="underpants"
+          name="Pants Waist"
+          value_min="0"
+          value_max="1"
+          value_default=".8">
+            <param_alpha
+             tga_file="pants_waist_alpha.tga"
+             domain="0.05" />
+         </param>
+      </layer>
+
+      <layer
+       name="lower_underpants">
+         <texture
+          local_texture="lower_underpants" />
+
+         <param
+          id="824"
+          group="0"
+          wearable="underpants"
+          edit_group="colorpicker"
+          name="underpants_red"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="255, 0, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="825"
+          group="0"
+          wearable="underpants"
+          edit_group="colorpicker"
+          name="underpants_green"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 255, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="826"
+          group="0"
+          wearable="underpants"
+          edit_group="colorpicker"
+          name="underpants_blue"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 0, 255, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="1054"
+          group="1"
+          wearable="underpants"
+          edit_group="driven"
+          name="Pants Length"
+          value_min="0"
+          value_max="1"
+          value_default=".3"
+          camera_distance="1.2"
+          camera_angle="30"
+          camera_elevation="-.3">
+            <param_alpha
+             tga_file="pants_length_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="1056"
+          group="1"
+          wearable="underpants"
+          edit_group="driven"
+          name="Pants Waist"
+          value_min="0"
+          value_max="1"
+          value_default=".8">
+            <param_alpha
+             tga_file="pants_waist_alpha.tga"
+             domain="0.05" />
+         </param>
+      </layer>
+
+      <layer
+       name="lower_socks bump"
+       render_pass="bump"
+       fixed_color="128,128,128,255">
+         <texture
+          local_texture="lower_socks"
+          local_texture_alpha_only="true" />
+
+         <param
+          id="1051"
+          group="1"
+          wearable="socks"
+          edit_group="driven"
+          name="Socks Length bump"
+          value_min="0"
+          value_max="1"
+          value_default="0.35">
+            <param_alpha
+             tga_file="shoe_height_alpha.tga"
+             domain="0.01" />
+         </param>
+      </layer>
+
+      <layer
+       name="lower_socks">
+         <texture
+          local_texture="lower_socks" />
+
+         <param
+          id="818"
+          group="0"
+          wearable="socks"
+          edit_group="colorpicker"
+          name="socks_red"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="255, 0, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="819"
+          group="0"
+          wearable="socks"
+          edit_group="colorpicker"
+          name="socks_green"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 255, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="820"
+          group="0"
+          wearable="socks"
+          edit_group="colorpicker"
+          name="socks_blue"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 0, 255, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="1050"
+          group="1"
+          wearable="socks"
+          edit_group="driven"
+          name="Socks Length bump"
+          value_min="0"
+          value_max="1"
+          value_default="0.35">
+            <param_alpha
+             tga_file="shoe_height_alpha.tga"
+             domain="0.01" />
+         </param>
+      </layer>
+
+      <layer
+       name="lower_shoes bump"
+       render_pass="bump"
+       fixed_color="128,128,128,255">
+         <texture
+          local_texture="lower_shoes"
+          local_texture_alpha_only="true" />
+
+         <param
+          id="1053"
+          group="1"
+          wearable="shoes"
+          edit_group="driven"
+          name="Shoe Height bump"
+          value_min="0"
+          value_max="1"
+          value_default="0.1">
+            <param_alpha
+             tga_file="shoe_height_alpha.tga"
+             domain="0.01" />
+         </param>
+      </layer>
+
+      <layer
+       name="lower_shoes">
+         <texture
+          local_texture="lower_shoes" />
+
+         <param
+          id="812"
+          group="0"
+          wearable="shoes"
+          edit_group="colorpicker"
+          name="shoes_red"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="255, 0, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="813"
+          group="0"
+          wearable="shoes"
+          edit_group="colorpicker"
+          name="shoes_green"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 255, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="817"
+          group="0"
+          wearable="shoes"
+          edit_group="colorpicker"
+          name="shoes_blue"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 0, 255, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="1052"
+          group="1"
+          wearable="shoes"
+          edit_group="driven"
+          name="Shoe Height"
+          value_min="0"
+          value_max="1"
+          value_default="0.1">
+            <param_alpha
+             tga_file="shoe_height_alpha.tga"
+             domain="0.01" />
+         </param>
+      </layer>
+
+      <layer
+       name="lower_clothes_shadow">
+         <texture
+          local_texture="lower_pants" />
+
+         <param
+          id="913"
+          group="1"
+          edit_group="driven"
+          wearable="pants"
+          name="Lower Clothes Shading"
+          value_min="0"
+          value_max="1"
+          value_default="0">
+            <param_color>
+               <value
+                color="0, 0, 0, 0" />
+
+               <value
+                color="0, 0, 0, 80" />
+            </param_color>
+         </param>
+
+         <param
+          id="914"
+          group="1"
+          edit_group="driven"
+          wearable="pants"
+          name="Waist Height Shadow"
+          value_min="0.02"
+          value_max="1">
+            <param_alpha
+             tga_file="pants_waist_alpha.tga"
+             skip_if_zero="true"
+             domain="0.04" />
+         </param>
+
+         <param
+          id="915"
+          group="1"
+          edit_group="driven"
+          wearable="pants"
+          name="Pants Length Shadow"
+          value_min="0.02"
+          value_max="1">
+            <param_alpha
+             tga_file="pants_length_alpha.tga"
+             skip_if_zero="true"
+             domain="0.03" />
+         </param>
+      </layer>
+
+      <layer
+       name="lower_pants base bump"
+       render_pass="bump"
+       fixed_color="128,128,128,255">
+         <texture
+          local_texture="lower_pants"
+          local_texture_alpha_only="true" />
+
+         <param
+          id="1035"
+          group="1"
+          edit_group="driven"
+          wearable="pants"
+          name="Waist Height Cloth"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="pants_waist_alpha.tga"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1036"
+          group="1"
+          edit_group="driven"
+          wearable="pants"
+          name="Pants Length Cloth"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="pants_length_alpha.tga"
+             domain="0.01" />
+         </param>
+      </layer>
+
+      <layer
+       name="lower_pants bump"
+       render_pass="bump">
+         <texture
+          tga_file="bump_pants_wrinkles.tga" />
+
+         <texture
+          local_texture="lower_pants"
+          local_texture_alpha_only="true" />
+
+         <param
+          id="869"
+          group="0"
+          wearable="pants"
+          edit_group="pants"
+          edit_group_order="6"
+          name="Pants Wrinkles"
+          value_min="0"
+          value_max="1"
+          value_default="0">
+            <param_color>
+               <value
+                color="255, 255, 255, 0" />
+
+               <value
+                color="255, 255, 255, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="1017"
+          group="1"
+          edit_group="driven"
+          wearable="pants"
+          name="Waist Height Cloth"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="pants_waist_alpha.tga"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="1018"
+          group="1"
+          edit_group="driven"
+          wearable="pants"
+          name="Pants Length Cloth"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             tga_file="pants_length_alpha.tga"
+             domain="0.01" />
+         </param>
+      </layer>
+
+      <layer
+       name="lower_pants">
+         <texture
+          local_texture="lower_pants" />
+
+         <morph_mask
+          morph_name="Displace_Loose_Lowerbody" />
+
+         <morph_mask
+          morph_name="Leg_Pantflair" />
+
+         <morph_mask
+          morph_name="Low_Crotch" />
+
+         <morph_mask
+          morph_name="Leg_Longcuffs" />
+
+         <param
+          id="806"
+          group="0"
+          wearable="pants"
+          edit_group="colorpicker"
+          name="pants_red"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="255, 0, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="807"
+          group="0"
+          wearable="pants"
+          edit_group="colorpicker"
+          name="pants_green"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 255, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="808"
+          group="0"
+          wearable="pants"
+          edit_group="colorpicker"
+          name="pants_blue"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 0, 255, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="614"
+          group="1"
+          edit_group="driven"
+          wearable="pants"
+          name="Waist Height Cloth"
+          value_min="0"
+          value_max="1"
+          value_default=".8">
+            <param_alpha
+             tga_file="pants_waist_alpha.tga"
+             domain="0.05" />
+         </param>
+
+         <param
+          id="615"
+          group="1"
+          edit_group="driven"
+          wearable="pants"
+          name="Pants Length Cloth"
+          value_min="0"
+          value_max="1"
+          value_default=".8">
+            <param_alpha
+             tga_file="pants_length_alpha.tga"
+             domain="0.01" />
+         </param>
+      </layer>
+
+      <layer
+       name="lower_jacket base bump"
+       render_pass="bump"
+       fixed_color="128,128,128,255">
+         <texture
+          local_texture="lower_jacket"
+          local_texture_alpha_only="true" />
+
+         <param
+          id="1033"
+          group="1"
+          wearable="jacket"
+          edit_group="driven"
+          name="jacket bottom length lower bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="false"
+             tga_file="jacket_length_lower_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="1034"
+          group="1"
+          wearable="jacket"
+          edit_group="driven"
+          name="jacket open lower bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="jacket_open_lower_alpha.tga"
+             domain="0.01" />
+         </param>
+      </layer>
+
+      <layer
+       name="lower_jacket bump"
+       render_pass="bump">
+         <texture
+          tga_file="bump_pants_wrinkles.tga" />
+
+         <texture
+          local_texture="lower_jacket"
+          local_texture_alpha_only="true" />
+          
+         <param
+          id="876"
+          group="1"
+          wearable="jacket"
+          name="jacket upper Wrinkles"
+          value_min="0"
+          value_max="1"
+          value_default="0">
+            <param_color>
+               <value
+                color="255, 255, 255, 0" />
+
+               <value
+                color="255, 255, 255, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="1027"
+          group="1"
+          wearable="jacket"
+          edit_group="driven"
+          name="jacket bottom length lower bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="false"
+             tga_file="jacket_length_lower_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="1028"
+          group="1"
+          wearable="jacket"
+          edit_group="driven"
+          name="jacket open lower bump"
+          value_min="0"
+          value_max="1">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="jacket_open_lower_alpha.tga"
+             domain="0.01" />
+         </param>
+      </layer>
+
+      <layer
+       name="lower_jacket">
+         <texture
+          local_texture="lower_jacket" />
+
+         <param
+          id="809"
+          group="1"
+          edit_group="colorpicker_driven"
+          wearable="jacket"
+          name="lower_jacket_red"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="255, 0, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="810"
+          group="1"
+          edit_group="colorpicker_driven"
+          wearable="jacket"
+          name="lower_jacket_green"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 255, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="811"
+          group="1"
+          edit_group="colorpicker_driven"
+          wearable="jacket"
+          name="lower_jacket_blue"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 0, 255, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="621"
+          group="1"
+          wearable="jacket"
+          edit_group="jacket"
+          name="bottom length lower"
+          label_min="hi cut"
+          label_max="low cut"
+          value_min="0"
+          value_max="1"
+          value_default=".8"
+          camera_distance="1.2"
+          camera_angle="30"
+          camera_elevation=".2">
+            <param_alpha
+             multiply_blend="false"
+             tga_file="jacket_length_lower_alpha.tga"
+             domain="0.01" />
+         </param>
+
+         <param
+          id="623"
+          group="1"
+          wearable="jacket"
+          edit_group="jacket"
+          name="open lower"
+          label_min="open"
+          label_max="closed"
+          value_min="0"
+          value_max="1"
+          value_default=".8"
+          camera_distance="1.2"
+          camera_angle="30"
+          camera_elevation=".2">
+            <param_alpha
+             multiply_blend="true"
+             tga_file="jacket_open_lower_alpha.tga"
+             domain="0.01" />
+         </param>
+      </layer>
+
+      <layer
+       name="lower alpha"
+       visibility_mask="TRUE">
+         <texture
+          local_texture="lower_alpha" />
+      </layer>
+
+   </layer_set>
+
+<!-- =========================================================== -->
+   <layer_set
+    body_region="eyes"
+    width="128"
+    height="128">
+      <layer
+       name="whites">
+         <texture
+          tga_file="eyewhite.tga" />
+      </layer>
+
+      <layer
+       name="iris"
+       global_color="eye_color">
+         <texture
+          local_texture="eyes_iris" />
+      </layer>
+
+      <layer
+       name="eyes alpha"
+       visibility_mask="TRUE">
+         <texture
+          local_texture="eyes_alpha" />
+      </layer>
+
+   </layer_set>
+
+<!-- =========================================================== -->
+   <layer_set
+    body_region="skirt"
+    width="512"
+    height="512"
+    clear_alpha="false">
+      <layer
+       name="skirt_fabric"
+       write_all_channels="true">
+         <texture
+          local_texture="skirt" />
+
+         <param
+          id="921"
+          group="0"
+          wearable="skirt"
+          edit_group="colorpicker"
+          name="skirt_red"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="255, 0, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="922"
+          group="0"
+          wearable="skirt"
+          edit_group="colorpicker"
+          name="skirt_green"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 255, 0, 255" />
+            </param_color>
+         </param>
+
+         <param
+          id="923"
+          group="0"
+          wearable="skirt"
+          edit_group="colorpicker"
+          name="skirt_blue"
+          value_min="0"
+          value_max="1"
+          value_default="1">
+            <param_color>
+               <value
+                color="0, 0, 0, 255" />
+
+               <value
+                color="0, 0, 255, 255" />
+            </param_color>
+         </param>
+      </layer>
+
+      <layer
+       name="skirt_fabric_alpha">
+         <param
+          id="858"
+          group="0"
+          wearable="skirt"
+          edit_group="skirt"
+          edit_group_order="1"
+          name="Skirt Length"
+		  show_simple="true"
+          label_min="Short"
+          label_max="Long"
+          value_min=".01"
+          value_max="1"
+          value_default=".4"
+		  simple_percent_min="40"
+		  simple_percent_max="100"
+          camera_distance="1.3"
+          camera_elevation="-.5"
+          camera_angle="30">
+            <param_alpha
+             tga_file="skirt_length_alpha.tga"
+             domain="0"
+             multiply_blend="true" />
+         </param>
+
+         <param
+          id="859"
+          group="0"
+          wearable="skirt"
+          edit_group="skirt"
+          edit_group_order="4"
+          name="Slit Front"
+          label_min="Open Front"
+          label_max="Closed Front"
+          value_min="0"
+          value_max="1"
+          value_default="1"
+          camera_distance="1.3"
+          camera_elevation="-.5"
+          camera_angle="30">
+            <param_alpha
+             tga_file="skirt_slit_front_alpha.tga"
+             multiply_blend="true"
+             domain="0" />
+         </param>
+
+         <param
+          id="860"
+          group="0"
+          wearable="skirt"
+          edit_group="skirt"
+          edit_group_order="5"
+          name="Slit Back"
+          label_min="Open Back"
+          label_max="Closed Back"
+          value_min="0"
+          value_max="1"
+          value_default="1"
+          camera_distance="1.3"
+          camera_elevation="-.5"
+          camera_angle="160">
+            <param_alpha
+             tga_file="skirt_slit_back_alpha.tga"
+             multiply_blend="true"
+             domain="0" />
+         </param>
+
+         <param
+          id="861"
+          group="0"
+          wearable="skirt"
+          edit_group="skirt"
+          edit_group_order="6"
+          name="Slit Left"
+          label_min="Open Left"
+          label_max="Closed Left"
+          value_min="0"
+          value_max="1"
+          value_default="1"
+          camera_distance="1.3"
+          camera_elevation="-.5"
+          camera_angle="30">
+            <param_alpha
+             tga_file="skirt_slit_left_alpha.tga"
+             multiply_blend="true"
+             domain="0" />
+         </param>
+
+         <param
+          id="862"
+          group="0"
+          wearable="skirt"
+          edit_group="skirt"
+          edit_group_order="7"
+          name="Slit Right"
+          label_min="Open Right"
+          label_max="Closed Right"
+          value_min="0"
+          value_max="1"
+          value_default="1"
+          camera_distance="1.3"
+          camera_elevation="-.5"
+          camera_angle="-30">
+            <param_alpha
+             tga_file="skirt_slit_right_alpha.tga"
+             multiply_blend="true"
+             domain="0" />
+         </param>
+      </layer>
+   </layer_set>
+
+<!-- =========================================================== -->
+   <driver_parameters>
+      <param
+       id="828"
+       group="0"
+       name="Loose Upper Clothing"
+       label="Shirt Fit"
+	   show_simple="true"
+       wearable="shirt"
+       edit_group="shirt"
+       edit_group_order="4"
+       label_min="Tight Shirt"
+       label_max="Loose Shirt"
+       value_min="0"
+       value_max="1"
+       camera_distance="1.2"
+       camera_angle="30"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="628" />
+
+            <driven
+             id="899"
+             min1="0.1"
+             max1="0.5"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="816"
+       group="0"
+       name="Loose Lower Clothing"
+       label="Pants Fit"
+	   show_simple="true"
+       wearable="pants"
+       edit_group="pants"
+       edit_group_order="2.5"
+       label_min="Tight Pants"
+       label_max="Loose Pants"
+       value_min="0"
+       value_max="1"
+       camera_distance="1.8"
+       camera_angle="30"
+       camera_elevation="-.3">
+         <param_driver>
+            <driven
+             id="516" />
+
+            <driven
+             id="913"
+             min1="0.1"
+             max1="0.5"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="814"
+       group="0"
+       wearable="pants"
+       edit_group="pants"
+       edit_group_order="2"
+       name="Waist Height"
+       label_min="Low"
+       label_max="High"
+       value_min="0"
+       value_max="1"
+       value_default="1"
+       camera_distance="1.2"
+       camera_angle="30"
+       camera_elevation="-.3">
+         <param_driver>
+            <driven
+             id="614" />
+
+            <driven
+             id="1017" />
+
+            <driven
+             id="1033" />
+
+            <driven
+             id="914"
+             min1="0"
+             max1=".98"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="815"
+       group="0"
+       wearable="pants"
+       edit_group="pants"
+       edit_group_order="1"
+       name="Pants Length"
+	   show_simple="true"
+       label_min="Short"
+       label_max="Long"
+       value_min="0"
+       value_max="1"
+       value_default=".8"
+	   simple_percent_min="20"
+	   simple_percent_max="100"
+       camera_distance="1.8"
+       camera_angle="30"
+       camera_elevation="-.3">
+         <param_driver>
+            <driven
+             id="615"
+             min1="0"
+             max1=".9"
+             max2="1"
+             min2="1" />
+
+            <driven
+             id="1018"
+             min1="0"
+             max1=".9"
+             max2="1"
+             min2="1" />
+
+            <driven
+             id="1036"
+             min1="0"
+             max1=".9"
+             max2="1"
+             min2="1" />
+
+            <driven
+             id="793"
+             min1=".9"
+             max1="1"
+             max2="1"
+             min2="1" />
+
+            <driven
+             id="915"
+             min1="0"
+             max1=".882"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="800"
+       group="0"
+       wearable="shirt"
+       edit_group="shirt"
+       edit_group_order="1"
+       name="Sleeve Length"
+	   show_simple="true"
+       label_min="Short"
+       label_max="Long"
+       value_min="0"
+       value_max="1"
+       value_default=".89"
+	   simple_percent_min="15"
+	   simple_percent_max="100"
+       camera_distance="1.2"
+       camera_angle="30"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="600" />
+
+            <driven
+             id="1013" />
+
+            <driven
+             id="1029" />
+
+            <driven
+             id="900"
+             min1="0"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="801"
+       group="0"
+       wearable="shirt"
+       edit_group="shirt"
+       edit_group_order="2"
+       name="Shirt Bottom"
+       label_min="Short"
+       label_max="Long"
+       value_min="0"
+       value_max="1"
+       value_default="1"
+       camera_distance="1.2"
+       camera_angle="30"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="601" />
+
+            <driven
+             id="1014" />
+
+            <driven
+             id="1030" />
+
+            <driven
+             id="901"
+             min1="0"
+             max1=".98"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="802"
+       group="0"
+       wearable="shirt"
+       edit_group="shirt"
+       edit_group_order="3"
+       name="Collar Front"
+	   show_simple="true"
+       label_min="Low"
+       label_max="High"
+       value_min="0"
+       value_max="1"
+       value_default=".78"
+	   simple_percent_min="40"
+	   simple_percent_max="100"
+       camera_distance="1.2"
+       camera_angle="15"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="602" />
+
+            <driven
+             id="1015" />
+
+            <driven
+             id="1031" />
+
+            <driven
+             id="902"
+             min1="0"
+             max1=".98"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="781"
+       group="0"
+       wearable="shirt"
+       edit_group="shirt"
+       edit_group_order="3.1"
+       name="Collar Back"
+       label_min="Low"
+       label_max="High"
+       value_min="0"
+       value_max="1"
+       value_default=".78"
+       camera_distance="1.2"
+       camera_angle="195"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="778" />
+
+            <driven
+             id="1016" />
+
+            <driven
+             id="1032" />
+
+            <driven
+             id="903"
+             min1="0"
+             max1=".98"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="150"
+       group="0"
+       wearable="skin"
+       edit_group="skin_bodydetail"
+       name="Body Definition"
+       label_min="Less"
+       label_max="More"
+       value_min="0"
+       value_max="1"
+       value_default="0"
+       camera_distance="1.4"
+       camera_elevation="-.2">
+         <param_driver>
+            <driven
+             id="125" />
+
+            <driven
+             id="126" />
+
+            <driven
+             id="160" />
+
+            <driven
+             id="161" />
+
+            <driven
+             id="874" />
+
+            <driven
+             id="878" />
+
+         </param_driver>
+      </param>
+
+      <param
+       id="775"
+       group="0"
+       wearable="skin"
+       edit_group="skin_bodydetail"
+       name="Body Freckles"
+       label_min="Less Freckles"
+       label_max="More Freckles"
+       value_min="0"
+       value_max="1"
+       value_default="0"
+       camera_distance="1.4"
+       camera_elevation="-.2">
+         <param_driver>
+            <driven
+             id="776" />
+
+            <driven
+             id="777" />
+         </param_driver>
+      </param>
+
+      <param
+       id="162"
+       group="0"
+       wearable="skin"
+       edit_group="skin_facedetail"
+       edit_group_order="1"
+       name="Facial Definition"
+       label_min="Less"
+       label_max="More"
+       value_min="0"
+       value_max="1"
+       camera_distance=".3"
+       camera_elevation=".07"
+       value_default="0">
+         <param_driver>
+            <driven
+             id="158" />
+
+            <driven
+             id="159" />
+
+			<driven
+             id="873" />
+         </param_driver>
+      </param>
+
+      <param
+       id="163"
+       group="0"
+       wearable="skin"
+       edit_group="skin_facedetail"
+       edit_group_order="3"
+       name="wrinkles"
+       label_min="Less"
+       label_max="More"
+       value_min="0"
+       value_max="1"
+       camera_distance=".3"
+       camera_elevation=".07"
+       value_default="0">
+         <param_driver>
+<!--<driven
+             id="128" />-->
+            <driven
+             id="118" />
+         </param_driver>
+      </param>
+
+      <param
+       id="505"
+       group="0"
+       wearable="shape"
+       edit_group="shape_mouth"
+       edit_group_order="3"
+       name="Lip Thickness"
+       label_min="Thin Lips"
+       label_max="Fat Lips"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_distance=".3"
+       camera_elevation=".04"
+       camera_angle="20">
+         <param_driver>
+            <driven
+             id="26"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="28"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="799"
+       group="0"
+       wearable="shape"
+       edit_group="shape_mouth"
+       edit_group_order="3.2"
+       name="Lip Ratio"
+	   label="Lip Ratio"
+	   show_simple="true"
+       label_min="More Upper Lip"
+       label_max="More Lower Lip"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_distance=".3"
+       camera_elevation=".04"
+       camera_angle="20">
+         <param_driver>
+            <driven
+             id="797"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="798"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="155"
+       group="0"
+       wearable="shape"
+       edit_group="shape_mouth"
+       edit_group_order="1"
+       name="Lip Width"
+	   label="Lip Width"
+       label_min="Narrow Lips"
+       label_max="Wide Lips"
+       show_simple="true"
+       value_min="-0.9"
+       value_max="1.3"
+       camera_distance=".3"
+       camera_elevation=".04"
+       value_default="0">
+         <param_driver>
+            <driven
+             id="29" />
+
+            <driven
+             id="30" />
+         </param_driver>
+      </param>
+
+      <param
+       id="196"
+       group="0"
+       wearable="shape"
+       edit_group="shape_eyes"
+       edit_group_order="2"
+       name="Eye Spacing"
+	   label="Eye Spacing"
+       label_min="Close Set Eyes"
+       label_max="Far Set Eyes"
+       show_simple="true"
+       value_min="-2"
+       value_max="1"
+       value_default="0"
+       camera_elevation=".1"
+       camera_distance=".35"
+       camera_angle="5">
+         <param_driver>
+            <driven
+             id="194" />
+
+            <driven
+             id="195" />
+         </param_driver>
+      </param>
+
+      <param
+       id="769"
+       group="0"
+       wearable="shape"
+       edit_group="shape_eyes"
+       edit_group_order="4.5"
+       name="Eye Depth"
+       label_min="Sunken Eyes"
+       label_max="Bugged Eyes"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation=".1"
+       camera_distance=".3"
+       camera_angle="75">
+         <param_driver>
+            <driven
+             id="767" />
+
+            <driven
+             id="768" />
+         </param_driver>
+      </param>
+
+      <param
+       id="198"
+       group="0"
+       wearable="shoes"
+       edit_group="shoes"
+       edit_group_order="2"
+       name="Heel Height"
+       label_min="Low Heels"
+       label_max="High Heels"
+       value_min="0"
+       value_max="1"
+       value_default="0"
+       camera_angle="45"
+       camera_distance=".8"
+       camera_elevation="-1">
+         <param_driver>
+            <driven
+             id="197" />
+
+            <driven
+             id="500" />
+         </param_driver>
+      </param>
+
+      <param
+       id="513"
+       group="0"
+       wearable="shoes"
+       edit_group="shoes"
+       edit_group_order="3"
+       name="Heel Shape"
+       label_min="Pointy Heels"
+       label_max="Thick Heels"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_angle="45"
+       camera_distance="1.5"
+       camera_elevation="-1">
+         <param_driver>
+            <driven
+             id="509"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="510"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="514"
+       group="0"
+       wearable="shoes"
+       edit_group="shoes"
+       edit_group_order="4"
+       name="Toe Shape"
+       label_min="Pointy"
+       label_max="Square"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_angle="5"
+       camera_distance=".8"
+       camera_elevation="-.8">
+         <param_driver>
+            <driven
+             id="511"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="512"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="503"
+       group="0"
+       wearable="shoes"
+       edit_group="shoes"
+       edit_group_order="6"
+       name="Platform Height"
+       label_min="Low Platforms"
+       label_max="High Platforms"
+       value_min="0"
+       value_max="1"
+       value_default="0"
+       camera_angle="45"
+       camera_distance=".5"
+       camera_elevation="-1">
+         <param_driver>
+            <driven
+             id="501" />
+
+            <driven
+             id="502" />
+         </param_driver>
+      </param>
+
+      <param
+       id="193"
+       group="0"
+       wearable="shape"
+       edit_group="shape_head"
+       edit_group_order="3"
+       name="Head Shape"
+	   label="Head Shape"
+       label_min="More Square"
+       label_max="More Round"
+       show_simple="true"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_driver>
+            <driven
+             id="188"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="642"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="189"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+
+            <driven
+             id="643"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="157"
+       group="0"
+       wearable="shape"
+       edit_group="shape_torso"
+       edit_group_order="13"
+       name="Belly Size"
+       label_min="Small"
+       label_max="Big"
+       value_min="0"
+       value_max="1"
+       value_default="0"
+       camera_distance="1.4"
+       camera_angle="30"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="104" />
+
+            <driven
+             id="156" />
+
+            <driven
+             id="849" />
+         </param_driver>
+      </param>
+
+      <param
+       id="637"
+       group="0"
+       wearable="shape"
+       edit_group="shape_body"
+       edit_group_order="3"
+       name="Body Fat"
+       label_min="Less Body Fat"
+       label_max="More Body Fat"
+       value_min="0"
+       value_max="1"
+       value_default="0"
+       camera_distance="1.8">
+         <param_driver>
+            <driven
+             id="633" />
+
+            <driven
+             id="634" />
+
+            <driven
+             id="635" />
+
+            <driven
+             id="851" />
+         </param_driver>
+      </param>
+
+      <param
+       id="130"
+       group="0"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="8"
+       name="Front Fringe"
+       label_min="Short"
+       label_max="Long"
+       value_min="0"
+       value_max="1"
+       value_default=".45"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_driver>
+            <driven
+             id="144"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="145"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="131"
+       group="0"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="9"
+       name="Side Fringe"
+       label_min="Short"
+       label_max="Long"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="90">
+         <param_driver>
+            <driven
+             id="146"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="147"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="132"
+       group="0"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="10"
+       name="Back Fringe"
+       label_min="Short"
+       label_max="Long"
+       value_min="0"
+       value_max="1"
+       value_default=".39"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="160">
+         <param_driver>
+            <driven
+             id="148"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="149"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="133"
+       group="0"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="2"
+       name="Hair Front"
+       label_min="Short"
+       label_max="Long"
+       value_min="0"
+       value_max="1"
+       value_default=".25"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_driver>
+            <driven
+             id="172"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="171"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="134"
+       group="0"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="3"
+       name="Hair Sides"
+       label_min="Short"
+       label_max="Long"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="90">
+         <param_driver>
+            <driven
+             id="174"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="173"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="135"
+       group="0"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="4"
+       name="Hair Back"
+	   show_simple="true"
+       label_min="Short"
+       label_max="Long"
+       value_min="0"
+       value_max="1"
+       value_default=".55"
+       camera_elevation="-.1"
+       camera_distance=".8"
+       camera_angle="160">
+         <param_driver>
+            <driven
+             id="176"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="175"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="136"
+       group="0"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="11.5"
+       name="Hair Sweep"
+       label_min="Sweep Forward"
+       label_max="Sweep Back"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="90">
+         <param_driver>
+            <driven
+             id="179"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="178"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="137"
+       group="0"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="16"
+       name="Hair Tilt"
+       label_min="Left"
+       label_max="Right"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="0">
+         <param_driver>
+            <driven
+             id="190"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="191"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="608"
+       group="0"
+       wearable="jacket"
+       edit_group="jacket"
+       edit_group_order="2"
+       name="bottom length lower"
+       label="Jacket Length"
+       label_min="Short"
+       label_max="Long"
+       value_min="0"
+       value_max="1"
+       value_default=".8"
+       camera_distance="1.4"
+       camera_angle="30"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="620" />
+
+            <driven
+             id="1025" />
+
+            <driven
+             id="1037" />
+
+            <driven
+             id="621" />
+
+            <driven
+             id="1027" />
+
+            <driven
+             id="1033" />
+         </param_driver>
+      </param>
+
+      <param
+       id="609"
+       group="0"
+       wearable="jacket"
+       edit_group="jacket"
+       edit_group_order="4"
+       name="open jacket"
+       label="Open Front"
+       label_min="Open"
+       label_max="Closed"
+       value_min="0"
+       value_max="1"
+       value_default=".2"
+       camera_distance="1.4"
+       camera_angle="30"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="622" />
+
+            <driven
+             id="1026" />
+
+            <driven
+             id="1038" />
+
+            <driven
+             id="623" />
+
+            <driven
+             id="1028" />
+
+            <driven
+             id="1034" />
+         </param_driver>
+      </param>
+
+      <param
+       id="105"
+       group="0"
+       sex="female"
+       wearable="shape"
+       edit_group="shape_torso"
+       edit_group_order="6"
+       name="Breast Size"
+       label_min="Small"
+       label_max="Large"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation=".3"
+       camera_distance="1.2"
+       camera_angle="30">
+         <param_driver>
+            <driven
+             id="843"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".01" />
+
+            <driven
+             id="627"
+             min1="0"
+             max1="0.01"
+             max2="0.01"
+             min2=".5" />
+
+            <driven
+             id="626"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="629"
+       group="0"
+       wearable="shape"
+       edit_group="shape_head"
+       edit_group_order="6"
+       name="Forehead Angle"
+       label_min="More Vertical"
+       label_max="More Sloped"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="70">
+         <param_driver>
+            <driven
+             id="630"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="644"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="631"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+
+            <driven
+             id="645"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="646"
+       group="0"
+       name="Egg_Head"
+       label="Egg Head"
+       wearable="shape"
+       edit_group="shape_head"
+       edit_group_order="4"
+       label_min="Chin Heavy"
+       label_max="Forehead Heavy"
+       show_simple="true"
+       value_min="-1.3"
+       value_max="1"
+       value_default="0"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_driver>
+            <driven
+             id="640" />
+
+            <driven
+             id="186" />
+         </param_driver>
+      </param>
+
+      <param
+       id="647"
+       group="0"
+       name="Squash_Stretch_Head"
+       label="Head Stretch"
+       wearable="shape"
+       edit_group="shape_head"
+       edit_group_order="2"
+       show_simple="true"
+       label_min="Squash Head"
+       label_max="Stretch Head"
+       value_min="-0.5"
+       value_max="1"
+       value_default="0"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_driver>
+            <driven
+             id="641" />
+
+            <driven
+             id="187" />
+         </param_driver>
+      </param>
+
+      <param
+       id="649"
+       group="0"
+       sex="female"
+       wearable="shape"
+       edit_group="shape_torso"
+       edit_group_order="1.1"
+       name="Torso Muscles"
+	   label="Torso Muscles"
+	   show_simple="true"
+       label_min="Less Muscular"
+       label_max="More Muscular"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation=".1"
+       camera_distance="1"
+       camera_angle="15">
+         <param_driver>
+            <driven
+             id="648"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="106"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="678"
+       group="0"
+       sex="male"
+       wearable="shape"
+       edit_group="shape_torso"
+       edit_group_order="1"
+       name="Torso Muscles"
+       show_simple="true"
+	   label_min="Less Muscular"
+       label_max="More Muscular"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation=".1"
+       camera_distance="1.2"
+       camera_angle="0">
+         <param_driver>
+            <driven
+             id="677"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="106"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="652"
+       group="0"
+       wearable="shape"
+       edit_group="shape_legs"
+       edit_group_order="1"
+       name="Leg Muscles"
+       label_min="Less Muscular"
+       label_max="More Muscular"
+       show_simple="true"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_distance="1.3"
+       camera_elevation="-.5"
+       camera_angle="15">
+         <param_driver>
+            <driven
+             id="651"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="152"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="80"
+       name="male"
+       group="0"
+       edit_group="dummy"
+       wearable="shape"
+       value_min="0"
+       value_max="1">
+         <param_driver>
+            <driven
+             id="32" />
+
+            <driven
+             id="153" />
+
+            <driven
+             id="40" />
+
+            <driven
+             id="100" />
+
+            <driven
+             id="857" />
+         </param_driver>
+      </param>
+
+      <param
+       id="659"
+       group="0"
+       wearable="shape"
+       edit_group="shape_mouth"
+       edit_group_order="5"
+       name="Mouth Corner"
+       label_min="Corner Down"
+       label_max="Corner Up"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation="0"
+       camera_distance=".28">
+         <param_driver>
+            <driven
+             id="658"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="657"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="662"
+       group="0"
+       wearable="shape"
+       edit_group="shape_head"
+       edit_group_order="5"
+       name="Face Shear"
+       label_min="Shear Right Up"
+       label_max="Shear Left Up"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation=".1"
+       camera_distance=".5">
+         <param_driver>
+            <driven
+             id="660" />
+
+            <driven
+             id="661" />
+
+            <driven
+             id="774" />
+         </param_driver>
+      </param>
+
+      <param
+       id="773"
+       group="0"
+       wearable="shape"
+       edit_group="shape_head"
+       edit_group_order="4.5"
+       name="Head Length"
+       label_min="Flat Head"
+       label_max="Long Head"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="75">
+         <param_driver>
+            <driven
+             id="770" />
+
+            <driven
+             id="771" />
+
+            <driven
+             id="772" />
+         </param_driver>
+      </param>
+
+      <param
+       id="682"
+       group="0"
+       wearable="shape"
+       edit_group="shape_head"
+       edit_group_order="1"
+       name="Head Size"
+	   label="Head Size"
+       label_min="Small Head"
+       label_max="Big Head"
+       show_simple="true"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation=".1"
+       camera_distance=".5">
+         <param_driver>
+            <driven
+             id="679" />
+
+            <driven
+             id="694" />
+
+            <driven
+             id="680" />
+
+            <driven
+             id="681" />
+
+            <driven
+             id="655" />
+         </param_driver>
+      </param>
+
+      <param
+       id="690"
+       group="0"
+       wearable="shape"
+       edit_group="shape_eyes"
+       edit_group_order="1"
+       name="Eye Size"
+	   label="Eye Size"
+       label_min="Beady Eyes"
+       label_max="Anime Eyes"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+	   show_simple="true"
+       camera_elevation=".1"
+       camera_distance=".35">
+         <param_driver>
+            <driven
+             id="686" />
+
+            <driven
+             id="687" />
+
+            <driven
+             id="695" />
+
+            <driven
+             id="688" />
+
+            <driven
+             id="691" />
+
+            <driven
+             id="689" />
+         </param_driver>
+      </param>
+
+      <param
+       id="752"
+       group="0"
+       sex="male"
+       wearable="hair"
+       edit_group="hair_facial"
+       edit_group_order="1"
+       name="Hair Thickness"
+       label_min="5 O'Clock Shadow"
+       label_max="Bushy Hair"
+       value_min="0"
+       value_max="1"
+       value_default=".5"
+       camera_elevation="0"
+       camera_distance=".28">
+         <param_driver>
+            <driven
+             id="751"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".2" />
+
+            <driven
+             id="1012"
+             min1="0"
+             max1="0"
+             max2=".2"
+             min2=".6" />
+
+            <driven
+             id="400"
+             min1=".2"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="763"
+       group="0"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="1"
+       name="Hair Volume"
+	   show_simple="true"
+       label_min="Less Volume"
+       label_max="More Volume"
+       value_min="0"
+       value_max="1"
+       value_default=".55"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="20">
+         <param_driver>
+            <driven
+             id="761"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".5" />
+
+            <driven
+             id="180"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="834"
+       group="0"
+       wearable="jacket"
+       edit_group="colorpicker"
+       name="jacket_red"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+         <param_driver>
+            <driven
+             id="809"
+             min1="0"
+             max1="1"
+             max2="1"
+             min2="1" />
+
+            <driven
+             id="831"
+             min1="0"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="835"
+       group="0"
+       wearable="jacket"
+       edit_group="colorpicker"
+       name="jacket_green"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+         <param_driver>
+            <driven
+             id="810"
+             min1="0"
+             max1="1"
+             max2="1"
+             min2="1" />
+
+            <driven
+             id="832"
+             min1="0"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="836"
+       group="0"
+       wearable="jacket"
+       edit_group="colorpicker"
+       name="jacket_blue"
+       value_min="0"
+       value_max="1"
+       value_default="1">
+         <param_driver>
+            <driven
+             id="811"
+             min1="0"
+             max1="1"
+             max2="1"
+             min2="1" />
+
+            <driven
+             id="833"
+             min1="0"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="785"
+       group="0"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="14.6"
+       name="Pigtails"
+	   show_simple="true"
+       label_min="Short Pigtails"
+       label_max="Long Pigtails"
+       value_min="0"
+       value_max="1"
+       value_default="0"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="15">
+         <param_driver>
+            <driven
+             id="782"
+             min1="0"
+             max1=".10"
+             max2=".10"
+             min2=".5" />
+
+            <driven
+             id="783"
+             min1=".10"
+             max1=".5"
+             max2=".5"
+             min2=".75" />
+
+            <driven
+             id="790"
+             min1=".5"
+             max1=".75"
+             max2=".75"
+             min2="1" />
+
+            <driven
+             id="784"
+             min1=".75"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="789"
+       group="0"
+       wearable="hair"
+       edit_group="hair_style"
+       edit_group_order="14.7"
+       name="Ponytail"
+       label_min="Short Ponytail"
+       label_max="Long Ponytail"
+       value_min="0"
+       value_max="1"
+       value_default="0"
+       camera_elevation=".1"
+       camera_distance=".5"
+       camera_angle="180">
+         <param_driver>
+            <driven
+             id="786"
+             min1="0"
+             max1=".10"
+             max2=".10"
+             min2=".66" />
+
+            <driven
+             id="787"
+             min1=".10"
+             max1=".66"
+             max2=".66"
+             min2="1" />
+
+            <driven
+             id="788"
+             min1=".66"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="795"
+       group="0"
+       name="Butt Size"
+       label="Butt Size"
+       wearable="shape"
+       edit_group="shape_legs"
+       edit_group_order="4"
+       label_min="Flat Butt"
+       label_max="Big Butt"
+       value_min="0"
+       value_max="1"
+       value_default=".25"
+       camera_angle="180"
+       camera_distance=".6">
+         <param_driver>
+            <driven
+             id="867"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".3" />
+
+            <driven
+             id="794"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".3" />
+
+            <driven
+             id="151"
+             min1=".3"
+             max1="1"
+             max2="1"
+             min2="1" />
+
+            <driven
+             id="852"
+             min1=".3"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="841"
+       group="0"
+       name="Bowed_Legs"
+       label="Knee Angle"
+       wearable="shape"
+       edit_group_order="5.5"
+       edit_group="shape_legs"
+       label_min="Knock Kneed"
+       label_max="Bow Legged"
+       value_min="-1"
+       value_max="1"
+       value_default="0"
+       camera_distance="1.3"
+       camera_elevation="-.5">
+         <param_driver>
+            <driven
+             id="853" />
+
+            <driven
+             id="847" />
+         </param_driver>
+      </param>
+
+      <param
+       id="753"
+       group="0"
+       name="Saddlebags"
+       label="Saddle Bags"
+       wearable="shape"
+       edit_group="shape_legs"
+       edit_group_order="5"
+       label_min="Less Saddle"
+       label_max="More Saddle"
+       value_min="-0.5"
+       value_max="3"
+       value_default="0"
+       camera_angle="0"
+       camera_distance="1.2">
+         <param_driver>
+            <driven
+             id="850" />
+
+            <driven
+             id="854" />
+         </param_driver>
+      </param>
+
+      <param
+       id="676"
+       group="0"
+       name="Love_Handles"
+       label="Love Handles"
+       wearable="shape"
+       edit_group="shape_torso"
+       edit_group_order="12"
+       label_min="Less Love"
+       label_max="More Love"
+       value_min="-1"
+       value_max="2"
+       value_default="0"
+       camera_elevation=".3"
+       camera_distance=".9">
+         <param_driver>
+            <driven
+             id="855" />
+
+            <driven
+             id="856" />
+         </param_driver>
+      </param>
+
+      <param
+       id="863"
+       group="0"
+       name="skirt_looseness"
+       label="Skirt Fit"
+	   show_simple="true"
+       clothing_morph="true"
+       wearable="skirt"
+       edit_group_order="2"
+       edit_group="skirt"
+       label_min="Tight Skirt"
+       label_max="Poofy Skirt"
+       value_min="0"
+       value_max="1"
+       value_default=".333"
+       camera_distance="1.3"
+       camera_elevation="-.5">
+         <param_driver>
+            <driven
+             id="866"
+             min1="0"
+             max1="0"
+             max2="0"
+             min2=".2" />
+
+            <driven
+             id="846"
+             min1="0"
+             max1=".5"
+             max2=".5"
+             min2="1" />
+
+            <driven
+             id="845"
+             min1=".5"
+             max1="1"
+             max2="1"
+             min2="1" />
+         </param_driver>
+      </param>
+
+      <param
+       id="119"
+       group="0"
+       wearable="hair"
+       edit_group="hair_eyebrows"
+       edit_group_order="1"
+       name="Eyebrow Size"
+	   show_simple="true"
+       label_min="Thin Eyebrows"
+       label_max="Bushy Eyebrows"
+       value_min="0"
+       value_max="1"
+       value_default="0.5"
+       camera_elevation=".1"
+       camera_distance=".3">
+         <param_driver>
+            <driven
+             id="1000" />
+
+            <driven
+             id="1001" />
+         </param_driver>
+      </param>
+
+      <param
+       id="750"
+       group="0"
+       wearable="hair"
+       edit_group="hair_eyebrows"
+       edit_group_order="2"
+       name="Eyebrow Density"
+       label_min="Sparse"
+       label_max="Dense"
+       value_min="0"
+       value_max="1"
+       value_default="0.7"
+       camera_elevation=".1"
+       camera_distance=".3">
+         <param_driver>
+            <driven
+             id="1002" />
+
+            <driven
+             id="1003" />
+         </param_driver>
+      </param>
+
+      <param
+       id="166"
+       sex="male"
+       group="0"
+       wearable="hair"
+       edit_group="hair_facial"
+       edit_group_order="2"
+       name="Sideburns"
+	   show_simple="true"
+       label_min="Short Sideburns"
+       label_max="Mutton Chops"
+       value_min="0"
+       value_max="1"
+       value_default="0.0"
+       camera_elevation=".1"
+       camera_distance=".3"
+       camera_angle="30">
+         <param_driver>
+            <driven
+             id="1004" />
+
+            <driven
+             id="1005" />
+         </param_driver>
+      </param>
+
+      <param
+       id="167"
+       sex="male"
+       group="0"
+       wearable="hair"
+       edit_group="hair_facial"
+       edit_group_order="3"
+       name="Moustache"
+	   show_simple="true"
+       label_min="Chaplin"
+       label_max="Handlebars"
+       value_min="0"
+       value_max="1"
+       value_default="0.0"
+       camera_elevation=".1"
+       camera_distance=".3"
+       camera_angle="30">
+         <param_driver>
+            <driven
+             id="1006" />
+
+            <driven
+             id="1007" />
+         </param_driver>
+      </param>
+
+      <param
+       id="168"
+       sex="male"
+       group="0"
+       wearable="hair"
+       edit_group="hair_facial"
+       edit_group_order="5"
+       name="Soulpatch"
+	   show_simple="true"
+       label_min="Less soul"
+       label_max="More soul"
+       value_min="0"
+       value_max="1"
+       value_default="0.0"
+       camera_elevation="-.1"
+       camera_distance=".3"
+       camera_angle="0">
+         <param_driver>
+            <driven
+             id="1008" />
+
+            <driven
+             id="1009" />
+         </param_driver>
+      </param>
+
+      <param
+       id="169"
+       sex="male"
+       group="0"
+       wearable="hair"
+       edit_group="hair_facial"
+       edit_group_order="4"
+       name="Chin Curtains"
+	   show_simple="true"
+       label_min="Less Curtains"
+       label_max="More Curtains"
+       value_min="0"
+       value_max="1"
+       value_default="0.0"
+       camera_elevation="-.1"
+       camera_distance=".3"
+       camera_angle="45">
+         <param_driver>
+            <driven
+             id="1010" />
+
+            <driven
+             id="1011" />
+         </param_driver>
+      </param>
+
+      <param
+       id="606"
+       group="0"
+       wearable="jacket"
+       edit_group="jacket"
+       edit_group_order="1"
+       name="Sleeve Length"
+       label_min="Short"
+       label_max="Long"
+       value_min="0"
+       value_max="1"
+       value_default=".8"
+       camera_distance="1.2"
+       camera_angle="30"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="1019" />
+
+            <driven
+             id="1039" />
+
+            <driven
+             id="1020" />
+         </param_driver>
+      </param>
+
+      <param
+       id="607"
+       group="0"
+       wearable="jacket"
+       edit_group="jacket"
+       edit_group_order="3"
+       name="Collar Front"
+       label_min="Low"
+       label_max="High"
+       value_min="0"
+       value_max="1"
+       value_default=".8"
+       camera_distance="1.2"
+       camera_angle="15"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="1021" />
+
+            <driven
+             id="1040" />
+
+            <driven
+             id="1022" />
+         </param_driver>
+      </param>
+
+      <param
+       id="780"
+       group="0"
+       wearable="jacket"
+       edit_group="jacket"
+       edit_group_order="3.5"
+       name="Collar Back"
+       label_min="Low"
+       label_max="High"
+       value_min="0"
+       value_max="1"
+       value_default=".8"
+       camera_distance="1.2"
+       camera_angle="195"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="1023" />
+
+            <driven
+             id="1041" />
+
+            <driven
+             id="1024" />
+         </param_driver>
+      </param>
+
+      <param
+       id="603"
+       group="0"
+       wearable="undershirt"
+       edit_group="undershirt"
+       edit_group_order="1"
+       name="Sleeve Length"
+       label_min="Short"
+       label_max="Long"
+       value_min=".01"
+       value_max="1"
+       value_default=".4"
+       camera_distance="1.2"
+       camera_angle="30"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="1042" />
+
+            <driven
+             id="1043" />
+         </param_driver>
+      </param>
+
+      <param
+       id="604"
+       group="0"
+       wearable="undershirt"
+       edit_group="undershirt"
+       edit_group_order="2"
+       name="Bottom"
+       label_min="Short"
+       label_max="Long"
+       value_min="0"
+       value_max="1"
+       value_default=".85"
+       camera_distance="1.2"
+       camera_angle="30"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="1044" />
+
+            <driven
+             id="1045" />
+         </param_driver>
+      </param>
+
+      <param
+       id="605"
+       group="0"
+       wearable="undershirt"
+       edit_group="undershirt"
+       edit_group_order="3"
+       name="Collar Front"
+       label_min="Low"
+       label_max="High"
+       value_min="0"
+       value_max="1"
+       value_default=".84"
+       camera_distance=".8"
+       camera_angle="15"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="1046" />
+
+            <driven
+             id="1047" />
+         </param_driver>
+      </param>
+
+      <param
+       id="779"
+       group="0"
+       wearable="undershirt"
+       edit_group="undershirt"
+       edit_group_order="4"
+       name="Collar Back"
+       label_min="Low"
+       label_max="High"
+       value_min="0"
+       value_max="1"
+       value_default=".84"
+       camera_distance=".8"
+       camera_angle="195"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="1048" />
+
+            <driven
+             id="1049" />
+         </param_driver>
+      </param>
+
+      <param
+       id="617"
+       group="0"
+       wearable="socks"
+       edit_group="socks"
+       name="Socks Length"
+       label_min="Short"
+       label_max="Long"
+       value_min="0"
+       value_max="1"
+       value_default="0.35"
+       camera_distance=".95"
+       camera_angle="30"
+       camera_elevation="-.75">
+         <param_driver>
+            <driven
+             id="1050" />
+
+            <driven
+             id="1051" />
+         </param_driver>
+      </param>
+
+      <param
+       id="616"
+       group="0"
+       wearable="shoes"
+       edit_group="shoes"
+       edit_group_order="1"
+       name="Shoe Height"
+       label_min="Short"
+       label_max="Tall"
+       value_min="0"
+       value_max="1"
+       value_default="0.1"
+       camera_distance="1.2"
+       camera_angle="30"
+       camera_elevation="-.75">
+         <param_driver>
+            <driven
+             id="1052" />
+
+            <driven
+             id="1053" />
+         </param_driver>
+      </param>
+
+      <param
+       id="619"
+       group="0"
+       wearable="underpants"
+       edit_group="underpants"
+       name="Pants Length"
+       label_min="Short"
+       label_max="Long"
+       value_min="0"
+       value_max="1"
+       value_default=".3"
+       camera_distance="1.2"
+       camera_angle="30"
+       camera_elevation="-.3">
+         <param_driver>
+            <driven
+             id="1054" />
+
+            <driven
+             id="1055" />
+         </param_driver>
+      </param>
+
+      <param
+       id="624"
+       group="0"
+       wearable="underpants"
+       edit_group="underpants"
+       name="Pants Waist"
+       label_min="Low"
+       label_max="High"
+       value_min="0"
+       value_max="1"
+       value_default=".8"
+       camera_distance="1.2"
+       camera_angle="30"
+       camera_elevation="-.3">
+         <param_driver>
+            <driven
+             id="1056" />
+
+            <driven
+             id="1057" />
+         </param_driver>
+      </param>
+
+      <param
+       id="93"
+       group="0"
+       wearable="gloves"
+       edit_group="gloves"
+       name="Glove Length"
+       label_min="Short"
+       label_max="Long"
+       value_min=".01"
+       value_max="1"
+       value_default=".8"
+       camera_distance="1.2"
+       camera_angle="30"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="1058" />
+
+            <driven
+             id="1059" />
+         </param_driver>
+      </param>
+
+      <param
+       id="844"
+       group="0"
+       wearable="gloves"
+       edit_group="gloves"
+       name="Glove Fingers"
+       label_min="Fingerless"
+       label_max="Fingers"
+       value_min=".01"
+       value_max="1"
+       value_default="1"
+       camera_distance="1.2"
+       camera_angle="30"
+       camera_elevation=".2">
+         <param_driver>
+            <driven
+             id="1060" />
+
+            <driven
+             id="1061" />
+         </param_driver>
+      </param>
+
+<!--Pointy eyebrows became a driver/driven param with new max value for backwards compatibility between 1.0 and 1.1-->
+      <param
+       id="16"
+       group="0"
+       name="Pointy_Eyebrows"
+       label="Eyebrow Points"
+       wearable="hair"
+       edit_group="hair_eyebrows"
+       edit_group_order="4"
+       label_min="Smooth"
+       label_max="Pointy"
+       value_min="-.5"
+       value_max="3"
+       camera_elevation=".1"
+       camera_distance=".3">
+         <param_driver>
+            <driven
+             id="870" />
+         </param_driver>
+      </param>
+
+<!--Lower eyebrows became a driver/driven param with new min value for backwards compatibility between 1.0 and 1.1-->
+      <param
+       id="757"
+       group="0"
+       name="Lower_Eyebrows"
+       label="Eyebrow Height"
+	   show_simple="true"
+       wearable="hair"
+       edit_group="hair_eyebrows"
+       edit_group_order="2.5"
+       label_min="Higher"
+       label_max="Lower"
+       value_min="-4"
+       value_max="2"
+       value_default="-1"
+       camera_elevation=".1"
+       camera_distance=".3">
+         <param_driver>
+            <driven
+             id="871" />
+         </param_driver>
+      </param>
+
+<!--Arced eyebrows became a driver/driven param with new max value for backwards compatibility between 1.0 and 1.1-->
+      <param
+       id="31"
+       group="0"
+       name="Arced_Eyebrows"
+       label="Eyebrow Arc"
+       wearable="hair"
+       edit_group="hair_eyebrows"
+       edit_group_order="3"
+       label_min="Flat"
+       label_max="Arced"
+       value_min="0"
+       value_max="2"
+       value_default=".5"
+       camera_elevation=".1"
+       camera_distance=".3">
+         <param_driver>
+            <driven
+             id="872" />
+         </param_driver>
+      </param>
+      
+      <param
+       id="877"
+       group="0"
+       name="Jacket Wrinkles"
+       label="Jacket Wrinkles"
+       wearable="jacket"
+       edit_group="jacket"
+       edit_group_order="20"
+       label_min="No Wrinkles"
+       label_max="Wrinkles"
+       value_min="0"
+       value_max="1"
+       value_default="0"
+       camera_elevation=".1"
+       camera_distance=".3">
+         <param_driver>
+            <driven
+             id="875" />
+             
+             <driven
+             id="876" />
+         </param_driver>
+      </param>
+		<param id="1071" group="2" wearable="tattoo" edit_group="colorpicker" name="tattoo_red" 
+			value_min="0" value_max="1" value_default="1">
+			<param_driver>
+				<driven id="1062" min1="0" max1="1" max2="1" min2="1" />
+				<driven id="1065" min1="0" max1="1" max2="1" min2="1" />
+				<driven id="1068" min1="0" max1="1" max2="1" min2="1" />
+			</param_driver>
+		</param>
+		<param id="1072" group="2" wearable="tattoo" edit_group="colorpicker" name="tattoo_green" 
+			value_min="0" value_max="1" value_default="1">
+			<param_driver>
+				<driven id="1063" min1="0" max1="1" max2="1" min2="1" />
+				<driven id="1066" min1="0" max1="1" max2="1" min2="1" />  
+				<driven id="1069" min1="0" max1="1" max2="1" min2="1" />
+			</param_driver>
+		</param>
+		<param id="1073" group="2" wearable="tattoo" edit_group="colorpicker" name="tattoo_blue" 
+			value_min="0" value_max="1" value_default="1">
+			<param_driver>
+				<driven id="1064" min1="0" max1="1" max2="1" min2="1" />
+				<driven id="1067" min1="0" max1="1" max2="1" min2="1" />  
+				<driven id="1070" min1="0" max1="1" max2="1" min2="1" />
+			</param_driver>
+		</param>
+      
+   </driver_parameters>
+</linden_avatar>
+
diff --git a/linden/indra/newview/character/avatar_lower_body.llm b/linden/indra/newview/character/avatar_lower_body.llm
new file mode 100644
index 0000000..0420899
Binary files /dev/null and b/linden/indra/newview/character/avatar_lower_body.llm differ
diff --git a/linden/indra/newview/character/avatar_lower_body_1.llm b/linden/indra/newview/character/avatar_lower_body_1.llm
new file mode 100644
index 0000000..1394eb8
Binary files /dev/null and b/linden/indra/newview/character/avatar_lower_body_1.llm differ
diff --git a/linden/indra/newview/character/avatar_lower_body_2.llm b/linden/indra/newview/character/avatar_lower_body_2.llm
new file mode 100644
index 0000000..0da9c12
Binary files /dev/null and b/linden/indra/newview/character/avatar_lower_body_2.llm differ
diff --git a/linden/indra/newview/character/avatar_lower_body_3.llm b/linden/indra/newview/character/avatar_lower_body_3.llm
new file mode 100644
index 0000000..f3c49a1
Binary files /dev/null and b/linden/indra/newview/character/avatar_lower_body_3.llm differ
diff --git a/linden/indra/newview/character/avatar_lower_body_4.llm b/linden/indra/newview/character/avatar_lower_body_4.llm
new file mode 100644
index 0000000..e717210
Binary files /dev/null and b/linden/indra/newview/character/avatar_lower_body_4.llm differ
diff --git a/linden/indra/newview/character/avatar_skeleton.xml b/linden/indra/newview/character/avatar_skeleton.xml
new file mode 100644
index 0000000..5e73804
--- /dev/null
+++ b/linden/indra/newview/character/avatar_skeleton.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="US-ASCII" standalone="yes"?>
+<linden_skeleton version="1.0" num_bones="46" num_collision_volumes="19">
+<bone name="mPelvis" pos="0.000 0.000 1.067" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.000000 0.000000 1.067015">
+	<collision_volume name="PELVIS" pos = "-0.01 0 -0.02" rot="0.000000 8.00000 0.000000" scale="0.12 0.16 0.17"/>
+	<bone name="mTorso" pos="0.000 0.000 0.084" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.000000 0.000000 0.084073">
+		<collision_volume name="BELLY" pos = "0.028 0 0.04" rot="0.000000 8.00000 0.000000" scale="0.09 0.13 0.15"/>
+		<bone name="mChest" pos="-0.015 0.000 0.205" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="-0.015368 0.000000 0.204877">
+			<collision_volume name="CHEST" pos = "0.028 0 0.07" rot="0.000000 -10.00000 0.000000" scale="0.11 0.15 0.2"/>
+			<bone name="mNeck" pos="-0.010 0.000 0.251" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="-0.009507 0.000000 0.251108">
+				<collision_volume name="NECK" pos = "0.0 0 0.02" rot="0.000000 0.000000 0.000000" scale="0.05 0.06 0.08"/>
+				<bone name="mHead" pos="0.000 -0.000 0.076" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.000000 -0.000000 0.075630">
+					<collision_volume name="HEAD" pos = "0.02 0 0.07" rot="0.000000 0.000000 0.000000" scale="0.11 0.09 0.12"/>
+					<bone name="mSkull" pos="0.000 0.000 0.079" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.000000 0.000000 0.079000">
+					</bone>
+					<bone name="mEyeRight" pos="0.098 -0.036 0.079" rot="0.000000 0.000000 -0.000000" scale="1.000 1.000 1.000" pivot="0.098466 -0.036000 0.079000">
+					</bone>
+					<bone name="mEyeLeft" pos="0.098 0.036 0.079" rot="0.000000 -0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.098461 0.036000 0.079000">
+					</bone>
+				</bone>
+			</bone>
+			<bone name="mCollarLeft" pos="-0.021 0.085 0.165" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="-0.020927 0.084665 0.165396">
+				<collision_volume name="L_CLAVICLE" pos = "0.02 0 0.02" rot="0.000000 0.00000 0.000000" scale="0.07 0.14 0.05"/>
+				<bone name="mShoulderLeft" pos="0.000 0.079 -0.000" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.000000 0.079000 -0.000000">
+					<collision_volume name="L_UPPER_ARM" pos = "0.0 0.12 0.01" rot="-5.000000 0.00000 0.000000" scale="0.05 0.17 0.05"/>
+					<bone name="mElbowLeft" pos="0.000 0.248 0.000" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.000000 0.248000 0.000000">
+						<collision_volume name="L_LOWER_ARM" pos = "0.0 0.1 0.0" rot="-3.000000 0.00000 0.000000" scale="0.04 0.14 0.04"/>
+						<bone name="mWristLeft" pos="-0.000 0.205 0.000" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="-0.000000 0.204846 0.000000">
+							<collision_volume name="L_HAND" pos = "0.01 0.05 0.0" rot="-3.000000 0.00000 -10.000000" scale="0.05 0.08 0.03"/>
+						</bone>
+					</bone>
+				</bone>
+			</bone>
+			<bone name="mCollarRight" pos="-0.021 -0.085 0.165" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="-0.020927 -0.085000 0.165396">
+				<collision_volume name="R_CLAVICLE" pos = "0.02 0 0.02" rot="0.000000 0.00000 0.000000" scale="0.07 0.14 0.05"/>
+				<bone name="mShoulderRight" pos="0.000 -0.079 -0.000" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.000000 -0.079418 -0.000000">
+					<collision_volume name="R_UPPER_ARM" pos = "0.0 -0.12 0.01" rot="5.000000 0.00000 0.000000" scale="0.05 0.17 0.05"/>
+					<bone name="mElbowRight" pos="0.000 -0.248 -0.000" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.000000 -0.248000 -0.000000">
+						<collision_volume name="R_LOWER_ARM" pos = "0.0 -0.1 0.0" rot="3.000000 0.00000 0.000000" scale="0.04 0.14 0.04"/>
+						<bone name="mWristRight" pos="0.000 -0.205 -0.000" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="-0.000000 -0.205000 -0.000000">
+							<collision_volume name="R_HAND" pos = "0.01 -0.05 0.0" rot="3.000000 0.00000 10.000000" scale="0.05 0.08 0.03"/>
+						</bone>
+					</bone>
+				</bone>
+			</bone>
+		</bone>
+	</bone>
+	<bone name="mHipRight" pos="0.034 -0.129 -0.041" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.033620 -0.128806 -0.041086">
+		<collision_volume name="R_UPPER_LEG" pos = "-0.02 0.05 -0.22" rot="0.000000 0.00000 0.000000" scale="0.09 0.09 0.32"/>
+		<bone name="mKneeRight" pos="-0.001 0.049 -0.491" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="-0.000780 0.048635 -0.490922">
+			<collision_volume name="R_LOWER_LEG" pos = "-0.02 0.0 -0.2" rot="0.000000 0.00000 0.000000" scale="0.06 0.06 0.25"/>
+			<bone name="mAnkleRight" pos="-0.029 0.000 -0.468" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="-0.028869 0.000000 -0.468494">
+				<collision_volume name="R_FOOT"  pos = "0.077 0.0 -0.041" rot="0.000000 10.00000 0.000000" scale="0.13 0.05 0.05"/>
+				<bone name="mFootRight" pos="0.112 -0.000 -0.061" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.111956 -0.000000 -0.060637">
+					<bone name="mToeRight" pos="0.109 0.000 0.000" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.105399 -0.010408 -0.000104">
+					</bone>
+				</bone>
+			</bone>
+		</bone>
+	</bone>
+	<bone name="mHipLeft" pos="0.034 0.127 -0.041" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.033757 0.126765 -0.040998">
+		<collision_volume name="L_UPPER_LEG" pos = "-0.02 -0.05 -0.22" rot="0.000000 0.00000 0.000000" scale="0.09 0.09 0.32"/>
+		<bone name="mKneeLeft" pos="-0.001 -0.046 -0.491" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="-0.000887 -0.045568 -0.491053">
+			<collision_volume name="L_LOWER_LEG" pos = "-0.02 0.0 -0.2" rot="0.000000 0.00000 0.000000" scale="0.06 0.06 0.25"/>
+			<bone name="mAnkleLeft" pos="-0.029 0.001 -0.468" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="-0.028887 0.001378 -0.468449">
+				<collision_volume name="L_FOOT" pos = "0.077 0.0 -0.041" rot="0.000000 10.00000 0.000000" scale="0.13 0.05 0.05"/>
+				<bone name="mFootLeft" pos="0.112 -0.000 -0.061" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.111956 -0.000000 -0.060620">
+					<bone name="mToeLeft" pos="0.109 0.000 0.000" rot="0.000000 0.000000 0.000000" scale="1.000 1.000 1.000" pivot="0.105387 0.008270 0.000871">
+					</bone>
+				</bone>
+			</bone>
+		</bone>
+	</bone>
+</bone>
+</linden_skeleton>
\ No newline at end of file
diff --git a/linden/indra/newview/character/avatar_skirt.llm b/linden/indra/newview/character/avatar_skirt.llm
new file mode 100644
index 0000000..08ce3d1
Binary files /dev/null and b/linden/indra/newview/character/avatar_skirt.llm differ
diff --git a/linden/indra/newview/character/avatar_skirt_1.llm b/linden/indra/newview/character/avatar_skirt_1.llm
new file mode 100644
index 0000000..88076c3
Binary files /dev/null and b/linden/indra/newview/character/avatar_skirt_1.llm differ
diff --git a/linden/indra/newview/character/avatar_skirt_2.llm b/linden/indra/newview/character/avatar_skirt_2.llm
new file mode 100644
index 0000000..73b3eff
Binary files /dev/null and b/linden/indra/newview/character/avatar_skirt_2.llm differ
diff --git a/linden/indra/newview/character/avatar_skirt_3.llm b/linden/indra/newview/character/avatar_skirt_3.llm
new file mode 100644
index 0000000..ded546f
Binary files /dev/null and b/linden/indra/newview/character/avatar_skirt_3.llm differ
diff --git a/linden/indra/newview/character/avatar_skirt_4.llm b/linden/indra/newview/character/avatar_skirt_4.llm
new file mode 100644
index 0000000..b9d5cb9
Binary files /dev/null and b/linden/indra/newview/character/avatar_skirt_4.llm differ
diff --git a/linden/indra/newview/character/avatar_upper_body.llm b/linden/indra/newview/character/avatar_upper_body.llm
new file mode 100644
index 0000000..da7d990
Binary files /dev/null and b/linden/indra/newview/character/avatar_upper_body.llm differ
diff --git a/linden/indra/newview/character/avatar_upper_body_1.llm b/linden/indra/newview/character/avatar_upper_body_1.llm
new file mode 100644
index 0000000..31e104c
Binary files /dev/null and b/linden/indra/newview/character/avatar_upper_body_1.llm differ
diff --git a/linden/indra/newview/character/avatar_upper_body_2.llm b/linden/indra/newview/character/avatar_upper_body_2.llm
new file mode 100644
index 0000000..c1f4199
Binary files /dev/null and b/linden/indra/newview/character/avatar_upper_body_2.llm differ
diff --git a/linden/indra/newview/character/avatar_upper_body_3.llm b/linden/indra/newview/character/avatar_upper_body_3.llm
new file mode 100644
index 0000000..9e89ed8
Binary files /dev/null and b/linden/indra/newview/character/avatar_upper_body_3.llm differ
diff --git a/linden/indra/newview/character/avatar_upper_body_4.llm b/linden/indra/newview/character/avatar_upper_body_4.llm
new file mode 100644
index 0000000..ec836d1
Binary files /dev/null and b/linden/indra/newview/character/avatar_upper_body_4.llm differ
diff --git a/linden/indra/newview/character/blush_alpha.tga b/linden/indra/newview/character/blush_alpha.tga
new file mode 100644
index 0000000..05be7e7
Binary files /dev/null and b/linden/indra/newview/character/blush_alpha.tga differ
diff --git a/linden/indra/newview/character/body_skingrain.tga b/linden/indra/newview/character/body_skingrain.tga
new file mode 100644
index 0000000..7264baa
Binary files /dev/null and b/linden/indra/newview/character/body_skingrain.tga differ
diff --git a/linden/indra/newview/character/bodyfreckles_alpha.tga b/linden/indra/newview/character/bodyfreckles_alpha.tga
new file mode 100644
index 0000000..d30ab3d
Binary files /dev/null and b/linden/indra/newview/character/bodyfreckles_alpha.tga differ
diff --git a/linden/indra/newview/character/bump_face_wrinkles.tga b/linden/indra/newview/character/bump_face_wrinkles.tga
new file mode 100644
index 0000000..54bf7a5
Binary files /dev/null and b/linden/indra/newview/character/bump_face_wrinkles.tga differ
diff --git a/linden/indra/newview/character/bump_head_base.tga b/linden/indra/newview/character/bump_head_base.tga
new file mode 100644
index 0000000..fa35685
Binary files /dev/null and b/linden/indra/newview/character/bump_head_base.tga differ
diff --git a/linden/indra/newview/character/bump_lowerbody_base.tga b/linden/indra/newview/character/bump_lowerbody_base.tga
new file mode 100644
index 0000000..498ea3c
Binary files /dev/null and b/linden/indra/newview/character/bump_lowerbody_base.tga differ
diff --git a/linden/indra/newview/character/bump_pants_wrinkles.tga b/linden/indra/newview/character/bump_pants_wrinkles.tga
new file mode 100644
index 0000000..cca7241
Binary files /dev/null and b/linden/indra/newview/character/bump_pants_wrinkles.tga differ
diff --git a/linden/indra/newview/character/bump_shirt_wrinkles.tga b/linden/indra/newview/character/bump_shirt_wrinkles.tga
new file mode 100644
index 0000000..9e0d757
Binary files /dev/null and b/linden/indra/newview/character/bump_shirt_wrinkles.tga differ
diff --git a/linden/indra/newview/character/bump_upperbody_base.tga b/linden/indra/newview/character/bump_upperbody_base.tga
new file mode 100644
index 0000000..e57d635
Binary files /dev/null and b/linden/indra/newview/character/bump_upperbody_base.tga differ
diff --git a/linden/indra/newview/character/eyebrows_alpha.tga b/linden/indra/newview/character/eyebrows_alpha.tga
new file mode 100644
index 0000000..c363e48
Binary files /dev/null and b/linden/indra/newview/character/eyebrows_alpha.tga differ
diff --git a/linden/indra/newview/character/eyeliner_alpha.tga b/linden/indra/newview/character/eyeliner_alpha.tga
new file mode 100644
index 0000000..1611eb3
Binary files /dev/null and b/linden/indra/newview/character/eyeliner_alpha.tga differ
diff --git a/linden/indra/newview/character/eyeshadow_inner_alpha.tga b/linden/indra/newview/character/eyeshadow_inner_alpha.tga
new file mode 100644
index 0000000..37d7919
Binary files /dev/null and b/linden/indra/newview/character/eyeshadow_inner_alpha.tga differ
diff --git a/linden/indra/newview/character/eyeshadow_outer_alpha.tga b/linden/indra/newview/character/eyeshadow_outer_alpha.tga
new file mode 100644
index 0000000..00eef9d
Binary files /dev/null and b/linden/indra/newview/character/eyeshadow_outer_alpha.tga differ
diff --git a/linden/indra/newview/character/eyewhite.tga b/linden/indra/newview/character/eyewhite.tga
new file mode 100644
index 0000000..a720496
Binary files /dev/null and b/linden/indra/newview/character/eyewhite.tga differ
diff --git a/linden/indra/newview/character/facehair_chincurtains_alpha.tga b/linden/indra/newview/character/facehair_chincurtains_alpha.tga
new file mode 100644
index 0000000..b103970
Binary files /dev/null and b/linden/indra/newview/character/facehair_chincurtains_alpha.tga differ
diff --git a/linden/indra/newview/character/facehair_moustache_alpha.tga b/linden/indra/newview/character/facehair_moustache_alpha.tga
new file mode 100644
index 0000000..4068c4f
Binary files /dev/null and b/linden/indra/newview/character/facehair_moustache_alpha.tga differ
diff --git a/linden/indra/newview/character/facehair_sideburns_alpha.tga b/linden/indra/newview/character/facehair_sideburns_alpha.tga
new file mode 100644
index 0000000..acddc2d
Binary files /dev/null and b/linden/indra/newview/character/facehair_sideburns_alpha.tga differ
diff --git a/linden/indra/newview/character/facehair_soulpatch_alpha.tga b/linden/indra/newview/character/facehair_soulpatch_alpha.tga
new file mode 100644
index 0000000..687091a
Binary files /dev/null and b/linden/indra/newview/character/facehair_soulpatch_alpha.tga differ
diff --git a/linden/indra/newview/character/freckles_alpha.tga b/linden/indra/newview/character/freckles_alpha.tga
new file mode 100644
index 0000000..a9a4ec0
Binary files /dev/null and b/linden/indra/newview/character/freckles_alpha.tga differ
diff --git a/linden/indra/newview/character/genepool.xml b/linden/indra/newview/character/genepool.xml
new file mode 100644
index 0000000..52300c2
--- /dev/null
+++ b/linden/indra/newview/character/genepool.xml
@@ -0,0 +1,7107 @@
+<?xml version="1.0" encoding="US-ASCII" standalone="yes"?>
+<linden_genepool version="1.0">
+   <archetype name="M W Skinny">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="1.540" />
+
+      <param id="2" name="Nose_Big_Out" value="0.720" />
+
+      <param id="4" name="Broad_Nostrils" value="0.540" />
+
+      <param id="5" name="Cleft_Chin" value="0.960" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.820" />
+
+      <param id="7" name="Weak_Chin" value="-0.260" />
+
+      <param id="8" name="Double_Chin" value="1.120" />
+
+      <param id="10" name="Sunken_Cheeks" value="1.780" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="-0.100" />
+
+      <param id="12" name="Jowls" value="0.520" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.940" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.550" />
+
+      <param id="15" name="Ears_Out" value="0.160" />
+
+      <param id="17" name="Square_Jaw" value="-0.060" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="-0.020" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-0.630" />
+
+      <param id="20" name="Bulbous_Nose" value="0.440" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="0.280" />
+
+      <param id="22" name="Attached_Earlobes" value="1.000" />
+
+      <param id="23" name="Baggy_Eyes" value="0.980" />
+
+      <param id="24" name="Wide_Eyes" value="-0.030" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="-0.250" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-0.030" />
+
+      <param id="33" name="Height" value="1.440" />
+
+      <param id="34" name="Thickness" value="-0.500" />
+
+      <param id="35" name="Big_Ears" value="0.590" />
+
+      <param id="36" name="Shoulders" value="0.180" />
+
+      <param id="37" name="Hip Width" value="-1.160" />
+
+      <param id="38" name="Torso Length" value="-0.180" />
+
+      <param id="80" name="male" value="1.000" />
+
+      <param id="105" name="Breast Size" value="0.500" />
+
+      <param id="151" name="Big_Butt_Legs" value="-0.110" />
+
+      <param id="155" name="Lip Width" value="0.770" />
+
+      <param id="157" name="Belly Size" value="0.030" />
+
+      <param id="185" name="Deep_Chin" value="-0.320" />
+
+      <param id="193" name="Head Shape" value="0.350" />
+
+      <param id="196" name="Eye Spacing" value="-0.050" />
+
+      <param id="505" name="Lip Thickness" value="0.560" />
+
+      <param id="506" name="Mouth_Height" value="-0.400" />
+
+      <param id="507" name="Breast_Gravity" value="0.000" />
+
+      <param id="515" name="Foot_Size" value="1.560" />
+
+      <param id="517" name="Wide_Nose" value="-0.290" />
+
+      <param id="518" name="Eyelashes_Long" value="0.640" />
+
+      <param id="629" name="Forehead Angle" value="0.040" />
+
+      <param id="637" name="Body Fat" value="0.070" />
+
+      <param id="646" name="Egg_Head" value="-0.590" />
+
+      <param id="647" name="Squash_Stretch_Head" value="0.760" />
+
+      <param id="649" name="Torso Muscles" value="0.500" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="-0.250" />
+
+      <param id="652" name="Leg Muscles" value="0.600" />
+
+      <param id="653" name="Tall_Lips" value="-1.000" />
+
+      <param id="656" name="Crooked_Nose" value="-0.120" />
+
+      <param id="659" name="Mouth Corner" value="0.720" />
+
+      <param id="662" name="Face Shear" value="0.500" />
+
+      <param id="663" name="Shift_Mouth" value="0.000" />
+
+      <param id="664" name="Pop_Eye" value="0.230" />
+
+      <param id="665" name="Jaw_Jut" value="0.040" />
+
+      <param id="675" name="Hand Size" value="0.060" />
+
+      <param id="676" name="Love_Handles" value="-0.160" />
+
+      <param id="678" name="Torso Muscles" value="0.550" />
+
+      <param id="682" name="Head Size" value="0.670" />
+
+      <param id="683" name="Neck Thickness" value="-0.090" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.000" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.280" />
+
+      <param id="690" name="Eye Size" value="0.470" />
+
+      <param id="692" name="Leg Length" value="0.540" />
+
+      <param id="693" name="Arm Length" value="0.540" />
+
+      <param id="753" name="Saddlebags" value="0.030" />
+
+      <param id="756" name="Neck Length" value="0.240" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="0.720" />
+
+      <param id="759" name="Low_Septum_Nose" value="1.200" />
+
+      <param id="760" name="Jaw_Angle" value="0.910" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.610" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="0.820" />
+
+      <param id="769" name="Eye Depth" value="0.190" />
+
+      <param id="773" name="Head Length" value="0.370" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.097" />
+
+      <param id="111" name="Pigment" value="0.120" />
+
+      <param id="116" name="Rosy Complexion" value="0.320" />
+
+      <param id="117" name="Lip Pinkness" value="0.560" />
+
+      <param id="150" name="Body Definition" value="0.000" />
+
+      <param id="162" name="Facial Definition" value="0.210" />
+
+      <param id="163" name="Wrinkles" value="0.490" />
+
+      <param id="165" name="Freckles" value="0.740" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.810" />
+
+      <param id="31" name="Arced_Eyebrows" value="1.000" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.150" />
+
+      <param id="114" name="Blonde Hair" value="0.960" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.210" />
+
+      <param id="130" name="Front Fringe" value="0.580" />
+
+      <param id="131" name="Side Fringe" value="0.370" />
+
+      <param id="132" name="Back Fringe" value="0.480" />
+
+      <param id="133" name="Hair Front" value="0.260" />
+
+      <param id="134" name="Hair Sides" value="0.580" />
+
+      <param id="135" name="Hair Back" value="0.570" />
+
+      <param id="136" name="Hair Sweep" value="0.370" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="1.520" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="-0.315" />
+
+      <param id="166" name="Sideburns" value="0.890" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.260" />
+
+      <param id="169" name="Chin Curtains" value="0.890" />
+
+      <param id="177" name="Hair_Rumpled" value="0.560" />
+
+      <param id="181" name="Hair_Big_Front" value="-0.060" />
+
+      <param id="182" name="Hair_Big_Top" value="-0.420" />
+
+      <param id="183" name="Hair_Big_Back" value="0.000" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.260" />
+
+      <param id="750" name="Eyebrow Density" value="0.840" />
+
+      <param id="752" name="Hair Thickness" value="0.120" />
+
+      <param id="754" name="Hair_Taper_Back" value="0.020" />
+
+      <param id="755" name="Hair_Taper_Front" value="0.000" />
+
+      <param id="757" name="Lower_Eyebrows" value="2.000" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.060" />
+
+      <param id="763" name="Hair Volume" value="0.770" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.260" />
+
+      <param id="99" name="Eye Color" value="0.420" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="M W Old">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="1.680" />
+
+      <param id="2" name="Nose_Big_Out" value="1.250" />
+
+      <param id="4" name="Broad_Nostrils" value="0.340" />
+
+      <param id="5" name="Cleft_Chin" value="0.410" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.310" />
+
+      <param id="7" name="Weak_Chin" value="-0.120" />
+
+      <param id="8" name="Double_Chin" value="1.500" />
+
+      <param id="10" name="Sunken_Cheeks" value="1.650" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="0.160" />
+
+      <param id="12" name="Jowls" value="2.020" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.330" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.200" />
+
+      <param id="15" name="Ears_Out" value="0.660" />
+
+      <param id="17" name="Square_Jaw" value="-0.500" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="-1.500" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-1.350" />
+
+      <param id="20" name="Bulbous_Nose" value="0.440" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="0.790" />
+
+      <param id="22" name="Attached_Earlobes" value="0.000" />
+
+      <param id="23" name="Baggy_Eyes" value="1.500" />
+
+      <param id="24" name="Wide_Eyes" value="-0.340" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="1.270" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-0.100" />
+
+      <param id="33" name="Height" value="-0.060" />
+
+      <param id="34" name="Thickness" value="-0.410" />
+
+      <param id="35" name="Big_Ears" value="1.430" />
+
+      <param id="36" name="Shoulders" value="-1.800" />
+
+      <param id="37" name="Hip Width" value="-0.380" />
+
+      <param id="38" name="Torso Length" value="0.060" />
+
+      <param id="80" name="male" value="1.000" />
+
+      <param id="105" name="Breast Size" value="0.500" />
+
+      <param id="151" name="Big_Butt_Legs" value="-0.230" />
+
+      <param id="155" name="Lip Width" value="0.440" />
+
+      <param id="157" name="Belly Size" value="0.610" />
+
+      <param id="185" name="Deep_Chin" value="0.060" />
+
+      <param id="193" name="Head Shape" value="0.240" />
+
+      <param id="196" name="Eye Spacing" value="0.580" />
+
+      <param id="505" name="Lip Thickness" value="0.280" />
+
+      <param id="506" name="Mouth_Height" value="0.680" />
+
+      <param id="507" name="Breast_Gravity" value="0.000" />
+
+      <param id="515" name="Foot_Size" value="2.000" />
+
+      <param id="517" name="Wide_Nose" value="-0.140" />
+
+      <param id="518" name="Eyelashes_Long" value="-0.010" />
+
+      <param id="629" name="Forehead Angle" value="0.080" />
+
+      <param id="637" name="Body Fat" value="0.220" />
+
+      <param id="646" name="Egg_Head" value="0.240" />
+
+      <param id="647" name="Squash_Stretch_Head" value="0.500" />
+
+      <param id="649" name="Torso Muscles" value="0.500" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="-0.520" />
+
+      <param id="652" name="Leg Muscles" value="0.160" />
+
+      <param id="653" name="Tall_Lips" value="-1.000" />
+
+      <param id="656" name="Crooked_Nose" value="0.680" />
+
+      <param id="659" name="Mouth Corner" value="0.210" />
+
+      <param id="662" name="Face Shear" value="0.570" />
+
+      <param id="663" name="Shift_Mouth" value="0.960" />
+
+      <param id="664" name="Pop_Eye" value="-0.340" />
+
+      <param id="665" name="Jaw_Jut" value="0.360" />
+
+      <param id="675" name="Hand Size" value="0.170" />
+
+      <param id="676" name="Love_Handles" value="0.740" />
+
+      <param id="678" name="Torso Muscles" value="0.120" />
+
+      <param id="682" name="Head Size" value="0.730" />
+
+      <param id="683" name="Neck Thickness" value="-0.240" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.000" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.970" />
+
+      <param id="690" name="Eye Size" value="0.370" />
+
+      <param id="692" name="Leg Length" value="0.320" />
+
+      <param id="693" name="Arm Length" value="0.580" />
+
+      <param id="753" name="Saddlebags" value="1.040" />
+
+      <param id="756" name="Neck Length" value="0.540" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="0.990" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.520" />
+
+      <param id="760" name="Jaw_Angle" value="-0.020" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="-0.250" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="2.500" />
+
+      <param id="769" name="Eye Depth" value="0.000" />
+
+      <param id="773" name="Head Length" value="0.530" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.010" />
+
+      <param id="111" name="Pigment" value="0.160" />
+
+      <param id="116" name="Rosy Complexion" value="0.010" />
+
+      <param id="117" name="Lip Pinkness" value="0.000" />
+
+      <param id="150" name="Body Definition" value="0.660" />
+
+      <param id="162" name="Facial Definition" value="1.000" />
+
+      <param id="163" name="Wrinkles" value="1.000" />
+
+      <param id="165" name="Freckles" value="0.920" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.805" />
+
+      <param id="31" name="Arced_Eyebrows" value="1.000" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.150" />
+
+      <param id="114" name="Blonde Hair" value="0.960" />
+
+      <param id="115" name="White Hair" value="1.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.210" />
+
+      <param id="130" name="Front Fringe" value="0.580" />
+
+      <param id="131" name="Side Fringe" value="0.000" />
+
+      <param id="132" name="Back Fringe" value="0.480" />
+
+      <param id="133" name="Hair Front" value="0.390" />
+
+      <param id="134" name="Hair Sides" value="0.350" />
+
+      <param id="135" name="Hair Back" value="0.540" />
+
+      <param id="136" name="Hair Sweep" value="0.370" />
+
+      <param id="137" name="Hair Tilt" value="0.370" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="2.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="0.070" />
+
+      <param id="166" name="Sideburns" value="0.890" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.260" />
+
+      <param id="169" name="Chin Curtains" value="0.890" />
+
+      <param id="177" name="Hair_Rumpled" value="0.470" />
+
+      <param id="181" name="Hair_Big_Front" value="0.460" />
+
+      <param id="182" name="Hair_Big_Top" value="-0.160" />
+
+      <param id="183" name="Hair_Big_Back" value="0.100" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.560" />
+
+      <param id="750" name="Eyebrow Density" value="0.840" />
+
+      <param id="752" name="Hair Thickness" value="0.120" />
+
+      <param id="754" name="Hair_Taper_Back" value="-0.190" />
+
+      <param id="755" name="Hair_Taper_Front" value="1.500" />
+
+      <param id="757" name="Lower_Eyebrows" value="2.000" />
+
+      <param id="762" name="Hair_Shear_Front" value="1.710" />
+
+      <param id="763" name="Hair Volume" value="0.820" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.260" />
+
+      <param id="99" name="Eye Color" value="0.420" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="M W Obese">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="1.380" />
+
+      <param id="2" name="Nose_Big_Out" value="0.750" />
+
+      <param id="4" name="Broad_Nostrils" value="0.170" />
+
+      <param id="5" name="Cleft_Chin" value="0.940" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.810" />
+
+      <param id="7" name="Weak_Chin" value="-0.070" />
+
+      <param id="8" name="Double_Chin" value="0.040" />
+
+      <param id="10" name="Sunken_Cheeks" value="-1.500" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="-0.480" />
+
+      <param id="12" name="Jowls" value="1.990" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="1.500" />
+
+      <param id="14" name="High_Cheek_Bones" value="-0.310" />
+
+      <param id="15" name="Ears_Out" value="1.160" />
+
+      <param id="17" name="Square_Jaw" value="0.670" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="2.500" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-0.500" />
+
+      <param id="20" name="Bulbous_Nose" value="0.540" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="0.090" />
+
+      <param id="22" name="Attached_Earlobes" value="0.420" />
+
+      <param id="23" name="Baggy_Eyes" value="1.500" />
+
+      <param id="24" name="Wide_Eyes" value="-0.100" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="-0.800" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-0.950" />
+
+      <param id="33" name="Height" value="-1.230" />
+
+      <param id="34" name="Thickness" value="1.500" />
+
+      <param id="35" name="Big_Ears" value="-0.220" />
+
+      <param id="36" name="Shoulders" value="-0.810" />
+
+      <param id="37" name="Hip Width" value="0.160" />
+
+      <param id="38" name="Torso Length" value="-0.360" />
+
+      <param id="80" name="male" value="1.000" />
+
+      <param id="105" name="Breast Size" value="0.500" />
+
+      <param id="151" name="Big_Butt_Legs" value="0.540" />
+
+      <param id="155" name="Lip Width" value="-0.900" />
+
+      <param id="157" name="Belly Size" value="0.150" />
+
+      <param id="185" name="Deep_Chin" value="1.000" />
+
+      <param id="193" name="Head Shape" value="0.950" />
+
+      <param id="196" name="Eye Spacing" value="-1.100" />
+
+      <param id="505" name="Lip Thickness" value="1.000" />
+
+      <param id="506" name="Mouth_Height" value="1.240" />
+
+      <param id="507" name="Breast_Gravity" value="0.000" />
+
+      <param id="515" name="Foot_Size" value="0.120" />
+
+      <param id="517" name="Wide_Nose" value="0.580" />
+
+      <param id="518" name="Eyelashes_Long" value="0.220" />
+
+      <param id="629" name="Forehead Angle" value="0.120" />
+
+      <param id="637" name="Body Fat" value="1.000" />
+
+      <param id="646" name="Egg_Head" value="-1.280" />
+
+      <param id="647" name="Squash_Stretch_Head" value="-0.500" />
+
+      <param id="649" name="Torso Muscles" value="0.500" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="-0.950" />
+
+      <param id="652" name="Leg Muscles" value="0.520" />
+
+      <param id="653" name="Tall_Lips" value="0.890" />
+
+      <param id="656" name="Crooked_Nose" value="-0.240" />
+
+      <param id="659" name="Mouth Corner" value="0.310" />
+
+      <param id="662" name="Face Shear" value="0.470" />
+
+      <param id="663" name="Shift_Mouth" value="0.520" />
+
+      <param id="664" name="Pop_Eye" value="0.570" />
+
+      <param id="665" name="Jaw_Jut" value="-0.600" />
+
+      <param id="675" name="Hand Size" value="-0.110" />
+
+      <param id="676" name="Love_Handles" value="-0.130" />
+
+      <param id="678" name="Torso Muscles" value="0.410" />
+
+      <param id="682" name="Head Size" value="0.150" />
+
+      <param id="683" name="Neck Thickness" value="0.090" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.000" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="-0.400" />
+
+      <param id="690" name="Eye Size" value="0.070" />
+
+      <param id="692" name="Leg Length" value="-0.080" />
+
+      <param id="693" name="Arm Length" value="-0.060" />
+
+      <param id="753" name="Saddlebags" value="1.500" />
+
+      <param id="756" name="Neck Length" value="-0.520" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="-0.990" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.300" />
+
+      <param id="760" name="Jaw_Angle" value="0.208" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.980" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="2.280" />
+
+      <param id="769" name="Eye Depth" value="0.370" />
+
+      <param id="773" name="Head Length" value="0.190" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.100" />
+
+      <param id="111" name="Pigment" value="0.000" />
+
+      <param id="116" name="Rosy Complexion" value="0.350" />
+
+      <param id="117" name="Lip Pinkness" value="0.470" />
+
+      <param id="150" name="Body Definition" value="0.000" />
+
+      <param id="162" name="Facial Definition" value="0.000" />
+
+      <param id="163" name="Wrinkles" value="0.000" />
+
+      <param id="165" name="Freckles" value="0.400" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="-0.500" />
+
+      <param id="31" name="Arced_Eyebrows" value="1.000" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.320" />
+
+      <param id="114" name="Blonde Hair" value="0.510" />
+
+      <param id="115" name="White Hair" value="0.170" />
+
+      <param id="119" name="Eyebrow Size" value="0.190" />
+
+      <param id="130" name="Front Fringe" value="0.470" />
+
+      <param id="131" name="Side Fringe" value="0.370" />
+
+      <param id="132" name="Back Fringe" value="0.300" />
+
+      <param id="133" name="Hair Front" value="0.370" />
+
+      <param id="134" name="Hair Sides" value="0.190" />
+
+      <param id="135" name="Hair Back" value="0.000" />
+
+      <param id="136" name="Hair Sweep" value="0.600" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="-0.370" />
+
+      <param id="166" name="Sideburns" value="0.000" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.860" />
+
+      <param id="181" name="Hair_Big_Front" value="0.240" />
+
+      <param id="182" name="Hair_Big_Top" value="0.060" />
+
+      <param id="183" name="Hair_Big_Back" value="0.120" />
+
+      <param id="184" name="Hair_Spiked" value="0.120" />
+
+      <param id="192" name="Bangs_Part_Middle" value="1.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="-0.640" />
+
+      <param id="750" name="Eyebrow Density" value="0.410" />
+
+      <param id="752" name="Hair Thickness" value="0.000" />
+
+      <param id="754" name="Hair_Taper_Back" value="0.350" />
+
+      <param id="755" name="Hair_Taper_Front" value="-1.170" />
+
+      <param id="757" name="Lower_Eyebrows" value="-2.000" />
+
+      <param id="762" name="Hair_Shear_Front" value="1.500" />
+
+      <param id="763" name="Hair Volume" value="0.820" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.270" />
+
+      <param id="99" name="Eye Color" value="0.090" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name=" M W Muscle">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="0.550" />
+
+      <param id="2" name="Nose_Big_Out" value="-0.070" />
+
+      <param id="4" name="Broad_Nostrils" value="0.160" />
+
+      <param id="5" name="Cleft_Chin" value="0.960" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.700" />
+
+      <param id="7" name="Weak_Chin" value="-0.280" />
+
+      <param id="8" name="Double_Chin" value="0.460" />
+
+      <param id="10" name="Sunken_Cheeks" value="0.120" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="0.240" />
+
+      <param id="12" name="Jowls" value="0.010" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.940" />
+
+      <param id="14" name="High_Cheek_Bones" value="-0.020" />
+
+      <param id="15" name="Ears_Out" value="-0.260" />
+
+      <param id="17" name="Square_Jaw" value="-0.090" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="-0.580" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-0.630" />
+
+      <param id="20" name="Bulbous_Nose" value="0.020" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="0.160" />
+
+      <param id="22" name="Attached_Earlobes" value="0.000" />
+
+      <param id="23" name="Baggy_Eyes" value="0.500" />
+
+      <param id="24" name="Wide_Eyes" value="-0.490" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="0.580" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="0.000" />
+
+      <param id="33" name="Height" value="0.580" />
+
+      <param id="34" name="Thickness" value="0.660" />
+
+      <param id="35" name="Big_Ears" value="0.410" />
+
+      <param id="36" name="Shoulders" value="0.470" />
+
+      <param id="37" name="Hip Width" value="-0.920" />
+
+      <param id="38" name="Torso Length" value="0.220" />
+
+      <param id="80" name="male" value="1.000" />
+
+      <param id="105" name="Breast Size" value="0.500" />
+
+      <param id="151" name="Big_Butt_Legs" value="-0.020" />
+
+      <param id="155" name="Lip Width" value="0.240" />
+
+      <param id="157" name="Belly Size" value="0.110" />
+
+      <param id="185" name="Deep_Chin" value="0.260" />
+
+      <param id="193" name="Head Shape" value="0.370" />
+
+      <param id="196" name="Eye Spacing" value="-0.080" />
+
+      <param id="505" name="Lip Thickness" value="0.500" />
+
+      <param id="506" name="Mouth_Height" value="0.600" />
+
+      <param id="507" name="Breast_Gravity" value="0.000" />
+
+      <param id="515" name="Foot_Size" value="1.800" />
+
+      <param id="517" name="Wide_Nose" value="-0.080" />
+
+      <param id="518" name="Eyelashes_Long" value="-0.080" />
+
+      <param id="629" name="Forehead Angle" value="0.170" />
+
+      <param id="637" name="Body Fat" value="0.120" />
+
+      <param id="646" name="Egg_Head" value="0.470" />
+
+      <param id="647" name="Squash_Stretch_Head" value="0.430" />
+
+      <param id="649" name="Torso Muscles" value="0.500" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="-0.250" />
+
+      <param id="652" name="Leg Muscles" value="0.720" />
+
+      <param id="653" name="Tall_Lips" value="-0.580" />
+
+      <param id="656" name="Crooked_Nose" value="0.000" />
+
+      <param id="659" name="Mouth Corner" value="0.480" />
+
+      <param id="662" name="Face Shear" value="0.500" />
+
+      <param id="663" name="Shift_Mouth" value="0.000" />
+
+      <param id="664" name="Pop_Eye" value="0.000" />
+
+      <param id="665" name="Jaw_Jut" value="0.560" />
+
+      <param id="675" name="Hand Size" value="0.100" />
+
+      <param id="676" name="Love_Handles" value="0.140" />
+
+      <param id="678" name="Torso Muscles" value="0.790" />
+
+      <param id="682" name="Head Size" value="0.650" />
+
+      <param id="683" name="Neck Thickness" value="0.070" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.000" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.200" />
+
+      <param id="690" name="Eye Size" value="0.260" />
+
+      <param id="692" name="Leg Length" value="0.340" />
+
+      <param id="693" name="Arm Length" value="0.440" />
+
+      <param id="753" name="Saddlebags" value="0.440" />
+
+      <param id="756" name="Neck Length" value="-0.020" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="0.270" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.950" />
+
+      <param id="760" name="Jaw_Angle" value="-0.050" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.470" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="0.820" />
+
+      <param id="769" name="Eye Depth" value="0.230" />
+
+      <param id="773" name="Head Length" value="0.670" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.075" />
+
+      <param id="111" name="Pigment" value="0.220" />
+
+      <param id="116" name="Rosy Complexion" value="0.170" />
+
+      <param id="117" name="Lip Pinkness" value="0.170" />
+
+      <param id="150" name="Body Definition" value="0.000" />
+
+      <param id="162" name="Facial Definition" value="0.320" />
+
+      <param id="163" name="Wrinkles" value="0.490" />
+
+      <param id="165" name="Freckles" value="0.250" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.280" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.270" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.480" />
+
+      <param id="114" name="Blonde Hair" value="0.500" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.470" />
+
+      <param id="130" name="Front Fringe" value="0.350" />
+
+      <param id="131" name="Side Fringe" value="0.370" />
+
+      <param id="132" name="Back Fringe" value="0.420" />
+
+      <param id="133" name="Hair Front" value="0.040" />
+
+      <param id="134" name="Hair Sides" value="0.580" />
+
+      <param id="135" name="Hair Back" value="0.520" />
+
+      <param id="136" name="Hair Sweep" value="0.510" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="1.520" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="-0.200" />
+
+      <param id="166" name="Sideburns" value="0.710" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.560" />
+
+      <param id="181" name="Hair_Big_Front" value="0.520" />
+
+      <param id="182" name="Hair_Big_Top" value="0.020" />
+
+      <param id="183" name="Hair_Big_Back" value="0.460" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.050" />
+
+      <param id="750" name="Eyebrow Density" value="0.610" />
+
+      <param id="752" name="Hair Thickness" value="0.690" />
+
+      <param id="754" name="Hair_Taper_Back" value="0.020" />
+
+      <param id="755" name="Hair_Taper_Front" value="0.000" />
+
+      <param id="757" name="Lower_Eyebrows" value="0.560" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.060" />
+
+      <param id="763" name="Hair Volume" value="0.650" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.170" />
+
+      <param id="99" name="Eye Color" value="0.340" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="W M Chubby">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="0.710" />
+
+      <param id="2" name="Nose_Big_Out" value="-0.110" />
+
+      <param id="4" name="Broad_Nostrils" value="0.310" />
+
+      <param id="5" name="Cleft_Chin" value="0.340" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.260" />
+
+      <param id="7" name="Weak_Chin" value="-0.260" />
+
+      <param id="8" name="Double_Chin" value="1.040" />
+
+      <param id="10" name="Sunken_Cheeks" value="-0.560" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="0.020" />
+
+      <param id="12" name="Jowls" value="1.240" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.690" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.650" />
+
+      <param id="15" name="Ears_Out" value="-0.180" />
+
+      <param id="17" name="Square_Jaw" value="-0.170" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="1.580" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-0.500" />
+
+      <param id="20" name="Bulbous_Nose" value="-0.020" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="0.600" />
+
+      <param id="22" name="Attached_Earlobes" value="0.420" />
+
+      <param id="23" name="Baggy_Eyes" value="0.680" />
+
+      <param id="24" name="Wide_Eyes" value="0.460" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="-0.250" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-0.320" />
+
+      <param id="33" name="Height" value="0.880" />
+
+      <param id="34" name="Thickness" value="0.800" />
+
+      <param id="35" name="Big_Ears" value="1.100" />
+
+      <param id="36" name="Shoulders" value="0.310" />
+
+      <param id="37" name="Hip Width" value="-1.040" />
+
+      <param id="38" name="Torso Length" value="-0.740" />
+
+      <param id="80" name="male" value="1.000" />
+
+      <param id="105" name="Breast Size" value="0.500" />
+
+      <param id="151" name="Big_Butt_Legs" value="0.330" />
+
+      <param id="155" name="Lip Width" value="-0.200" />
+
+      <param id="157" name="Belly Size" value="0.320" />
+
+      <param id="185" name="Deep_Chin" value="0.680" />
+
+      <param id="193" name="Head Shape" value="0.720" />
+
+      <param id="196" name="Eye Spacing" value="-0.380" />
+
+      <param id="505" name="Lip Thickness" value="0.680" />
+
+      <param id="506" name="Mouth_Height" value="0.080" />
+
+      <param id="507" name="Breast_Gravity" value="0.000" />
+
+      <param id="515" name="Foot_Size" value="1.120" />
+
+      <param id="517" name="Wide_Nose" value="0.070" />
+
+      <param id="518" name="Eyelashes_Long" value="0.400" />
+
+      <param id="629" name="Forehead Angle" value="0.620" />
+
+      <param id="637" name="Body Fat" value="0.130" />
+
+      <param id="646" name="Egg_Head" value="-0.220" />
+
+      <param id="647" name="Squash_Stretch_Head" value="0.030" />
+
+      <param id="649" name="Torso Muscles" value="0.500" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="0.380" />
+
+      <param id="652" name="Leg Muscles" value="0.770" />
+
+      <param id="653" name="Tall_Lips" value="0.470" />
+
+      <param id="656" name="Crooked_Nose" value="-0.400" />
+
+      <param id="659" name="Mouth Corner" value="0.520" />
+
+      <param id="662" name="Face Shear" value="0.460" />
+
+      <param id="663" name="Shift_Mouth" value="0.000" />
+
+      <param id="664" name="Pop_Eye" value="0.310" />
+
+      <param id="665" name="Jaw_Jut" value="-0.680" />
+
+      <param id="675" name="Hand Size" value="0.010" />
+
+      <param id="676" name="Love_Handles" value="0.380" />
+
+      <param id="678" name="Torso Muscles" value="0.800" />
+
+      <param id="682" name="Head Size" value="0.690" />
+
+      <param id="683" name="Neck Thickness" value="-0.030" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.000" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.010" />
+
+      <param id="690" name="Eye Size" value="0.210" />
+
+      <param id="692" name="Leg Length" value="-0.260" />
+
+      <param id="693" name="Arm Length" value="0.200" />
+
+      <param id="753" name="Saddlebags" value="0.650" />
+
+      <param id="756" name="Neck Length" value="-0.040" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="0.210" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.650" />
+
+      <param id="760" name="Jaw_Angle" value="0.240" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.610" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="1.100" />
+
+      <param id="769" name="Eye Depth" value="0.580" />
+
+      <param id="773" name="Head Length" value="0.350" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.084" />
+
+      <param id="111" name="Pigment" value="0.320" />
+
+      <param id="116" name="Rosy Complexion" value="0.120" />
+
+      <param id="117" name="Lip Pinkness" value="0.220" />
+
+      <param id="150" name="Body Definition" value="0.000" />
+
+      <param id="162" name="Facial Definition" value="0.370" />
+
+      <param id="163" name="Wrinkles" value="0.150" />
+
+      <param id="165" name="Freckles" value="0.740" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.370" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.000" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.130" />
+
+      <param id="114" name="Blonde Hair" value="0.040" />
+
+      <param id="115" name="White Hair" value="0.170" />
+
+      <param id="119" name="Eyebrow Size" value="0.540" />
+
+      <param id="130" name="Front Fringe" value="0.470" />
+
+      <param id="131" name="Side Fringe" value="0.480" />
+
+      <param id="132" name="Back Fringe" value="0.500" />
+
+      <param id="133" name="Hair Front" value="0.370" />
+
+      <param id="134" name="Hair Sides" value="0.000" />
+
+      <param id="135" name="Hair Back" value="0.600" />
+
+      <param id="136" name="Hair Sweep" value="0.210" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="2.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="0.785" />
+
+      <param id="166" name="Sideburns" value="0.000" />
+
+      <param id="167" name="Moustache" value="0.470" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.000" />
+
+      <param id="181" name="Hair_Big_Front" value="-0.120" />
+
+      <param id="182" name="Hair_Big_Top" value="0.060" />
+
+      <param id="183" name="Hair_Big_Back" value="0.240" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.020" />
+
+      <param id="750" name="Eyebrow Density" value="0.920" />
+
+      <param id="752" name="Hair Thickness" value="0.390" />
+
+      <param id="754" name="Hair_Taper_Back" value="0.620" />
+
+      <param id="755" name="Hair_Taper_Front" value="0.990" />
+
+      <param id="757" name="Lower_Eyebrows" value="-0.200" />
+
+      <param id="762" name="Hair_Shear_Front" value="1.440" />
+
+      <param id="763" name="Hair Volume" value="0.610" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.270" />
+
+      <param id="99" name="Eye Color" value="0.090" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="M Troll">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="2.000" />
+
+      <param id="2" name="Nose_Big_Out" value="1.670" />
+
+      <param id="4" name="Broad_Nostrils" value="0.730" />
+
+      <param id="5" name="Cleft_Chin" value="0.110" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="1.000" />
+
+      <param id="7" name="Weak_Chin" value="0.500" />
+
+      <param id="8" name="Double_Chin" value="0.840" />
+
+      <param id="10" name="Sunken_Cheeks" value="1.830" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="0.440" />
+
+      <param id="12" name="Jowls" value="0.760" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.940" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.810" />
+
+      <param id="15" name="Ears_Out" value="1.500" />
+
+      <param id="17" name="Square_Jaw" value="0.050" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="1.420" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="0.300" />
+
+      <param id="20" name="Bulbous_Nose" value="1.040" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="-0.060" />
+
+      <param id="22" name="Attached_Earlobes" value="0.000" />
+
+      <param id="23" name="Baggy_Eyes" value="1.500" />
+
+      <param id="24" name="Wide_Eyes" value="1.970" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="0.720" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-1.300" />
+
+      <param id="33" name="Height" value="-2.210" />
+
+      <param id="34" name="Thickness" value="0.910" />
+
+      <param id="35" name="Big_Ears" value="2.000" />
+
+      <param id="36" name="Shoulders" value="1.180" />
+
+      <param id="37" name="Hip Width" value="-1.160" />
+
+      <param id="38" name="Torso Length" value="1.000" />
+
+      <param id="80" name="male" value="1.000" />
+
+      <param id="105" name="Breast Size" value="0.500" />
+
+      <param id="151" name="Big_Butt_Legs" value="-0.110" />
+
+      <param id="155" name="Lip Width" value="1.300" />
+
+      <param id="157" name="Belly Size" value="0.740" />
+
+      <param id="185" name="Deep_Chin" value="-0.960" />
+
+      <param id="193" name="Head Shape" value="0.010" />
+
+      <param id="196" name="Eye Spacing" value="1.000" />
+
+      <param id="505" name="Lip Thickness" value="0.730" />
+
+      <param id="506" name="Mouth_Height" value="1.080" />
+
+      <param id="507" name="Breast_Gravity" value="0.000" />
+
+      <param id="515" name="Foot_Size" value="1.560" />
+
+      <param id="517" name="Wide_Nose" value="0.170" />
+
+      <param id="518" name="Eyelashes_Long" value="1.500" />
+
+      <param id="629" name="Forehead Angle" value="1.000" />
+
+      <param id="637" name="Body Fat" value="0.000" />
+
+      <param id="646" name="Egg_Head" value="0.700" />
+
+      <param id="647" name="Squash_Stretch_Head" value="-0.220" />
+
+      <param id="649" name="Torso Muscles" value="0.500" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="-0.100" />
+
+      <param id="652" name="Leg Muscles" value="0.640" />
+
+      <param id="653" name="Tall_Lips" value="0.920" />
+
+      <param id="656" name="Crooked_Nose" value="-1.160" />
+
+      <param id="659" name="Mouth Corner" value="1.000" />
+
+      <param id="662" name="Face Shear" value="0.500" />
+
+      <param id="663" name="Shift_Mouth" value="-0.320" />
+
+      <param id="664" name="Pop_Eye" value="1.250" />
+
+      <param id="665" name="Jaw_Jut" value="1.760" />
+
+      <param id="675" name="Hand Size" value="0.300" />
+
+      <param id="676" name="Love_Handles" value="-0.160" />
+
+      <param id="678" name="Torso Muscles" value="0.290" />
+
+      <param id="682" name="Head Size" value="1.000" />
+
+      <param id="683" name="Neck Thickness" value="-0.004" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.000" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.332" />
+
+      <param id="690" name="Eye Size" value="1.000" />
+
+      <param id="692" name="Leg Length" value="0.240" />
+
+      <param id="693" name="Arm Length" value="-0.220" />
+
+      <param id="753" name="Saddlebags" value="0.030" />
+
+      <param id="756" name="Neck Length" value="-0.420" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="-1.500" />
+
+      <param id="759" name="Low_Septum_Nose" value="1.500" />
+
+      <param id="760" name="Jaw_Angle" value="1.580" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="1.100" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="2.440" />
+
+      <param id="769" name="Eye Depth" value="0.000" />
+
+      <param id="773" name="Head Length" value="1.000" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="1.000" />
+
+      <param id="110" name="Red Skin" value="0.100" />
+
+      <param id="111" name="Pigment" value="1.000" />
+
+      <param id="116" name="Rosy Complexion" value="0.320" />
+
+      <param id="117" name="Lip Pinkness" value="0.560" />
+
+      <param id="150" name="Body Definition" value="1.000" />
+
+      <param id="162" name="Facial Definition" value="1.000" />
+
+      <param id="163" name="Wrinkles" value="0.490" />
+
+      <param id="165" name="Freckles" value="0.740" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.805" />
+
+      <param id="31" name="Arced_Eyebrows" value="1.000" />
+
+      <param id="112" name="Rainbow Color" value="1.000" />
+
+      <param id="113" name="Red Hair" value="0.000" />
+
+      <param id="114" name="Blonde Hair" value="0.000" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.210" />
+
+      <param id="130" name="Front Fringe" value="0.580" />
+
+      <param id="131" name="Side Fringe" value="0.000" />
+
+      <param id="132" name="Back Fringe" value="1.000" />
+
+      <param id="133" name="Hair Front" value="0.000" />
+
+      <param id="134" name="Hair Sides" value="0.000" />
+
+      <param id="135" name="Hair Back" value="0.670" />
+
+      <param id="136" name="Hair Sweep" value="0.940" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="-3.835" />
+
+      <param id="166" name="Sideburns" value="0.890" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.260" />
+
+      <param id="169" name="Chin Curtains" value="0.890" />
+
+      <param id="177" name="Hair_Rumpled" value="0.560" />
+
+      <param id="181" name="Hair_Big_Front" value="0.480" />
+
+      <param id="182" name="Hair_Big_Top" value="0.320" />
+
+      <param id="183" name="Hair_Big_Back" value="0.240" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.440" />
+
+      <param id="750" name="Eyebrow Density" value="0.840" />
+
+      <param id="752" name="Hair Thickness" value="0.120" />
+
+      <param id="754" name="Hair_Taper_Back" value="0.350" />
+
+      <param id="755" name="Hair_Taper_Front" value="0.330" />
+
+      <param id="757" name="Lower_Eyebrows" value="2.000" />
+
+      <param id="762" name="Hair_Shear_Front" value="3.000" />
+
+      <param id="763" name="Hair Volume" value="0.940" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.000" />
+
+      <param id="99" name="Eye Color" value="1.000" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="M B Skinny">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="0.320" />
+
+      <param id="2" name="Nose_Big_Out" value="0.420" />
+
+      <param id="4" name="Broad_Nostrils" value="0.320" />
+
+      <param id="5" name="Cleft_Chin" value="0.680" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.490" />
+
+      <param id="7" name="Weak_Chin" value="-0.350" />
+
+      <param id="8" name="Double_Chin" value="-0.360" />
+
+      <param id="10" name="Sunken_Cheeks" value="0.440" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="-0.320" />
+
+      <param id="12" name="Jowls" value="-0.470" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.520" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.010" />
+
+      <param id="15" name="Ears_Out" value="1.020" />
+
+      <param id="17" name="Square_Jaw" value="-0.430" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="1.180" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-1.270" />
+
+      <param id="20" name="Bulbous_Nose" value="0.040" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="-0.040" />
+
+      <param id="22" name="Attached_Earlobes" value="0.590" />
+
+      <param id="23" name="Baggy_Eyes" value="-0.300" />
+
+      <param id="24" name="Wide_Eyes" value="1.340" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="-0.250" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-1.300" />
+
+      <param id="33" name="Height" value="-0.370" />
+
+      <param id="34" name="Thickness" value="-0.280" />
+
+      <param id="35" name="Big_Ears" value="0.410" />
+
+      <param id="36" name="Shoulders" value="-0.140" />
+
+      <param id="37" name="Hip Width" value="-0.860" />
+
+      <param id="38" name="Torso Length" value="-0.560" />
+
+      <param id="80" name="male" value="1.000" />
+
+      <param id="105" name="Breast Size" value="0.500" />
+
+      <param id="151" name="Big_Butt_Legs" value="0.540" />
+
+      <param id="155" name="Lip Width" value="-0.170" />
+
+      <param id="157" name="Belly Size" value="0.000" />
+
+      <param id="185" name="Deep_Chin" value="0.720" />
+
+      <param id="193" name="Head Shape" value="0.700" />
+
+      <param id="196" name="Eye Spacing" value="0.610" />
+
+      <param id="505" name="Lip Thickness" value="0.800" />
+
+      <param id="506" name="Mouth_Height" value="0.400" />
+
+      <param id="507" name="Breast_Gravity" value="0.000" />
+
+      <param id="515" name="Foot_Size" value="1.080" />
+
+      <param id="517" name="Wide_Nose" value="0.870" />
+
+      <param id="518" name="Eyelashes_Long" value="0.940" />
+
+      <param id="629" name="Forehead Angle" value="0.340" />
+
+      <param id="637" name="Body Fat" value="0.170" />
+
+      <param id="646" name="Egg_Head" value="-0.010" />
+
+      <param id="647" name="Squash_Stretch_Head" value="0.250" />
+
+      <param id="649" name="Torso Muscles" value="0.500" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="-0.220" />
+
+      <param id="652" name="Leg Muscles" value="0.520" />
+
+      <param id="653" name="Tall_Lips" value="0.950" />
+
+      <param id="656" name="Crooked_Nose" value="0.120" />
+
+      <param id="659" name="Mouth Corner" value="0.500" />
+
+      <param id="662" name="Face Shear" value="0.500" />
+
+      <param id="663" name="Shift_Mouth" value="-0.400" />
+
+      <param id="664" name="Pop_Eye" value="0.100" />
+
+      <param id="665" name="Jaw_Jut" value="0.640" />
+
+      <param id="675" name="Hand Size" value="0.160" />
+
+      <param id="676" name="Love_Handles" value="-0.190" />
+
+      <param id="678" name="Torso Muscles" value="0.370" />
+
+      <param id="682" name="Head Size" value="0.820" />
+
+      <param id="683" name="Neck Thickness" value="-0.220" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.000" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="-0.260" />
+
+      <param id="690" name="Eye Size" value="0.470" />
+
+      <param id="692" name="Leg Length" value="0.540" />
+
+      <param id="693" name="Arm Length" value="0.780" />
+
+      <param id="753" name="Saddlebags" value="-0.250" />
+
+      <param id="756" name="Neck Length" value="0.540" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="0.690" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.550" />
+
+      <param id="760" name="Jaw_Angle" value="1.330" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.040" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="-0.300" />
+
+      <param id="769" name="Eye Depth" value="0.790" />
+
+      <param id="773" name="Head Length" value="0.690" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.000" />
+
+      <param id="111" name="Pigment" value="0.650" />
+
+      <param id="116" name="Rosy Complexion" value="0.000" />
+
+      <param id="117" name="Lip Pinkness" value="0.000" />
+
+      <param id="150" name="Body Definition" value="0.000" />
+
+      <param id="162" name="Facial Definition" value="0.800" />
+
+      <param id="163" name="Wrinkles" value="0.000" />
+
+      <param id="165" name="Freckles" value="0.000" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="-0.440" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.000" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.220" />
+
+      <param id="114" name="Blonde Hair" value="0.000" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.580" />
+
+      <param id="130" name="Front Fringe" value="0.360" />
+
+      <param id="131" name="Side Fringe" value="0.310" />
+
+      <param id="132" name="Back Fringe" value="0.050" />
+
+      <param id="133" name="Hair Front" value="0.100" />
+
+      <param id="134" name="Hair Sides" value="0.170" />
+
+      <param id="135" name="Hair Back" value="0.450" />
+
+      <param id="136" name="Hair Sweep" value="0.670" />
+
+      <param id="137" name="Hair Tilt" value="0.520" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="-0.095" />
+
+      <param id="166" name="Sideburns" value="0.000" />
+
+      <param id="167" name="Moustache" value="0.610" />
+
+      <param id="168" name="Soulpatch" value="0.420" />
+
+      <param id="169" name="Chin Curtains" value="0.820" />
+
+      <param id="177" name="Hair_Rumpled" value="0.000" />
+
+      <param id="181" name="Hair_Big_Front" value="-0.160" />
+
+      <param id="182" name="Hair_Big_Top" value="-0.080" />
+
+      <param id="183" name="Hair_Big_Back" value="0.140" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="-0.310" />
+
+      <param id="750" name="Eyebrow Density" value="0.540" />
+
+      <param id="752" name="Hair Thickness" value="0.750" />
+
+      <param id="754" name="Hair_Taper_Back" value="-0.400" />
+
+      <param id="755" name="Hair_Taper_Front" value="0.030" />
+
+      <param id="757" name="Lower_Eyebrows" value="-2.000" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.600" />
+
+      <param id="763" name="Hair Volume" value="0.660" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.000" />
+
+      <param id="99" name="Eye Color" value="0.000" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="M B Muscle">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="0.090" />
+
+      <param id="2" name="Nose_Big_Out" value="0.090" />
+
+      <param id="4" name="Broad_Nostrils" value="0.950" />
+
+      <param id="5" name="Cleft_Chin" value="0.100" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="-0.010" />
+
+      <param id="7" name="Weak_Chin" value="-0.040" />
+
+      <param id="8" name="Double_Chin" value="-0.040" />
+
+      <param id="10" name="Sunken_Cheeks" value="0.880" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="0.140" />
+
+      <param id="12" name="Jowls" value="0.520" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.190" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.500" />
+
+      <param id="15" name="Ears_Out" value="0.340" />
+
+      <param id="17" name="Square_Jaw" value="-0.500" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="0.540" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-0.080" />
+
+      <param id="20" name="Bulbous_Nose" value="0.520" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="0.100" />
+
+      <param id="22" name="Attached_Earlobes" value="0.000" />
+
+      <param id="23" name="Baggy_Eyes" value="0.440" />
+
+      <param id="24" name="Wide_Eyes" value="0.500" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="-0.410" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="0.450" />
+
+      <param id="33" name="Height" value="1.440" />
+
+      <param id="34" name="Thickness" value="1.190" />
+
+      <param id="35" name="Big_Ears" value="-0.040" />
+
+      <param id="36" name="Shoulders" value="0.920" />
+
+      <param id="37" name="Hip Width" value="-1.640" />
+
+      <param id="38" name="Torso Length" value="0.660" />
+
+      <param id="80" name="male" value="1.000" />
+
+      <param id="105" name="Breast Size" value="0.500" />
+
+      <param id="151" name="Big_Butt_Legs" value="0.550" />
+
+      <param id="155" name="Lip Width" value="0.880" />
+
+      <param id="157" name="Belly Size" value="0.160" />
+
+      <param id="185" name="Deep_Chin" value="0.540" />
+
+      <param id="193" name="Head Shape" value="0.140" />
+
+      <param id="196" name="Eye Spacing" value="0.460" />
+
+      <param id="505" name="Lip Thickness" value="0.920" />
+
+      <param id="506" name="Mouth_Height" value="0.280" />
+
+      <param id="507" name="Breast_Gravity" value="0.000" />
+
+      <param id="515" name="Foot_Size" value="2.000" />
+
+      <param id="517" name="Wide_Nose" value="0.470" />
+
+      <param id="518" name="Eyelashes_Long" value="0.640" />
+
+      <param id="629" name="Forehead Angle" value="0.000" />
+
+      <param id="637" name="Body Fat" value="0.010" />
+
+      <param id="646" name="Egg_Head" value="0.330" />
+
+      <param id="647" name="Squash_Stretch_Head" value="0.440" />
+
+      <param id="649" name="Torso Muscles" value="0.500" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="0.430" />
+
+      <param id="652" name="Leg Muscles" value="0.860" />
+
+      <param id="653" name="Tall_Lips" value="0.860" />
+
+      <param id="656" name="Crooked_Nose" value="0.000" />
+
+      <param id="659" name="Mouth Corner" value="0.820" />
+
+      <param id="662" name="Face Shear" value="0.500" />
+
+      <param id="663" name="Shift_Mouth" value="0.280" />
+
+      <param id="664" name="Pop_Eye" value="-0.260" />
+
+      <param id="665" name="Jaw_Jut" value="0.080" />
+
+      <param id="675" name="Hand Size" value="0.170" />
+
+      <param id="676" name="Love_Handles" value="-0.100" />
+
+      <param id="678" name="Torso Muscles" value="0.850" />
+
+      <param id="682" name="Head Size" value="0.820" />
+
+      <param id="683" name="Neck Thickness" value="0.100" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.000" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="-0.230" />
+
+      <param id="690" name="Eye Size" value="0.520" />
+
+      <param id="692" name="Leg Length" value="0.600" />
+
+      <param id="693" name="Arm Length" value="0.640" />
+
+      <param id="753" name="Saddlebags" value="0.030" />
+
+      <param id="756" name="Neck Length" value="0.140" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="-0.420" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.030" />
+
+      <param id="760" name="Jaw_Angle" value="0.850" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.370" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="0.460" />
+
+      <param id="769" name="Eye Depth" value="0.740" />
+
+      <param id="773" name="Head Length" value="0.520" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.010" />
+
+      <param id="111" name="Pigment" value="0.720" />
+
+      <param id="116" name="Rosy Complexion" value="0.000" />
+
+      <param id="117" name="Lip Pinkness" value="0.170" />
+
+      <param id="150" name="Body Definition" value="0.820" />
+
+      <param id="162" name="Facial Definition" value="0.870" />
+
+      <param id="163" name="Wrinkles" value="0.060" />
+
+      <param id="165" name="Freckles" value="0.000" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.730" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.930" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.000" />
+
+      <param id="114" name="Blonde Hair" value="0.000" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.330" />
+
+      <param id="130" name="Front Fringe" value="0.000" />
+
+      <param id="131" name="Side Fringe" value="0.410" />
+
+      <param id="132" name="Back Fringe" value="0.000" />
+
+      <param id="133" name="Hair Front" value="0.030" />
+
+      <param id="134" name="Hair Sides" value="0.000" />
+
+      <param id="135" name="Hair Back" value="0.530" />
+
+      <param id="136" name="Hair Sweep" value="0.570" />
+
+      <param id="137" name="Hair Tilt" value="0.540" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="-0.095" />
+
+      <param id="166" name="Sideburns" value="0.960" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.120" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.040" />
+
+      <param id="181" name="Hair_Big_Front" value="-0.220" />
+
+      <param id="182" name="Hair_Big_Top" value="-0.120" />
+
+      <param id="183" name="Hair_Big_Back" value="0.080" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.860" />
+
+      <param id="750" name="Eyebrow Density" value="0.680" />
+
+      <param id="752" name="Hair Thickness" value="0.500" />
+
+      <param id="754" name="Hair_Taper_Back" value="-0.130" />
+
+      <param id="755" name="Hair_Taper_Front" value="1.470" />
+
+      <param id="757" name="Lower_Eyebrows" value="0.720" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.330" />
+
+      <param id="763" name="Hair Volume" value="0.870" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.180" />
+
+      <param id="99" name="Eye Color" value="0.060" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="M B Chubby">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="1.240" />
+
+      <param id="2" name="Nose_Big_Out" value="-0.110" />
+
+      <param id="4" name="Broad_Nostrils" value="0.310" />
+
+      <param id="5" name="Cleft_Chin" value="-0.100" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.260" />
+
+      <param id="7" name="Weak_Chin" value="-0.260" />
+
+      <param id="8" name="Double_Chin" value="0.540" />
+
+      <param id="10" name="Sunken_Cheeks" value="0.080" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="0.020" />
+
+      <param id="12" name="Jowls" value="1.240" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.000" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.070" />
+
+      <param id="15" name="Ears_Out" value="-0.180" />
+
+      <param id="17" name="Square_Jaw" value="-0.170" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="2.500" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-0.500" />
+
+      <param id="20" name="Bulbous_Nose" value="-0.020" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="0.600" />
+
+      <param id="22" name="Attached_Earlobes" value="0.420" />
+
+      <param id="23" name="Baggy_Eyes" value="0.680" />
+
+      <param id="24" name="Wide_Eyes" value="1.050" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="-0.250" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-0.320" />
+
+      <param id="33" name="Height" value="1.400" />
+
+      <param id="34" name="Thickness" value="1.260" />
+
+      <param id="35" name="Big_Ears" value="1.100" />
+
+      <param id="36" name="Shoulders" value="0.820" />
+
+      <param id="37" name="Hip Width" value="-0.380" />
+
+      <param id="38" name="Torso Length" value="0.380" />
+
+      <param id="80" name="male" value="1.000" />
+
+      <param id="105" name="Breast Size" value="0.500" />
+
+      <param id="151" name="Big_Butt_Legs" value="0.640" />
+
+      <param id="155" name="Lip Width" value="0.400" />
+
+      <param id="157" name="Belly Size" value="0.480" />
+
+      <param id="185" name="Deep_Chin" value="0.680" />
+
+      <param id="193" name="Head Shape" value="0.950" />
+
+      <param id="196" name="Eye Spacing" value="-0.710" />
+
+      <param id="505" name="Lip Thickness" value="0.840" />
+
+      <param id="506" name="Mouth_Height" value="1.000" />
+
+      <param id="507" name="Breast_Gravity" value="0.000" />
+
+      <param id="515" name="Foot_Size" value="1.760" />
+
+      <param id="517" name="Wide_Nose" value="0.070" />
+
+      <param id="518" name="Eyelashes_Long" value="0.400" />
+
+      <param id="629" name="Forehead Angle" value="0.000" />
+
+      <param id="637" name="Body Fat" value="0.130" />
+
+      <param id="646" name="Egg_Head" value="-0.910" />
+
+      <param id="647" name="Squash_Stretch_Head" value="-0.320" />
+
+      <param id="649" name="Torso Muscles" value="0.500" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="0.130" />
+
+      <param id="652" name="Leg Muscles" value="0.830" />
+
+      <param id="653" name="Tall_Lips" value="0.410" />
+
+      <param id="656" name="Crooked_Nose" value="-0.400" />
+
+      <param id="659" name="Mouth Corner" value="0.580" />
+
+      <param id="662" name="Face Shear" value="0.460" />
+
+      <param id="663" name="Shift_Mouth" value="0.000" />
+
+      <param id="664" name="Pop_Eye" value="0.310" />
+
+      <param id="665" name="Jaw_Jut" value="0.120" />
+
+      <param id="675" name="Hand Size" value="0.150" />
+
+      <param id="676" name="Love_Handles" value="0.530" />
+
+      <param id="678" name="Torso Muscles" value="0.850" />
+
+      <param id="682" name="Head Size" value="0.810" />
+
+      <param id="683" name="Neck Thickness" value="0.100" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.000" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="-0.020" />
+
+      <param id="690" name="Eye Size" value="0.460" />
+
+      <param id="692" name="Leg Length" value="-0.040" />
+
+      <param id="693" name="Arm Length" value="0.500" />
+
+      <param id="753" name="Saddlebags" value="0.620" />
+
+      <param id="756" name="Neck Length" value="-0.160" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="0.210" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.650" />
+
+      <param id="760" name="Jaw_Angle" value="-0.720" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.440" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="1.100" />
+
+      <param id="769" name="Eye Depth" value="0.720" />
+
+      <param id="773" name="Head Length" value="0.370" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.000" />
+
+      <param id="111" name="Pigment" value="0.600" />
+
+      <param id="116" name="Rosy Complexion" value="0.000" />
+
+      <param id="117" name="Lip Pinkness" value="0.560" />
+
+      <param id="150" name="Body Definition" value="0.000" />
+
+      <param id="162" name="Facial Definition" value="0.550" />
+
+      <param id="163" name="Wrinkles" value="0.520" />
+
+      <param id="165" name="Freckles" value="0.250" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="1.000" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.580" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.000" />
+
+      <param id="114" name="Blonde Hair" value="0.000" />
+
+      <param id="115" name="White Hair" value="0.170" />
+
+      <param id="119" name="Eyebrow Size" value="0.540" />
+
+      <param id="130" name="Front Fringe" value="0.000" />
+
+      <param id="131" name="Side Fringe" value="0.230" />
+
+      <param id="132" name="Back Fringe" value="0.110" />
+
+      <param id="133" name="Hair Front" value="0.270" />
+
+      <param id="134" name="Hair Sides" value="0.000" />
+
+      <param id="135" name="Hair Back" value="0.530" />
+
+      <param id="136" name="Hair Sweep" value="0.760" />
+
+      <param id="137" name="Hair Tilt" value="0.620" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="-0.425" />
+
+      <param id="166" name="Sideburns" value="0.000" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="1.000" />
+
+      <param id="181" name="Hair_Big_Front" value="0.240" />
+
+      <param id="182" name="Hair_Big_Top" value="0.080" />
+
+      <param id="183" name="Hair_Big_Back" value="0.020" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.350" />
+
+      <param id="750" name="Eyebrow Density" value="0.850" />
+
+      <param id="752" name="Hair Thickness" value="0.000" />
+
+      <param id="754" name="Hair_Taper_Back" value="-0.340" />
+
+      <param id="755" name="Hair_Taper_Front" value="-0.330" />
+
+      <param id="757" name="Lower_Eyebrows" value="2.000" />
+
+      <param id="762" name="Hair_Shear_Front" value="1.260" />
+
+      <param id="763" name="Hair Volume" value="0.770" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.200" />
+
+      <param id="99" name="Eye Color" value="0.000" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="M A Skinny">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="1.680" />
+
+      <param id="2" name="Nose_Big_Out" value="0.420" />
+
+      <param id="4" name="Broad_Nostrils" value="0.340" />
+
+      <param id="5" name="Cleft_Chin" value="0.030" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.120" />
+
+      <param id="7" name="Weak_Chin" value="0.020" />
+
+      <param id="8" name="Double_Chin" value="0.040" />
+
+      <param id="10" name="Sunken_Cheeks" value="1.070" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="-0.460" />
+
+      <param id="12" name="Jowls" value="-0.500" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.560" />
+
+      <param id="14" name="High_Cheek_Bones" value="1.000" />
+
+      <param id="15" name="Ears_Out" value="0.160" />
+
+      <param id="17" name="Square_Jaw" value="0.550" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="1.220" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="0.300" />
+
+      <param id="20" name="Bulbous_Nose" value="-0.500" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="1.080" />
+
+      <param id="22" name="Attached_Earlobes" value="1.000" />
+
+      <param id="23" name="Baggy_Eyes" value="0.180" />
+
+      <param id="24" name="Wide_Eyes" value="-1.430" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="0.530" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-0.930" />
+
+      <param id="33" name="Height" value="-0.150" />
+
+      <param id="34" name="Thickness" value="-0.500" />
+
+      <param id="35" name="Big_Ears" value="-0.040" />
+
+      <param id="36" name="Shoulders" value="-0.940" />
+
+      <param id="37" name="Hip Width" value="-1.580" />
+
+      <param id="38" name="Torso Length" value="0.020" />
+
+      <param id="80" name="male" value="1.000" />
+
+      <param id="105" name="Breast Size" value="0.500" />
+
+      <param id="151" name="Big_Butt_Legs" value="-0.270" />
+
+      <param id="155" name="Lip Width" value="-0.150" />
+
+      <param id="157" name="Belly Size" value="0.030" />
+
+      <param id="185" name="Deep_Chin" value="0.040" />
+
+      <param id="193" name="Head Shape" value="0.660" />
+
+      <param id="196" name="Eye Spacing" value="0.010" />
+
+      <param id="505" name="Lip Thickness" value="0.650" />
+
+      <param id="506" name="Mouth_Height" value="1.000" />
+
+      <param id="507" name="Breast_Gravity" value="0.000" />
+
+      <param id="515" name="Foot_Size" value="0.600" />
+
+      <param id="517" name="Wide_Nose" value="0.010" />
+
+      <param id="518" name="Eyelashes_Long" value="0.290" />
+
+      <param id="629" name="Forehead Angle" value="0.640" />
+
+      <param id="637" name="Body Fat" value="0.060" />
+
+      <param id="646" name="Egg_Head" value="-0.010" />
+
+      <param id="647" name="Squash_Stretch_Head" value="0.290" />
+
+      <param id="649" name="Torso Muscles" value="0.500" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="-0.930" />
+
+      <param id="652" name="Leg Muscles" value="0.450" />
+
+      <param id="653" name="Tall_Lips" value="1.100" />
+
+      <param id="656" name="Crooked_Nose" value="0.040" />
+
+      <param id="659" name="Mouth Corner" value="0.340" />
+
+      <param id="662" name="Face Shear" value="0.600" />
+
+      <param id="663" name="Shift_Mouth" value="0.280" />
+
+      <param id="664" name="Pop_Eye" value="0.100" />
+
+      <param id="665" name="Jaw_Jut" value="0.040" />
+
+      <param id="675" name="Hand Size" value="-0.020" />
+
+      <param id="676" name="Love_Handles" value="-0.010" />
+
+      <param id="678" name="Torso Muscles" value="0.290" />
+
+      <param id="682" name="Head Size" value="0.480" />
+
+      <param id="683" name="Neck Thickness" value="-0.240" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.000" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.090" />
+
+      <param id="690" name="Eye Size" value="0.560" />
+
+      <param id="692" name="Leg Length" value="0.060" />
+
+      <param id="693" name="Arm Length" value="0.380" />
+
+      <param id="753" name="Saddlebags" value="-0.400" />
+
+      <param id="756" name="Neck Length" value="-0.020" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="-0.510" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.680" />
+
+      <param id="760" name="Jaw_Angle" value="1.296" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.350" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="-0.300" />
+
+      <param id="769" name="Eye Depth" value="0.570" />
+
+      <param id="773" name="Head Length" value="0.170" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.010" />
+
+      <param id="111" name="Pigment" value="0.360" />
+
+      <param id="116" name="Rosy Complexion" value="0.000" />
+
+      <param id="117" name="Lip Pinkness" value="0.260" />
+
+      <param id="150" name="Body Definition" value="0.310" />
+
+      <param id="162" name="Facial Definition" value="0.260" />
+
+      <param id="163" name="Wrinkles" value="0.030" />
+
+      <param id="165" name="Freckles" value="0.000" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.805" />
+
+      <param id="31" name="Arced_Eyebrows" value="1.000" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.000" />
+
+      <param id="114" name="Blonde Hair" value="0.000" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.270" />
+
+      <param id="130" name="Front Fringe" value="0.870" />
+
+      <param id="131" name="Side Fringe" value="0.590" />
+
+      <param id="132" name="Back Fringe" value="0.550" />
+
+      <param id="133" name="Hair Front" value="0.220" />
+
+      <param id="134" name="Hair Sides" value="0.350" />
+
+      <param id="135" name="Hair Back" value="0.470" />
+
+      <param id="136" name="Hair Sweep" value="0.580" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="1.380" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="0.235" />
+
+      <param id="166" name="Sideburns" value="0.000" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.000" />
+
+      <param id="181" name="Hair_Big_Front" value="0.120" />
+
+      <param id="182" name="Hair_Big_Top" value="-0.160" />
+
+      <param id="183" name="Hair_Big_Back" value="0.480" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.620" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.590" />
+
+      <param id="750" name="Eyebrow Density" value="0.840" />
+
+      <param id="752" name="Hair Thickness" value="0.250" />
+
+      <param id="754" name="Hair_Taper_Back" value="-0.190" />
+
+      <param id="755" name="Hair_Taper_Front" value="0.210" />
+
+      <param id="757" name="Lower_Eyebrows" value="2.000" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.150" />
+
+      <param id="763" name="Hair Volume" value="0.610" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.370" />
+
+      <param id="99" name="Eye Color" value="0.000" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="M A Muscle">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="-0.020" />
+
+      <param id="2" name="Nose_Big_Out" value="-0.310" />
+
+      <param id="4" name="Broad_Nostrils" value="0.470" />
+
+      <param id="5" name="Cleft_Chin" value="-0.100" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.400" />
+
+      <param id="7" name="Weak_Chin" value="0.160" />
+
+      <param id="8" name="Double_Chin" value="-0.080" />
+
+      <param id="10" name="Sunken_Cheeks" value="1.250" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="-0.320" />
+
+      <param id="12" name="Jowls" value="0.010" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.000" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.650" />
+
+      <param id="15" name="Ears_Out" value="-0.080" />
+
+      <param id="17" name="Square_Jaw" value="0.540" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="1.620" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-0.080" />
+
+      <param id="20" name="Bulbous_Nose" value="-0.460" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="1.300" />
+
+      <param id="22" name="Attached_Earlobes" value="1.000" />
+
+      <param id="23" name="Baggy_Eyes" value="0.540" />
+
+      <param id="24" name="Wide_Eyes" value="-0.900" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="1.020" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-0.170" />
+
+      <param id="33" name="Height" value="0.580" />
+
+      <param id="34" name="Thickness" value="0.250" />
+
+      <param id="35" name="Big_Ears" value="-0.040" />
+
+      <param id="36" name="Shoulders" value="-0.650" />
+
+      <param id="37" name="Hip Width" value="-0.800" />
+
+      <param id="38" name="Torso Length" value="0.800" />
+
+      <param id="80" name="male" value="1.000" />
+
+      <param id="105" name="Breast Size" value="0.500" />
+
+      <param id="151" name="Big_Butt_Legs" value="-0.290" />
+
+      <param id="155" name="Lip Width" value="-0.500" />
+
+      <param id="157" name="Belly Size" value="0.070" />
+
+      <param id="185" name="Deep_Chin" value="0.180" />
+
+      <param id="193" name="Head Shape" value="0.830" />
+
+      <param id="196" name="Eye Spacing" value="0.070" />
+
+      <param id="505" name="Lip Thickness" value="0.720" />
+
+      <param id="506" name="Mouth_Height" value="0.880" />
+
+      <param id="507" name="Breast_Gravity" value="0.000" />
+
+      <param id="515" name="Foot_Size" value="1.160" />
+
+      <param id="517" name="Wide_Nose" value="0.250" />
+
+      <param id="518" name="Eyelashes_Long" value="0.020" />
+
+      <param id="629" name="Forehead Angle" value="1.000" />
+
+      <param id="637" name="Body Fat" value="0.140" />
+
+      <param id="646" name="Egg_Head" value="-0.200" />
+
+      <param id="647" name="Squash_Stretch_Head" value="0.310" />
+
+      <param id="649" name="Torso Muscles" value="0.500" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="0.570" />
+
+      <param id="652" name="Leg Muscles" value="0.680" />
+
+      <param id="653" name="Tall_Lips" value="1.280" />
+
+      <param id="656" name="Crooked_Nose" value="-0.200" />
+
+      <param id="659" name="Mouth Corner" value="0.330" />
+
+      <param id="662" name="Face Shear" value="0.520" />
+
+      <param id="663" name="Shift_Mouth" value="0.200" />
+
+      <param id="664" name="Pop_Eye" value="-0.080" />
+
+      <param id="665" name="Jaw_Jut" value="-0.160" />
+
+      <param id="675" name="Hand Size" value="-0.070" />
+
+      <param id="676" name="Love_Handles" value="-0.250" />
+
+      <param id="678" name="Torso Muscles" value="0.540" />
+
+      <param id="682" name="Head Size" value="0.730" />
+
+      <param id="683" name="Neck Thickness" value="-0.030" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.000" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="-0.180" />
+
+      <param id="690" name="Eye Size" value="0.620" />
+
+      <param id="692" name="Leg Length" value="0.400" />
+
+      <param id="693" name="Arm Length" value="0.780" />
+
+      <param id="753" name="Saddlebags" value="0.090" />
+
+      <param id="756" name="Neck Length" value="0.140" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="-0.300" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.320" />
+
+      <param id="760" name="Jaw_Angle" value="0.750" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="-0.380" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="0.790" />
+
+      <param id="769" name="Eye Depth" value="0.650" />
+
+      <param id="773" name="Head Length" value="0.240" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.000" />
+
+      <param id="111" name="Pigment" value="0.220" />
+
+      <param id="116" name="Rosy Complexion" value="0.020" />
+
+      <param id="117" name="Lip Pinkness" value="0.000" />
+
+      <param id="150" name="Body Definition" value="0.820" />
+
+      <param id="162" name="Facial Definition" value="0.600" />
+
+      <param id="163" name="Wrinkles" value="0.040" />
+
+      <param id="165" name="Freckles" value="0.000" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.580" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.650" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.010" />
+
+      <param id="114" name="Blonde Hair" value="0.000" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.400" />
+
+      <param id="130" name="Front Fringe" value="0.350" />
+
+      <param id="131" name="Side Fringe" value="0.520" />
+
+      <param id="132" name="Back Fringe" value="0.470" />
+
+      <param id="133" name="Hair Front" value="0.000" />
+
+      <param id="134" name="Hair Sides" value="0.580" />
+
+      <param id="135" name="Hair Back" value="0.540" />
+
+      <param id="136" name="Hair Sweep" value="0.880" />
+
+      <param id="137" name="Hair Tilt" value="0.470" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="1.520" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="0.345" />
+
+      <param id="166" name="Sideburns" value="0.000" />
+
+      <param id="167" name="Moustache" value="0.120" />
+
+      <param id="168" name="Soulpatch" value="0.270" />
+
+      <param id="169" name="Chin Curtains" value="0.090" />
+
+      <param id="177" name="Hair_Rumpled" value="0.180" />
+
+      <param id="181" name="Hair_Big_Front" value="0.520" />
+
+      <param id="182" name="Hair_Big_Top" value="0.200" />
+
+      <param id="183" name="Hair_Big_Back" value="0.060" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.110" />
+
+      <param id="750" name="Eyebrow Density" value="1.000" />
+
+      <param id="752" name="Hair Thickness" value="0.470" />
+
+      <param id="754" name="Hair_Taper_Back" value="0.200" />
+
+      <param id="755" name="Hair_Taper_Front" value="-0.240" />
+
+      <param id="757" name="Lower_Eyebrows" value="-0.760" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.810" />
+
+      <param id="763" name="Hair Volume" value="0.520" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.000" />
+
+      <param id="99" name="Eye Color" value="0.000" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="M A Chubby">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="1.130" />
+
+      <param id="2" name="Nose_Big_Out" value="0.590" />
+
+      <param id="4" name="Broad_Nostrils" value="-0.060" />
+
+      <param id="5" name="Cleft_Chin" value="-0.100" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="-0.300" />
+
+      <param id="7" name="Weak_Chin" value="-0.260" />
+
+      <param id="8" name="Double_Chin" value="0.620" />
+
+      <param id="10" name="Sunken_Cheeks" value="-0.780" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="-0.500" />
+
+      <param id="12" name="Jowls" value="-0.080" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.440" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.580" />
+
+      <param id="15" name="Ears_Out" value="-0.500" />
+
+      <param id="17" name="Square_Jaw" value="-0.500" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="2.380" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="0.000" />
+
+      <param id="20" name="Bulbous_Nose" value="-0.020" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="0.850" />
+
+      <param id="22" name="Attached_Earlobes" value="1.000" />
+
+      <param id="23" name="Baggy_Eyes" value="0.180" />
+
+      <param id="24" name="Wide_Eyes" value="-0.800" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="0.260" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-0.350" />
+
+      <param id="33" name="Height" value="0.110" />
+
+      <param id="34" name="Thickness" value="1.320" />
+
+      <param id="35" name="Big_Ears" value="-0.040" />
+
+      <param id="36" name="Shoulders" value="-0.710" />
+
+      <param id="37" name="Hip Width" value="-0.560" />
+
+      <param id="38" name="Torso Length" value="0.040" />
+
+      <param id="80" name="male" value="1.000" />
+
+      <param id="105" name="Breast Size" value="0.500" />
+
+      <param id="151" name="Big_Butt_Legs" value="-0.010" />
+
+      <param id="155" name="Lip Width" value="-0.750" />
+
+      <param id="157" name="Belly Size" value="0.380" />
+
+      <param id="185" name="Deep_Chin" value="0.760" />
+
+      <param id="193" name="Head Shape" value="0.240" />
+
+      <param id="196" name="Eye Spacing" value="-0.140" />
+
+      <param id="505" name="Lip Thickness" value="0.760" />
+
+      <param id="506" name="Mouth_Height" value="0.040" />
+
+      <param id="507" name="Breast_Gravity" value="0.000" />
+
+      <param id="515" name="Foot_Size" value="0.640" />
+
+      <param id="517" name="Wide_Nose" value="0.790" />
+
+      <param id="518" name="Eyelashes_Long" value="0.550" />
+
+      <param id="629" name="Forehead Angle" value="0.820" />
+
+      <param id="637" name="Body Fat" value="0.130" />
+
+      <param id="646" name="Egg_Head" value="-0.860" />
+
+      <param id="647" name="Squash_Stretch_Head" value="-0.500" />
+
+      <param id="649" name="Torso Muscles" value="0.500" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="-1.150" />
+
+      <param id="652" name="Leg Muscles" value="0.820" />
+
+      <param id="653" name="Tall_Lips" value="1.550" />
+
+      <param id="656" name="Crooked_Nose" value="-0.600" />
+
+      <param id="659" name="Mouth Corner" value="0.760" />
+
+      <param id="662" name="Face Shear" value="0.460" />
+
+      <param id="663" name="Shift_Mouth" value="-0.360" />
+
+      <param id="664" name="Pop_Eye" value="0.080" />
+
+      <param id="665" name="Jaw_Jut" value="-1.080" />
+
+      <param id="675" name="Hand Size" value="-0.040" />
+
+      <param id="676" name="Love_Handles" value="0.290" />
+
+      <param id="678" name="Torso Muscles" value="0.630" />
+
+      <param id="682" name="Head Size" value="0.600" />
+
+      <param id="683" name="Neck Thickness" value="0.060" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.000" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="-0.180" />
+
+      <param id="690" name="Eye Size" value="0.290" />
+
+      <param id="692" name="Leg Length" value="-0.340" />
+
+      <param id="693" name="Arm Length" value="-0.060" />
+
+      <param id="753" name="Saddlebags" value="0.900" />
+
+      <param id="756" name="Neck Length" value="-0.220" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="-0.690" />
+
+      <param id="759" name="Low_Septum_Nose" value="-0.950" />
+
+      <param id="760" name="Jaw_Angle" value="-0.340" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.250" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="0.600" />
+
+      <param id="769" name="Eye Depth" value="0.720" />
+
+      <param id="773" name="Head Length" value="0.240" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.000" />
+
+      <param id="111" name="Pigment" value="0.200" />
+
+      <param id="116" name="Rosy Complexion" value="0.120" />
+
+      <param id="117" name="Lip Pinkness" value="0.220" />
+
+      <param id="150" name="Body Definition" value="0.000" />
+
+      <param id="162" name="Facial Definition" value="0.250" />
+
+      <param id="163" name="Wrinkles" value="0.000" />
+
+      <param id="165" name="Freckles" value="0.000" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.370" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.000" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.000" />
+
+      <param id="114" name="Blonde Hair" value="0.000" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.540" />
+
+      <param id="130" name="Front Fringe" value="0.000" />
+
+      <param id="131" name="Side Fringe" value="0.380" />
+
+      <param id="132" name="Back Fringe" value="0.320" />
+
+      <param id="133" name="Hair Front" value="0.000" />
+
+      <param id="134" name="Hair Sides" value="0.320" />
+
+      <param id="135" name="Hair Back" value="0.540" />
+
+      <param id="136" name="Hair Sweep" value="0.170" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.100" />
+
+      <param id="143" name="Hair_Sides_Full" value="0.290" />
+
+      <param id="166" name="Sideburns" value="0.000" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.820" />
+
+      <param id="177" name="Hair_Rumpled" value="0.170" />
+
+      <param id="181" name="Hair_Big_Front" value="0.300" />
+
+      <param id="182" name="Hair_Big_Top" value="0.200" />
+
+      <param id="183" name="Hair_Big_Back" value="0.060" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="-0.460" />
+
+      <param id="750" name="Eyebrow Density" value="0.920" />
+
+      <param id="752" name="Hair Thickness" value="0.670" />
+
+      <param id="754" name="Hair_Taper_Back" value="0.830" />
+
+      <param id="755" name="Hair_Taper_Front" value="-0.840" />
+
+      <param id="757" name="Lower_Eyebrows" value="-0.200" />
+
+      <param id="762" name="Hair_Shear_Front" value="1.710" />
+
+      <param id="763" name="Hair Volume" value="0.510" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.270" />
+
+      <param id="99" name="Eye Color" value="0.090" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="F W Skinny">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="0.183" />
+
+      <param id="2" name="Nose_Big_Out" value="-0.338" />
+
+      <param id="4" name="Broad_Nostrils" value="-0.155" />
+
+      <param id="5" name="Cleft_Chin" value="-0.100" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.636" />
+
+      <param id="7" name="Weak_Chin" value="-0.040" />
+
+      <param id="8" name="Double_Chin" value="-0.500" />
+
+      <param id="10" name="Sunken_Cheeks" value="-0.060" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="0.120" />
+
+      <param id="12" name="Jowls" value="0.850" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.000" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.370" />
+
+      <param id="15" name="Ears_Out" value="0.240" />
+
+      <param id="17" name="Square_Jaw" value="0.250" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="-0.060" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-0.100" />
+
+      <param id="20" name="Bulbous_Nose" value="0.020" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="0.475" />
+
+      <param id="22" name="Attached_Earlobes" value="1.000" />
+
+      <param id="23" name="Baggy_Eyes" value="0.120" />
+
+      <param id="24" name="Wide_Eyes" value="0.250" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="0.511" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-0.850" />
+
+      <param id="33" name="Height" value="1.140" />
+
+      <param id="34" name="Thickness" value="-0.392" />
+
+      <param id="35" name="Big_Ears" value="-0.460" />
+
+      <param id="36" name="Shoulders" value="0.024" />
+
+      <param id="37" name="Hip Width" value="-0.800" />
+
+      <param id="38" name="Torso Length" value="0.480" />
+
+      <param id="80" name="male" value="0.000" />
+
+      <param id="105" name="Breast Size" value="0.270" />
+
+      <param id="151" name="Big_Butt_Legs" value="-0.092" />
+
+      <param id="155" name="Lip Width" value="-0.174" />
+
+      <param id="157" name="Belly Size" value="0.260" />
+
+      <param id="185" name="Deep_Chin" value="-0.400" />
+
+      <param id="193" name="Head Shape" value="0.890" />
+
+      <param id="196" name="Eye Spacing" value="0.310" />
+
+      <param id="505" name="Lip Thickness" value="0.470" />
+
+      <param id="506" name="Mouth_Height" value="-0.560" />
+
+      <param id="507" name="Breast_Gravity" value="-0.975" />
+
+      <param id="515" name="Foot_Size" value="1.640" />
+
+      <param id="517" name="Wide_Nose" value="0.055" />
+
+      <param id="518" name="Eyelashes_Long" value="-0.156" />
+
+      <param id="629" name="Forehead Angle" value="0.140" />
+
+      <param id="637" name="Body Fat" value="0.020" />
+
+      <param id="646" name="Egg_Head" value="0.655" />
+
+      <param id="647" name="Squash_Stretch_Head" value="0.595" />
+
+      <param id="649" name="Torso Muscles" value="0.400" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="0.225" />
+
+      <param id="652" name="Leg Muscles" value="0.430" />
+
+      <param id="653" name="Tall_Lips" value="-0.910" />
+
+      <param id="656" name="Crooked_Nose" value="0.000" />
+
+      <param id="659" name="Mouth Corner" value="0.500" />
+
+      <param id="662" name="Face Shear" value="0.500" />
+
+      <param id="663" name="Shift_Mouth" value="0.000" />
+
+      <param id="664" name="Pop_Eye" value="0.000" />
+
+      <param id="665" name="Jaw_Jut" value="0.320" />
+
+      <param id="675" name="Hand Size" value="0.066" />
+
+      <param id="676" name="Love_Handles" value="-0.040" />
+
+      <param id="678" name="Torso Muscles" value="0.790" />
+
+      <param id="682" name="Head Size" value="0.770" />
+
+      <param id="683" name="Neck Thickness" value="-0.214" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.308" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.200" />
+
+      <param id="690" name="Eye Size" value="0.640" />
+
+      <param id="692" name="Leg Length" value="0.580" />
+
+      <param id="693" name="Arm Length" value="0.660" />
+
+      <param id="753" name="Saddlebags" value="0.795" />
+
+      <param id="756" name="Neck Length" value="0.300" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="-0.570" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.500" />
+
+      <param id="760" name="Jaw_Angle" value="1.328" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="1.081" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="0.036" />
+
+      <param id="769" name="Eye Depth" value="0.270" />
+
+      <param id="773" name="Head Length" value="0.720" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.029" />
+
+      <param id="111" name="Pigment" value="0.090" />
+
+      <param id="116" name="Rosy Complexion" value="0.370" />
+
+      <param id="117" name="Lip Pinkness" value="0.640" />
+
+      <param id="150" name="Body Definition" value="0.870" />
+
+      <param id="162" name="Facial Definition" value="0.000" />
+
+      <param id="163" name="Wrinkles" value="0.000" />
+
+      <param id="165" name="Freckles" value="0.200" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="-0.170" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.000" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.640" />
+
+      <param id="114" name="Blonde Hair" value="0.940" />
+
+      <param id="115" name="White Hair" value="0.120" />
+
+      <param id="119" name="Eyebrow Size" value="0.310" />
+
+      <param id="130" name="Front Fringe" value="0.590" />
+
+      <param id="131" name="Side Fringe" value="0.720" />
+
+      <param id="132" name="Back Fringe" value="0.720" />
+
+      <param id="133" name="Hair Front" value="0.000" />
+
+      <param id="134" name="Hair Sides" value="0.580" />
+
+      <param id="135" name="Hair Back" value="0.940" />
+
+      <param id="136" name="Hair Sweep" value="0.370" />
+
+      <param id="137" name="Hair Tilt" value="0.510" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="1.520" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="-0.040" />
+
+      <param id="166" name="Sideburns" value="0.710" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.410" />
+
+      <param id="181" name="Hair_Big_Front" value="0.020" />
+
+      <param id="182" name="Hair_Big_Top" value="0.840" />
+
+      <param id="183" name="Hair_Big_Back" value="0.000" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.740" />
+
+      <param id="750" name="Eyebrow Density" value="0.490" />
+
+      <param id="752" name="Hair Thickness" value="0.690" />
+
+      <param id="754" name="Hair_Taper_Back" value="-0.490" />
+
+      <param id="755" name="Hair_Taper_Front" value="-0.030" />
+
+      <param id="757" name="Lower_Eyebrows" value="-1.600" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.060" />
+
+      <param id="763" name="Hair Volume" value="0.520" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.220" />
+
+      <param id="99" name="Eye Color" value="0.340" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="F W Old">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="0.505" />
+
+      <param id="2" name="Nose_Big_Out" value="0.817" />
+
+      <param id="4" name="Broad_Nostrils" value="0.700" />
+
+      <param id="5" name="Cleft_Chin" value="1.000" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.116" />
+
+      <param id="7" name="Weak_Chin" value="0.200" />
+
+      <param id="8" name="Double_Chin" value="0.560" />
+
+      <param id="10" name="Sunken_Cheeks" value="-0.510" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="0.640" />
+
+      <param id="12" name="Jowls" value="2.260" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="1.170" />
+
+      <param id="14" name="High_Cheek_Bones" value="-0.395" />
+
+      <param id="15" name="Ears_Out" value="0.440" />
+
+      <param id="17" name="Square_Jaw" value="0.940" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="-1.500" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-1.200" />
+
+      <param id="20" name="Bulbous_Nose" value="0.740" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="0.640" />
+
+      <param id="22" name="Attached_Earlobes" value="0.000" />
+
+      <param id="23" name="Baggy_Eyes" value="1.340" />
+
+      <param id="24" name="Wide_Eyes" value="-1.500" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="1.500" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-1.200" />
+
+      <param id="33" name="Height" value="-0.838" />
+
+      <param id="34" name="Thickness" value="1.500" />
+
+      <param id="35" name="Big_Ears" value="1.430" />
+
+      <param id="36" name="Shoulders" value="-1.736" />
+
+      <param id="37" name="Hip Width" value="-0.020" />
+
+      <param id="38" name="Torso Length" value="1.000" />
+
+      <param id="80" name="male" value="0.000" />
+
+      <param id="105" name="Breast Size" value="0.840" />
+
+      <param id="151" name="Big_Butt_Legs" value="0.706" />
+
+      <param id="155" name="Lip Width" value="0.926" />
+
+      <param id="157" name="Belly Size" value="0.300" />
+
+      <param id="185" name="Deep_Chin" value="0.500" />
+
+      <param id="193" name="Head Shape" value="0.400" />
+
+      <param id="196" name="Eye Spacing" value="-0.560" />
+
+      <param id="505" name="Lip Thickness" value="0.220" />
+
+      <param id="506" name="Mouth_Height" value="1.160" />
+
+      <param id="507" name="Breast_Gravity" value="2.000" />
+
+      <param id="515" name="Foot_Size" value="2.080" />
+
+      <param id="517" name="Wide_Nose" value="-0.200" />
+
+      <param id="518" name="Eyelashes_Long" value="-0.300" />
+
+      <param id="629" name="Forehead Angle" value="0.000" />
+
+      <param id="637" name="Body Fat" value="0.930" />
+
+      <param id="646" name="Egg_Head" value="0.333" />
+
+      <param id="647" name="Squash_Stretch_Head" value="0.550" />
+
+      <param id="649" name="Torso Muscles" value="0.180" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="-0.725" />
+
+      <param id="652" name="Leg Muscles" value="0.560" />
+
+      <param id="653" name="Tall_Lips" value="-1.000" />
+
+      <param id="656" name="Crooked_Nose" value="-0.400" />
+
+      <param id="659" name="Mouth Corner" value="0.180" />
+
+      <param id="662" name="Face Shear" value="0.500" />
+
+      <param id="663" name="Shift_Mouth" value="0.600" />
+
+      <param id="664" name="Pop_Eye" value="0.052" />
+
+      <param id="665" name="Jaw_Jut" value="-0.160" />
+
+      <param id="675" name="Hand Size" value="0.048" />
+
+      <param id="676" name="Love_Handles" value="-0.460" />
+
+      <param id="678" name="Torso Muscles" value="0.790" />
+
+      <param id="682" name="Head Size" value="0.800" />
+
+      <param id="683" name="Neck Thickness" value="-0.088" />
+
+      <param id="684" name="Breast_Female_Clevage" value="-0.204" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.200" />
+
+      <param id="690" name="Eye Size" value="0.620" />
+
+      <param id="692" name="Leg Length" value="0.180" />
+
+      <param id="693" name="Arm Length" value="0.540" />
+
+      <param id="753" name="Saddlebags" value="1.390" />
+
+      <param id="756" name="Neck Length" value="-0.960" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="0.540" />
+
+      <param id="759" name="Low_Septum_Nose" value="1.125" />
+
+      <param id="760" name="Jaw_Angle" value="-0.368" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.928" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="1.576" />
+
+      <param id="769" name="Eye Depth" value="0.120" />
+
+      <param id="773" name="Head Length" value="0.770" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.000" />
+
+      <param id="111" name="Pigment" value="0.000" />
+
+      <param id="116" name="Rosy Complexion" value="0.000" />
+
+      <param id="117" name="Lip Pinkness" value="0.000" />
+
+      <param id="150" name="Body Definition" value="0.740" />
+
+      <param id="162" name="Facial Definition" value="1.000" />
+
+      <param id="163" name="Wrinkles" value="1.000" />
+
+      <param id="165" name="Freckles" value="0.380" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="-0.095" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.610" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.150" />
+
+      <param id="114" name="Blonde Hair" value="1.000" />
+
+      <param id="115" name="White Hair" value="1.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.110" />
+
+      <param id="130" name="Front Fringe" value="0.000" />
+
+      <param id="131" name="Side Fringe" value="0.000" />
+
+      <param id="132" name="Back Fringe" value="0.550" />
+
+      <param id="133" name="Hair Front" value="0.000" />
+
+      <param id="134" name="Hair Sides" value="0.120" />
+
+      <param id="135" name="Hair Back" value="0.490" />
+
+      <param id="136" name="Hair Sweep" value="0.820" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="0.290" />
+
+      <param id="166" name="Sideburns" value="0.710" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.770" />
+
+      <param id="181" name="Hair_Big_Front" value="0.260" />
+
+      <param id="182" name="Hair_Big_Top" value="0.680" />
+
+      <param id="183" name="Hair_Big_Back" value="0.200" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.110" />
+
+      <param id="750" name="Eyebrow Density" value="0.580" />
+
+      <param id="752" name="Hair Thickness" value="0.690" />
+
+      <param id="754" name="Hair_Taper_Back" value="-0.670" />
+
+      <param id="755" name="Hair_Taper_Front" value="-0.060" />
+
+      <param id="757" name="Lower_Eyebrows" value="1.760" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.060" />
+
+      <param id="763" name="Hair Volume" value="0.670" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.080" />
+
+      <param id="99" name="Eye Color" value="0.160" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="F W Obese">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="0.597" />
+
+      <param id="2" name="Nose_Big_Out" value="-0.800" />
+
+      <param id="4" name="Broad_Nostrils" value="0.835" />
+
+      <param id="5" name="Cleft_Chin" value="0.813" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.961" />
+
+      <param id="7" name="Weak_Chin" value="-0.230" />
+
+      <param id="8" name="Double_Chin" value="1.500" />
+
+      <param id="10" name="Sunken_Cheeks" value="-0.960" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="0.440" />
+
+      <param id="12" name="Jowls" value="1.000" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="1.500" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.280" />
+
+      <param id="15" name="Ears_Out" value="0.860" />
+
+      <param id="17" name="Square_Jaw" value="0.055" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="0.740" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-0.250" />
+
+      <param id="20" name="Bulbous_Nose" value="-0.260" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="0.505" />
+
+      <param id="22" name="Attached_Earlobes" value="1.000" />
+
+      <param id="23" name="Baggy_Eyes" value="1.060" />
+
+      <param id="24" name="Wide_Eyes" value="0.915" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="1.500" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-1.200" />
+
+      <param id="33" name="Height" value="-1.096" />
+
+      <param id="34" name="Thickness" value="1.104" />
+
+      <param id="35" name="Big_Ears" value="0.350" />
+
+      <param id="36" name="Shoulders" value="-0.840" />
+
+      <param id="37" name="Hip Width" value="-0.500" />
+
+      <param id="38" name="Torso Length" value="1.000" />
+
+      <param id="80" name="male" value="0.000" />
+
+      <param id="105" name="Breast Size" value="0.760" />
+
+      <param id="151" name="Big_Butt_Legs" value="1.000" />
+
+      <param id="155" name="Lip Width" value="-0.900" />
+
+      <param id="157" name="Belly Size" value="0.670" />
+
+      <param id="185" name="Deep_Chin" value="1.000" />
+
+      <param id="193" name="Head Shape" value="0.830" />
+
+      <param id="196" name="Eye Spacing" value="-1.010" />
+
+      <param id="505" name="Lip Thickness" value="0.480" />
+
+      <param id="506" name="Mouth_Height" value="-0.320" />
+
+      <param id="507" name="Breast_Gravity" value="1.195" />
+
+      <param id="515" name="Foot_Size" value="0.200" />
+
+      <param id="517" name="Wide_Nose" value="-0.050" />
+
+      <param id="518" name="Eyelashes_Long" value="0.420" />
+
+      <param id="629" name="Forehead Angle" value="0.340" />
+
+      <param id="637" name="Body Fat" value="0.950" />
+
+      <param id="646" name="Egg_Head" value="-0.886" />
+
+      <param id="647" name="Squash_Stretch_Head" value="-0.275" />
+
+      <param id="649" name="Torso Muscles" value="0.940" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="-0.650" />
+
+      <param id="652" name="Leg Muscles" value="0.790" />
+
+      <param id="653" name="Tall_Lips" value="0.470" />
+
+      <param id="656" name="Crooked_Nose" value="-0.120" />
+
+      <param id="659" name="Mouth Corner" value="0.800" />
+
+      <param id="662" name="Face Shear" value="0.460" />
+
+      <param id="663" name="Shift_Mouth" value="0.760" />
+
+      <param id="664" name="Pop_Eye" value="-0.156" />
+
+      <param id="665" name="Jaw_Jut" value="-0.640" />
+
+      <param id="675" name="Hand Size" value="-0.168" />
+
+      <param id="676" name="Love_Handles" value="-0.550" />
+
+      <param id="678" name="Torso Muscles" value="0.790" />
+
+      <param id="682" name="Head Size" value="0.380" />
+
+      <param id="683" name="Neck Thickness" value="0.164" />
+
+      <param id="684" name="Breast_Female_Clevage" value="-0.140" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.200" />
+
+      <param id="690" name="Eye Size" value="0.230" />
+
+      <param id="692" name="Leg Length" value="0.360" />
+
+      <param id="693" name="Arm Length" value="0.240" />
+
+      <param id="753" name="Saddlebags" value="2.720" />
+
+      <param id="756" name="Neck Length" value="-0.460" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="-1.350" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.650" />
+
+      <param id="760" name="Jaw_Angle" value="-1.200" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.537" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="2.500" />
+
+      <param id="769" name="Eye Depth" value="0.320" />
+
+      <param id="773" name="Head Length" value="0.880" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.097" />
+
+      <param id="111" name="Pigment" value="0.070" />
+
+      <param id="116" name="Rosy Complexion" value="0.450" />
+
+      <param id="117" name="Lip Pinkness" value="0.720" />
+
+      <param id="150" name="Body Definition" value="0.000" />
+
+      <param id="162" name="Facial Definition" value="0.000" />
+
+      <param id="163" name="Wrinkles" value="0.000" />
+
+      <param id="165" name="Freckles" value="0.830" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="-0.095" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.610" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.120" />
+
+      <param id="114" name="Blonde Hair" value="0.460" />
+
+      <param id="115" name="White Hair" value="0.220" />
+
+      <param id="119" name="Eyebrow Size" value="0.110" />
+
+      <param id="130" name="Front Fringe" value="0.000" />
+
+      <param id="131" name="Side Fringe" value="0.080" />
+
+      <param id="132" name="Back Fringe" value="0.200" />
+
+      <param id="133" name="Hair Front" value="0.520" />
+
+      <param id="134" name="Hair Sides" value="0.400" />
+
+      <param id="135" name="Hair Back" value="0.560" />
+
+      <param id="136" name="Hair Sweep" value="1.000" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="0.290" />
+
+      <param id="166" name="Sideburns" value="0.710" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.770" />
+
+      <param id="181" name="Hair_Big_Front" value="0.260" />
+
+      <param id="182" name="Hair_Big_Top" value="0.200" />
+
+      <param id="183" name="Hair_Big_Back" value="0.300" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.110" />
+
+      <param id="750" name="Eyebrow Density" value="0.580" />
+
+      <param id="752" name="Hair Thickness" value="0.690" />
+
+      <param id="754" name="Hair_Taper_Back" value="-0.670" />
+
+      <param id="755" name="Hair_Taper_Front" value="-0.060" />
+
+      <param id="757" name="Lower_Eyebrows" value="1.760" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.210" />
+
+      <param id="763" name="Hair Volume" value="0.520" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.080" />
+
+      <param id="99" name="Eye Color" value="0.160" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="F W Muscle">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="0.183" />
+
+      <param id="2" name="Nose_Big_Out" value="-0.404" />
+
+      <param id="4" name="Broad_Nostrils" value="-0.095" />
+
+      <param id="5" name="Cleft_Chin" value="0.373" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.389" />
+
+      <param id="7" name="Weak_Chin" value="-0.200" />
+
+      <param id="8" name="Double_Chin" value="-0.160" />
+
+      <param id="10" name="Sunken_Cheeks" value="-0.060" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="0.340" />
+
+      <param id="12" name="Jowls" value="0.520" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.630" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.370" />
+
+      <param id="15" name="Ears_Out" value="-0.060" />
+
+      <param id="17" name="Square_Jaw" value="-0.200" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="-0.060" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="0.025" />
+
+      <param id="20" name="Bulbous_Nose" value="-0.240" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="-0.200" />
+
+      <param id="22" name="Attached_Earlobes" value="0.000" />
+
+      <param id="23" name="Baggy_Eyes" value="-0.500" />
+
+      <param id="24" name="Wide_Eyes" value="0.425" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="-0.087" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="0.000" />
+
+      <param id="33" name="Height" value="0.580" />
+
+      <param id="34" name="Thickness" value="0.660" />
+
+      <param id="35" name="Big_Ears" value="-0.040" />
+
+      <param id="36" name="Shoulders" value="-0.456" />
+
+      <param id="37" name="Hip Width" value="-0.380" />
+
+      <param id="38" name="Torso Length" value="-0.160" />
+
+      <param id="80" name="male" value="0.000" />
+
+      <param id="105" name="Breast Size" value="0.370" />
+
+      <param id="151" name="Big_Butt_Legs" value="-0.050" />
+
+      <param id="155" name="Lip Width" value="-0.636" />
+
+      <param id="157" name="Belly Size" value="0.050" />
+
+      <param id="185" name="Deep_Chin" value="-0.360" />
+
+      <param id="193" name="Head Shape" value="0.890" />
+
+      <param id="196" name="Eye Spacing" value="-0.020" />
+
+      <param id="505" name="Lip Thickness" value="0.600" />
+
+      <param id="506" name="Mouth_Height" value="-0.320" />
+
+      <param id="507" name="Breast_Gravity" value="-0.940" />
+
+      <param id="515" name="Foot_Size" value="0.880" />
+
+      <param id="517" name="Wide_Nose" value="0.070" />
+
+      <param id="518" name="Eyelashes_Long" value="0.330" />
+
+      <param id="629" name="Forehead Angle" value="0.070" />
+
+      <param id="637" name="Body Fat" value="0.120" />
+
+      <param id="646" name="Egg_Head" value="0.586" />
+
+      <param id="647" name="Squash_Stretch_Head" value="0.160" />
+
+      <param id="649" name="Torso Muscles" value="0.670" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="0.400" />
+
+      <param id="652" name="Leg Muscles" value="0.570" />
+
+      <param id="653" name="Tall_Lips" value="-0.190" />
+
+      <param id="656" name="Crooked_Nose" value="0.000" />
+
+      <param id="659" name="Mouth Corner" value="0.620" />
+
+      <param id="662" name="Face Shear" value="0.500" />
+
+      <param id="663" name="Shift_Mouth" value="0.000" />
+
+      <param id="664" name="Pop_Eye" value="0.000" />
+
+      <param id="665" name="Jaw_Jut" value="-0.160" />
+
+      <param id="675" name="Hand Size" value="-0.042" />
+
+      <param id="676" name="Love_Handles" value="-0.340" />
+
+      <param id="678" name="Torso Muscles" value="0.790" />
+
+      <param id="682" name="Head Size" value="0.710" />
+
+      <param id="683" name="Neck Thickness" value="-0.088" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.644" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.200" />
+
+      <param id="690" name="Eye Size" value="0.480" />
+
+      <param id="692" name="Leg Length" value="0.420" />
+
+      <param id="693" name="Arm Length" value="0.520" />
+
+      <param id="753" name="Saddlebags" value="0.620" />
+
+      <param id="756" name="Neck Length" value="0.060" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="0.570" />
+
+      <param id="759" name="Low_Septum_Nose" value="1.300" />
+
+      <param id="760" name="Jaw_Angle" value="1.104" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.622" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="-0.300" />
+
+      <param id="769" name="Eye Depth" value="0.310" />
+
+      <param id="773" name="Head Length" value="0.720" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.082" />
+
+      <param id="111" name="Pigment" value="0.120" />
+
+      <param id="116" name="Rosy Complexion" value="0.370" />
+
+      <param id="117" name="Lip Pinkness" value="0.640" />
+
+      <param id="150" name="Body Definition" value="0.870" />
+
+      <param id="162" name="Facial Definition" value="0.000" />
+
+      <param id="163" name="Wrinkles" value="0.000" />
+
+      <param id="165" name="Freckles" value="0.460" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.280" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.270" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.640" />
+
+      <param id="114" name="Blonde Hair" value="0.030" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.470" />
+
+      <param id="130" name="Front Fringe" value="0.570" />
+
+      <param id="131" name="Side Fringe" value="0.720" />
+
+      <param id="132" name="Back Fringe" value="0.600" />
+
+      <param id="133" name="Hair Front" value="0.040" />
+
+      <param id="134" name="Hair Sides" value="0.580" />
+
+      <param id="135" name="Hair Back" value="0.610" />
+
+      <param id="136" name="Hair Sweep" value="0.370" />
+
+      <param id="137" name="Hair Tilt" value="0.510" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="1.520" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="0.455" />
+
+      <param id="166" name="Sideburns" value="0.710" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.410" />
+
+      <param id="181" name="Hair_Big_Front" value="0.060" />
+
+      <param id="182" name="Hair_Big_Top" value="0.640" />
+
+      <param id="183" name="Hair_Big_Back" value="0.440" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.740" />
+
+      <param id="750" name="Eyebrow Density" value="0.610" />
+
+      <param id="752" name="Hair Thickness" value="0.690" />
+
+      <param id="754" name="Hair_Taper_Back" value="-0.490" />
+
+      <param id="755" name="Hair_Taper_Front" value="-0.030" />
+
+      <param id="757" name="Lower_Eyebrows" value="0.560" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.060" />
+
+      <param id="763" name="Hair Volume" value="0.520" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.170" />
+
+      <param id="99" name="Eye Color" value="0.270" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="F W Chubby">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="0.436" />
+
+      <param id="2" name="Nose_Big_Out" value="-0.074" />
+
+      <param id="4" name="Broad_Nostrils" value="0.100" />
+
+      <param id="5" name="Cleft_Chin" value="-0.100" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.012" />
+
+      <param id="7" name="Weak_Chin" value="0.150" />
+
+      <param id="8" name="Double_Chin" value="-0.500" />
+
+      <param id="10" name="Sunken_Cheeks" value="-0.285" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="0.440" />
+
+      <param id="12" name="Jowls" value="0.160" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.000" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.250" />
+
+      <param id="15" name="Ears_Out" value="0.580" />
+
+      <param id="17" name="Square_Jaw" value="-0.050" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="1.500" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-0.950" />
+
+      <param id="20" name="Bulbous_Nose" value="-0.240" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="0.160" />
+
+      <param id="22" name="Attached_Earlobes" value="0.520" />
+
+      <param id="23" name="Baggy_Eyes" value="0.040" />
+
+      <param id="24" name="Wide_Eyes" value="0.810" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="-0.110" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-0.850" />
+
+      <param id="33" name="Height" value="0.151" />
+
+      <param id="34" name="Thickness" value="0.312" />
+
+      <param id="35" name="Big_Ears" value="0.800" />
+
+      <param id="36" name="Shoulders" value="-1.224" />
+
+      <param id="37" name="Hip Width" value="-0.080" />
+
+      <param id="38" name="Torso Length" value="0.740" />
+
+      <param id="80" name="male" value="0.000" />
+
+      <param id="105" name="Breast Size" value="0.730" />
+
+      <param id="151" name="Big_Butt_Legs" value="0.230" />
+
+      <param id="155" name="Lip Width" value="0.002" />
+
+      <param id="157" name="Belly Size" value="0.180" />
+
+      <param id="185" name="Deep_Chin" value="-0.600" />
+
+      <param id="193" name="Head Shape" value="0.470" />
+
+      <param id="196" name="Eye Spacing" value="-0.170" />
+
+      <param id="505" name="Lip Thickness" value="0.190" />
+
+      <param id="506" name="Mouth_Height" value="-0.920" />
+
+      <param id="507" name="Breast_Gravity" value="0.565" />
+
+      <param id="515" name="Foot_Size" value="1.760" />
+
+      <param id="517" name="Wide_Nose" value="0.055" />
+
+      <param id="518" name="Eyelashes_Long" value="-0.066" />
+
+      <param id="629" name="Forehead Angle" value="0.470" />
+
+      <param id="637" name="Body Fat" value="0.280" />
+
+      <param id="646" name="Egg_Head" value="0.379" />
+
+      <param id="647" name="Squash_Stretch_Head" value="-0.020" />
+
+      <param id="649" name="Torso Muscles" value="0.540" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="-0.250" />
+
+      <param id="652" name="Leg Muscles" value="0.740" />
+
+      <param id="653" name="Tall_Lips" value="-0.310" />
+
+      <param id="656" name="Crooked_Nose" value="0.000" />
+
+      <param id="659" name="Mouth Corner" value="0.660" />
+
+      <param id="662" name="Face Shear" value="0.500" />
+
+      <param id="663" name="Shift_Mouth" value="0.000" />
+
+      <param id="664" name="Pop_Eye" value="0.000" />
+
+      <param id="665" name="Jaw_Jut" value="-0.040" />
+
+      <param id="675" name="Hand Size" value="-0.084" />
+
+      <param id="676" name="Love_Handles" value="-0.370" />
+
+      <param id="678" name="Torso Muscles" value="0.790" />
+
+      <param id="682" name="Head Size" value="0.840" />
+
+      <param id="683" name="Neck Thickness" value="-0.130" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.084" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.200" />
+
+      <param id="690" name="Eye Size" value="0.370" />
+
+      <param id="692" name="Leg Length" value="0.420" />
+
+      <param id="693" name="Arm Length" value="0.480" />
+
+      <param id="753" name="Saddlebags" value="1.040" />
+
+      <param id="756" name="Neck Length" value="-0.060" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="-0.090" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.425" />
+
+      <param id="760" name="Jaw_Angle" value="0.400" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="-0.024" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="0.456" />
+
+      <param id="769" name="Eye Depth" value="0.420" />
+
+      <param id="773" name="Head Length" value="0.720" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.014" />
+
+      <param id="111" name="Pigment" value="0.140" />
+
+      <param id="116" name="Rosy Complexion" value="0.370" />
+
+      <param id="117" name="Lip Pinkness" value="0.640" />
+
+      <param id="150" name="Body Definition" value="0.500" />
+
+      <param id="162" name="Facial Definition" value="0.120" />
+
+      <param id="163" name="Wrinkles" value="0.000" />
+
+      <param id="165" name="Freckles" value="0.710" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.040" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.570" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.840" />
+
+      <param id="114" name="Blonde Hair" value="0.520" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.390" />
+
+      <param id="130" name="Front Fringe" value="0.720" />
+
+      <param id="131" name="Side Fringe" value="0.760" />
+
+      <param id="132" name="Back Fringe" value="0.800" />
+
+      <param id="133" name="Hair Front" value="0.000" />
+
+      <param id="134" name="Hair Sides" value="0.580" />
+
+      <param id="135" name="Hair Back" value="0.680" />
+
+      <param id="136" name="Hair Sweep" value="0.370" />
+
+      <param id="137" name="Hair Tilt" value="0.620" />
+
+      <param id="140" name="Hair_Part_Middle" value="1.240" />
+
+      <param id="141" name="Hair_Part_Right" value="1.520" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="1.115" />
+
+      <param id="166" name="Sideburns" value="0.710" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.970" />
+
+      <param id="181" name="Hair_Big_Front" value="0.020" />
+
+      <param id="182" name="Hair_Big_Top" value="0.840" />
+
+      <param id="183" name="Hair_Big_Back" value="0.600" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="1.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="1.700" />
+
+      <param id="750" name="Eyebrow Density" value="0.650" />
+
+      <param id="752" name="Hair Thickness" value="0.690" />
+
+      <param id="754" name="Hair_Taper_Back" value="0.710" />
+
+      <param id="755" name="Hair_Taper_Front" value="-0.030" />
+
+      <param id="757" name="Lower_Eyebrows" value="1.360" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.060" />
+
+      <param id="763" name="Hair Volume" value="0.690" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.220" />
+
+      <param id="99" name="Eye Color" value="0.340" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="F Troll">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="0.597" />
+
+      <param id="2" name="Nose_Big_Out" value="2.500" />
+
+      <param id="4" name="Broad_Nostrils" value="0.205" />
+
+      <param id="5" name="Cleft_Chin" value="0.945" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.220" />
+
+      <param id="7" name="Weak_Chin" value="0.170" />
+
+      <param id="8" name="Double_Chin" value="0.540" />
+
+      <param id="10" name="Sunken_Cheeks" value="-0.960" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="0.880" />
+
+      <param id="12" name="Jowls" value="0.490" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="1.500" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.280" />
+
+      <param id="15" name="Ears_Out" value="0.860" />
+
+      <param id="17" name="Square_Jaw" value="-0.500" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="0.740" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="1.000" />
+
+      <param id="20" name="Bulbous_Nose" value="1.040" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="-0.200" />
+
+      <param id="22" name="Attached_Earlobes" value="0.000" />
+
+      <param id="23" name="Baggy_Eyes" value="-0.500" />
+
+      <param id="24" name="Wide_Eyes" value="1.720" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="1.500" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-0.225" />
+
+      <param id="33" name="Height" value="-1.483" />
+
+      <param id="34" name="Thickness" value="1.478" />
+
+      <param id="35" name="Big_Ears" value="-0.400" />
+
+      <param id="36" name="Shoulders" value="0.760" />
+
+      <param id="37" name="Hip Width" value="0.460" />
+
+      <param id="38" name="Torso Length" value="0.060" />
+
+      <param id="80" name="male" value="0.000" />
+
+      <param id="105" name="Breast Size" value="0.970" />
+
+      <param id="151" name="Big_Butt_Legs" value="0.160" />
+
+      <param id="155" name="Lip Width" value="1.300" />
+
+      <param id="157" name="Belly Size" value="0.460" />
+
+      <param id="185" name="Deep_Chin" value="0.040" />
+
+      <param id="193" name="Head Shape" value="0.830" />
+
+      <param id="196" name="Eye Spacing" value="0.010" />
+
+      <param id="505" name="Lip Thickness" value="0.840" />
+
+      <param id="506" name="Mouth_Height" value="1.160" />
+
+      <param id="507" name="Breast_Gravity" value="0.845" />
+
+      <param id="515" name="Foot_Size" value="2.560" />
+
+      <param id="517" name="Wide_Nose" value="0.385" />
+
+      <param id="518" name="Eyelashes_Long" value="1.284" />
+
+      <param id="629" name="Forehead Angle" value="0.340" />
+
+      <param id="637" name="Body Fat" value="0.470" />
+
+      <param id="646" name="Egg_Head" value="-0.886" />
+
+      <param id="647" name="Squash_Stretch_Head" value="-0.275" />
+
+      <param id="649" name="Torso Muscles" value="0.560" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="0.300" />
+
+      <param id="652" name="Leg Muscles" value="0.790" />
+
+      <param id="653" name="Tall_Lips" value="2.000" />
+
+      <param id="656" name="Crooked_Nose" value="0.280" />
+
+      <param id="659" name="Mouth Corner" value="1.000" />
+
+      <param id="662" name="Face Shear" value="0.460" />
+
+      <param id="663" name="Shift_Mouth" value="0.560" />
+
+      <param id="664" name="Pop_Eye" value="0.390" />
+
+      <param id="665" name="Jaw_Jut" value="1.160" />
+
+      <param id="675" name="Hand Size" value="0.252" />
+
+      <param id="676" name="Love_Handles" value="-1.000" />
+
+      <param id="678" name="Torso Muscles" value="0.790" />
+
+      <param id="682" name="Head Size" value="0.950" />
+
+      <param id="683" name="Neck Thickness" value="-0.238" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.404" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.200" />
+
+      <param id="690" name="Eye Size" value="0.870" />
+
+      <param id="692" name="Leg Length" value="0.020" />
+
+      <param id="693" name="Arm Length" value="-0.260" />
+
+      <param id="753" name="Saddlebags" value="1.355" />
+
+      <param id="756" name="Neck Length" value="-0.160" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="1.020" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.650" />
+
+      <param id="760" name="Jaw_Angle" value="-0.400" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="-0.075" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="2.472" />
+
+      <param id="769" name="Eye Depth" value="1.000" />
+
+      <param id="773" name="Head Length" value="0.880" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.820" />
+
+      <param id="110" name="Red Skin" value="0.000" />
+
+      <param id="111" name="Pigment" value="0.770" />
+
+      <param id="116" name="Rosy Complexion" value="0.450" />
+
+      <param id="117" name="Lip Pinkness" value="0.720" />
+
+      <param id="150" name="Body Definition" value="0.000" />
+
+      <param id="162" name="Facial Definition" value="0.000" />
+
+      <param id="163" name="Wrinkles" value="0.000" />
+
+      <param id="165" name="Freckles" value="0.830" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="-0.095" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.610" />
+
+      <param id="112" name="Rainbow Color" value="0.790" />
+
+      <param id="113" name="Red Hair" value="0.000" />
+
+      <param id="114" name="Blonde Hair" value="0.000" />
+
+      <param id="115" name="White Hair" value="0.220" />
+
+      <param id="119" name="Eyebrow Size" value="0.110" />
+
+      <param id="130" name="Front Fringe" value="0.000" />
+
+      <param id="131" name="Side Fringe" value="1.000" />
+
+      <param id="132" name="Back Fringe" value="0.200" />
+
+      <param id="133" name="Hair Front" value="0.520" />
+
+      <param id="134" name="Hair Sides" value="0.400" />
+
+      <param id="135" name="Hair Back" value="0.480" />
+
+      <param id="136" name="Hair Sweep" value="1.000" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="-2.790" />
+
+      <param id="166" name="Sideburns" value="0.710" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.770" />
+
+      <param id="181" name="Hair_Big_Front" value="0.720" />
+
+      <param id="182" name="Hair_Big_Top" value="1.000" />
+
+      <param id="183" name="Hair_Big_Back" value="1.000" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.110" />
+
+      <param id="750" name="Eyebrow Density" value="0.580" />
+
+      <param id="752" name="Hair Thickness" value="0.690" />
+
+      <param id="754" name="Hair_Taper_Back" value="1.310" />
+
+      <param id="755" name="Hair_Taper_Front" value="-0.060" />
+
+      <param id="757" name="Lower_Eyebrows" value="1.760" />
+
+      <param id="762" name="Hair_Shear_Front" value="2.220" />
+
+      <param id="763" name="Hair Volume" value="0.720" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.000" />
+
+      <param id="99" name="Eye Color" value="0.890" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="F B Skinny">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="0.321" />
+
+      <param id="2" name="Nose_Big_Out" value="-0.239" />
+
+      <param id="4" name="Broad_Nostrils" value="-0.065" />
+
+      <param id="5" name="Cleft_Chin" value="0.483" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.376" />
+
+      <param id="7" name="Weak_Chin" value="-0.010" />
+
+      <param id="8" name="Double_Chin" value="0.440" />
+
+      <param id="10" name="Sunken_Cheeks" value="0.840" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="-0.100" />
+
+      <param id="12" name="Jowls" value="0.310" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.000" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.205" />
+
+      <param id="15" name="Ears_Out" value="-0.140" />
+
+      <param id="17" name="Square_Jaw" value="0.835" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="-0.380" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-0.200" />
+
+      <param id="20" name="Bulbous_Nose" value="0.140" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="0.280" />
+
+      <param id="22" name="Attached_Earlobes" value="0.620" />
+
+      <param id="23" name="Baggy_Eyes" value="-0.140" />
+
+      <param id="24" name="Wide_Eyes" value="0.460" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="0.350" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-1.125" />
+
+      <param id="33" name="Height" value="1.785" />
+
+      <param id="34" name="Thickness" value="-0.216" />
+
+      <param id="35" name="Big_Ears" value="-0.250" />
+
+      <param id="36" name="Shoulders" value="-0.008" />
+
+      <param id="37" name="Hip Width" value="-1.040" />
+
+      <param id="38" name="Torso Length" value="0.820" />
+
+      <param id="80" name="male" value="0.000" />
+
+      <param id="105" name="Breast Size" value="0.450" />
+
+      <param id="151" name="Big_Butt_Legs" value="0.314" />
+
+      <param id="155" name="Lip Width" value="-0.130" />
+
+      <param id="157" name="Belly Size" value="0.100" />
+
+      <param id="185" name="Deep_Chin" value="-0.260" />
+
+      <param id="193" name="Head Shape" value="0.790" />
+
+      <param id="196" name="Eye Spacing" value="0.160" />
+
+      <param id="505" name="Lip Thickness" value="0.770" />
+
+      <param id="506" name="Mouth_Height" value="1.280" />
+
+      <param id="507" name="Breast_Gravity" value="-0.345" />
+
+      <param id="515" name="Foot_Size" value="2.000" />
+
+      <param id="517" name="Wide_Nose" value="0.460" />
+
+      <param id="518" name="Eyelashes_Long" value="0.906" />
+
+      <param id="629" name="Forehead Angle" value="0.000" />
+
+      <param id="637" name="Body Fat" value="0.000" />
+
+      <param id="646" name="Egg_Head" value="0.540" />
+
+      <param id="647" name="Squash_Stretch_Head" value="0.505" />
+
+      <param id="649" name="Torso Muscles" value="0.670" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="-0.375" />
+
+      <param id="652" name="Leg Muscles" value="0.810" />
+
+      <param id="653" name="Tall_Lips" value="-0.190" />
+
+      <param id="656" name="Crooked_Nose" value="0.000" />
+
+      <param id="659" name="Mouth Corner" value="0.610" />
+
+      <param id="662" name="Face Shear" value="0.500" />
+
+      <param id="663" name="Shift_Mouth" value="-0.080" />
+
+      <param id="664" name="Pop_Eye" value="0.052" />
+
+      <param id="665" name="Jaw_Jut" value="0.480" />
+
+      <param id="675" name="Hand Size" value="0.186" />
+
+      <param id="676" name="Love_Handles" value="-0.340" />
+
+      <param id="678" name="Torso Muscles" value="0.790" />
+
+      <param id="682" name="Head Size" value="0.420" />
+
+      <param id="683" name="Neck Thickness" value="-0.178" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.148" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.200" />
+
+      <param id="690" name="Eye Size" value="0.470" />
+
+      <param id="692" name="Leg Length" value="0.620" />
+
+      <param id="693" name="Arm Length" value="0.820" />
+
+      <param id="753" name="Saddlebags" value="1.180" />
+
+      <param id="756" name="Neck Length" value="0.640" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="-0.420" />
+
+      <param id="759" name="Low_Septum_Nose" value="-0.175" />
+
+      <param id="760" name="Jaw_Angle" value="1.104" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.350" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="0.652" />
+
+      <param id="769" name="Eye Depth" value="0.560" />
+
+      <param id="773" name="Head Length" value="0.570" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.060" />
+
+      <param id="111" name="Pigment" value="0.560" />
+
+      <param id="116" name="Rosy Complexion" value="0.000" />
+
+      <param id="117" name="Lip Pinkness" value="0.000" />
+
+      <param id="150" name="Body Definition" value="0.990" />
+
+      <param id="162" name="Facial Definition" value="0.070" />
+
+      <param id="163" name="Wrinkles" value="0.000" />
+
+      <param id="165" name="Freckles" value="0.000" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.010" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.470" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.310" />
+
+      <param id="114" name="Blonde Hair" value="0.110" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.370" />
+
+      <param id="130" name="Front Fringe" value="0.740" />
+
+      <param id="131" name="Side Fringe" value="0.730" />
+
+      <param id="132" name="Back Fringe" value="0.560" />
+
+      <param id="133" name="Hair Front" value="0.190" />
+
+      <param id="134" name="Hair Sides" value="0.100" />
+
+      <param id="135" name="Hair Back" value="0.000" />
+
+      <param id="136" name="Hair Sweep" value="0.920" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="2.000" />
+
+      <param id="141" name="Hair_Part_Right" value="2.000" />
+
+      <param id="142" name="Hair_Part_Left" value="2.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="-0.205" />
+
+      <param id="166" name="Sideburns" value="0.710" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.270" />
+
+      <param id="181" name="Hair_Big_Front" value="-0.160" />
+
+      <param id="182" name="Hair_Big_Top" value="0.860" />
+
+      <param id="183" name="Hair_Big_Back" value="1.000" />
+
+      <param id="184" name="Hair_Spiked" value="0.130" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.000" />
+
+      <param id="750" name="Eyebrow Density" value="1.000" />
+
+      <param id="752" name="Hair Thickness" value="0.690" />
+
+      <param id="754" name="Hair_Taper_Back" value="-0.340" />
+
+      <param id="755" name="Hair_Taper_Front" value="-0.030" />
+
+      <param id="757" name="Lower_Eyebrows" value="0.360" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.540" />
+
+      <param id="763" name="Hair Volume" value="0.770" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.320" />
+
+      <param id="99" name="Eye Color" value="0.130" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="F B Muscle">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="0.321" />
+
+      <param id="2" name="Nose_Big_Out" value="0.091" />
+
+      <param id="4" name="Broad_Nostrils" value="0.175" />
+
+      <param id="5" name="Cleft_Chin" value="0.604" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.259" />
+
+      <param id="7" name="Weak_Chin" value="-0.320" />
+
+      <param id="8" name="Double_Chin" value="-0.100" />
+
+      <param id="10" name="Sunken_Cheeks" value="0.255" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="-0.080" />
+
+      <param id="12" name="Jowls" value="0.460" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.000" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.070" />
+
+      <param id="15" name="Ears_Out" value="0.400" />
+
+      <param id="17" name="Square_Jaw" value="0.610" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="0.860" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-0.375" />
+
+      <param id="20" name="Bulbous_Nose" value="0.060" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="-0.035" />
+
+      <param id="22" name="Attached_Earlobes" value="0.000" />
+
+      <param id="23" name="Baggy_Eyes" value="-0.340" />
+
+      <param id="24" name="Wide_Eyes" value="-0.380" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="0.971" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-0.575" />
+
+      <param id="33" name="Height" value="1.097" />
+
+      <param id="34" name="Thickness" value="0.642" />
+
+      <param id="35" name="Big_Ears" value="0.050" />
+
+      <param id="36" name="Shoulders" value="-0.456" />
+
+      <param id="37" name="Hip Width" value="-1.340" />
+
+      <param id="38" name="Torso Length" value="0.720" />
+
+      <param id="80" name="male" value="0.000" />
+
+      <param id="105" name="Breast Size" value="0.750" />
+
+      <param id="151" name="Big_Butt_Legs" value="0.202" />
+
+      <param id="155" name="Lip Width" value="0.024" />
+
+      <param id="157" name="Belly Size" value="0.220" />
+
+      <param id="185" name="Deep_Chin" value="0.400" />
+
+      <param id="193" name="Head Shape" value="0.810" />
+
+      <param id="196" name="Eye Spacing" value="-0.380" />
+
+      <param id="505" name="Lip Thickness" value="0.740" />
+
+      <param id="506" name="Mouth_Height" value="0.640" />
+
+      <param id="507" name="Breast_Gravity" value="0.600" />
+
+      <param id="515" name="Foot_Size" value="1.840" />
+
+      <param id="517" name="Wide_Nose" value="0.505" />
+
+      <param id="518" name="Eyelashes_Long" value="0.330" />
+
+      <param id="629" name="Forehead Angle" value="0.000" />
+
+      <param id="637" name="Body Fat" value="0.140" />
+
+      <param id="646" name="Egg_Head" value="0.563" />
+
+      <param id="647" name="Squash_Stretch_Head" value="0.130" />
+
+      <param id="649" name="Torso Muscles" value="0.870" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="0.700" />
+
+      <param id="652" name="Leg Muscles" value="0.850" />
+
+      <param id="653" name="Tall_Lips" value="1.850" />
+
+      <param id="656" name="Crooked_Nose" value="0.000" />
+
+      <param id="659" name="Mouth Corner" value="0.860" />
+
+      <param id="662" name="Face Shear" value="0.500" />
+
+      <param id="663" name="Shift_Mouth" value="0.160" />
+
+      <param id="664" name="Pop_Eye" value="0.052" />
+
+      <param id="665" name="Jaw_Jut" value="-0.320" />
+
+      <param id="675" name="Hand Size" value="0.120" />
+
+      <param id="676" name="Love_Handles" value="-0.190" />
+
+      <param id="678" name="Torso Muscles" value="0.790" />
+
+      <param id="682" name="Head Size" value="0.720" />
+
+      <param id="683" name="Neck Thickness" value="0.044" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.148" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.200" />
+
+      <param id="690" name="Eye Size" value="0.660" />
+
+      <param id="692" name="Leg Length" value="0.460" />
+
+      <param id="693" name="Arm Length" value="0.540" />
+
+      <param id="753" name="Saddlebags" value="0.865" />
+
+      <param id="756" name="Neck Length" value="0.220" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="-0.000" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.100" />
+
+      <param id="760" name="Jaw_Angle" value="1.072" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.180" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="0.316" />
+
+      <param id="769" name="Eye Depth" value="0.780" />
+
+      <param id="773" name="Head Length" value="0.570" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.042" />
+
+      <param id="111" name="Pigment" value="0.570" />
+
+      <param id="116" name="Rosy Complexion" value="0.350" />
+
+      <param id="117" name="Lip Pinkness" value="0.470" />
+
+      <param id="150" name="Body Definition" value="0.690" />
+
+      <param id="162" name="Facial Definition" value="0.220" />
+
+      <param id="163" name="Wrinkles" value="0.000" />
+
+      <param id="165" name="Freckles" value="0.030" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.010" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.470" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.520" />
+
+      <param id="114" name="Blonde Hair" value="0.030" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.370" />
+
+      <param id="130" name="Front Fringe" value="0.280" />
+
+      <param id="131" name="Side Fringe" value="1.000" />
+
+      <param id="132" name="Back Fringe" value="1.000" />
+
+      <param id="133" name="Hair Front" value="0.280" />
+
+      <param id="134" name="Hair Sides" value="0.000" />
+
+      <param id="135" name="Hair Back" value="0.570" />
+
+      <param id="136" name="Hair Sweep" value="1.000" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="-0.040" />
+
+      <param id="166" name="Sideburns" value="0.710" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.270" />
+
+      <param id="181" name="Hair_Big_Front" value="-0.260" />
+
+      <param id="182" name="Hair_Big_Top" value="0.860" />
+
+      <param id="183" name="Hair_Big_Back" value="0.300" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.620" />
+
+      <param id="750" name="Eyebrow Density" value="1.000" />
+
+      <param id="752" name="Hair Thickness" value="0.690" />
+
+      <param id="754" name="Hair_Taper_Back" value="-0.340" />
+
+      <param id="755" name="Hair_Taper_Front" value="-0.030" />
+
+      <param id="757" name="Lower_Eyebrows" value="0.360" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.570" />
+
+      <param id="763" name="Hair Volume" value="0.770" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.140" />
+
+      <param id="99" name="Eye Color" value="0.000" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="F B Chubby">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="0.436" />
+
+      <param id="2" name="Nose_Big_Out" value="-0.404" />
+
+      <param id="4" name="Broad_Nostrils" value="0.430" />
+
+      <param id="5" name="Cleft_Chin" value="0.219" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.428" />
+
+      <param id="7" name="Weak_Chin" value="0.270" />
+
+      <param id="8" name="Double_Chin" value="0.060" />
+
+      <param id="10" name="Sunken_Cheeks" value="-0.285" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="0.180" />
+
+      <param id="12" name="Jowls" value="0.640" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.000" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.250" />
+
+      <param id="15" name="Ears_Out" value="-0.280" />
+
+      <param id="17" name="Square_Jaw" value="0.280" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="1.500" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-1.175" />
+
+      <param id="20" name="Bulbous_Nose" value="-0.200" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="-0.200" />
+
+      <param id="22" name="Attached_Earlobes" value="0.000" />
+
+      <param id="23" name="Baggy_Eyes" value="-0.340" />
+
+      <param id="24" name="Wide_Eyes" value="1.020" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="-0.064" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="0.025" />
+
+      <param id="33" name="Height" value="0.753" />
+
+      <param id="34" name="Thickness" value="0.928" />
+
+      <param id="35" name="Big_Ears" value="-0.130" />
+
+      <param id="36" name="Shoulders" value="-0.776" />
+
+      <param id="37" name="Hip Width" value="-0.860" />
+
+      <param id="38" name="Torso Length" value="0.860" />
+
+      <param id="80" name="male" value="0.000" />
+
+      <param id="105" name="Breast Size" value="0.850" />
+
+      <param id="151" name="Big_Butt_Legs" value="0.398" />
+
+      <param id="155" name="Lip Width" value="0.134" />
+
+      <param id="157" name="Belly Size" value="0.150" />
+
+      <param id="185" name="Deep_Chin" value="-0.560" />
+
+      <param id="193" name="Head Shape" value="0.470" />
+
+      <param id="196" name="Eye Spacing" value="0.400" />
+
+      <param id="505" name="Lip Thickness" value="0.740" />
+
+      <param id="506" name="Mouth_Height" value="0.280" />
+
+      <param id="507" name="Breast_Gravity" value="1.370" />
+
+      <param id="515" name="Foot_Size" value="1.480" />
+
+      <param id="517" name="Wide_Nose" value="0.550" />
+
+      <param id="518" name="Eyelashes_Long" value="0.222" />
+
+      <param id="629" name="Forehead Angle" value="0.470" />
+
+      <param id="637" name="Body Fat" value="0.370" />
+
+      <param id="646" name="Egg_Head" value="0.379" />
+
+      <param id="647" name="Squash_Stretch_Head" value="0.430" />
+
+      <param id="649" name="Torso Muscles" value="0.680" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="0.325" />
+
+      <param id="652" name="Leg Muscles" value="0.800" />
+
+      <param id="653" name="Tall_Lips" value="0.560" />
+
+      <param id="656" name="Crooked_Nose" value="0.000" />
+
+      <param id="659" name="Mouth Corner" value="0.830" />
+
+      <param id="662" name="Face Shear" value="0.500" />
+
+      <param id="663" name="Shift_Mouth" value="0.160" />
+
+      <param id="664" name="Pop_Eye" value="0.052" />
+
+      <param id="665" name="Jaw_Jut" value="-0.320" />
+
+      <param id="675" name="Hand Size" value="0.006" />
+
+      <param id="676" name="Love_Handles" value="-0.070" />
+
+      <param id="678" name="Torso Muscles" value="0.790" />
+
+      <param id="682" name="Head Size" value="0.770" />
+
+      <param id="683" name="Neck Thickness" value="-0.064" />
+
+      <param id="684" name="Breast_Female_Clevage" value="-0.092" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.200" />
+
+      <param id="690" name="Eye Size" value="0.530" />
+
+      <param id="692" name="Leg Length" value="0.640" />
+
+      <param id="693" name="Arm Length" value="0.780" />
+
+      <param id="753" name="Saddlebags" value="1.250" />
+
+      <param id="756" name="Neck Length" value="0.200" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="0.060" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.925" />
+
+      <param id="760" name="Jaw_Angle" value="0.688" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.520" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="0.316" />
+
+      <param id="769" name="Eye Depth" value="0.620" />
+
+      <param id="773" name="Head Length" value="0.720" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.000" />
+
+      <param id="111" name="Pigment" value="0.660" />
+
+      <param id="116" name="Rosy Complexion" value="0.080" />
+
+      <param id="117" name="Lip Pinkness" value="0.330" />
+
+      <param id="150" name="Body Definition" value="0.690" />
+
+      <param id="162" name="Facial Definition" value="0.470" />
+
+      <param id="163" name="Wrinkles" value="0.000" />
+
+      <param id="165" name="Freckles" value="0.190" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.655" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.180" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.340" />
+
+      <param id="114" name="Blonde Hair" value="0.000" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.200" />
+
+      <param id="130" name="Front Fringe" value="0.000" />
+
+      <param id="131" name="Side Fringe" value="0.730" />
+
+      <param id="132" name="Back Fringe" value="0.210" />
+
+      <param id="133" name="Hair Front" value="0.280" />
+
+      <param id="134" name="Hair Sides" value="0.170" />
+
+      <param id="135" name="Hair Back" value="0.560" />
+
+      <param id="136" name="Hair Sweep" value="0.800" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="-0.040" />
+
+      <param id="166" name="Sideburns" value="0.710" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.230" />
+
+      <param id="181" name="Hair_Big_Front" value="0.400" />
+
+      <param id="182" name="Hair_Big_Top" value="0.340" />
+
+      <param id="183" name="Hair_Big_Back" value="0.380" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="0.830" />
+
+      <param id="750" name="Eyebrow Density" value="0.850" />
+
+      <param id="752" name="Hair Thickness" value="0.690" />
+
+      <param id="754" name="Hair_Taper_Back" value="-0.190" />
+
+      <param id="755" name="Hair_Taper_Front" value="-0.090" />
+
+      <param id="757" name="Lower_Eyebrows" value="-0.120" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.750" />
+
+      <param id="763" name="Hair Volume" value="0.660" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.140" />
+
+      <param id="99" name="Eye Color" value="0.000" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="F A Skinny">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="-0.254" />
+
+      <param id="2" name="Nose_Big_Out" value="-0.371" />
+
+      <param id="4" name="Broad_Nostrils" value="-0.365" />
+
+      <param id="5" name="Cleft_Chin" value="-0.100" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.675" />
+
+      <param id="7" name="Weak_Chin" value="0.230" />
+
+      <param id="8" name="Double_Chin" value="0.040" />
+
+      <param id="10" name="Sunken_Cheeks" value="0.390" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="0.140" />
+
+      <param id="12" name="Jowls" value="-0.500" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.000" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.640" />
+
+      <param id="15" name="Ears_Out" value="0.140" />
+
+      <param id="17" name="Square_Jaw" value="-0.170" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="0.860" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="0.375" />
+
+      <param id="20" name="Bulbous_Nose" value="-0.280" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="1.195" />
+
+      <param id="22" name="Attached_Earlobes" value="0.000" />
+
+      <param id="23" name="Baggy_Eyes" value="-0.500" />
+
+      <param id="24" name="Wide_Eyes" value="-0.030" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="1.247" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-0.325" />
+
+      <param id="33" name="Height" value="-0.064" />
+
+      <param id="34" name="Thickness" value="-0.700" />
+
+      <param id="35" name="Big_Ears" value="0.260" />
+
+      <param id="36" name="Shoulders" value="-1.320" />
+
+      <param id="37" name="Hip Width" value="-2.060" />
+
+      <param id="38" name="Torso Length" value="0.280" />
+
+      <param id="80" name="male" value="0.000" />
+
+      <param id="105" name="Breast Size" value="0.100" />
+
+      <param id="151" name="Big_Butt_Legs" value="-0.260" />
+
+      <param id="155" name="Lip Width" value="-0.526" />
+
+      <param id="157" name="Belly Size" value="0.040" />
+
+      <param id="185" name="Deep_Chin" value="-0.460" />
+
+      <param id="193" name="Head Shape" value="0.540" />
+
+      <param id="196" name="Eye Spacing" value="-0.170" />
+
+      <param id="505" name="Lip Thickness" value="0.560" />
+
+      <param id="506" name="Mouth_Height" value="-0.480" />
+
+      <param id="507" name="Breast_Gravity" value="0.005" />
+
+      <param id="515" name="Foot_Size" value="0.040" />
+
+      <param id="517" name="Wide_Nose" value="0.535" />
+
+      <param id="518" name="Eyelashes_Long" value="1.230" />
+
+      <param id="629" name="Forehead Angle" value="0.470" />
+
+      <param id="637" name="Body Fat" value="0.000" />
+
+      <param id="646" name="Egg_Head" value="0.310" />
+
+      <param id="647" name="Squash_Stretch_Head" value="0.565" />
+
+      <param id="649" name="Torso Muscles" value="0.200" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="0.700" />
+
+      <param id="652" name="Leg Muscles" value="0.390" />
+
+      <param id="653" name="Tall_Lips" value="0.740" />
+
+      <param id="656" name="Crooked_Nose" value="0.000" />
+
+      <param id="659" name="Mouth Corner" value="0.770" />
+
+      <param id="662" name="Face Shear" value="0.500" />
+
+      <param id="663" name="Shift_Mouth" value="-0.080" />
+
+      <param id="664" name="Pop_Eye" value="0.052" />
+
+      <param id="665" name="Jaw_Jut" value="-0.600" />
+
+      <param id="675" name="Hand Size" value="-0.216" />
+
+      <param id="676" name="Love_Handles" value="-0.340" />
+
+      <param id="678" name="Torso Muscles" value="0.790" />
+
+      <param id="682" name="Head Size" value="0.500" />
+
+      <param id="683" name="Neck Thickness" value="-0.310" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.292" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.200" />
+
+      <param id="690" name="Eye Size" value="0.620" />
+
+      <param id="692" name="Leg Length" value="0.160" />
+
+      <param id="693" name="Arm Length" value="0.220" />
+
+      <param id="753" name="Saddlebags" value="0.865" />
+
+      <param id="756" name="Neck Length" value="-0.260" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="0.180" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.175" />
+
+      <param id="760" name="Jaw_Angle" value="0.496" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="0.061" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="-0.300" />
+
+      <param id="769" name="Eye Depth" value="0.710" />
+
+      <param id="773" name="Head Length" value="0.390" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.000" />
+
+      <param id="111" name="Pigment" value="0.150" />
+
+      <param id="116" name="Rosy Complexion" value="0.000" />
+
+      <param id="117" name="Lip Pinkness" value="0.000" />
+
+      <param id="150" name="Body Definition" value="0.990" />
+
+      <param id="162" name="Facial Definition" value="0.070" />
+
+      <param id="163" name="Wrinkles" value="0.000" />
+
+      <param id="165" name="Freckles" value="0.000" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.205" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.450" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.310" />
+
+      <param id="114" name="Blonde Hair" value="0.000" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.350" />
+
+      <param id="130" name="Front Fringe" value="0.560" />
+
+      <param id="131" name="Side Fringe" value="0.730" />
+
+      <param id="132" name="Back Fringe" value="0.510" />
+
+      <param id="133" name="Hair Front" value="0.140" />
+
+      <param id="134" name="Hair Sides" value="0.000" />
+
+      <param id="135" name="Hair Back" value="0.920" />
+
+      <param id="136" name="Hair Sweep" value="0.520" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="1.880" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="-0.590" />
+
+      <param id="166" name="Sideburns" value="0.710" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.000" />
+
+      <param id="181" name="Hair_Big_Front" value="-0.160" />
+
+      <param id="182" name="Hair_Big_Top" value="0.500" />
+
+      <param id="183" name="Hair_Big_Back" value="0.260" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.530" />
+
+      <param id="674" name="Hair_Shear_Back" value="1.500" />
+
+      <param id="750" name="Eyebrow Density" value="0.810" />
+
+      <param id="752" name="Hair Thickness" value="0.690" />
+
+      <param id="754" name="Hair_Taper_Back" value="-0.940" />
+
+      <param id="755" name="Hair_Taper_Front" value="0.480" />
+
+      <param id="757" name="Lower_Eyebrows" value="-0.440" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.210" />
+
+      <param id="763" name="Hair Volume" value="0.770" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.000" />
+
+      <param id="99" name="Eye Color" value="0.040" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="F A Muscle">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="0.574" />
+
+      <param id="2" name="Nose_Big_Out" value="0.586" />
+
+      <param id="4" name="Broad_Nostrils" value="-0.500" />
+
+      <param id="5" name="Cleft_Chin" value="-0.100" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="-0.079" />
+
+      <param id="7" name="Weak_Chin" value="0.320" />
+
+      <param id="8" name="Double_Chin" value="0.440" />
+
+      <param id="10" name="Sunken_Cheeks" value="-0.105" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="0.240" />
+
+      <param id="12" name="Jowls" value="0.340" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.000" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.880" />
+
+      <param id="15" name="Ears_Out" value="0.340" />
+
+      <param id="17" name="Square_Jaw" value="-0.455" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="0.860" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-0.350" />
+
+      <param id="20" name="Bulbous_Nose" value="-0.500" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="1.300" />
+
+      <param id="22" name="Attached_Earlobes" value="1.000" />
+
+      <param id="23" name="Baggy_Eyes" value="0.340" />
+
+      <param id="24" name="Wide_Eyes" value="-0.380" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="0.327" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-1.125" />
+
+      <param id="33" name="Height" value="0.194" />
+
+      <param id="34" name="Thickness" value="-0.018" />
+
+      <param id="35" name="Big_Ears" value="0.560" />
+
+      <param id="36" name="Shoulders" value="-0.456" />
+
+      <param id="37" name="Hip Width" value="-1.760" />
+
+      <param id="38" name="Torso Length" value="0.400" />
+
+      <param id="80" name="male" value="0.000" />
+
+      <param id="105" name="Breast Size" value="0.240" />
+
+      <param id="151" name="Big_Butt_Legs" value="-0.134" />
+
+      <param id="155" name="Lip Width" value="-0.900" />
+
+      <param id="157" name="Belly Size" value="0.020" />
+
+      <param id="185" name="Deep_Chin" value="0.500" />
+
+      <param id="193" name="Head Shape" value="0.360" />
+
+      <param id="196" name="Eye Spacing" value="-0.500" />
+
+      <param id="505" name="Lip Thickness" value="0.280" />
+
+      <param id="506" name="Mouth_Height" value="0.080" />
+
+      <param id="507" name="Breast_Gravity" value="-0.520" />
+
+      <param id="515" name="Foot_Size" value="0.280" />
+
+      <param id="517" name="Wide_Nose" value="0.265" />
+
+      <param id="518" name="Eyelashes_Long" value="0.006" />
+
+      <param id="629" name="Forehead Angle" value="0.850" />
+
+      <param id="637" name="Body Fat" value="0.000" />
+
+      <param id="646" name="Egg_Head" value="-0.334" />
+
+      <param id="647" name="Squash_Stretch_Head" value="-0.395" />
+
+      <param id="649" name="Torso Muscles" value="0.510" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="-0.375" />
+
+      <param id="652" name="Leg Muscles" value="0.750" />
+
+      <param id="653" name="Tall_Lips" value="1.460" />
+
+      <param id="656" name="Crooked_Nose" value="0.000" />
+
+      <param id="659" name="Mouth Corner" value="0.580" />
+
+      <param id="662" name="Face Shear" value="0.500" />
+
+      <param id="663" name="Shift_Mouth" value="-0.080" />
+
+      <param id="664" name="Pop_Eye" value="0.052" />
+
+      <param id="665" name="Jaw_Jut" value="-0.080" />
+
+      <param id="675" name="Hand Size" value="-0.168" />
+
+      <param id="676" name="Love_Handles" value="0.110" />
+
+      <param id="678" name="Torso Muscles" value="0.790" />
+
+      <param id="682" name="Head Size" value="0.470" />
+
+      <param id="683" name="Neck Thickness" value="-0.148" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.436" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.200" />
+
+      <param id="690" name="Eye Size" value="0.620" />
+
+      <param id="692" name="Leg Length" value="0.260" />
+
+      <param id="693" name="Arm Length" value="0.420" />
+
+      <param id="753" name="Saddlebags" value="0.340" />
+
+      <param id="756" name="Neck Length" value="-0.360" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="0.510" />
+
+      <param id="759" name="Low_Septum_Nose" value="-0.625" />
+
+      <param id="760" name="Jaw_Angle" value="0.816" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="-0.500" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="0.064" />
+
+      <param id="769" name="Eye Depth" value="0.720" />
+
+      <param id="773" name="Head Length" value="0.330" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.011" />
+
+      <param id="111" name="Pigment" value="0.370" />
+
+      <param id="116" name="Rosy Complexion" value="0.000" />
+
+      <param id="117" name="Lip Pinkness" value="0.000" />
+
+      <param id="150" name="Body Definition" value="1.000" />
+
+      <param id="162" name="Facial Definition" value="0.070" />
+
+      <param id="163" name="Wrinkles" value="0.000" />
+
+      <param id="165" name="Freckles" value="0.000" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="0.610" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.160" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.310" />
+
+      <param id="114" name="Blonde Hair" value="0.000" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.260" />
+
+      <param id="130" name="Front Fringe" value="0.650" />
+
+      <param id="131" name="Side Fringe" value="0.990" />
+
+      <param id="132" name="Back Fringe" value="0.960" />
+
+      <param id="133" name="Hair Front" value="0.000" />
+
+      <param id="134" name="Hair Sides" value="0.000" />
+
+      <param id="135" name="Hair Back" value="0.530" />
+
+      <param id="136" name="Hair Sweep" value="0.630" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="0.000" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="-0.590" />
+
+      <param id="166" name="Sideburns" value="0.710" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.000" />
+
+      <param id="181" name="Hair_Big_Front" value="-0.160" />
+
+      <param id="182" name="Hair_Big_Top" value="0.320" />
+
+      <param id="183" name="Hair_Big_Back" value="0.300" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="-0.100" />
+
+      <param id="750" name="Eyebrow Density" value="1.000" />
+
+      <param id="752" name="Hair Thickness" value="0.690" />
+
+      <param id="754" name="Hair_Taper_Back" value="0.020" />
+
+      <param id="755" name="Hair_Taper_Front" value="-0.120" />
+
+      <param id="757" name="Lower_Eyebrows" value="0.120" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.000" />
+
+      <param id="763" name="Hair Volume" value="0.770" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.000" />
+
+      <param id="99" name="Eye Color" value="0.040" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+
+   <archetype name="F A Chubby">
+<!-- wearable: shape -->
+      <param id="1" name="Big_Brow" value="0.482" />
+
+      <param id="2" name="Nose_Big_Out" value="-0.140" />
+
+      <param id="4" name="Broad_Nostrils" value="0.280" />
+
+      <param id="5" name="Cleft_Chin" value="0.164" />
+
+      <param id="6" name="Bulbous_Nose_Tip" value="0.220" />
+
+      <param id="7" name="Weak_Chin" value="-0.040" />
+
+      <param id="8" name="Double_Chin" value="0.200" />
+
+      <param id="10" name="Sunken_Cheeks" value="-0.150" />
+
+      <param id="11" name="Noble_Nose_Bridge" value="-0.020" />
+
+      <param id="12" name="Jowls" value="0.550" />
+
+      <param id="13" name="Cleft_Chin_Upper" value="0.000" />
+
+      <param id="14" name="High_Cheek_Bones" value="0.670" />
+
+      <param id="15" name="Ears_Out" value="0.720" />
+
+      <param id="17" name="Square_Jaw" value="0.175" />
+
+      <param id="18" name="Puffy_Upper_Cheeks" value="1.420" />
+
+      <param id="19" name="Upturned_Nose_Tip" value="-0.075" />
+
+      <param id="20" name="Bulbous_Nose" value="-0.500" />
+
+      <param id="21" name="Upper_Eyelid_Fold" value="0.640" />
+
+      <param id="22" name="Attached_Earlobes" value="0.570" />
+
+      <param id="23" name="Baggy_Eyes" value="0.020" />
+
+      <param id="24" name="Wide_Eyes" value="-0.555" />
+
+      <param id="25" name="Wide_Lip_Cleft" value="0.764" />
+
+      <param id="27" name="Wide_Nose_Bridge" value="-1.300" />
+
+      <param id="33" name="Height" value="-0.709" />
+
+      <param id="34" name="Thickness" value="-0.084" />
+
+      <param id="35" name="Big_Ears" value="0.140" />
+
+      <param id="36" name="Shoulders" value="-0.936" />
+
+      <param id="37" name="Hip Width" value="-1.220" />
+
+      <param id="38" name="Torso Length" value="0.860" />
+
+      <param id="80" name="male" value="0.000" />
+
+      <param id="105" name="Breast Size" value="0.780" />
+
+      <param id="151" name="Big_Butt_Legs" value="-0.022" />
+
+      <param id="155" name="Lip Width" value="-0.548" />
+
+      <param id="157" name="Belly Size" value="0.180" />
+
+      <param id="185" name="Deep_Chin" value="-0.120" />
+
+      <param id="193" name="Head Shape" value="0.680" />
+
+      <param id="196" name="Eye Spacing" value="-0.230" />
+
+      <param id="505" name="Lip Thickness" value="0.730" />
+
+      <param id="506" name="Mouth_Height" value="-0.160" />
+
+      <param id="507" name="Breast_Gravity" value="-0.205" />
+
+      <param id="515" name="Foot_Size" value="0.200" />
+
+      <param id="517" name="Wide_Nose" value="0.130" />
+
+      <param id="518" name="Eyelashes_Long" value="0.240" />
+
+      <param id="629" name="Forehead Angle" value="0.670" />
+
+      <param id="637" name="Body Fat" value="0.120" />
+
+      <param id="646" name="Egg_Head" value="0.149" />
+
+      <param id="647" name="Squash_Stretch_Head" value="-0.005" />
+
+      <param id="649" name="Torso Muscles" value="0.640" />
+
+      <param id="650" name="Eyelid_Corner_Up" value="0.050" />
+
+      <param id="652" name="Leg Muscles" value="0.570" />
+
+      <param id="653" name="Tall_Lips" value="0.740" />
+
+      <param id="656" name="Crooked_Nose" value="0.000" />
+
+      <param id="659" name="Mouth Corner" value="0.720" />
+
+      <param id="662" name="Face Shear" value="0.500" />
+
+      <param id="663" name="Shift_Mouth" value="-0.080" />
+
+      <param id="664" name="Pop_Eye" value="0.052" />
+
+      <param id="665" name="Jaw_Jut" value="-0.640" />
+
+      <param id="675" name="Hand Size" value="-0.198" />
+
+      <param id="676" name="Love_Handles" value="0.560" />
+
+      <param id="678" name="Torso Muscles" value="0.790" />
+
+      <param id="682" name="Head Size" value="0.770" />
+
+      <param id="683" name="Neck Thickness" value="-0.058" />
+
+      <param id="684" name="Breast_Female_Clevage" value="0.116" />
+
+      <param id="685" name="Chest_Male_No_Pecs" value="0.200" />
+
+      <param id="690" name="Eye Size" value="0.530" />
+
+      <param id="692" name="Leg Length" value="0.400" />
+
+      <param id="693" name="Arm Length" value="0.500" />
+
+      <param id="753" name="Saddlebags" value="0.725" />
+
+      <param id="756" name="Neck Length" value="-0.380" />
+
+      <param id="758" name="Lower_Bridge_Nose" value="-0.330" />
+
+      <param id="759" name="Low_Septum_Nose" value="0.200" />
+
+      <param id="760" name="Jaw_Angle" value="0.528" />
+
+      <param id="764" name="Lip_Cleft_Deep" value="-0.228" />
+
+      <param id="765" name="Puffy_Lower_Lids" value="-0.020" />
+
+      <param id="769" name="Eye Depth" value="0.670" />
+
+      <param id="773" name="Head Length" value="0.340" />
+
+<!-- wearable: skin -->
+      <param id="108" name="Rainbow Color" value="0.000" />
+
+      <param id="110" name="Red Skin" value="0.000" />
+
+      <param id="111" name="Pigment" value="0.390" />
+
+      <param id="116" name="Rosy Complexion" value="0.000" />
+
+      <param id="117" name="Lip Pinkness" value="0.000" />
+
+      <param id="150" name="Body Definition" value="0.430" />
+
+      <param id="162" name="Facial Definition" value="0.000" />
+
+      <param id="163" name="Wrinkles" value="0.000" />
+
+      <param id="165" name="Freckles" value="0.000" />
+
+      <param id="700" name="Lipstick Color" value="0.250" />
+
+      <param id="701" name="Lipstick" value="0.000" />
+
+      <param id="702" name="Lipgloss" value="0.000" />
+
+      <param id="703" name="Eyeliner" value="0.000" />
+
+      <param id="704" name="Blush" value="0.000" />
+
+      <param id="705" name="Blush Color" value="0.500" />
+
+      <param id="706" name="Out Shdw Opacity" value="0.600" />
+
+      <param id="707" name="Outer Shadow" value="0.000" />
+
+      <param id="708" name="Out Shdw Color" value="0.000" />
+
+      <param id="709" name="Inner Shadow" value="0.000" />
+
+      <param id="710" name="Nail Polish" value="0.000" />
+
+      <param id="711" name="Blush Opacity" value="0.500" />
+
+      <param id="712" name="In Shdw Color" value="0.000" />
+
+      <param id="713" name="In Shdw Opacity" value="0.700" />
+
+      <param id="714" name="Eyeliner Color" value="0.000" />
+
+      <param id="715" name="Nail Polish Color" value="0.000" />
+
+      <texture te="0" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="5" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+      <texture te="6" uuid="c228d1cf-4b5d-4ba8-84f4-899a0796aa97" />
+
+<!-- wearable: hair -->
+      <param id="16" name="Pointy_Eyebrows" value="-0.095" />
+
+      <param id="31" name="Arced_Eyebrows" value="0.610" />
+
+      <param id="112" name="Rainbow Color" value="0.000" />
+
+      <param id="113" name="Red Hair" value="0.150" />
+
+      <param id="114" name="Blonde Hair" value="0.050" />
+
+      <param id="115" name="White Hair" value="0.000" />
+
+      <param id="119" name="Eyebrow Size" value="0.110" />
+
+      <param id="130" name="Front Fringe" value="0.300" />
+
+      <param id="131" name="Side Fringe" value="0.630" />
+
+      <param id="132" name="Back Fringe" value="0.690" />
+
+      <param id="133" name="Hair Front" value="0.000" />
+
+      <param id="134" name="Hair Sides" value="0.670" />
+
+      <param id="135" name="Hair Back" value="0.730" />
+
+      <param id="136" name="Hair Sweep" value="0.820" />
+
+      <param id="137" name="Hair Tilt" value="0.500" />
+
+      <param id="140" name="Hair_Part_Middle" value="1.260" />
+
+      <param id="141" name="Hair_Part_Right" value="0.000" />
+
+      <param id="142" name="Hair_Part_Left" value="0.000" />
+
+      <param id="143" name="Hair_Sides_Full" value="-0.315" />
+
+      <param id="166" name="Sideburns" value="0.710" />
+
+      <param id="167" name="Moustache" value="0.000" />
+
+      <param id="168" name="Soulpatch" value="0.000" />
+
+      <param id="169" name="Chin Curtains" value="0.000" />
+
+      <param id="177" name="Hair_Rumpled" value="0.000" />
+
+      <param id="181" name="Hair_Big_Front" value="0.260" />
+
+      <param id="182" name="Hair_Big_Top" value="0.260" />
+
+      <param id="183" name="Hair_Big_Back" value="0.000" />
+
+      <param id="184" name="Hair_Spiked" value="0.000" />
+
+      <param id="192" name="Bangs_Part_Middle" value="0.000" />
+
+      <param id="674" name="Hair_Shear_Back" value="-0.100" />
+
+      <param id="750" name="Eyebrow Density" value="0.580" />
+
+      <param id="752" name="Hair Thickness" value="0.690" />
+
+      <param id="754" name="Hair_Taper_Back" value="-0.970" />
+
+      <param id="755" name="Hair_Taper_Front" value="-0.060" />
+
+      <param id="757" name="Lower_Eyebrows" value="1.760" />
+
+      <param id="762" name="Hair_Shear_Front" value="0.060" />
+
+      <param id="763" name="Hair Volume" value="0.690" />
+
+      <texture te="4" uuid="7ca39b4c-bd19-4699-aff7-f93fd03d3e7b" />
+
+<!-- wearable: eyes -->
+      <param id="98" name="Eye Lightness" value="0.080" />
+
+      <param id="99" name="Eye Color" value="0.160" />
+
+      <texture te="3" uuid="6522e74d-1660-4e7f-b601-6f48c1659a77" />
+   </archetype>
+</linden_genepool>
+
diff --git a/linden/indra/newview/character/glove_length_alpha.tga b/linden/indra/newview/character/glove_length_alpha.tga
new file mode 100644
index 0000000..db89ad5
Binary files /dev/null and b/linden/indra/newview/character/glove_length_alpha.tga differ
diff --git a/linden/indra/newview/character/gloves_fingers_alpha.tga b/linden/indra/newview/character/gloves_fingers_alpha.tga
new file mode 100644
index 0000000..dba2eec
Binary files /dev/null and b/linden/indra/newview/character/gloves_fingers_alpha.tga differ
diff --git a/linden/indra/newview/character/head_alpha.tga b/linden/indra/newview/character/head_alpha.tga
new file mode 100644
index 0000000..8164525
Binary files /dev/null and b/linden/indra/newview/character/head_alpha.tga differ
diff --git a/linden/indra/newview/character/head_color.tga b/linden/indra/newview/character/head_color.tga
new file mode 100644
index 0000000..74b1b30
Binary files /dev/null and b/linden/indra/newview/character/head_color.tga differ
diff --git a/linden/indra/newview/character/head_hair.tga b/linden/indra/newview/character/head_hair.tga
new file mode 100644
index 0000000..5321f35
Binary files /dev/null and b/linden/indra/newview/character/head_hair.tga differ
diff --git a/linden/indra/newview/character/head_highlights_alpha.tga b/linden/indra/newview/character/head_highlights_alpha.tga
new file mode 100644
index 0000000..8dc5239
Binary files /dev/null and b/linden/indra/newview/character/head_highlights_alpha.tga differ
diff --git a/linden/indra/newview/character/head_shading_alpha.tga b/linden/indra/newview/character/head_shading_alpha.tga
new file mode 100644
index 0000000..e8ea490
Binary files /dev/null and b/linden/indra/newview/character/head_shading_alpha.tga differ
diff --git a/linden/indra/newview/character/head_skingrain.tga b/linden/indra/newview/character/head_skingrain.tga
new file mode 100644
index 0000000..b42dee0
Binary files /dev/null and b/linden/indra/newview/character/head_skingrain.tga differ
diff --git a/linden/indra/newview/character/jacket_length_lower_alpha.tga b/linden/indra/newview/character/jacket_length_lower_alpha.tga
new file mode 100644
index 0000000..722bc19
Binary files /dev/null and b/linden/indra/newview/character/jacket_length_lower_alpha.tga differ
diff --git a/linden/indra/newview/character/jacket_length_upper_alpha.tga b/linden/indra/newview/character/jacket_length_upper_alpha.tga
new file mode 100644
index 0000000..e9db7e7
Binary files /dev/null and b/linden/indra/newview/character/jacket_length_upper_alpha.tga differ
diff --git a/linden/indra/newview/character/jacket_open_lower_alpha.tga b/linden/indra/newview/character/jacket_open_lower_alpha.tga
new file mode 100644
index 0000000..db0c2fb
Binary files /dev/null and b/linden/indra/newview/character/jacket_open_lower_alpha.tga differ
diff --git a/linden/indra/newview/character/jacket_open_upper_alpha.tga b/linden/indra/newview/character/jacket_open_upper_alpha.tga
new file mode 100644
index 0000000..71b8a0b
Binary files /dev/null and b/linden/indra/newview/character/jacket_open_upper_alpha.tga differ
diff --git a/linden/indra/newview/character/lipgloss_alpha.tga b/linden/indra/newview/character/lipgloss_alpha.tga
new file mode 100644
index 0000000..78ceeca
Binary files /dev/null and b/linden/indra/newview/character/lipgloss_alpha.tga differ
diff --git a/linden/indra/newview/character/lips_mask.tga b/linden/indra/newview/character/lips_mask.tga
new file mode 100644
index 0000000..ae1401c
Binary files /dev/null and b/linden/indra/newview/character/lips_mask.tga differ
diff --git a/linden/indra/newview/character/lipstick_alpha.tga b/linden/indra/newview/character/lipstick_alpha.tga
new file mode 100644
index 0000000..2795f1b
Binary files /dev/null and b/linden/indra/newview/character/lipstick_alpha.tga differ
diff --git a/linden/indra/newview/character/lowerbody_color.tga b/linden/indra/newview/character/lowerbody_color.tga
new file mode 100644
index 0000000..a63aa12
Binary files /dev/null and b/linden/indra/newview/character/lowerbody_color.tga differ
diff --git a/linden/indra/newview/character/lowerbody_highlights_alpha.tga b/linden/indra/newview/character/lowerbody_highlights_alpha.tga
new file mode 100644
index 0000000..ae3413a
Binary files /dev/null and b/linden/indra/newview/character/lowerbody_highlights_alpha.tga differ
diff --git a/linden/indra/newview/character/lowerbody_shading_alpha.tga b/linden/indra/newview/character/lowerbody_shading_alpha.tga
new file mode 100644
index 0000000..0242663
Binary files /dev/null and b/linden/indra/newview/character/lowerbody_shading_alpha.tga differ
diff --git a/linden/indra/newview/character/nailpolish_alpha.tga b/linden/indra/newview/character/nailpolish_alpha.tga
new file mode 100644
index 0000000..91af762
Binary files /dev/null and b/linden/indra/newview/character/nailpolish_alpha.tga differ
diff --git a/linden/indra/newview/character/pants_length_alpha.tga b/linden/indra/newview/character/pants_length_alpha.tga
new file mode 100644
index 0000000..3c4f21c
Binary files /dev/null and b/linden/indra/newview/character/pants_length_alpha.tga differ
diff --git a/linden/indra/newview/character/pants_waist_alpha.tga b/linden/indra/newview/character/pants_waist_alpha.tga
new file mode 100644
index 0000000..35658c0
Binary files /dev/null and b/linden/indra/newview/character/pants_waist_alpha.tga differ
diff --git a/linden/indra/newview/character/rosyface_alpha.tga b/linden/indra/newview/character/rosyface_alpha.tga
new file mode 100644
index 0000000..a0c8513
Binary files /dev/null and b/linden/indra/newview/character/rosyface_alpha.tga differ
diff --git a/linden/indra/newview/character/rouge_alpha.tga b/linden/indra/newview/character/rouge_alpha.tga
new file mode 100644
index 0000000..a0c8513
Binary files /dev/null and b/linden/indra/newview/character/rouge_alpha.tga differ
diff --git a/linden/indra/newview/character/shirt_bottom_alpha.tga b/linden/indra/newview/character/shirt_bottom_alpha.tga
new file mode 100644
index 0000000..7cce03d
Binary files /dev/null and b/linden/indra/newview/character/shirt_bottom_alpha.tga differ
diff --git a/linden/indra/newview/character/shirt_collar_alpha.tga b/linden/indra/newview/character/shirt_collar_alpha.tga
new file mode 100644
index 0000000..f55f635
Binary files /dev/null and b/linden/indra/newview/character/shirt_collar_alpha.tga differ
diff --git a/linden/indra/newview/character/shirt_collar_back_alpha.tga b/linden/indra/newview/character/shirt_collar_back_alpha.tga
new file mode 100644
index 0000000..43a6453
Binary files /dev/null and b/linden/indra/newview/character/shirt_collar_back_alpha.tga differ
diff --git a/linden/indra/newview/character/shirt_sleeve_alpha.tga b/linden/indra/newview/character/shirt_sleeve_alpha.tga
new file mode 100644
index 0000000..e3b18f4
Binary files /dev/null and b/linden/indra/newview/character/shirt_sleeve_alpha.tga differ
diff --git a/linden/indra/newview/character/shoe_height_alpha.tga b/linden/indra/newview/character/shoe_height_alpha.tga
new file mode 100644
index 0000000..d08dd75
Binary files /dev/null and b/linden/indra/newview/character/shoe_height_alpha.tga differ
diff --git a/linden/indra/newview/character/skirt_length_alpha.tga b/linden/indra/newview/character/skirt_length_alpha.tga
new file mode 100644
index 0000000..c867994
Binary files /dev/null and b/linden/indra/newview/character/skirt_length_alpha.tga differ
diff --git a/linden/indra/newview/character/skirt_slit_back_alpha.tga b/linden/indra/newview/character/skirt_slit_back_alpha.tga
new file mode 100644
index 0000000..0e49688
Binary files /dev/null and b/linden/indra/newview/character/skirt_slit_back_alpha.tga differ
diff --git a/linden/indra/newview/character/skirt_slit_front_alpha.tga b/linden/indra/newview/character/skirt_slit_front_alpha.tga
new file mode 100644
index 0000000..888bbf7
Binary files /dev/null and b/linden/indra/newview/character/skirt_slit_front_alpha.tga differ
diff --git a/linden/indra/newview/character/skirt_slit_left_alpha.tga b/linden/indra/newview/character/skirt_slit_left_alpha.tga
new file mode 100644
index 0000000..210feac
Binary files /dev/null and b/linden/indra/newview/character/skirt_slit_left_alpha.tga differ
diff --git a/linden/indra/newview/character/skirt_slit_right_alpha.tga b/linden/indra/newview/character/skirt_slit_right_alpha.tga
new file mode 100644
index 0000000..ce11c64
Binary files /dev/null and b/linden/indra/newview/character/skirt_slit_right_alpha.tga differ
diff --git a/linden/indra/newview/character/underpants_trial_female.tga b/linden/indra/newview/character/underpants_trial_female.tga
new file mode 100644
index 0000000..96bf732
Binary files /dev/null and b/linden/indra/newview/character/underpants_trial_female.tga differ
diff --git a/linden/indra/newview/character/underpants_trial_male.tga b/linden/indra/newview/character/underpants_trial_male.tga
new file mode 100644
index 0000000..095695c
Binary files /dev/null and b/linden/indra/newview/character/underpants_trial_male.tga differ
diff --git a/linden/indra/newview/character/undershirt_trial_female.tga b/linden/indra/newview/character/undershirt_trial_female.tga
new file mode 100644
index 0000000..e17a309
Binary files /dev/null and b/linden/indra/newview/character/undershirt_trial_female.tga differ
diff --git a/linden/indra/newview/character/upperbody_color.tga b/linden/indra/newview/character/upperbody_color.tga
new file mode 100644
index 0000000..85fcc41
Binary files /dev/null and b/linden/indra/newview/character/upperbody_color.tga differ
diff --git a/linden/indra/newview/character/upperbody_highlights_alpha.tga b/linden/indra/newview/character/upperbody_highlights_alpha.tga
new file mode 100644
index 0000000..2d8102b
Binary files /dev/null and b/linden/indra/newview/character/upperbody_highlights_alpha.tga differ
diff --git a/linden/indra/newview/character/upperbody_shading_alpha.tga b/linden/indra/newview/character/upperbody_shading_alpha.tga
new file mode 100644
index 0000000..b420506
Binary files /dev/null and b/linden/indra/newview/character/upperbody_shading_alpha.tga differ
diff --git a/linden/indra/newview/character/upperbodyfreckles_alpha.tga b/linden/indra/newview/character/upperbodyfreckles_alpha.tga
new file mode 100644
index 0000000..76c7ce8
Binary files /dev/null and b/linden/indra/newview/character/upperbodyfreckles_alpha.tga differ
diff --git a/linden/install.xml b/linden/install.xml
index 374f676..eb1626b 100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -179,9 +179,9 @@
           <key>common</key>
           <map>
             <key>md5sum</key>
-            <string>bf3547c5bf5555e82355cd82ad8eaf73</string>
+            <string>d98b49b6fcbb603da3632bb94374230d</string>
             <key>url</key>
-            <uri>http://download.kokuaviewer.org/files/extras/imprudence-artwork-20110301.tar.bz2</uri>
+            <uri>http://download.kokuaviewer.org/files/extras/imprudence-artwork-20110314.tar.bz2</uri>
           </map>
         </map>
       </map>
-- 
cgit v1.1


From cfea5db240426dac04b8d0bc4c20b1d59e5607cf Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 14 Mar 2011 11:20:51 -0700
Subject: Moved boost 1.43 libs to our server

---
 linden/install.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linden/install.xml b/linden/install.xml
index eb1626b..e12b38a 100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -230,7 +230,7 @@
             <key>md5sum</key>
             <string>3d4bd78f30f118c6e35f8d367ec25fc2</string>
             <key>url</key>
-            <uri>http://downloads.phoenixviewer.com/boost-1.43.0-windows-20100902.tar.bz2</uri>
+            <uri>http://download.kokuaviewer.org/files/libs/boost-1.43.0-windows-20100902.tar.bz2</uri>
           </map>
         </map>
       </map>
-- 
cgit v1.1


From eed6a3b7b515343215203adb28591d82e89fa226 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 14 Mar 2011 11:51:12 -0700
Subject: Forgot to include the licenses file in the artwork package

---
 linden/install.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linden/install.xml b/linden/install.xml
index e12b38a..4e4a7c6 100755
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -179,7 +179,7 @@
           <key>common</key>
           <map>
             <key>md5sum</key>
-            <string>d98b49b6fcbb603da3632bb94374230d</string>
+            <string>a6221f9f81be1f044ec1d32c93b11ad9</string>
             <key>url</key>
             <uri>http://download.kokuaviewer.org/files/extras/imprudence-artwork-20110314.tar.bz2</uri>
           </map>
-- 
cgit v1.1


From c8902bbebbc3c71ec1417bf3a92ba41386c704b2 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 14 Mar 2011 12:05:01 -0700
Subject: Added cmake files to the solution. This should've been done AGES ago

---
 linden/indra/cmake/CMakeLists.txt  | 119 +++++++++++++++++++++++++++++++++++++
 linden/indra/cmake/cmake_dummy.cpp |  30 ++++++++++
 2 files changed, 149 insertions(+)
 create mode 100644 linden/indra/cmake/cmake_dummy.cpp

diff --git a/linden/indra/cmake/CMakeLists.txt b/linden/indra/cmake/CMakeLists.txt
index e69de29..4a7d633 100644
--- a/linden/indra/cmake/CMakeLists.txt
+++ b/linden/indra/cmake/CMakeLists.txt
@@ -0,0 +1,119 @@
+# -*- cmake -*-
+
+include(00-Common)
+
+project(cmake)
+
+set(cmake_SOURCE_FILES
+    CMakeLists.txt
+
+    00-Common.cmake
+	APR.cmake
+	Audio.cmake
+	BerkeleyDB.cmake
+	Boost.cmake
+	BuildVersion.cmake
+	CARes.cmake
+	CMakeCopyIfDifferent.cmake
+	CopyBackToSource.cmake
+	CopyWinLibs.cmake
+	CSharpMacros.cmake
+	CURL.cmake
+	DBusGlib.cmake
+	DirectX.cmake
+	ELFIO.cmake
+	ExamplePlugin.cmake
+	EXPAT.cmake
+	FindAPR.cmake
+	FindBerkeleyDB.cmake
+	FindCARes.cmake
+	FindELFIO.cmake
+	FindGooglePerfTools.cmake
+	FindHunSpell.cmake
+	FindJsonCpp.cmake
+	FindLLQtWebkit.cmake
+	FindMono.cmake
+	FindMT.cmake
+	FindMySQL.cmake
+	FindNDOF.cmake
+	FindOpenJPEG.cmake
+	FindSCP.cmake
+	FindTut.cmake
+	FindXmlRpcEpi.cmake
+	FindZLIB.cmake
+	FMOD.cmake
+	FreeType.cmake
+	Glui.cmake
+	Glut.cmake
+	GooglePerfTools.cmake
+	GStreamer010Plugin.cmake
+	HUNSPELL.cmake
+	JPEG.cmake
+	JsonCpp.cmake
+	Linking.cmake
+	LLAddBuildTest.cmake
+	LLAudio.cmake
+	LLCharacter.cmake
+	LLCommon.cmake
+	LLCrashLogger.cmake
+	LLDatabase.cmake
+	LLImage.cmake
+	LLImageJ2COJ.cmake
+	LLInventory.cmake
+	LLMath.cmake
+	LLMessage.cmake
+	LLPlugin.cmake
+	LLPrimitive.cmake
+	LLRender.cmake
+	LLScene.cmake
+	LLUI.cmake
+	LLVFS.cmake
+	LLWindow.cmake
+	LLXML.cmake
+	LScript.cmake
+	MediaPluginBase.cmake
+	MonoDeps.cmake
+	MonoEmbed.cmake
+	Mozlib.cmake
+	MySQL.cmake
+	NDOF.cmake
+	OPENAL.cmake
+	OpenGL.cmake
+	OpenJPEG.cmake
+	OpenSSL.cmake
+	PluginAPI.cmake
+	PNG.cmake
+	Prebuilt.cmake
+	PulseAudio.cmake
+	Python.cmake
+	QuickTimePlugin.cmake
+	RunBuildTest.cmake
+	TemplateCheck.cmake
+	Tut.cmake
+	UI.cmake
+	UnixInstall.cmake
+	Variables.cmake
+	ViewerArtwork.cmake
+	ViewerMiscLibs.cmake
+	WebKitLibPlugin.cmake
+	XmlRpcEpi.cmake
+	ZLIB.cmake
+    )
+
+source_group("Shared Rules" FILES ${cmake_SOURCE_FILES})
+
+set(master_SOURCE_FILES
+    ../CMakeLists.txt
+    ../develop.py
+    )
+
+source_group("Master Rules" FILES ${master_SOURCE_FILES})
+
+set_source_files_properties(${cmake_SOURCE_FILES} ${master_SOURCE_FILES}
+                            PROPERTIES HEADER_FILE_ONLY TRUE)
+
+add_library(cmake
+            cmake_dummy.cpp
+            ${cmake_SOURCE_FILES}
+            ${master_SOURCE_FILES}
+            )
diff --git a/linden/indra/cmake/cmake_dummy.cpp b/linden/indra/cmake/cmake_dummy.cpp
new file mode 100644
index 0000000..25191e2
--- /dev/null
+++ b/linden/indra/cmake/cmake_dummy.cpp
@@ -0,0 +1,30 @@
+/** 
+ * @file cmake_dummy.cpp
+ *
+ * $LicenseInfo:firstyear=2008&license=viewergpl$
+ * 
+ * Copyright (c) 2008-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$
+ */
-- 
cgit v1.1


From 425b4744ec6e7a82eb9b8836b9ef765485836efb Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 14 Mar 2011 12:09:59 -0700
Subject: Added info message when cmake can't find the quicktime sdk

---
 linden/indra/cmake/QuickTimePlugin.cmake | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/linden/indra/cmake/QuickTimePlugin.cmake b/linden/indra/cmake/QuickTimePlugin.cmake
index 8afd8f3..db5e001 100644
--- a/linden/indra/cmake/QuickTimePlugin.cmake
+++ b/linden/indra/cmake/QuickTimePlugin.cmake
@@ -42,5 +42,7 @@ mark_as_advanced(QUICKTIME_LIBRARY)
 
 if (QUICKTIME_LIBRARY)
   set(QUICKTIME ON CACHE BOOL "Build with QuickTime streaming media support.")
+elseif (QUICKTIME_LIBRARY)
+  message(STATUS "CMake cannot find the Quicktime SDK. Building without Quicktime support!")
 endif (QUICKTIME_LIBRARY)
 
-- 
cgit v1.1


From 5768a6b7855c77467385b4f59dc90aea4cd14332 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 14 Mar 2011 12:41:01 -0700
Subject: Fixed typo in 425b474

---
 linden/indra/cmake/QuickTimePlugin.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linden/indra/cmake/QuickTimePlugin.cmake b/linden/indra/cmake/QuickTimePlugin.cmake
index db5e001..1693d0f 100644
--- a/linden/indra/cmake/QuickTimePlugin.cmake
+++ b/linden/indra/cmake/QuickTimePlugin.cmake
@@ -42,7 +42,7 @@ mark_as_advanced(QUICKTIME_LIBRARY)
 
 if (QUICKTIME_LIBRARY)
   set(QUICKTIME ON CACHE BOOL "Build with QuickTime streaming media support.")
-elseif (QUICKTIME_LIBRARY)
+else (QUICKTIME_LIBRARY)
   message(STATUS "CMake cannot find the Quicktime SDK. Building without Quicktime support!")
 endif (QUICKTIME_LIBRARY)
 
-- 
cgit v1.1


From a530d21bb01e721f9dfae02426d1cbd7806979db Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 14 Mar 2011 16:20:44 -0700
Subject: Added copy text button to Help > About Imprudence and tabbed the
 info. Ported from Singularity, patch by Siana Gearz

---
 linden/indra/newview/llfloaterabout.cpp            |  20 ++++
 linden/indra/newview/llfloaterabout.h              |   2 +
 .../skins/default/xui/en-us/floater_about.xml      | 133 ++++++++++++---------
 3 files changed, 101 insertions(+), 54 deletions(-)

diff --git a/linden/indra/newview/llfloaterabout.cpp b/linden/indra/newview/llfloaterabout.cpp
index f7163ee..a5d2c98 100644
--- a/linden/indra/newview/llfloaterabout.cpp
+++ b/linden/indra/newview/llfloaterabout.cpp
@@ -57,6 +57,7 @@
 #include "lltrans.h"
 #include "llappviewer.h" 
 #include "llglheaders.h"
+#include "llviewerwindow.h"
 #include "llwindow.h"
 #include "viewerversion.h"
 
@@ -106,6 +107,8 @@ LLFloaterAbout::LLFloaterAbout()
 		return;
 	}
 
+	childSetAction("copy_btn", onClickCopy, this);
+
 	// For some reason, adding style doesn't work unless this is true.
 	support_widget->setParseHTML(TRUE);
 
@@ -294,6 +297,23 @@ void LLFloaterAbout::show(void*)
 	sInstance->open();	 /*Flawfinder: ignore*/
 }
 
+// static
+void LLFloaterAbout::onClickCopy(void* user_data)
+{
+	LLFloaterAbout* self = (LLFloaterAbout*)user_data;
+
+	if (self)
+	{
+		LLViewerTextEditor* support_widget = self->getChild<LLViewerTextEditor>("support_editor", true);
+
+		if (support_widget)
+		{
+			std::string buffer = support_widget->getText();
+			gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(buffer));
+		}
+	}
+}
+
 
 static std::string get_viewer_release_notes_url()
 {
diff --git a/linden/indra/newview/llfloaterabout.h b/linden/indra/newview/llfloaterabout.h
index 7564b8e..44241ca 100644
--- a/linden/indra/newview/llfloaterabout.h
+++ b/linden/indra/newview/llfloaterabout.h
@@ -46,6 +46,8 @@ public:
 
 private:
 	static LLFloaterAbout* sInstance;
+
+	static void onClickCopy(void* user_data);
 };
 
 
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 db4e11d..0b73d9b 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
@@ -3,69 +3,94 @@
      can_resize="false" height="440" min_height="100" min_width="100"
      name="floater_about" rect_control="FloaterAboutRect"
      title="About Second Life" width="470">
-	<text_editor bottom="-434" embedded_items="false"
-	     follows="left|top|right|bottom" font="SansSerifSmall" height="168" left="6"
-  max_length="65536" mouse_opaque="true" name="credits_editor" width="458"
-  word_wrap="true">
-  The Imprudence Viewer was rocked hard by:
-  Jacek Antonelli, McCabe Maxsted, Armin Weatherwax, Elektra Hesse, and CodeBastard Redgrave. 
-  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, Archimedies Plutonian, Angus Boyd, Ansariel Hiller, Ardy Lay, Asuka Neely, Balp Allen, Carjay McGinnis, Chalice Yao, Dale Glass, Damian Delacrois, Danny Nolan, Felix Duesenburg, Geneko Nemeth, Henri Beauchamp, Katharine Berry, KirstenLee Cinquetti, Kitty Barnett, Latif Khalifa, Lilly Zenovka, Makomk Makosen, Mana Janus, Matthew Dowd, Michelle2 Zenovka, Mm Alder, Nemurimasu Neiro, Nicholaz Beresford, Patrick Sapinski, Paul Churchill, Peter Lameth, Robin Cornelius, Stephen Zenith, Thickbrick Sleaford, Thomas Shikami, Tom Meta, tx Oh, Vaalith Jinn, Vadim Bigbear, Vex Streeter, 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 Emerald Viewer, Hippo Viewer, Cool VL Viewer, Snowglobe Viewer, Meta7 Viewer, FrozenGlobe Viewer, and Meerkat 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!
-  
+  <tab_container
+		 follows="all"
+		 bottom="10"
+		 left="10"
+		 height="405"
+		 width="450"
+		 name="about_tab"
+		 tab_position="top">
+    <panel
+      border="true"
+      height="386"
+      label="Version"
+      help_topic="about_support_tab"
+      name="support_panel">
+      <text_editor bottom="28" embedded_items="false"
+         follows="left|top|right|bottom" font="SansSerif" height="352" left="6"
+         max_length="65536" mouse_opaque="true" name="support_editor" width="423"
+         word_wrap="true" />
+      <button follows="left|top" label="Copy to Clipboard" name="copy_btn"
+         left="5" bottom="0" top_pad="5" height="20" width="180" />
+    </panel>
+    <panel
+        border="true"
+        label="Credits"
+        height="386"
+        help_topic="about_credits_tab"
+        name="credits_panel">
+      <text_editor bottom="6" embedded_items="false"
+           follows="left|top|right|bottom" font="SansSerifSmall" height="374" left="6"
+           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, and CodeBastard Redgrave.
+        http://kokuaviewer.org/
 
-  Second Life Copyright (C) 1999-2009 Linden Research Inc.
-  
-  Second Life is brought to you by Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl and many others.
+        Imprudence is so awesome thanks to contributions from many generous people:
 
-  Thank you to the following residents for helping to ensure that this is the best version yet: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime, 
-Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida, 
-Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao, 
-Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi, 
-Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky, 
-Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
+        For their patches and code contributions, we thank Admiral Admiral, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Archimedies Plutonian, Angus Boyd, Ansariel Hiller, Ardy Lay, Asuka Neely, Balp Allen, Carjay McGinnis, Chalice Yao, Dale Glass, Damian Delacrois, Danny Nolan, Felix Duesenburg, Geneko Nemeth, Henri Beauchamp, Katharine Berry, KirstenLee Cinquetti, Kitty Barnett, Latif Khalifa, Lilly Zenovka, Makomk Makosen, Mana Janus, Matthew Dowd, Michelle2 Zenovka, Mm Alder, Nemurimasu Neiro, Nicholaz Beresford, Patrick Sapinski, Paul Churchill, Peter Lameth, Robin Cornelius, Stephen Zenith, Thickbrick Sleaford, Thomas Shikami, Tom Meta, tx Oh, Vaalith Jinn, Vadim Bigbear, Vex Streeter, Zi Ree, and Zwagoth Klaar.
 
-  3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
-  APR Copyright (C) 2000-2004 The Apache Software Foundation
-  cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
-  DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
-  expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
-  FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
-  GL Copyright (C) 1999-2004 Brian Paul.
-  Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
-  jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
-  jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
-  ogg/vorbis Copyright (C) 2001, Xiphophorus
-  OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
-  SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
-  SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
-  xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
-  zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
-  google-perftools Copyright (c) 2005, Google Inc.
-  Code from FAAD2 is copyright (c) Nero AG, www.nero.com
+        For their WindLight presets, we thank Ana Lutetia, CodeBastard Redgrave, and Torley Linden.
 
-  All rights reserved.  See LICENSE-libraries.txt for details.
+        Thanks also to the developer(s) of the Emerald Viewer, Hippo Viewer, Cool VL Viewer, Snowglobe Viewer, Meta7 Viewer, FrozenGlobe Viewer, and Meerkat 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.
 
-  Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
+        For a complete list of who did what, read the release notes!
 
 
-  Begin, be bold and venture to be wise. -- Horace
+        Second Life Copyright (C) 1999-2009 Linden Research Inc.
 
-  If you don't like something, change it. If you can't change it, change your attitude. -- Maya Angelou </text_editor>
+        Second Life is brought to you by Philip, Tessa, Andrew, Cory, James, Ben, Char, Charlie, Colin, Dan, Daniel, Doug, Eric, Hamlet, Haney, Eve, Hunter, Ian, Jeff, Jennifer, Jim, John, Lee, Mark, Peter, Phoenix, Richard, Robin, Xenon, Steve, Tanya, Eddie, Avi, Frank, Bruce, Aaron, Alice, Bob, Debra, Eileen, Helen, Janet, Louie, Leviathania, Stefan, Ray, Kevin, Tom, Mikeb, MikeT, Burgess, Elena, Tracy, Bill, Todd, Ryan, Zach, Sarah, Nova, Tim, Stephanie, Michael, Evan, Nicolas, Catherine, Rachelle, Dave, Holly, Bub, Kelly, Magellan, Ramzi, Don, Sabin, Jill, Rheya, Jeska, Torley, Kona, Callum, Charity, Ventrella, Jack, Vektor, Iris, Chris, Nicole, Mick, Reuben, Blue, Babbage, Yedwab, Deana, Lauren, Brent, Pathfinder, Chadrick, Altruima, Jesse, Teeny, Monroe, Icculus, David, Tess, Lizzie, Patsy, Isaac, Lawrence, Cyn, Bo, Gia, Annette, Marius, Tbone, Jonathan, Karen, Ginsu, Satoko, Yuko, Makiko, Thomas, Harry, Seth, Alexei, Brian, Guy, Runitai, Ethan, Data, Cornelius, Kenny, Swiss, Zero, Natria, Wendy, Stephen, Teeple, Thumper, Lucy, Dee, Mia, Liana, Warren, Branka, Aura, beez, Milo, Hermia, Red, Thrax, Joe, Sally, Magenta, Mogura, Paul, Jose, Rejean, Henrik, Lexie, Amber, Logan, Xan, Nora, Morpheus, Donovan, Leyla, MichaelFrancis, Beast, Cube, Bucky, Joshua, Stryfe, Harmony, Teresa, Claudia, Walker, Glenn, Fritz, Fordak, June, Cleopetra, Jean, Ivy, Betsy, Roosevelt, Spike, Ken, Which, Tofu, Chiyo, Rob, Zee, dustin, George, Del, Matthew, Cat, Jacqui, Lightfoot, Adrian, Viola, Alfred, Noel, Irfan, Sunil, Yool, Rika, Jane, Xtreme, Frontier, a2, Neo, Siobhan, Yoz, Justin, Elle, Qarl, Benjamin, Isabel, Gulliver, Everett, Christopher, Izzy, Stephany, Garry, Sejong, Sean, Tobin, Iridium, Meta, Anthony, Jeremy, JP, Jake, Maurice, Madhavi, Leopard, Kyle, Joon, Kari, Bert, Belinda, Jon, Kristi, Bridie, Pramod, KJ, Socrates, Maria, Ivan, Aric, Yamasaki, Adreanne, Jay, MitchK, Ceren, Coco, Durl, Jenny, Periapse, Kartic, Storrs, Lotte, Sandy, Rohn, Colossus, Zen, BigPapi, Brad, Pastrami, Kurz, Mani, Neuro, Jaime, MJ, Rowan, Sgt, Elvis, Gecko, Samuel, Sardonyx, Leo, Bryan, Niko, Soft, Poppy, Rachel, Aki, Angelo, Banzai, Alexa, Sue, CeeLo, Bender, CG, Gillian, Pelle, Nick, Echo, Zara, Christine, Shamiran, Emma, Blake, Keiko, Plexus, Joppa, Sidewinder, Erica, Ashlei, Twilight, Kristen, Brett, Q, Enus, Simon, Bevis, Kraft, Kip, Chandler, Ron, LauraP, Ram, KyleJM, Scouse, Prospero, Melissa, Marty, Nat, Hamilton, Kend, Lordan, Jimmy, Kosmo, Seraph, Green, Ekim, Wiggo, JT, Rome, Doris, Miz, Benoc, Whump, Trinity, Patch, Kate, TJ, Bao, Joohwan, Christy, Sofia, Matias, Cogsworth, Johan, Oreh, Cheah, Angela, Brandy, Mango, Lan, Aleks, Gloria, Heidy, Mitchell, Space, Colton, Bambers, Einstein, Maggie, Malbers, Rose, Winnie, Stella, Milton, Rothman, Niall, Marin, Allison, Katie, Dawn, Katt, Dusty, Kalpana, Judy, Andrea, Ambroff, Infinity, Gail, Rico, Raymond, Yi, William, Christa, M, Teagan, Scout, Molly, Dante, Corr, Dynamike, Usi, Kaylee, Vidtuts, Lil, Danica, Sascha, Kelv, Jacob, Nya, Rodney, Brandon, Elsie, Blondin, Grant, Katrin, Nyx, Gabriel, Locklainn, Claire, Devin, Minerva, Monty, Austin, Bradford, Si, Keira, H, Caitlin, Dita, Makai, Jenn, Ann, Meredith, Clare, Joy, Praveen, Cody, Edmund, Ruthe, Sirena, Gayathri, Spider, FJ, Davidoff, Tian, Jennie, Louise, Oskar, Landon, Noelle, Jarv, Ingrid, Al, Sommer, Doc, Aria, Huin, Gray, Lili, Vir, DJ, Yang, T, Simone, Maestro, Scott, Charlene, Quixote, Amanda, Susan, Zed, Anne, Enkidu, Esbee, Joroan, Katelin, Roxie, Tay, Scarlet, Kevin, Johnny, Wolfgang, Andren, Bob, Howard, Merov, Rand, Ray, Michon, Newell, Galen, Dessie, Les, Michon, Jenelle, Geo, Siz, Shapiro, Pete, Calyle, Selene, Allen, Phoebe, Goldin, Kimmora, Dakota, Slaton, Lindquist, Zoey, Hari, Othello, Rohit, Sheldon, Petra, Viale, Gordon, Kaye, Pink, Ferny, Emerson, Davy, Bri, Chan, Juan, Robert, Terrence, Nathan, Carl and many others.
 
-	<text_editor bottom_delta="174" embedded_items="false"
-	     follows="left|top|right|bottom" font="SansSerif" height="238" left="6"
-	     max_length="65536" mouse_opaque="true" name="support_editor" width="458"
-	     word_wrap="true" />
-	<string name="you_are_at">
+        Thank you to the following residents for helping to ensure that this is the best version yet: able whitman, Adeon Writer, adonaira aabye, Aeron Kohime,
+        Agathos Frascati, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Aminom Marvin, Angela Talamasca, Aralara Rajal, Armin Weatherwax, Ashrilyn Hayashida,
+        Athanasius Skytower, Aura Dirval, Barney Boomslang, Biancaluce Robbiani, Biker Offcourse, Borg Capalini, Bulli Schumann, catherine pfeffer, Chalice Yao,
+        Corre Porta, Court Goodman, Cummere Mayo, Dale Innis, Darien Caldwell, Darjeeling Schoonhoven, Daten Thielt, dimentox travanti, Dirk Talamasca, Drew Dwi,
+        Duckless Vandyke, Elanthius Flagstaff, Electro Burnstein, emiley tomsen, Escort DeFarge, Eva Rau, Ezian Ecksol, Fire Centaur, Fluf Fredriksson, Francisco Koolhoven, Frontera Thor, Frungi Stastny, Gally Young, gearsawe stonecutter, Gigs Taggart, Gordon Wendt, Gudmund Shepherd, Gypsy Paz, Harleen Gretzky,
+        Henri Beauchamp, Inma Rau, Irene Muni, Iskar Ariantho, Jacek Antonelli, JB Kraft, Jessicka Graves, Joeseph Albanese, Joshua Philgarlic, Khyota Wulluf, kirstenlee Cinquetti, Latif Khalifa, Lex Neva, Lilibeth Andree, Lisa Lowe, Lunita Savira, Loosey Demonia, lum pfohl, Marcos Fonzarelli, MartinRJ Fayray, Marusame Arai, Matthew Dowd, Maya Remblai, McCabe Maxsted, Meghan Dench, Melchoir Tokhes, Menos Short, Michelle2 Zenovka, Mimika Oh, Minerva Memel, Mm Alder, Ochi Wolfe, Omei Turnbull, Pesho Replacement, Phantom Ninetails, phoenixflames kukulcan, Polo Gufler, prez pessoa, princess niven, Prokofy Neva, Qie Niangao, Rem Beattie, RodneyLee Jessop, Saijanai Kuhn, Seg Baphomet, Sergen Davies, Shirley Marquez, SignpostMarv Martin, Sindy Tsure, Sira Arbizu, Skips Jigsaw, Sougent Harrop, Spritely Pixel, Squirrel Wood, StarSong Bright, Subversive Writer, Sugarcult Dagger, Sylumm Grigorovich, Tammy Nowotny, Tanooki Darkes, Tayra Dagostino, Theoretical Chemistry, Thickbrick Sleaford, valerie rosewood, Vex Streeter, Vixen Heron, Whoops Babii, Winter Ventura, Xiki Luik, Yann Dufaux, Yina Yao, Yukinoroh Kamachi, Zolute Infinity, Zwagoth Klaar
+
+        3Dconnexion SDK Copyright (C) 1992-2007 3Dconnexion
+        APR Copyright (C) 2000-2004 The Apache Software Foundation
+        cURL Copyright (C) 1996-2002, Daniel Stenberg, (daniel@haxx.se)
+        DBus/dbus-glib Copyright (C) 2002, 2003  CodeFactory AB / Copyright (C) 2003, 2004 Red Hat, Inc.
+        expat Copyright (C) 1998, 1999, 2000 Thai Open Source Software Center Ltd.
+        FreeType Copyright (C) 1996-2002, The FreeType Project (www.freetype.org).
+        GL Copyright (C) 1999-2004 Brian Paul.
+        Havok.com(TM) Copyright (C) 1999-2001, Telekinesys Research Limited.
+        jpeg2000 Copyright (C) 2001, David Taubman, The University of New South Wales (UNSW)
+        jpeglib Copyright (C) 1991-1998, Thomas G. Lane.
+        ogg/vorbis Copyright (C) 2001, Xiphophorus
+        OpenSSL Copyright (C) 1998-2002 The OpenSSL Project.
+        SDL Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
+        SSLeay Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+        xmlrpc-epi Copyright (C) 2000 Epinions, Inc.
+        zlib Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler.
+        google-perftools Copyright (c) 2005, Google Inc.
+        Code from FAAD2 is copyright (c) Nero AG, www.nero.com
+
+        All rights reserved.  See LICENSE-libraries.txt for details.
+
+        Voice chat Audio coding: Polycom(R) Siren14(TM) (ITU-T Rec. G.722.1 Annex C)
+
+
+        Begin, be bold and venture to be wise. -- Horace
+
+        If you don't like something, change it. If you can't change it, change your attitude. -- Maya Angelou
+      </text_editor>
+    </panel>
+  </tab_container>
+  <string name="you_are_at">
 		You are at [POSITION]
 	</string>
 </floater>
-- 
cgit v1.1


From 5be2952cc340b70aee026fc9a65a10bd6c5e52e0 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Mon, 14 Mar 2011 16:58:37 -0700
Subject: Use a buffer for debug console output (improves speed on Windows when
 console is enabled). Ported from Singularity, patch by Shyotl

---
 linden/indra/llcommon/llerror.cpp         | 3 +++
 linden/indra/llvfs/lldir_win32.cpp        | 2 +-
 linden/indra/newview/llappviewerwin32.cpp | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/linden/indra/llcommon/llerror.cpp b/linden/indra/llcommon/llerror.cpp
index 532a453..aeba629 100644
--- a/linden/indra/llcommon/llerror.cpp
+++ b/linden/indra/llcommon/llerror.cpp
@@ -168,6 +168,9 @@ namespace {
 				}
 			}
 			fprintf(stderr, "%s\n", message.c_str());
+#if LL_WINDOWS
+		    fflush(stderr); //Now using a buffer. flush is required.
+#endif
 			if (ANSI_YES == mUseANSI) colorANSI("0"); // reset
 		}
 	
diff --git a/linden/indra/llvfs/lldir_win32.cpp b/linden/indra/llvfs/lldir_win32.cpp
index 9d4c5ec..e5d6747 100644
--- a/linden/indra/llvfs/lldir_win32.cpp
+++ b/linden/indra/llvfs/lldir_win32.cpp
@@ -112,7 +112,7 @@ LLDir_Win32::LLDir_Win32()
 	}
 	else
 	{
-		fprintf(stderr, "Couldn't get APP path, assuming current directory!");
+		LL_WARNS("AppInit") << "Couldn't get APP path, assuming current directory!\n" << LL_ENDL;
 		GetCurrentDirectory(MAX_PATH, w_str);
 		mExecutableDir = utf16str_to_utf8str(llutf16string(w_str));
 		// Assume it's the current directory
diff --git a/linden/indra/newview/llappviewerwin32.cpp b/linden/indra/newview/llappviewerwin32.cpp
index 1f042bd..2e74d0a 100644
--- a/linden/indra/newview/llappviewerwin32.cpp
+++ b/linden/indra/newview/llappviewerwin32.cpp
@@ -365,7 +365,8 @@ void create_console()
 	h_con_handle = _open_osfhandle(l_std_handle, _O_TEXT);
 	fp = _fdopen( h_con_handle, "w" );
 	*stderr = *fp;
-	setvbuf( stderr, NULL, _IONBF, 0 );
+	setvbuf( stderr, NULL, _IOFBF, 1024 );  //Assigning a buffer improves speed a LOT, esp on vista/win7
+                      //_IOLBF is borked.
 }
 
 LLAppViewerWin32::LLAppViewerWin32(const char* cmd_line) :
-- 
cgit v1.1


From a47ebd7864f6dceedd52ceef56a30786f38a00c2 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 15 Mar 2011 17:12:51 -0700
Subject: Don't use the build window keyboard shortcuts when the UI has focus
 (except for the chatbar)

---
 linden/indra/newview/lltoolmgr.cpp      | 21 +++++++++++++++++----
 linden/indra/newview/llviewerwindow.cpp | 10 ++++++++++
 linden/indra/newview/llviewerwindow.h   |  3 +++
 3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/linden/indra/newview/lltoolmgr.cpp b/linden/indra/newview/lltoolmgr.cpp
index 8204374..764ca9d 100644
--- a/linden/indra/newview/lltoolmgr.cpp
+++ b/linden/indra/newview/lltoolmgr.cpp
@@ -34,6 +34,8 @@
 
 #include "lltoolmgr.h"
 
+#include "llchatbar.h"
+#include "llfloatertools.h"
 #include "lltool.h"
 // tools and manipulators
 #include "llmanipscale.h"
@@ -191,11 +193,22 @@ LLTool* LLToolMgr::getCurrentTool()
 	else
 	{
 		// due to window management weirdness we can get here with gToolNull
-		bool can_override = mBaseTool && (mBaseTool != gToolNull);
-		mOverrideTool = can_override ? mBaseTool->getOverrideTool(override_mask) : NULL;
+		// Don't use keyboard overrides when the edit window doesn't have focus. The chatbar is an unfortunate exception -- MC
+		if (gViewerWindow && gViewerWindow->getUIHasFocus()
+			&& gFloaterTools && !gFloaterTools->hasFocus()
+			&& gChatBar && !gChatBar->getVisible())
+		{
+			cur_tool = mBaseTool;
+		}
+		else
+		{
+			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
-		cur_tool = mOverrideTool ? mOverrideTool : mBaseTool;
+			// use keyboard-override tool if available otherwise drop back to base tool
+			cur_tool = mOverrideTool ? mOverrideTool : mBaseTool;
+		}
 	}
 
 	LLTool* prev_tool = mSelectedTool;
diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index b4ef3ff..8423f4b 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -5011,6 +5011,16 @@ LLRect LLViewerWindow::getChatConsoleRect()
 
 	return console_rect;
 }
+
+bool LLViewerWindow::getUIHasFocus()
+{
+	return gFocusMgr.getKeyboardFocus() != NULL
+		|| LLMenuGL::getKeyboardMode() 
+		|| (gMenuBarView && gMenuBarView->getHighlightedItem() && gMenuBarView->getHighlightedItem()->isActive())
+		|| gFocusMgr.childHasKeyboardFocus(mRootView);
+}
+
+
 //----------------------------------------------------------------------------
 
 
diff --git a/linden/indra/newview/llviewerwindow.h b/linden/indra/newview/llviewerwindow.h
index fd159e1..6b8e2b7 100644
--- a/linden/indra/newview/llviewerwindow.h
+++ b/linden/indra/newview/llviewerwindow.h
@@ -195,6 +195,9 @@ public:
 	S32				getWindowDisplayHeight()	const;
 	S32				getWindowDisplayWidth()	const;
 
+	// Returns true when the UI has focus, false when the 3D world does
+	bool			getUIHasFocus();
+
 	// Window in scaled pixels (via UI scale), use this for
 	// UI elements checking size.
 	const LLRect&	getVirtualWindowRect()		const	{ return mVirtualWindowRect; };
-- 
cgit v1.1


From b195e7a0d78d66d256688be01385cede58b0894e Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Tue, 15 Mar 2011 17:17:10 -0700
Subject: Fixed missing use_prebuilt_binary(gstreamer-plugins) from
 GStreamer010Plugin.cmake and fixed some out-of-date lib requirements for
 Windows

---
 linden/indra/cmake/GStreamer010Plugin.cmake | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/linden/indra/cmake/GStreamer010Plugin.cmake b/linden/indra/cmake/GStreamer010Plugin.cmake
index ccad5be..9d2c553 100644
--- a/linden/indra/cmake/GStreamer010Plugin.cmake
+++ b/linden/indra/cmake/GStreamer010Plugin.cmake
@@ -10,9 +10,8 @@ if (STANDALONE)
 else (STANDALONE)
 
   # Possibly libxml and glib should have their own .cmake file instead...
-  use_prebuilt_binary(glib)			# gstreamer needs glib
-  use_prebuilt_binary(libxml)
-  use_prebuilt_binary(gstreamer)
+  use_prebuilt_binary(gstreamer)	# includes glib, libxml, and iconv on Windows
+  use_prebuilt_binary(gstreamer-plugins)
   set(GSTREAMER010_FOUND ON FORCE BOOL)
   set(GSTREAMER010_PLUGINS_BASE_FOUND ON FORCE BOOL)
   if (WINDOWS)
@@ -22,6 +21,8 @@ else (STANDALONE)
 		${LIBS_PREBUILT_DIR}/include/libxml2
 		)
   else (WINDOWS)
+    use_prebuilt_binary(glib)			# gstreamer needs glib
+	use_prebuilt_binary(libxml)
 	set(GSTREAMER010_INCLUDE_DIRS
 		${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/gstreamer-0.10
 		${LIBS_PREBUILT_DIR}/${LL_ARCH_DIR}/include/glib-2.0
-- 
cgit v1.1


From f63e3abf79e96943c2c7542fcb9e2945b0912e34 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Fri, 18 Mar 2011 11:56:08 +0100
Subject: Fix Bug #799 german floater_pay_object.xml broken

---
 linden/indra/newview/skins/default/xui/de/floater_pay_object.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml
index 07dee37..fc7c204 100644
--- a/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/de/floater_pay_object.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater name="Give Money" title="[PAY TYPE] [FIRST] [LAST>
+<floater name="Give Money" title="[PAY TYPE] [FIRST] [LAST]">
 
 	<string name="pay group">
 		Gruppe bezahlen:
-- 
cgit v1.1


From 16457f139853b280043e727f67306673e778e8b6 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Fri, 18 Mar 2011 16:06:39 +0100
Subject: fix currency in the german status bar button missing

---
 linden/indra/newview/skins/default/xui/de/panel_status_bar.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/linden/indra/newview/skins/default/xui/de/panel_status_bar.xml b/linden/indra/newview/skins/default/xui/de/panel_status_bar.xml
index 565e6b8..6c2da13 100644
--- a/linden/indra/newview/skins/default/xui/de/panel_status_bar.xml
+++ b/linden/indra/newview/skins/default/xui/de/panel_status_bar.xml
@@ -6,7 +6,7 @@
 	<text length="1" name="BalanceText" tool_tip="Kontostand" type="string">
 		Wird geladen...
 	</text>
-	<button label="" label_selected="" name="buycurrency" tool_tip="Geld kaufen"/>
+	<button label="[CURRENCY]" label_selected="" name="buycurrency" tool_tip="Geld kaufen"/>
 	<text length="12" name="TimeText" tool_tip="Aktuelle Zeit (Pazifik)" type="string">
 		12:00
 	</text>
-- 
cgit v1.1


From f8e5faa3079218704cfb793917e96a0a7a9ef8b1 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Fri, 18 Mar 2011 16:55:28 +0100
Subject: only use vbo if available

---
 linden/indra/newview/llviewerwindow.cpp | 2 +-
 linden/indra/newview/pipeline.cpp       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index b4ef3ff..269a3d0 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -1309,7 +1309,7 @@ LLViewerWindow::LLViewerWindow(
 	{
 		gSavedSettings.setBOOL("RenderVBOEnable", FALSE);
 	}
-	LLVertexBuffer::initClass(gSavedSettings.getBOOL("RenderVBOEnable"));
+	LLVertexBuffer::initClass(gSavedSettings.getBOOL("RenderVBOEnable") && gGLManager.mHasVertexBufferObject);
 
 	if (LLFeatureManager::getInstance()->isSafe()
 		|| (gSavedSettings.getS32("LastFeatureVersion") != LLFeatureManager::getInstance()->getVersion())
diff --git a/linden/indra/newview/pipeline.cpp b/linden/indra/newview/pipeline.cpp
index 36ffb05..5458af5 100644
--- a/linden/indra/newview/pipeline.cpp
+++ b/linden/indra/newview/pipeline.cpp
@@ -4934,7 +4934,7 @@ void LLPipeline::setUseVBO(BOOL use_vbo)
 		}
 		
 		resetVertexBuffers();
-		LLVertexBuffer::initClass(use_vbo);
+		LLVertexBuffer::initClass(use_vbo && gGLManager.mHasVertexBufferObject);
 	}
 }
 
-- 
cgit v1.1


From 07d67729f0052944b94bf1ecc9b0bc9690db20ad Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Fri, 18 Mar 2011 12:48:00 -0700
Subject: Added a null check for corrupt volume lists

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

diff --git a/linden/indra/newview/llvovolume.cpp b/linden/indra/newview/llvovolume.cpp
index 204d641..7aaf845 100644
--- a/linden/indra/newview/llvovolume.cpp
+++ b/linden/indra/newview/llvovolume.cpp
@@ -785,7 +785,7 @@ void LLVOVolume::sculpt()
 		for (S32 i = 0; i < mSculptTexture->getNumVolumes(); ++i)
 		{
 			LLVOVolume* volume = (*(mSculptTexture->getVolumeList()))[i];
-			if (volume != this && volume->getVolume() == getVolume())
+			if (volume && volume != this && volume->getVolume() == getVolume())
 			{
 				gPipeline.markRebuild(volume->mDrawable, LLDrawable::REBUILD_GEOMETRY, FALSE);
 			}
-- 
cgit v1.1


From 892e8b82d84266f8bdfbd5c2cdd388f71c208035 Mon Sep 17 00:00:00 2001
From: RevolutionSmythe
Date: Fri, 18 Mar 2011 17:32:12 -0500
Subject: Merge in Var Sized Regions into the Imprudence Experimental.

---
 linden/indra/llcommon/indra_constants.h        |    7 +-
 linden/indra/llinventory/llparcel.h            |    3 +-
 linden/indra/llmessage/message_prehash.cpp     |    4 +-
 linden/indra/llmessage/message_prehash.h       |    4 +-
 linden/indra/llmessage/patch_code.cpp          |   13 +-
 linden/indra/llmessage/patch_code.h            |    2 +-
 linden/indra/llmessage/patch_dct.h             |    2 +-
 linden/indra/llwindow/glh/glh_linear.h         | 3242 ++++++++++++------------
 linden/indra/newview/llcloud.cpp               |    2 +-
 linden/indra/newview/llfloaterregioninfo.cpp   |    8 +-
 linden/indra/newview/llglsandbox.cpp           |    2 +-
 linden/indra/newview/llmapresponders.cpp       |    4 +
 linden/indra/newview/llstartup.cpp             |   14 +-
 linden/indra/newview/llsurface.cpp             |   20 +-
 linden/indra/newview/llviewermessage.cpp       |   27 +-
 linden/indra/newview/llviewerparcelmgr.cpp     |   22 +-
 linden/indra/newview/llviewerparcelmgr.h       |    2 +
 linden/indra/newview/llviewerparceloverlay.cpp |    4 +-
 linden/indra/newview/llviewerparceloverlay.h   |    1 +
 linden/indra/newview/llviewerregion.cpp        |    3 +
 linden/indra/newview/llvlmanager.cpp           |   61 +-
 linden/indra/newview/llvowater.cpp             |    2 +-
 linden/indra/newview/llwind.cpp                |    4 +-
 linden/indra/newview/llworld.cpp               |   27 +-
 linden/indra/newview/llworld.h                 |    6 +-
 linden/indra/newview/llworldmap.cpp            |   29 +-
 linden/indra/newview/llworldmap.h              |    2 +
 linden/indra/newview/llworldmapview.cpp        |   14 +-
 28 files changed, 1823 insertions(+), 1708 deletions(-)

diff --git a/linden/indra/llcommon/indra_constants.h b/linden/indra/llcommon/indra_constants.h
index 279d280..ae1e04a 100644
--- a/linden/indra/llcommon/indra_constants.h
+++ b/linden/indra/llcommon/indra_constants.h
@@ -151,7 +151,12 @@ const	U32		PORT_DISCOVERY_RANGE_MAX		= PORT_DISCOVERY_RANGE_MIN + 50;
 const	char	LAND_LAYER_CODE					= 'L';
 const	char	WATER_LAYER_CODE				= 'W';
 const	char	WIND_LAYER_CODE					= '7';
-const	char	CLOUD_LAYER_CODE				= '8';
+const	char	CLOUD_LAYER_CODE				= '8';
+
+// Extended land layer for Aurora Sim
+const	char	AURORA_LAND_LAYER_CODE			= 'M';
+const	char	AURORA_WIND_LAYER_CODE			= '9';
+const	char	AURORA_CLOUD_LAYER_CODE			= ':';
 
 // keys
 // Bit masks for various keyboard modifier keys.
diff --git a/linden/indra/llinventory/llparcel.h b/linden/indra/llinventory/llparcel.h
index 8faa673..366f589 100644
--- a/linden/indra/llinventory/llparcel.h
+++ b/linden/indra/llinventory/llparcel.h
@@ -66,7 +66,8 @@ const S32 PARCEL_PASS_PRICE_DEFAULT = 10;
 const F32 PARCEL_PASS_HOURS_DEFAULT = 1.f;
 
 // Number of "chunks" in which parcel overlay data is sent
-// Chunk 0 = southern rows, entire width
+// Chunk 0 = southern rows, entire width
+// NOTE: NOT USABLE FOR VAR SIZED REGIONS!
 const S32 PARCEL_OVERLAY_CHUNKS = 4;
 
 // Bottom three bits are a color index for the land overlay
diff --git a/linden/indra/llmessage/message_prehash.cpp b/linden/indra/llmessage/message_prehash.cpp
index ecb45bf..a8b021f 100644
--- a/linden/indra/llmessage/message_prehash.cpp
+++ b/linden/indra/llmessage/message_prehash.cpp
@@ -586,7 +586,9 @@ char* _PREHASH_NotecardItemID = LLMessageStringTable::getInstance()->getString("
 char* _PREHASH_LastName = LLMessageStringTable::getInstance()->getString("LastName");
 char* _PREHASH_From = LLMessageStringTable::getInstance()->getString("From");
 char* _PREHASH_RoleChange = LLMessageStringTable::getInstance()->getString("RoleChange");
-char* _PREHASH_Port = LLMessageStringTable::getInstance()->getString("Port");
+char* _PREHASH_Port = LLMessageStringTable::getInstance()->getString("Port");
+char* _PREHASH_RegionSizeX = LLMessageStringTable::getInstance()->getString("RegionSizeX");
+char* _PREHASH_RegionSizeY = LLMessageStringTable::getInstance()->getString("RegionSizeY");
 char* _PREHASH_MemberTitle = LLMessageStringTable::getInstance()->getString("MemberTitle");
 char* _PREHASH_LogParcelChanges = LLMessageStringTable::getInstance()->getString("LogParcelChanges");
 char* _PREHASH_AgentCachedTextureResponse = LLMessageStringTable::getInstance()->getString("AgentCachedTextureResponse");
diff --git a/linden/indra/llmessage/message_prehash.h b/linden/indra/llmessage/message_prehash.h
index 8516483..adf27ee 100644
--- a/linden/indra/llmessage/message_prehash.h
+++ b/linden/indra/llmessage/message_prehash.h
@@ -586,7 +586,9 @@ extern char * _PREHASH_NotecardItemID;
 extern char * _PREHASH_LastName;
 extern char * _PREHASH_From;
 extern char * _PREHASH_RoleChange;
-extern char * _PREHASH_Port;
+extern char * _PREHASH_Port;
+extern char * _PREHASH_RegionSizeX;
+extern char * _PREHASH_RegionSizeY;
 extern char * _PREHASH_MemberTitle;
 extern char * _PREHASH_LogParcelChanges;
 extern char * _PREHASH_AgentCachedTextureResponse;
diff --git a/linden/indra/llmessage/patch_code.cpp b/linden/indra/llmessage/patch_code.cpp
index 90fb236..4b4313d 100644
--- a/linden/indra/llmessage/patch_code.cpp
+++ b/linden/indra/llmessage/patch_code.cpp
@@ -235,7 +235,7 @@ void	decode_patch_group_header(LLBitPack &bitpack, LLGroupHeader *gopp)
 	gPatchSize = gopp->patch_size; 
 }
 
-void	decode_patch_header(LLBitPack &bitpack, LLPatchHeader *ph)
+void	decode_patch_header(LLBitPack &bitpack, LLPatchHeader *ph, BOOL b_large_patch)
 {
 	U8 retvalu8;
 
@@ -274,15 +274,18 @@ void	decode_patch_header(LLBitPack &bitpack, LLPatchHeader *ph)
 #endif
 	ph->range = retvalu16;
 
-	retvalu16 = 0;
+	retvalu32 = 0;
 #ifdef LL_BIG_ENDIAN
 	ret = (U8 *)&retvalu16;
 	bitpack.bitUnpack(&(ret[1]), 8);
 	bitpack.bitUnpack(&(ret[0]), 2);
 #else
-	bitpack.bitUnpack((U8 *)&retvalu16, 10);
-#endif
-	ph->patchids = retvalu16;
+	if (b_large_patch)
+		bitpack.bitUnpack((U8 *)&retvalu32, 32);
+	else
+		bitpack.bitUnpack((U8 *)&retvalu32, 10);
+#endif
+	ph->patchids = retvalu32;
 
 	gWordBits = (ph->quant_wbits & 0xf) + 2;
 }
diff --git a/linden/indra/llmessage/patch_code.h b/linden/indra/llmessage/patch_code.h
index 82fa6bb..dbfdf70 100644
--- a/linden/indra/llmessage/patch_code.h
+++ b/linden/indra/llmessage/patch_code.h
@@ -46,7 +46,7 @@ void	end_patch_coding(LLBitPack &bitpack);
 
 void	init_patch_decoding(LLBitPack &bitpack);
 void	decode_patch_group_header(LLBitPack &bitpack, LLGroupHeader *gopp);
-void	decode_patch_header(LLBitPack &bitpack, LLPatchHeader *ph);
+void	decode_patch_header(LLBitPack &bitpack, LLPatchHeader *ph, BOOL b_large_patch);
 void	decode_patch(LLBitPack &bitpack, S32 *patches);
 
 #endif
diff --git a/linden/indra/llmessage/patch_dct.h b/linden/indra/llmessage/patch_dct.h
index 663e146..ba21be7 100644
--- a/linden/indra/llmessage/patch_dct.h
+++ b/linden/indra/llmessage/patch_dct.h
@@ -79,7 +79,7 @@ public:
 	F32	dc_offset;		// 4 bytes
 	U16	range;			// 2 = 7 ((S16) FP range (breaks if we need > 32K meters in 1 patch)
 	U8	quant_wbits;	// 1 = 8 (upper 4 bits is quant - 2, lower 4 bits is word bits - 2)
-	U16	patchids;		// 2 = 10 (actually only uses 10 bits, 5 for each)
+	U32	patchids;		// 2 = 10 (actually only uses 10 bits, 5 for each)
 };
 
 // Compression routines
diff --git a/linden/indra/llwindow/glh/glh_linear.h b/linden/indra/llwindow/glh/glh_linear.h
index 04ae1bd..bb59d7e 100755
--- a/linden/indra/llwindow/glh/glh_linear.h
+++ b/linden/indra/llwindow/glh/glh_linear.h
@@ -1,1621 +1,1621 @@
-/*
-    glh - is a platform-indepenedent C++ OpenGL helper library 
-
-
-    Copyright (c) 2000 Cass Everitt
-	Copyright (c) 2000 NVIDIA Corporation
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or
-	without modification, are permitted provided that the following
-	conditions are met:
-
-     * Redistributions of source code must retain the above
-	   copyright notice, this list of conditions and the following
-	   disclaimer.
-
-     * Redistributions in binary form must reproduce the above
-	   copyright notice, this list of conditions and the following
-	   disclaimer in the documentation and/or other materials
-	   provided with the distribution.
-
-     * The names of contributors to this software may not be used
-	   to endorse or promote products derived from this software
-	   without specific prior written permission. 
-
-       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-	   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-	   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-	   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	   REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-	   INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-	   BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-	   CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-	   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-	   ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
-	   POSSIBILITY OF SUCH DAMAGE. 
-
-
-    Cass Everitt - cass@r3.nu
-*/
-
-/*
-glh_linear.h
-*/
-
-// Author:  Cass W. Everitt
-
-#ifndef GLH_LINEAR_H
-#define GLH_LINEAR_H
-
-#include <memory.h>
-#include <math.h>
-#include <assert.h>
-
-// only supports float for now...
-#define GLH_REAL_IS_FLOAT
-
-#ifdef GLH_REAL_IS_FLOAT
-# define GLH_REAL float
-# define GLH_REAL_NAMESPACE ns_float
-#endif
-
-#define     GLH_QUATERNION_NORMALIZATION_THRESHOLD  64
-
-#define     GLH_RAD_TO_DEG      GLH_REAL(57.2957795130823208767981548141052)
-#define     GLH_DEG_TO_RAD      GLH_REAL(0.0174532925199432957692369076848861)
-#define     GLH_ZERO            GLH_REAL(0.0)
-#define     GLH_ONE             GLH_REAL(1.0)
-#define     GLH_TWO             GLH_REAL(2.0)
-#define     GLH_EPSILON         GLH_REAL(10e-6)
-#define     GLH_PI              GLH_REAL(3.1415926535897932384626433832795)    
-
-#define     equivalent(a,b)     (((a < b + GLH_EPSILON) && (a > b - GLH_EPSILON)) ? true : false)
-
-namespace glh
-{
-
-	inline GLH_REAL to_degrees(GLH_REAL radians) { return radians*GLH_RAD_TO_DEG; }
-	inline GLH_REAL to_radians(GLH_REAL degrees) { return degrees*GLH_DEG_TO_RAD; }
-
-	// forward declarations for friend template functions.
-	template <int N, class T> class vec;
-	
-	// forward declarations for friend template functions.
-	template <int N, class T>
-		bool operator == ( const vec<N,T> & v1, const vec<N,T> & v2 );
-	
-	// forward declarations for friend template functions.
-	template <int N, class T>
-		bool operator != ( const vec<N,T> & v1, const vec<N,T> & v2 );
-
-	template <int N, class T>	
-	class vec
-	{				
-    public:
-		int size() const { return N; }
-		
-		vec(const T & t = T()) 
-		{ for(int i = 0; i < N; i++) v[i] = t; }
-		vec(const T * tp)
-		{ for(int i = 0; i < N; i++) v[i] = tp[i]; }
-		
-		const T * get_value() const
-		{ return v; }
-		
-		
-		T dot( const vec<N,T> & rhs ) const
-		{ 
-			T r = 0;
-			for(int i = 0; i < N; i++) r += v[i]*rhs.v[i];
-			return r;
-		}
-		
-		T length() const
-		{
-			T r = 0;
-			for(int i = 0; i < N; i++) r += v[i]*v[i]; 
-			return T(sqrt(r));
-		}	
-		
-		T square_norm() const
-		{
-			T r = 0;
-			for(int i = 0; i < N; i++) r += v[i]*v[i]; 
-			return r;
-		}	
-		
-		void  negate()
-		{ for(int i = 0; i < N; i++) v[i] = -v[i]; }
-		
-		
-		T normalize() 
-		{ 
-			T sum(0);
-			for(int i = 0; i < N; i++) 
-                sum += v[i]*v[i];
-			sum = T(sqrt(sum));
-            if (sum > GLH_EPSILON)
-			    for(int i = 0; i < N; i++) 
-                    v[i] /= sum;
-			return sum;
-		}
-		
-		
-		vec<N,T> & set_value( const T * rhs )
-		{ for(int i = 0; i < N; i++) v[i] = rhs[i]; return *this; }
-		
-		T & operator [] ( int i )
-		{ return v[i]; }
-		
-		const T & operator [] ( int i ) const
-		{ return v[i]; }
-
-		vec<N,T> & operator *= ( T d )
-		{ for(int i = 0; i < N; i++) v[i] *= d; return *this;}
-		
-		vec<N,T> & operator *= ( const vec<N,T> & u )
-		{ for(int i = 0; i < N; i++) v[i] *= u[i]; return *this;}
-		
-		vec<N,T> & operator /= ( T d )
-		{ if(d == 0) return *this; for(int i = 0; i < N; i++) v[i] /= d; return *this;}
-		
-		vec<N,T> & operator += ( const vec<N,T> & u )
-		{ for(int i = 0; i < N; i++) v[i] += u.v[i]; return *this;}
-		
-		vec<N,T> & operator -= ( const vec<N,T> & u )
-		{ for(int i = 0; i < N; i++) v[i] -= u.v[i]; return *this;}
-		
-		
-		vec<N,T> operator - () const
-		{ vec<N,T> rv = v; rv.negate(); return rv; }
-		
-		vec<N,T> operator + ( const vec<N,T> &v) const
-		{ vec<N,T> rt(*this); return rt += v; }
-		
-		vec<N,T> operator - ( const vec<N,T> &v) const
-		{ vec<N,T> rt(*this); return rt -= v; }
-		
-		vec<N,T> operator * ( T d) const
-		{ vec<N,T> rt(*this); return rt *= d; }
-		
-		friend bool operator == <> ( const vec<N,T> &v1, const vec<N,T> &v2 );
-		friend bool operator != <> ( const vec<N,T> &v1, const vec<N,T> &v2 );
-		
-		
-	//protected:
-		T v[N];
-	};
-	
-	
-	
-	// vector friend operators
-	
-	template <int N, class T> inline
-		vec<N,T> operator * ( const vec<N,T> & b, T d )
-	{
-		vec<N,T> rt(b);
-		return rt *= d;
-	}
-
-	template <int N, class T> inline
-		vec<N,T> operator * ( T d, const vec<N,T> & b )
-	{ return b*d; }
-	
-	template <int N, class T> inline
-		vec<N,T> operator * ( const vec<N,T> & b, const vec<N,T> & d )
-	{
-		vec<N,T> rt(b);
-		return rt *= d;
-	}
-
-	template <int N, class T> inline
-		vec<N,T> operator / ( const vec<N,T> & b, T d )
-	{ vec<N,T> rt(b); return rt /= d; }
-	
-	template <int N, class T> inline
-		vec<N,T> operator + ( const vec<N,T> & v1, const vec<N,T> & v2 )
-	{ vec<N,T> rt(v1); return rt += v2; }
-	
-	template <int N, class T> inline
-		vec<N,T> operator - ( const vec<N,T> & v1, const vec<N,T> & v2 )
-	{ vec<N,T> rt(v1); return rt -= v2; }
-	
-	
-	template <int N, class T> inline
-		bool operator == ( const vec<N,T> & v1, const vec<N,T> & v2 )
-	{
-		for(int i = 0; i < N; i++)
-			if(v1.v[i] != v2.v[i])
-				return false;
-			return true;
-	}
-	
-	template <int N, class T> inline
-		bool operator != ( const vec<N,T> & v1, const vec<N,T> & v2 )
-	{ return !(v1 == v2); }
-	
-
-	typedef vec<3,unsigned char> vec3ub;
-	typedef vec<4,unsigned char> vec4ub;
-
-
-
-
-
-	namespace GLH_REAL_NAMESPACE
-	{
-	typedef GLH_REAL real;
-
-	class line;
-	class plane;
-	class matrix4;
-	class quaternion;
-	typedef quaternion rotation; 
-  
-	class vec2 : public vec<2,real>
-	{
-    public:
-		vec2(const real & t = real()) : vec<2,real>(t)
-		{}
-		vec2(const vec<2,real> & t) : vec<2,real>(t)
-		{}
-		vec2(const real * tp) : vec<2,real>(tp)
-		{}
-		
-		vec2(real x, real y )
-		{ v[0] = x; v[1] = y; }
-		
-		void get_value(real & x, real & y) const
-		{ x = v[0]; y = v[1]; }
-		
-		vec2 & set_value( const real & x, const real & y)
-		{ v[0] = x; v[1] = y; return *this; }
-		
-	};
-	
-	
-	class vec3 : public vec<3,real>
-	{
-    public:
-		vec3(const real & t = real()) : vec<3,real>(t)
-		{}
-		vec3(const vec<3,real> & t) : vec<3,real>(t)
-		{}
-		vec3(const real * tp) : vec<3,real>(tp)
-		{}
-		
-		vec3(real x, real y, real z)
-		{ v[0] = x; v[1] = y; v[2] = z; }
-		
-		void get_value(real & x, real & y, real & z) const
-		{ x = v[0]; y = v[1]; z = v[2]; }
-		
-		vec3 cross( const vec3 &rhs ) const
-		{
-			vec3 rt;
-			rt.v[0] = v[1]*rhs.v[2]-v[2]*rhs.v[1];
-			rt.v[1] = v[2]*rhs.v[0]-v[0]*rhs.v[2];
-			rt.v[2] = v[0]*rhs.v[1]-v[1]*rhs.v[0];	
-			return rt;
-		}
-		
-		vec3 & set_value( const real & x, const real & y, const real & z)
-		{ v[0] = x; v[1] = y; v[2] = z; return *this; }
-		
-	};
-
-  		
-    class vec4 : public vec<4,real>
-    {
-    public:
-        vec4(const real & t = real()) : vec<4,real>(t)
-        {}
-        vec4(const vec<4,real> & t) : vec<4,real>(t)
-        {}
-
-        vec4(const vec<3,real> & t, real fourth)
-
-        { v[0] = t.v[0]; v[1] = t.v[1]; v[2] = t.v[2]; v[3] = fourth; }
-        vec4(const real * tp) : vec<4,real>(tp)
-        {}
-        vec4(real x, real y, real z, real w)
-        { v[0] = x; v[1] = y; v[2] = z; v[3] = w; }
-
-        void get_value(real & x, real & y, real & z, real & w) const
-        { x = v[0]; y = v[1]; z = v[2]; w = v[3]; }
-  
-        vec4 & set_value( const real & x, const real & y, const real & z, const real & w)
-        { v[0] = x; v[1] = y; v[2] = z; v[3] = w; return *this; }
-    };
-
-    inline
-    vec3 homogenize(const vec4 & v)
-    {
-      vec3 rt;
-      assert(v.v[3] != GLH_ZERO);
-      rt.v[0] = v.v[0]/v.v[3];
-      rt.v[1] = v.v[1]/v.v[3];
-      rt.v[2] = v.v[2]/v.v[3];
-      return rt;
-    }
-  
-
-
-    class line
-    {
-    public:
-  
-        line()
-        { set_value(vec3(0,0,0),vec3(0,0,1)); }
-
-        line( const vec3 & p0, const vec3 &p1)
-        { set_value(p0,p1); }
-
-        void set_value( const vec3 &p0, const vec3 &p1)
-        {
-          position = p0;
-          direction = p1-p0;
-          direction.normalize();
-        }
-  
-        bool get_closest_points(const line &line2, 
-					          vec3 &pointOnThis,
-					          vec3 &pointOnThat)
-        {
-  
-          // quick check to see if parallel -- if so, quit.
-          if(fabs(direction.dot(line2.direction)) == 1.0)
-	          return 0;
-          line l2 = line2;
-  
-          // Algorithm: Brian Jean
-          // 
-          register real u;
-          register real v;
-          vec3 Vr = direction;
-          vec3 Vs = l2.direction;
-          register real Vr_Dot_Vs = Vr.dot(Vs);
-          register real detA = real(1.0 - (Vr_Dot_Vs * Vr_Dot_Vs));
-          vec3 C = l2.position - position;
-          register real C_Dot_Vr =  C.dot(Vr);
-          register real C_Dot_Vs =  C.dot(Vs);
-  
-          u = (C_Dot_Vr - Vr_Dot_Vs * C_Dot_Vs)/detA;
-          v = (C_Dot_Vr * Vr_Dot_Vs - C_Dot_Vs)/detA;
-  
-          pointOnThis = position;
-          pointOnThis += direction * u;
-          pointOnThat = l2.position;
-          pointOnThat += l2.direction * v;
-  
-          return 1;
-        }
-  
-        vec3 get_closest_point(const vec3 &point)
-        {
-          vec3 np = point - position;
-          vec3 rp = direction*direction.dot(np)+position;
-          return rp;
-        }
-  
-        const vec3 & get_position() const {return position;}
-
-        const vec3 & get_direction() const {return direction;}
-  
-    //protected:
-        vec3 position;
-        vec3 direction;
-    };
-  
-  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  
-  
-
-
-
-
-
-
-
-
-
-
-
-  // matrix
-
-  
-  class matrix4
-  {
-    
-  public:
-        
-    matrix4() { make_identity(); }
-    
-	matrix4( real r ) 
-	{ set_value(r); }
-
-	matrix4( real * m )
-	{ set_value(m); }
-    
-    matrix4( real a00, real a01, real a02, real a03,
-	       real a10, real a11, real a12, real a13,
-		   real a20, real a21, real a22, real a23,
-		   real a30, real a31, real a32, real a33 )
-	{
-		element(0,0) = a00;
-		element(0,1) = a01;
-		element(0,2) = a02;
-		element(0,3) = a03;
-		
-		element(1,0) = a10;
-		element(1,1) = a11;
-		element(1,2) = a12;
-		element(1,3) = a13;
-		
-		element(2,0) = a20;
-		element(2,1) = a21;
-		element(2,2) = a22;
-		element(2,3) = a23;
-		
-		element(3,0) = a30;
-		element(3,1) = a31;
-		element(3,2) = a32;
-		element(3,3) = a33;
-	}
-            
-    
-    void get_value( real * mp ) const
-	{
-		int c = 0;
-		for(int j=0; j < 4; j++)
-			for(int i=0; i < 4; i++)
-				mp[c++] = element(i,j);
-	}
-    
-    
-    const real * get_value() const
-	{ return m; }
-    
-	void set_value( real * mp)
-	{
-		int c = 0;
-		for(int j=0; j < 4; j++)
-			for(int i=0; i < 4; i++)
-				element(i,j) = mp[c++];
-	}
-    
-	void set_value( real r ) 
-	{
-		for(int i=0; i < 4; i++)
-			for(int j=0; j < 4; j++)
-				element(i,j) = r;
-	}
-    
-    void make_identity()
-	{
-		element(0,0) = 1.0;
-		element(0,1) = 0.0;
-		element(0,2) = 0.0; 
-		element(0,3) = 0.0;
-		
-		element(1,0) = 0.0;
-		element(1,1) = 1.0; 
-		element(1,2) = 0.0;
-		element(1,3) = 0.0;
-		
-		element(2,0) = 0.0;
-		element(2,1) = 0.0;
-		element(2,2) = 1.0;
-		element(2,3) = 0.0;
-		
-		element(3,0) = 0.0; 
-		element(3,1) = 0.0; 
-		element(3,2) = 0.0;
-		element(3,3) = 1.0;
-	}
-	
-	
-    static matrix4 identity()
-	{
-		static matrix4 mident (
-			1.0, 0.0, 0.0, 0.0,
-			0.0, 1.0, 0.0, 0.0,
-			0.0, 0.0, 1.0, 0.0,
-			0.0, 0.0, 0.0, 1.0  );
-		return mident;
-	}
-    
-        
-    void set_scale( real s )
-	{
-		element(0,0) = s;
-		element(1,1) = s;
-		element(2,2) = s;
-	}
-    
-    void set_scale( const vec3 & s )
-	{
-		element(0,0) = s.v[0];
-		element(1,1) = s.v[1];
-		element(2,2) = s.v[2];
-	}
-    
-    
-    void set_translate( const vec3 & t )
-	{
-		element(0,3) = t.v[0];
-		element(1,3) = t.v[1];
-		element(2,3) = t.v[2];
-	}
-    
-	void set_row(int r, const vec4 & t)
-	{
-		element(r,0) = t.v[0];
-		element(r,1) = t.v[1];
-		element(r,2) = t.v[2];
-		element(r,3) = t.v[3];
-	}
-
-	void set_column(int c, const vec4 & t)
-	{
-		element(0,c) = t.v[0];
-		element(1,c) = t.v[1];
-		element(2,c) = t.v[2];
-		element(3,c) = t.v[3];
-	}
-
-    
-	void get_row(int r, vec4 & t) const
-	{
-		t.v[0] = element(r,0);
-		t.v[1] = element(r,1);
-		t.v[2] = element(r,2);
-		t.v[3] = element(r,3);
-	}
-
-	vec4 get_row(int r) const
-	{
-		vec4 v; get_row(r, v);
-		return v;
-	}
-
-	void get_column(int c, vec4 & t) const
-	{
-		t.v[0] = element(0,c);
-		t.v[1] = element(1,c);
-		t.v[2] = element(2,c);
-		t.v[3] = element(3,c);
-	}
-
-	vec4 get_column(int c) const
-	{
-		vec4 v; get_column(c, v);
-		return v;
-	}
-
-    matrix4 inverse() const
-	{
-		matrix4 minv;
-		
-		real r1[8], r2[8], r3[8], r4[8];
-		real *s[4], *tmprow;
-		
-		s[0] = &r1[0];
-		s[1] = &r2[0];
-		s[2] = &r3[0];
-		s[3] = &r4[0];
-		
-		register int i,j,p,jj;
-		for(i=0;i<4;i++)
-		{
-			for(j=0;j<4;j++)
-			{
-				s[i][j] = element(i,j);
-				if(i==j) s[i][j+4] = 1.0;
-				else     s[i][j+4] = 0.0;
-			}
-		}
-		real scp[4];
-		for(i=0;i<4;i++)
-		{
-			scp[i] = real(fabs(s[i][0]));
-			for(j=1;j<4;j++)
-				if(real(fabs(s[i][j])) > scp[i]) scp[i] = real(fabs(s[i][j]));
-				if(scp[i] == 0.0) return minv; // singular matrix!
-		}
-		
-		int pivot_to;
-		real scp_max;
-		for(i=0;i<4;i++)
-		{
-			// select pivot row
-			pivot_to = i;
-			scp_max = real(fabs(s[i][i]/scp[i]));
-			// find out which row should be on top
-			for(p=i+1;p<4;p++)
-				if(real(fabs(s[p][i]/scp[p])) > scp_max)
-				{ scp_max = real(fabs(s[p][i]/scp[p])); pivot_to = p; }
-				// Pivot if necessary
-				if(pivot_to != i)
-				{
-					tmprow = s[i];
-					s[i] = s[pivot_to];
-					s[pivot_to] = tmprow;
-					real tmpscp;
-					tmpscp = scp[i];
-					scp[i] = scp[pivot_to];
-					scp[pivot_to] = tmpscp;
-				}
-				
-				real mji;
-				// perform gaussian elimination
-				for(j=i+1;j<4;j++)
-				{
-					mji = s[j][i]/s[i][i];
-					s[j][i] = 0.0;
-					for(jj=i+1;jj<8;jj++)
-						s[j][jj] -= mji*s[i][jj];
-				}
-		}
-		if(s[3][3] == 0.0) return minv; // singular matrix!
-		
-		//
-		// Now we have an upper triangular matrix.
-		//
-		//  x x x x | y y y y
-		//  0 x x x | y y y y 
-		//  0 0 x x | y y y y
-		//  0 0 0 x | y y y y
-		//
-		//  we'll back substitute to get the inverse
-		//
-		//  1 0 0 0 | z z z z
-		//  0 1 0 0 | z z z z
-		//  0 0 1 0 | z z z z
-		//  0 0 0 1 | z z z z 
-		//
-		
-		real mij;
-		for(i=3;i>0;i--)
-		{
-			for(j=i-1;j > -1; j--)
-			{
-				mij = s[j][i]/s[i][i];
-				for(jj=j+1;jj<8;jj++)
-					s[j][jj] -= mij*s[i][jj];
-			}
-		}
-		
-		for(i=0;i<4;i++)
-			for(j=0;j<4;j++)
-				minv(i,j) = s[i][j+4] / s[i][i];
-			
-			return minv;
-	}
-    
-    
-    matrix4 transpose() const
-	{
-		matrix4 mtrans;
-		
-		for(int i=0;i<4;i++)
-			for(int j=0;j<4;j++)
-				mtrans(i,j) = element(j,i);		
-		return mtrans;
-	}
-    
-    matrix4 & mult_right( const matrix4 & b )
-	{
-		matrix4 mt(*this);
-		set_value(real(0));
-
-		for(int i=0; i < 4; i++)
-			for(int j=0; j < 4; j++)
-				for(int c=0; c < 4; c++)
-					element(i,j) += mt(i,c) * b(c,j);
-		return *this;
-	}    
-
-    matrix4 & mult_left( const matrix4 & b )
-	{
-		matrix4 mt(*this);
-		set_value(real(0));
-
-		for(int i=0; i < 4; i++)
-			for(int j=0; j < 4; j++)
-				for(int c=0; c < 4; c++)
-					element(i,j) += b(i,c) * mt(c,j);
-		return *this;
-	}
-	
-	// dst = M * src
-    void mult_matrix_vec( const vec3 &src, vec3 &dst ) const
-	{
-		real w = (
-			src.v[0] * element(3,0) +
-			src.v[1] * element(3,1) + 
-			src.v[2] * element(3,2) +
-			element(3,3)          );
-        
-        assert(w != GLH_ZERO);
-
-        dst.v[0]  = (
-			src.v[0] * element(0,0) +
-			src.v[1] * element(0,1) +
-			src.v[2] * element(0,2) +
-			element(0,3)          ) / w;
-		dst.v[1]  = (
-			src.v[0] * element(1,0) +
-			src.v[1] * element(1,1) +
-			src.v[2] * element(1,2) +
-			element(1,3)          ) / w;
-		dst.v[2]  = (
-			src.v[0] * element(2,0) +
-			src.v[1] * element(2,1) + 
-			src.v[2] * element(2,2) +
-			element(2,3)          ) / w;
-	}
-    
-	void mult_matrix_vec( vec3 & src_and_dst) const
-	{ mult_matrix_vec(vec3(src_and_dst), src_and_dst); }
-
-
-    // dst = src * M
-    void mult_vec_matrix( const vec3 &src, vec3 &dst ) const
-	{
-		real w = (
-			src.v[0] * element(0,3) +
-			src.v[1] * element(1,3) +
-			src.v[2] * element(2,3) +
-			element(3,3)          );
-        
-        assert(w != GLH_ZERO);
-
-		dst.v[0]  = (
-			src.v[0] * element(0,0) +
-			src.v[1] * element(1,0) + 
-			src.v[2] * element(2,0) + 
-			element(3,0)          ) / w;
-		dst.v[1]  = (
-			src.v[0] * element(0,1) +
-			src.v[1] * element(1,1) +
-			src.v[2] * element(2,1) +
-			element(3,1)          ) / w;
-		dst.v[2]  = (
-			src.v[0] * element(0,2) +
-			src.v[1] * element(1,2) +
-			src.v[2] * element(2,2) +
-			element(3,2)          ) / w;
-	}
-        
-
-	void mult_vec_matrix( vec3 & src_and_dst) const
-	{ mult_vec_matrix(vec3(src_and_dst), src_and_dst); }
-
-	// dst = M * src
-    void mult_matrix_vec( const vec4 &src, vec4 &dst ) const
-	{
-        dst.v[0]  = (
-			src.v[0] * element(0,0) +
-			src.v[1] * element(0,1) +
-			src.v[2] * element(0,2) +
-			src.v[3] * element(0,3));
-		dst.v[1]  = (
-			src.v[0] * element(1,0) +
-			src.v[1] * element(1,1) +
-			src.v[2] * element(1,2) +
-			src.v[3] * element(1,3));
-		dst.v[2]  = (
-			src.v[0] * element(2,0) +
-			src.v[1] * element(2,1) + 
-			src.v[2] * element(2,2) +
-			src.v[3] * element(2,3));
-		dst.v[3] = (
-			src.v[0] * element(3,0) +
-			src.v[1] * element(3,1) + 
-			src.v[2] * element(3,2) +
-			src.v[3] * element(3,3));
-	}
-    
-	void mult_matrix_vec( vec4 & src_and_dst) const
-	{ mult_matrix_vec(vec4(src_and_dst), src_and_dst); }
-
-
-    // dst = src * M
-    void mult_vec_matrix( const vec4 &src, vec4 &dst ) const
-	{
-		dst.v[0]  = (
-			src.v[0] * element(0,0) +
-			src.v[1] * element(1,0) + 
-			src.v[2] * element(2,0) + 
-			src.v[3] * element(3,0));
-		dst.v[1]  = (
-			src.v[0] * element(0,1) +
-			src.v[1] * element(1,1) +
-			src.v[2] * element(2,1) +
-			src.v[3] * element(3,1));
-		dst.v[2]  = (
-			src.v[0] * element(0,2) +
-			src.v[1] * element(1,2) +
-			src.v[2] * element(2,2) +
-			src.v[3] * element(3,2));
-		dst.v[3] = (
-			src.v[0] * element(0,3) +
-			src.v[1] * element(1,3) +
-			src.v[2] * element(2,3) +
-			src.v[3] * element(3,3));
-	}
-        
-
-	void mult_vec_matrix( vec4 & src_and_dst) const
-	{ mult_vec_matrix(vec4(src_and_dst), src_and_dst); }
-
-    
-    // dst = M * src
-    void mult_matrix_dir( const vec3 &src, vec3 &dst ) const
-	{
-		dst.v[0]  = (
-			src.v[0] * element(0,0) +
-			src.v[1] * element(0,1) +
-			src.v[2] * element(0,2) ) ;
-		dst.v[1]  = ( 
-			src.v[0] * element(1,0) +
-			src.v[1] * element(1,1) +
-			src.v[2] * element(1,2) ) ;
-		dst.v[2]  = ( 
-			src.v[0] * element(2,0) +
-			src.v[1] * element(2,1) + 
-			src.v[2] * element(2,2) ) ;
-	}
-        
-
-	void mult_matrix_dir( vec3 & src_and_dst) const
-	{ mult_matrix_dir(vec3(src_and_dst), src_and_dst); }
-
-
-	// dst = src * M
-    void mult_dir_matrix( const vec3 &src, vec3 &dst ) const
-	{
-		dst.v[0]  = ( 
-			src.v[0] * element(0,0) +
-			src.v[1] * element(1,0) +
-			src.v[2] * element(2,0) ) ;
-		dst.v[1]  = ( 
-			src.v[0] * element(0,1) +
-			src.v[1] * element(1,1) +
-			src.v[2] * element(2,1) ) ;
-		dst.v[2]  = (
-			src.v[0] * element(0,2) +
-			src.v[1] * element(1,2) + 
-			src.v[2] * element(2,2) ) ;
-	}
-    
-    
-	void mult_dir_matrix( vec3 & src_and_dst) const
-	{ mult_dir_matrix(vec3(src_and_dst), src_and_dst); }
-
-
-    real & operator () (int row, int col)
-    { return element(row,col); }
-
-    const real & operator () (int row, int col) const
-    { return element(row,col); }
-
-	real & element (int row, int col)
-    { return m[row | (col<<2)]; }
-
-    const real & element (int row, int col) const
-    { return m[row | (col<<2)]; }
-
-    matrix4 & operator *= ( const matrix4 & mat )
-	{
-		mult_right( mat );
-		return *this;
-	}
-    
-    matrix4 & operator *= ( const real & r )
-	{
-		for (int i = 0; i < 4; ++i)
-        {
-            element(0,i) *= r;
-            element(1,i) *= r;
-            element(2,i) *= r;
-            element(3,i) *= r;
-        }
-		return *this;
-	}
-
-    matrix4 & operator += ( const matrix4 & mat )
-	{
-		for (int i = 0; i < 4; ++i)
-        {
-            element(0,i) += mat.element(0,i);
-            element(1,i) += mat.element(1,i);
-            element(2,i) += mat.element(2,i);
-            element(3,i) += mat.element(3,i);
-        }
-		return *this;
-	}
-
-    friend matrix4 operator * ( const matrix4 & m1,	const matrix4 & m2 );
-    friend bool operator == ( const matrix4 & m1, const matrix4 & m2 );
-    friend bool operator != ( const matrix4 & m1, const matrix4 & m2 );
-    
-  //protected:
-	  real m[16];
-  };
-  
-  inline  
-  matrix4 operator * ( const matrix4 & m1, const matrix4 & m2 )
-  {
-	  matrix4 product;
-	  
-	  product = m1;
-	  product.mult_right(m2);
-	  
-	  return product;
-  }
-  
-  inline
-  bool operator ==( const matrix4 &m1, const matrix4 &m2 )
-  {
-	  return ( 
-		  m1(0,0) == m2(0,0) &&
-		  m1(0,1) == m2(0,1) &&
-		  m1(0,2) == m2(0,2) &&
-		  m1(0,3) == m2(0,3) &&
-		  m1(1,0) == m2(1,0) &&
-		  m1(1,1) == m2(1,1) &&
-		  m1(1,2) == m2(1,2) &&
-		  m1(1,3) == m2(1,3) &&
-		  m1(2,0) == m2(2,0) &&
-		  m1(2,1) == m2(2,1) &&
-		  m1(2,2) == m2(2,2) &&
-		  m1(2,3) == m2(2,3) &&
-		  m1(3,0) == m2(3,0) &&
-		  m1(3,1) == m2(3,1) &&
-		  m1(3,2) == m2(3,2) &&
-		  m1(3,3) == m2(3,3) );
-  }
-  
-  inline
-  bool operator != ( const matrix4 & m1, const matrix4 & m2 )
-  { return !( m1 == m2 ); }  
-
-
-
-
-
-
-
-
-
-
-
-
-  
-    class quaternion
-    {
-    public:
-    
-    quaternion()
-    {
-        *this = identity();
-    }
-
-    quaternion( const real v[4] )
-    {
-        set_value( v );
-    }
-
-
-    quaternion( real q0, real q1, real q2, real q3 )
-    {
-        set_value( q0, q1, q2, q3 );
-    }
-
-
-    quaternion( const matrix4 & m )
-    {
-        set_value( m );
-    }
-
-
-    quaternion( const vec3 &axis, real radians )
-    {
-        set_value( axis, radians );
-    }
-
-
-    quaternion( const vec3 &rotateFrom, const vec3 &rotateTo )
-    {
-        set_value( rotateFrom, rotateTo );
-    }
-
-    quaternion( const vec3 & from_look, const vec3 & from_up,
-		      const vec3 & to_look, const vec3& to_up)
-    {
-	    set_value(from_look, from_up, to_look, to_up);
-    }
-
-    const real * get_value() const
-    {
-        return  &q[0];
-    }
-
-    void get_value( real &q0, real &q1, real &q2, real &q3 ) const
-    {
-        q0 = q[0];
-        q1 = q[1];
-        q2 = q[2];
-        q3 = q[3];
-    }
-
-    quaternion & set_value( real q0, real q1, real q2, real q3 )
-    {
-        q[0] = q0;
-        q[1] = q1;
-        q[2] = q2;
-        q[3] = q3;
-        counter = 0;
-        return *this;
-    }
-
-    void get_value( vec3 &axis, real &radians ) const
-    {
-        radians = real(acos( q[3] ) * GLH_TWO);
-        if ( radians == GLH_ZERO )
-            axis = vec3( 0.0, 0.0, 1.0 );
-        else
-        {
-            axis.v[0] = q[0];
-            axis.v[1] = q[1];
-            axis.v[2] = q[2];
-            axis.normalize();
-        }
-    }
-
-    void get_value( matrix4 & m ) const
-    {
-        real s, xs, ys, zs, wx, wy, wz, xx, xy, xz, yy, yz, zz;
-
-        real norm = q[0] * q[0] + q[1] * q[1] + q[2] * q[2] + q[3] * q[3];
-
-        s = (equivalent(norm,GLH_ZERO)) ? GLH_ZERO : ( GLH_TWO / norm );
-
-        xs = q[0] * s;
-        ys = q[1] * s;
-        zs = q[2] * s;
-
-        wx = q[3] * xs;
-        wy = q[3] * ys;
-        wz = q[3] * zs;
-
-        xx = q[0] * xs;
-        xy = q[0] * ys;
-        xz = q[0] * zs;
-
-        yy = q[1] * ys;
-        yz = q[1] * zs;
-        zz = q[2] * zs;
-
-        m(0,0) = real( GLH_ONE - ( yy + zz ));
-        m(1,0) = real ( xy + wz );
-        m(2,0) = real ( xz - wy );
-
-        m(0,1) = real ( xy - wz );
-        m(1,1) = real ( GLH_ONE - ( xx + zz ));
-        m(2,1) = real ( yz + wx );
-
-        m(0,2) = real ( xz + wy );
-        m(1,2) = real ( yz - wx );
-        m(2,2) = real ( GLH_ONE - ( xx + yy ));
-
-        m(3,0) = m(3,1) = m(3,2) = m(0,3) = m(1,3) = m(2,3) = GLH_ZERO;
-        m(3,3) = GLH_ONE;
-    }
-
-    quaternion & set_value( const real * qp )
-    {
-        memcpy(q,qp,sizeof(real) * 4);
-
-        counter = 0;
-        return *this;
-    }
-
-    quaternion & set_value( const matrix4 & m )
-    {
-        real tr, s;
-        int i, j, k;
-        const int nxt[3] = { 1, 2, 0 };
-
-        tr = m(0,0) + m(1,1) + m(2,2);
-
-        if ( tr > GLH_ZERO )
-        {
-            s = real(sqrt( tr + m(3,3) ));
-            q[3] = real ( s * 0.5 );
-            s = real(0.5) / s;
-
-            q[0] = real ( ( m(1,2) - m(2,1) ) * s );
-            q[1] = real ( ( m(2,0) - m(0,2) ) * s );
-            q[2] = real ( ( m(0,1) - m(1,0) ) * s );
-        }
-        else
-        {
-            i = 0;
-            if ( m(1,1) > m(0,0) )
-              i = 1;
-
-            if ( m(2,2) > m(i,i) )
-              i = 2;
-
-            j = nxt[i];
-            k = nxt[j];
-
-            s = real(sqrt( ( m(i,j) - ( m(j,j) + m(k,k) )) + GLH_ONE ));
-
-            q[i] = real ( s * 0.5 );
-            s = real(0.5 / s);
-
-            q[3] = real ( ( m(j,k) - m(k,j) ) * s );
-            q[j] = real ( ( m(i,j) + m(j,i) ) * s );
-            q[k] = real ( ( m(i,k) + m(k,i) ) * s );
-        }
-
-        counter = 0;
-        return *this;
-    }
-
-    quaternion & set_value( const vec3 &axis, real theta )
-    {
-        real sqnorm = axis.square_norm();
-
-        if (sqnorm <= GLH_EPSILON)
-        {
-            // axis too small.
-            x = y = z = 0.0;
-            w = 1.0;
-        } 
-        else 
-        {
-            theta *= real(0.5);
-            real sin_theta = real(sin(theta));
-
-            if (!equivalent(sqnorm,GLH_ONE)) 
-              sin_theta /= real(sqrt(sqnorm));
-            x = sin_theta * axis.v[0];
-            y = sin_theta * axis.v[1];
-            z = sin_theta * axis.v[2];
-            w = real(cos(theta));
-        }
-        return *this;
-    }
-
-    quaternion & set_value( const vec3 & rotateFrom, const vec3 & rotateTo )
-    {
-        vec3 p1, p2;
-        real alpha;
-
-        p1 = rotateFrom; 
-        p1.normalize();
-        p2 = rotateTo;  
-        p2.normalize();
-
-        alpha = p1.dot(p2);
-
-        if(equivalent(alpha,GLH_ONE))
-        { 
-            *this = identity(); 
-            return *this; 
-        }
-
-        // ensures that the anti-parallel case leads to a positive dot
-        if(equivalent(alpha,-GLH_ONE))
-        {
-            vec3 v;
-
-            if(p1.v[0] != p1.v[1] || p1.v[0] != p1.v[2])
-    	        v = vec3(p1.v[1], p1.v[2], p1.v[0]);
-            else
-    	        v = vec3(-p1.v[0], p1.v[1], p1.v[2]);
-
-            v -= p1 * p1.dot(v);
-            v.normalize();
-
-            set_value(v, GLH_PI);
-            return *this;
-        }
-
-        p1 = p1.cross(p2);  
-        p1.normalize();
-        set_value(p1,real(acos(alpha)));
-
-        counter = 0;
-        return *this;
-    }
-
-    quaternion & set_value( const vec3 & from_look, const vec3 & from_up,
-		      const vec3 & to_look, const vec3 & to_up)
-    {
-	    quaternion r_look = quaternion(from_look, to_look);
-	    
-	    vec3 rotated_from_up(from_up);
-	    r_look.mult_vec(rotated_from_up);
-	    
-	    quaternion r_twist = quaternion(rotated_from_up, to_up);
-	    
-	    *this = r_twist;
-	    *this *= r_look;
-	    return *this;
-    }
-
-    quaternion & operator *= ( const quaternion & qr )
-    {
-        quaternion ql(*this);
-   
-        w = ql.w * qr.w - ql.x * qr.x - ql.y * qr.y - ql.z * qr.z;
-        x = ql.w * qr.x + ql.x * qr.w + ql.y * qr.z - ql.z * qr.y;
-        y = ql.w * qr.y + ql.y * qr.w + ql.z * qr.x - ql.x * qr.z;
-        z = ql.w * qr.z + ql.z * qr.w + ql.x * qr.y - ql.y * qr.x;
-
-        counter += qr.counter;
-        counter++;
-        counter_normalize();
-        return *this;
-    }
-
-    void normalize()
-    {
-        real rnorm = GLH_ONE / real(sqrt(w * w + x * x + y * y + z * z));
-        if (equivalent(rnorm, GLH_ZERO))
-            return;
-        x *= rnorm;
-        y *= rnorm;
-        z *= rnorm;
-        w *= rnorm;
-        counter = 0;
-    }
-
-    friend bool operator == ( const quaternion & q1, const quaternion & q2 );      
-
-    friend bool operator != ( const quaternion & q1, const quaternion & q2 );
-
-    friend quaternion operator * ( const quaternion & q1, const quaternion & q2 );
-
-    bool equals( const quaternion & r, real tolerance ) const
-    {
-        real t;
-
-        t = (
-			(q[0]-r.q[0])*(q[0]-r.q[0]) +
-            (q[1]-r.q[1])*(q[1]-r.q[1]) +
-            (q[2]-r.q[2])*(q[2]-r.q[2]) +
-            (q[3]-r.q[3])*(q[3]-r.q[3]) );
-        if(t > GLH_EPSILON) 
-            return false;
-        return 1;
-    }
-
-    quaternion & conjugate()
-    {
-        q[0] *= -GLH_ONE;
-        q[1] *= -GLH_ONE;
-        q[2] *= -GLH_ONE;
-        return *this;
-    }
-
-    quaternion & invert()
-    {
-        return conjugate();
-    }
-
-    quaternion inverse() const
-    {
-        quaternion r = *this;
-        return r.invert();
-    }
-
-    //
-    // Quaternion multiplication with cartesian vector
-    // v' = q*v*q(star)
-    //
-    void mult_vec( const vec3 &src, vec3 &dst ) const
-    {
-        real v_coef = w * w - x * x - y * y - z * z;                     
-        real u_coef = GLH_TWO * (src.v[0] * x + src.v[1] * y + src.v[2] * z);  
-        real c_coef = GLH_TWO * w;                                       
-
-        dst.v[0] = v_coef * src.v[0] + u_coef * x + c_coef * (y * src.v[2] - z * src.v[1]);
-        dst.v[1] = v_coef * src.v[1] + u_coef * y + c_coef * (z * src.v[0] - x * src.v[2]);
-        dst.v[2] = v_coef * src.v[2] + u_coef * z + c_coef * (x * src.v[1] - y * src.v[0]);
-    }
-
-    void mult_vec( vec3 & src_and_dst) const
-    {
-        mult_vec(vec3(src_and_dst), src_and_dst);
-    }
-
-    void scale_angle( real scaleFactor )
-    {
-        vec3 axis;
-        real radians;
-
-        get_value(axis, radians);
-        radians *= scaleFactor;
-        set_value(axis, radians);
-    }
-
-    static quaternion slerp( const quaternion & p, const quaternion & q, real alpha )
-    {
-        quaternion r;
-
-        real cos_omega = p.x * q.x + p.y * q.y + p.z * q.z + p.w * q.w;
-        // if B is on opposite hemisphere from A, use -B instead
-      
-        int bflip;
-        if ( ( bflip = (cos_omega < GLH_ZERO)) )
-            cos_omega = -cos_omega;
-
-        // complementary interpolation parameter
-        real beta = GLH_ONE - alpha;     
-
-        if(cos_omega <= GLH_ONE - GLH_EPSILON)
-            return p;
-
-        real omega = real(acos(cos_omega));
-        real one_over_sin_omega = GLH_ONE / real(sin(omega));
-
-        beta    = real(sin(omega*beta)  * one_over_sin_omega);
-        alpha   = real(sin(omega*alpha) * one_over_sin_omega);
-
-        if (bflip)
-            alpha = -alpha;
-
-        r.x = beta * p.q[0]+ alpha * q.q[0];
-        r.y = beta * p.q[1]+ alpha * q.q[1];
-        r.z = beta * p.q[2]+ alpha * q.q[2];
-        r.w = beta * p.q[3]+ alpha * q.q[3];
-        return r;
-    }
-
-    static quaternion identity()
-    {
-        static quaternion ident( vec3( 0.0, 0.0, 0.0 ), GLH_ONE );
-        return ident;
-    }
-
-    real & operator []( int i )
-    {
-        assert(i < 4);
-        return q[i];
-    }
-
-    const real & operator []( int i ) const
-    {
-        assert(i < 4);
-        return q[i];
-    }
-
-    protected:
-
-        void counter_normalize()
-        {
-            if (counter > GLH_QUATERNION_NORMALIZATION_THRESHOLD)
-                normalize();
-        }
-
-        union 
-        {
-            struct 
-            {
-                real q[4];
-            };
-            struct 
-            {
-                real x;
-                real y;
-                real z;
-                real w;
-            };
-        };
-
-        // renormalization counter
-        unsigned char counter;
-    };
-
-    inline
-    bool operator == ( const quaternion & q1, const quaternion & q2 )
-    {
-        return (equivalent(q1.x, q2.x) &&
-		        equivalent(q1.y, q2.y) &&
-		        equivalent(q1.z, q2.z) &&
-		        equivalent(q1.w, q2.w) );
-    }
-
-    inline
-    bool operator != ( const quaternion & q1, const quaternion & q2 )
-    { 
-        return ! ( q1 == q2 ); 
-    }
-
-    inline
-    quaternion operator * ( const quaternion & q1, const quaternion & q2 )
-    {	
-        quaternion r(q1); 
-        r *= q2; 
-        return r; 
-    }
-  
-      
-    
-
-
-
-
-
-  
-  
-  class plane
-  {
-  public:
-	  
-	  plane()
-      {
-		  planedistance = 0.0;
-		  planenormal.set_value( 0.0, 0.0, 1.0 );
-      }
-	  
-	  
-	  plane( const vec3 &p0, const vec3 &p1, const vec3 &p2 )
-      {
-		  vec3 v0 = p1 - p0;
-		  vec3 v1 = p2 - p0;
-		  planenormal = v0.cross(v1);  
-		  planenormal.normalize();
-		  planedistance = p0.dot(planenormal);
-      }
-	  
-	  plane( const vec3 &normal, real distance )
-      {
-		  planedistance = distance;
-		  planenormal = normal;
-		  planenormal.normalize();
-      }
-	  
-	  plane( const vec3 &normal, const vec3 &point )
-      {
-		  planenormal = normal;
-		  planenormal.normalize();
-		  planedistance = point.dot(planenormal);
-      }
-	  
-	  void offset( real d )
-      {
-		  planedistance += d;
-      }
-	  
-	  bool intersect( const line &l, vec3 &intersection ) const
-      {
-		  vec3 pos, dir;
-		  vec3 pn = planenormal;
-		  real pd = planedistance;
-		  
-		  pos = l.get_position();
-		  dir = l.get_direction();
-		  
-		  if(dir.dot(pn) == 0.0) return 0;
-		  pos -= pn*pd;
-		  // now we're talking about a plane passing through the origin
-		  if(pos.dot(pn) < 0.0) pn.negate();
-		  if(dir.dot(pn) > 0.0) dir.negate();
-		  vec3 ppos = pn * pos.dot(pn);
-		  pos = (ppos.length()/dir.dot(-pn))*dir;
-		  intersection = l.get_position();
-		  intersection += pos;
-		  return 1;
-      }
-	  void transform( const matrix4 &matrix )
-      {
-		  matrix4 invtr = matrix.inverse();
-		  invtr = invtr.transpose();
-		  
-		  vec3 pntOnplane = planenormal * planedistance;
-		  vec3 newPntOnplane;
-		  vec3 newnormal;
-		  
-		  invtr.mult_dir_matrix(planenormal, newnormal);
-		  matrix.mult_vec_matrix(pntOnplane, newPntOnplane);
-		  
-		  newnormal.normalize();
-		  planenormal = newnormal;
-		  planedistance = newPntOnplane.dot(planenormal);
-      }
-	  
-	  bool is_in_half_space( const vec3 &point ) const
-      {
-		  
-		  if(( point.dot(planenormal) - planedistance) < 0.0)
-			  return 0;
-		  return 1;
-      }
-	  
-	  
-	  real distance( const vec3 & point ) const 
-      {
-		  return planenormal.dot(point - planenormal*planedistance);
-      }
-	  
-	  const vec3 &get_normal() const
-      {
-		  return planenormal;
-      }
-	  
-	  
-	  real get_distance_from_origin() const
-      {
-		  return planedistance;
-      }
-	  
-	  
-	  friend bool operator == ( const plane & p1, const plane & p2 );
-	  
-	  
-	  friend bool operator != ( const plane & p1, const plane & p2 );
-	  
-  //protected:
-	  vec3 planenormal;
-	  real planedistance;
-  };
-  
-  inline
-  bool operator == (const plane & p1, const plane & p2 )
-  {
-	  return (  p1.planedistance == p2.planedistance && p1.planenormal == p2.planenormal);
-  }
-  
-  inline
-  bool operator != ( const plane & p1, const plane & p2 )
-  { return  ! (p1 == p2); }
-  
-  
-
-  } // "ns_##GLH_REAL"
-
-  // make common typedefs...
-#ifdef GLH_REAL_IS_FLOAT
-  typedef GLH_REAL_NAMESPACE::vec2 vec2f;
-  typedef GLH_REAL_NAMESPACE::vec3 vec3f;
-  typedef GLH_REAL_NAMESPACE::vec4 vec4f;
-  typedef GLH_REAL_NAMESPACE::quaternion quaternionf;
-  typedef GLH_REAL_NAMESPACE::quaternion rotationf;
-  typedef GLH_REAL_NAMESPACE::line linef;
-  typedef GLH_REAL_NAMESPACE::plane planef;
-  typedef GLH_REAL_NAMESPACE::matrix4 matrix4f;
-#endif
-
-  
-
-
-}  // namespace glh
-
-
-
-#endif
-
+/*
+    glh - is a platform-indepenedent C++ OpenGL helper library 
+
+
+    Copyright (c) 2000 Cass Everitt
+	Copyright (c) 2000 NVIDIA Corporation
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or
+	without modification, are permitted provided that the following
+	conditions are met:
+
+     * Redistributions of source code must retain the above
+	   copyright notice, this list of conditions and the following
+	   disclaimer.
+
+     * Redistributions in binary form must reproduce the above
+	   copyright notice, this list of conditions and the following
+	   disclaimer in the documentation and/or other materials
+	   provided with the distribution.
+
+     * The names of contributors to this software may not be used
+	   to endorse or promote products derived from this software
+	   without specific prior written permission. 
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+	   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+	   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+	   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	   REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+	   INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+	   BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+	   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+	   CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+	   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+	   ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+	   POSSIBILITY OF SUCH DAMAGE. 
+
+
+    Cass Everitt - cass@r3.nu
+*/
+
+/*
+glh_linear.h
+*/
+
+// Author:  Cass W. Everitt
+
+#ifndef GLH_LINEAR_H
+#define GLH_LINEAR_H
+
+#include <memory.h>
+#include <math.h>
+#include <assert.h>
+
+// only supports float for now...
+#define GLH_REAL_IS_FLOAT
+
+#ifdef GLH_REAL_IS_FLOAT
+# define GLH_REAL float
+# define GLH_REAL_NAMESPACE ns_float
+#endif
+
+#define     GLH_QUATERNION_NORMALIZATION_THRESHOLD  64
+
+#define     GLH_RAD_TO_DEG      GLH_REAL(57.2957795130823208767981548141052)
+#define     GLH_DEG_TO_RAD      GLH_REAL(0.0174532925199432957692369076848861)
+#define     GLH_ZERO            GLH_REAL(0.0)
+#define     GLH_ONE             GLH_REAL(1.0)
+#define     GLH_TWO             GLH_REAL(2.0)
+#define     GLH_EPSILON         GLH_REAL(10e-6)
+#define     GLH_PI              GLH_REAL(3.1415926535897932384626433832795)    
+
+#define     equivalent(a,b)     (((a < b + GLH_EPSILON) && (a > b - GLH_EPSILON)) ? true : false)
+
+namespace glh
+{
+
+	inline GLH_REAL to_degrees(GLH_REAL radians) { return radians*GLH_RAD_TO_DEG; }
+	inline GLH_REAL to_radians(GLH_REAL degrees) { return degrees*GLH_DEG_TO_RAD; }
+
+	// forward declarations for friend template functions.
+	template <int N, class T> class vec;
+	
+	// forward declarations for friend template functions.
+	template <int N, class T>
+		bool operator == ( const vec<N,T> & v1, const vec<N,T> & v2 );
+	
+	// forward declarations for friend template functions.
+	template <int N, class T>
+		bool operator != ( const vec<N,T> & v1, const vec<N,T> & v2 );
+
+	template <int N, class T>	
+	class vec
+	{				
+    public:
+		int size() const { return N; }
+		
+		vec(const T & t = T()) 
+		{ for(int i = 0; i < N; i++) v[i] = t; }
+		vec(const T * tp)
+		{ for(int i = 0; i < N; i++) v[i] = tp[i]; }
+		
+		const T * get_value() const
+		{ return v; }
+		
+		
+		T dot( const vec<N,T> & rhs ) const
+		{ 
+			T r = 0;
+			for(int i = 0; i < N; i++) r += v[i]*rhs.v[i];
+			return r;
+		}
+		
+		T length() const
+		{
+			T r = 0;
+			for(int i = 0; i < N; i++) r += v[i]*v[i]; 
+			return T(sqrt(r));
+		}	
+		
+		T square_norm() const
+		{
+			T r = 0;
+			for(int i = 0; i < N; i++) r += v[i]*v[i]; 
+			return r;
+		}	
+		
+		void  negate()
+		{ for(int i = 0; i < N; i++) v[i] = -v[i]; }
+		
+		
+		T normalize() 
+		{ 
+			T sum(0);
+			for(int i = 0; i < N; i++) 
+                sum += v[i]*v[i];
+			sum = T(sqrt(sum));
+            if (sum > GLH_EPSILON)
+			    for(int i = 0; i < N; i++) 
+                    v[i] /= sum;
+			return sum;
+		}
+		
+		
+		vec<N,T> & set_value( const T * rhs )
+		{ for(int i = 0; i < N; i++) v[i] = rhs[i]; return *this; }
+		
+		T & operator [] ( int i )
+		{ return v[i]; }
+		
+		const T & operator [] ( int i ) const
+		{ return v[i]; }
+
+		vec<N,T> & operator *= ( T d )
+		{ for(int i = 0; i < N; i++) v[i] *= d; return *this;}
+		
+		vec<N,T> & operator *= ( const vec<N,T> & u )
+		{ for(int i = 0; i < N; i++) v[i] *= u[i]; return *this;}
+		
+		vec<N,T> & operator /= ( T d )
+		{ if(d == 0) return *this; for(int i = 0; i < N; i++) v[i] /= d; return *this;}
+		
+		vec<N,T> & operator += ( const vec<N,T> & u )
+		{ for(int i = 0; i < N; i++) v[i] += u.v[i]; return *this;}
+		
+		vec<N,T> & operator -= ( const vec<N,T> & u )
+		{ for(int i = 0; i < N; i++) v[i] -= u.v[i]; return *this;}
+		
+		
+		vec<N,T> operator - () const
+		{ vec<N,T> rv = v; rv.negate(); return rv; }
+		
+		vec<N,T> operator + ( const vec<N,T> &v) const
+		{ vec<N,T> rt(*this); return rt += v; }
+		
+		vec<N,T> operator - ( const vec<N,T> &v) const
+		{ vec<N,T> rt(*this); return rt -= v; }
+		
+		vec<N,T> operator * ( T d) const
+		{ vec<N,T> rt(*this); return rt *= d; }
+		
+		friend bool operator == <> ( const vec<N,T> &v1, const vec<N,T> &v2 );
+		friend bool operator != <> ( const vec<N,T> &v1, const vec<N,T> &v2 );
+		
+		
+	//protected:
+		T v[N];
+	};
+	
+	
+	
+	// vector friend operators
+	
+	template <int N, class T> inline
+		vec<N,T> operator * ( const vec<N,T> & b, T d )
+	{
+		vec<N,T> rt(b);
+		return rt *= d;
+	}
+
+	template <int N, class T> inline
+		vec<N,T> operator * ( T d, const vec<N,T> & b )
+	{ return b*d; }
+	
+	template <int N, class T> inline
+		vec<N,T> operator * ( const vec<N,T> & b, const vec<N,T> & d )
+	{
+		vec<N,T> rt(b);
+		return rt *= d;
+	}
+
+	template <int N, class T> inline
+		vec<N,T> operator / ( const vec<N,T> & b, T d )
+	{ vec<N,T> rt(b); return rt /= d; }
+	
+	template <int N, class T> inline
+		vec<N,T> operator + ( const vec<N,T> & v1, const vec<N,T> & v2 )
+	{ vec<N,T> rt(v1); return rt += v2; }
+	
+	template <int N, class T> inline
+		vec<N,T> operator - ( const vec<N,T> & v1, const vec<N,T> & v2 )
+	{ vec<N,T> rt(v1); return rt -= v2; }
+	
+	
+	template <int N, class T> inline
+		bool operator == ( const vec<N,T> & v1, const vec<N,T> & v2 )
+	{
+		for(int i = 0; i < N; i++)
+			if(v1.v[i] != v2.v[i])
+				return false;
+			return true;
+	}
+	
+	template <int N, class T> inline
+		bool operator != ( const vec<N,T> & v1, const vec<N,T> & v2 )
+	{ return !(v1 == v2); }
+	
+
+	typedef vec<3,unsigned char> vec3ub;
+	typedef vec<4,unsigned char> vec4ub;
+
+
+
+
+
+	namespace GLH_REAL_NAMESPACE
+	{
+	typedef GLH_REAL real;
+
+	class line;
+	class plane;
+	class matrix4;
+	class quaternion;
+	typedef quaternion rotation; 
+  
+	class vec2 : public vec<2,real>
+	{
+    public:
+		vec2(const real & t = real()) : vec<2,real>(t)
+		{}
+		vec2(const vec<2,real> & t) : vec<2,real>(t)
+		{}
+		vec2(const real * tp) : vec<2,real>(tp)
+		{}
+		
+		vec2(real x, real y )
+		{ v[0] = x; v[1] = y; }
+		
+		void get_value(real & x, real & y) const
+		{ x = v[0]; y = v[1]; }
+		
+		vec2 & set_value( const real & x, const real & y)
+		{ v[0] = x; v[1] = y; return *this; }
+		
+	};
+	
+	
+	class vec3 : public vec<3,real>
+	{
+    public:
+		vec3(const real & t = real()) : vec<3,real>(t)
+		{}
+		vec3(const vec<3,real> & t) : vec<3,real>(t)
+		{}
+		vec3(const real * tp) : vec<3,real>(tp)
+		{}
+		
+		vec3(real x, real y, real z)
+		{ v[0] = x; v[1] = y; v[2] = z; }
+		
+		void get_value(real & x, real & y, real & z) const
+		{ x = v[0]; y = v[1]; z = v[2]; }
+		
+		vec3 cross( const vec3 &rhs ) const
+		{
+			vec3 rt;
+			rt.v[0] = v[1]*rhs.v[2]-v[2]*rhs.v[1];
+			rt.v[1] = v[2]*rhs.v[0]-v[0]*rhs.v[2];
+			rt.v[2] = v[0]*rhs.v[1]-v[1]*rhs.v[0];	
+			return rt;
+		}
+		
+		vec3 & set_value( const real & x, const real & y, const real & z)
+		{ v[0] = x; v[1] = y; v[2] = z; return *this; }
+		
+	};
+
+  		
+    class vec4 : public vec<4,real>
+    {
+    public:
+        vec4(const real & t = real()) : vec<4,real>(t)
+        {}
+        vec4(const vec<4,real> & t) : vec<4,real>(t)
+        {}
+
+        vec4(const vec<3,real> & t, real fourth)
+
+        { v[0] = t.v[0]; v[1] = t.v[1]; v[2] = t.v[2]; v[3] = fourth; }
+        vec4(const real * tp) : vec<4,real>(tp)
+        {}
+        vec4(real x, real y, real z, real w)
+        { v[0] = x; v[1] = y; v[2] = z; v[3] = w; }
+
+        void get_value(real & x, real & y, real & z, real & w) const
+        { x = v[0]; y = v[1]; z = v[2]; w = v[3]; }
+  
+        vec4 & set_value( const real & x, const real & y, const real & z, const real & w)
+        { v[0] = x; v[1] = y; v[2] = z; v[3] = w; return *this; }
+    };
+
+    inline
+    vec3 homogenize(const vec4 & v)
+    {
+      vec3 rt;
+      assert(v.v[3] != GLH_ZERO);
+      rt.v[0] = v.v[0]/v.v[3];
+      rt.v[1] = v.v[1]/v.v[3];
+      rt.v[2] = v.v[2]/v.v[3];
+      return rt;
+    }
+  
+
+
+    class line
+    {
+    public:
+  
+        line()
+        { set_value(vec3(0,0,0),vec3(0,0,1)); }
+
+        line( const vec3 & p0, const vec3 &p1)
+        { set_value(p0,p1); }
+
+        void set_value( const vec3 &p0, const vec3 &p1)
+        {
+          position = p0;
+          direction = p1-p0;
+          direction.normalize();
+        }
+  
+        bool get_closest_points(const line &line2, 
+					          vec3 &pointOnThis,
+					          vec3 &pointOnThat)
+        {
+  
+          // quick check to see if parallel -- if so, quit.
+          if(fabs(direction.dot(line2.direction)) == 1.0)
+	          return 0;
+          line l2 = line2;
+  
+          // Algorithm: Brian Jean
+          // 
+          register real u;
+          register real v;
+          vec3 Vr = direction;
+          vec3 Vs = l2.direction;
+          register real Vr_Dot_Vs = Vr.dot(Vs);
+          register real detA = real(1.0 - (Vr_Dot_Vs * Vr_Dot_Vs));
+          vec3 C = l2.position - position;
+          register real C_Dot_Vr =  C.dot(Vr);
+          register real C_Dot_Vs =  C.dot(Vs);
+  
+          u = (C_Dot_Vr - Vr_Dot_Vs * C_Dot_Vs)/detA;
+          v = (C_Dot_Vr * Vr_Dot_Vs - C_Dot_Vs)/detA;
+  
+          pointOnThis = position;
+          pointOnThis += direction * u;
+          pointOnThat = l2.position;
+          pointOnThat += l2.direction * v;
+  
+          return 1;
+        }
+  
+        vec3 get_closest_point(const vec3 &point)
+        {
+          vec3 np = point - position;
+          vec3 rp = direction*direction.dot(np)+position;
+          return rp;
+        }
+  
+        const vec3 & get_position() const {return position;}
+
+        const vec3 & get_direction() const {return direction;}
+  
+    //protected:
+        vec3 position;
+        vec3 direction;
+    };
+  
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+
+
+
+
+
+
+
+
+
+
+
+  // matrix
+
+  
+  class matrix4
+  {
+    
+  public:
+        
+    matrix4() { make_identity(); }
+    
+	matrix4( real r ) 
+	{ set_value(r); }
+
+	matrix4( real * m )
+	{ set_value(m); }
+    
+    matrix4( real a00, real a01, real a02, real a03,
+	       real a10, real a11, real a12, real a13,
+		   real a20, real a21, real a22, real a23,
+		   real a30, real a31, real a32, real a33 )
+	{
+		element(0,0) = a00;
+		element(0,1) = a01;
+		element(0,2) = a02;
+		element(0,3) = a03;
+		
+		element(1,0) = a10;
+		element(1,1) = a11;
+		element(1,2) = a12;
+		element(1,3) = a13;
+		
+		element(2,0) = a20;
+		element(2,1) = a21;
+		element(2,2) = a22;
+		element(2,3) = a23;
+		
+		element(3,0) = a30;
+		element(3,1) = a31;
+		element(3,2) = a32;
+		element(3,3) = a33;
+	}
+            
+    
+    void get_value( real * mp ) const
+	{
+		int c = 0;
+		for(int j=0; j < 4; j++)
+			for(int i=0; i < 4; i++)
+				mp[c++] = element(i,j);
+	}
+    
+    
+    const real * get_value() const
+	{ return m; }
+    
+	void set_value( real * mp)
+	{
+		int c = 0;
+		for(int j=0; j < 4; j++)
+			for(int i=0; i < 4; i++)
+				element(i,j) = mp[c++];
+	}
+    
+	void set_value( real r ) 
+	{
+		for(int i=0; i < 4; i++)
+			for(int j=0; j < 4; j++)
+				element(i,j) = r;
+	}
+    
+    void make_identity()
+	{
+		element(0,0) = 1.0;
+		element(0,1) = 0.0;
+		element(0,2) = 0.0; 
+		element(0,3) = 0.0;
+		
+		element(1,0) = 0.0;
+		element(1,1) = 1.0; 
+		element(1,2) = 0.0;
+		element(1,3) = 0.0;
+		
+		element(2,0) = 0.0;
+		element(2,1) = 0.0;
+		element(2,2) = 1.0;
+		element(2,3) = 0.0;
+		
+		element(3,0) = 0.0; 
+		element(3,1) = 0.0; 
+		element(3,2) = 0.0;
+		element(3,3) = 1.0;
+	}
+	
+	
+    static matrix4 identity()
+	{
+		static matrix4 mident (
+			1.0, 0.0, 0.0, 0.0,
+			0.0, 1.0, 0.0, 0.0,
+			0.0, 0.0, 1.0, 0.0,
+			0.0, 0.0, 0.0, 1.0  );
+		return mident;
+	}
+    
+        
+    void set_scale( real s )
+	{
+		element(0,0) = s;
+		element(1,1) = s;
+		element(2,2) = s;
+	}
+    
+    void set_scale( const vec3 & s )
+	{
+		element(0,0) = s.v[0];
+		element(1,1) = s.v[1];
+		element(2,2) = s.v[2];
+	}
+    
+    
+    void set_translate( const vec3 & t )
+	{
+		element(0,3) = t.v[0];
+		element(1,3) = t.v[1];
+		element(2,3) = t.v[2];
+	}
+    
+	void set_row(int r, const vec4 & t)
+	{
+		element(r,0) = t.v[0];
+		element(r,1) = t.v[1];
+		element(r,2) = t.v[2];
+		element(r,3) = t.v[3];
+	}
+
+	void set_column(int c, const vec4 & t)
+	{
+		element(0,c) = t.v[0];
+		element(1,c) = t.v[1];
+		element(2,c) = t.v[2];
+		element(3,c) = t.v[3];
+	}
+
+    
+	void get_row(int r, vec4 & t) const
+	{
+		t.v[0] = element(r,0);
+		t.v[1] = element(r,1);
+		t.v[2] = element(r,2);
+		t.v[3] = element(r,3);
+	}
+
+	vec4 get_row(int r) const
+	{
+		vec4 v; get_row(r, v);
+		return v;
+	}
+
+	void get_column(int c, vec4 & t) const
+	{
+		t.v[0] = element(0,c);
+		t.v[1] = element(1,c);
+		t.v[2] = element(2,c);
+		t.v[3] = element(3,c);
+	}
+
+	vec4 get_column(int c) const
+	{
+		vec4 v; get_column(c, v);
+		return v;
+	}
+
+    matrix4 inverse() const
+	{
+		matrix4 minv;
+		
+		real r1[8], r2[8], r3[8], r4[8];
+		real *s[4], *tmprow;
+		
+		s[0] = &r1[0];
+		s[1] = &r2[0];
+		s[2] = &r3[0];
+		s[3] = &r4[0];
+		
+		register int i,j,p,jj;
+		for(i=0;i<4;i++)
+		{
+			for(j=0;j<4;j++)
+			{
+				s[i][j] = element(i,j);
+				if(i==j) s[i][j+4] = 1.0;
+				else     s[i][j+4] = 0.0;
+			}
+		}
+		real scp[4];
+		for(i=0;i<4;i++)
+		{
+			scp[i] = real(fabs(s[i][0]));
+			for(j=1;j<4;j++)
+				if(real(fabs(s[i][j])) > scp[i]) scp[i] = real(fabs(s[i][j]));
+				if(scp[i] == 0.0) return minv; // singular matrix!
+		}
+		
+		int pivot_to;
+		real scp_max;
+		for(i=0;i<4;i++)
+		{
+			// select pivot row
+			pivot_to = i;
+			scp_max = real(fabs(s[i][i]/scp[i]));
+			// find out which row should be on top
+			for(p=i+1;p<4;p++)
+				if(real(fabs(s[p][i]/scp[p])) > scp_max)
+				{ scp_max = real(fabs(s[p][i]/scp[p])); pivot_to = p; }
+				// Pivot if necessary
+				if(pivot_to != i)
+				{
+					tmprow = s[i];
+					s[i] = s[pivot_to];
+					s[pivot_to] = tmprow;
+					real tmpscp;
+					tmpscp = scp[i];
+					scp[i] = scp[pivot_to];
+					scp[pivot_to] = tmpscp;
+				}
+				
+				real mji;
+				// perform gaussian elimination
+				for(j=i+1;j<4;j++)
+				{
+					mji = s[j][i]/s[i][i];
+					s[j][i] = 0.0;
+					for(jj=i+1;jj<8;jj++)
+						s[j][jj] -= mji*s[i][jj];
+				}
+		}
+		if(s[3][3] == 0.0) return minv; // singular matrix!
+		
+		//
+		// Now we have an upper triangular matrix.
+		//
+		//  x x x x | y y y y
+		//  0 x x x | y y y y 
+		//  0 0 x x | y y y y
+		//  0 0 0 x | y y y y
+		//
+		//  we'll back substitute to get the inverse
+		//
+		//  1 0 0 0 | z z z z
+		//  0 1 0 0 | z z z z
+		//  0 0 1 0 | z z z z
+		//  0 0 0 1 | z z z z 
+		//
+		
+		real mij;
+		for(i=3;i>0;i--)
+		{
+			for(j=i-1;j > -1; j--)
+			{
+				mij = s[j][i]/s[i][i];
+				for(jj=j+1;jj<8;jj++)
+					s[j][jj] -= mij*s[i][jj];
+			}
+		}
+		
+		for(i=0;i<4;i++)
+			for(j=0;j<4;j++)
+				minv(i,j) = s[i][j+4] / s[i][i];
+			
+			return minv;
+	}
+    
+    
+    matrix4 transpose() const
+	{
+		matrix4 mtrans;
+		
+		for(int i=0;i<4;i++)
+			for(int j=0;j<4;j++)
+				mtrans(i,j) = element(j,i);		
+		return mtrans;
+	}
+    
+    matrix4 & mult_right( const matrix4 & b )
+	{
+		matrix4 mt(*this);
+		set_value(real(0));
+
+		for(int i=0; i < 4; i++)
+			for(int j=0; j < 4; j++)
+				for(int c=0; c < 4; c++)
+					element(i,j) += mt(i,c) * b(c,j);
+		return *this;
+	}    
+
+    matrix4 & mult_left( const matrix4 & b )
+	{
+		matrix4 mt(*this);
+		set_value(real(0));
+
+		for(int i=0; i < 4; i++)
+			for(int j=0; j < 4; j++)
+				for(int c=0; c < 4; c++)
+					element(i,j) += b(i,c) * mt(c,j);
+		return *this;
+	}
+	
+	// dst = M * src
+    void mult_matrix_vec( const vec3 &src, vec3 &dst ) const
+	{
+		real w = (
+			src.v[0] * element(3,0) +
+			src.v[1] * element(3,1) + 
+			src.v[2] * element(3,2) +
+			element(3,3)          );
+        
+        assert(w != GLH_ZERO);
+
+        dst.v[0]  = (
+			src.v[0] * element(0,0) +
+			src.v[1] * element(0,1) +
+			src.v[2] * element(0,2) +
+			element(0,3)          ) / w;
+		dst.v[1]  = (
+			src.v[0] * element(1,0) +
+			src.v[1] * element(1,1) +
+			src.v[2] * element(1,2) +
+			element(1,3)          ) / w;
+		dst.v[2]  = (
+			src.v[0] * element(2,0) +
+			src.v[1] * element(2,1) + 
+			src.v[2] * element(2,2) +
+			element(2,3)          ) / w;
+	}
+    
+	void mult_matrix_vec( vec3 & src_and_dst) const
+	{ mult_matrix_vec(vec3(src_and_dst), src_and_dst); }
+
+
+    // dst = src * M
+    void mult_vec_matrix( const vec3 &src, vec3 &dst ) const
+	{
+		real w = (
+			src.v[0] * element(0,3) +
+			src.v[1] * element(1,3) +
+			src.v[2] * element(2,3) +
+			element(3,3)          );
+        
+        assert(w != GLH_ZERO);
+
+		dst.v[0]  = (
+			src.v[0] * element(0,0) +
+			src.v[1] * element(1,0) + 
+			src.v[2] * element(2,0) + 
+			element(3,0)          ) / w;
+		dst.v[1]  = (
+			src.v[0] * element(0,1) +
+			src.v[1] * element(1,1) +
+			src.v[2] * element(2,1) +
+			element(3,1)          ) / w;
+		dst.v[2]  = (
+			src.v[0] * element(0,2) +
+			src.v[1] * element(1,2) +
+			src.v[2] * element(2,2) +
+			element(3,2)          ) / w;
+	}
+        
+
+	void mult_vec_matrix( vec3 & src_and_dst) const
+	{ mult_vec_matrix(vec3(src_and_dst), src_and_dst); }
+
+	// dst = M * src
+    void mult_matrix_vec( const vec4 &src, vec4 &dst ) const
+	{
+        dst.v[0]  = (
+			src.v[0] * element(0,0) +
+			src.v[1] * element(0,1) +
+			src.v[2] * element(0,2) +
+			src.v[3] * element(0,3));
+		dst.v[1]  = (
+			src.v[0] * element(1,0) +
+			src.v[1] * element(1,1) +
+			src.v[2] * element(1,2) +
+			src.v[3] * element(1,3));
+		dst.v[2]  = (
+			src.v[0] * element(2,0) +
+			src.v[1] * element(2,1) + 
+			src.v[2] * element(2,2) +
+			src.v[3] * element(2,3));
+		dst.v[3] = (
+			src.v[0] * element(3,0) +
+			src.v[1] * element(3,1) + 
+			src.v[2] * element(3,2) +
+			src.v[3] * element(3,3));
+	}
+    
+	void mult_matrix_vec( vec4 & src_and_dst) const
+	{ mult_matrix_vec(vec4(src_and_dst), src_and_dst); }
+
+
+    // dst = src * M
+    void mult_vec_matrix( const vec4 &src, vec4 &dst ) const
+	{
+		dst.v[0]  = (
+			src.v[0] * element(0,0) +
+			src.v[1] * element(1,0) + 
+			src.v[2] * element(2,0) + 
+			src.v[3] * element(3,0));
+		dst.v[1]  = (
+			src.v[0] * element(0,1) +
+			src.v[1] * element(1,1) +
+			src.v[2] * element(2,1) +
+			src.v[3] * element(3,1));
+		dst.v[2]  = (
+			src.v[0] * element(0,2) +
+			src.v[1] * element(1,2) +
+			src.v[2] * element(2,2) +
+			src.v[3] * element(3,2));
+		dst.v[3] = (
+			src.v[0] * element(0,3) +
+			src.v[1] * element(1,3) +
+			src.v[2] * element(2,3) +
+			src.v[3] * element(3,3));
+	}
+        
+
+	void mult_vec_matrix( vec4 & src_and_dst) const
+	{ mult_vec_matrix(vec4(src_and_dst), src_and_dst); }
+
+    
+    // dst = M * src
+    void mult_matrix_dir( const vec3 &src, vec3 &dst ) const
+	{
+		dst.v[0]  = (
+			src.v[0] * element(0,0) +
+			src.v[1] * element(0,1) +
+			src.v[2] * element(0,2) ) ;
+		dst.v[1]  = ( 
+			src.v[0] * element(1,0) +
+			src.v[1] * element(1,1) +
+			src.v[2] * element(1,2) ) ;
+		dst.v[2]  = ( 
+			src.v[0] * element(2,0) +
+			src.v[1] * element(2,1) + 
+			src.v[2] * element(2,2) ) ;
+	}
+        
+
+	void mult_matrix_dir( vec3 & src_and_dst) const
+	{ mult_matrix_dir(vec3(src_and_dst), src_and_dst); }
+
+
+	// dst = src * M
+    void mult_dir_matrix( const vec3 &src, vec3 &dst ) const
+	{
+		dst.v[0]  = ( 
+			src.v[0] * element(0,0) +
+			src.v[1] * element(1,0) +
+			src.v[2] * element(2,0) ) ;
+		dst.v[1]  = ( 
+			src.v[0] * element(0,1) +
+			src.v[1] * element(1,1) +
+			src.v[2] * element(2,1) ) ;
+		dst.v[2]  = (
+			src.v[0] * element(0,2) +
+			src.v[1] * element(1,2) + 
+			src.v[2] * element(2,2) ) ;
+	}
+    
+    
+	void mult_dir_matrix( vec3 & src_and_dst) const
+	{ mult_dir_matrix(vec3(src_and_dst), src_and_dst); }
+
+
+    real & operator () (int row, int col)
+    { return element(row,col); }
+
+    const real & operator () (int row, int col) const
+    { return element(row,col); }
+
+	real & element (int row, int col)
+    { return m[row | (col<<2)]; }
+
+    const real & element (int row, int col) const
+    { return m[row | (col<<2)]; }
+
+    matrix4 & operator *= ( const matrix4 & mat )
+	{
+		mult_right( mat );
+		return *this;
+	}
+    
+    matrix4 & operator *= ( const real & r )
+	{
+		for (int i = 0; i < 4; ++i)
+        {
+            element(0,i) *= r;
+            element(1,i) *= r;
+            element(2,i) *= r;
+            element(3,i) *= r;
+        }
+		return *this;
+	}
+
+    matrix4 & operator += ( const matrix4 & mat )
+	{
+		for (int i = 0; i < 4; ++i)
+        {
+            element(0,i) += mat.element(0,i);
+            element(1,i) += mat.element(1,i);
+            element(2,i) += mat.element(2,i);
+            element(3,i) += mat.element(3,i);
+        }
+		return *this;
+	}
+
+    friend matrix4 operator * ( const matrix4 & m1,	const matrix4 & m2 );
+    friend bool operator == ( const matrix4 & m1, const matrix4 & m2 );
+    friend bool operator != ( const matrix4 & m1, const matrix4 & m2 );
+    
+  //protected:
+	  real m[16];
+  };
+  
+  inline  
+  matrix4 operator * ( const matrix4 & m1, const matrix4 & m2 )
+  {
+	  matrix4 product;
+	  
+	  product = m1;
+	  product.mult_right(m2);
+	  
+	  return product;
+  }
+  
+  inline
+  bool operator ==( const matrix4 &m1, const matrix4 &m2 )
+  {
+	  return ( 
+		  m1(0,0) == m2(0,0) &&
+		  m1(0,1) == m2(0,1) &&
+		  m1(0,2) == m2(0,2) &&
+		  m1(0,3) == m2(0,3) &&
+		  m1(1,0) == m2(1,0) &&
+		  m1(1,1) == m2(1,1) &&
+		  m1(1,2) == m2(1,2) &&
+		  m1(1,3) == m2(1,3) &&
+		  m1(2,0) == m2(2,0) &&
+		  m1(2,1) == m2(2,1) &&
+		  m1(2,2) == m2(2,2) &&
+		  m1(2,3) == m2(2,3) &&
+		  m1(3,0) == m2(3,0) &&
+		  m1(3,1) == m2(3,1) &&
+		  m1(3,2) == m2(3,2) &&
+		  m1(3,3) == m2(3,3) );
+  }
+  
+  inline
+  bool operator != ( const matrix4 & m1, const matrix4 & m2 )
+  { return !( m1 == m2 ); }  
+
+
+
+
+
+
+
+
+
+
+
+
+  
+    class quaternion
+    {
+    public:
+    
+    quaternion()
+    {
+        *this = identity();
+    }
+
+    quaternion( const real v[4] )
+    {
+        set_value( v );
+    }
+
+
+    quaternion( real q0, real q1, real q2, real q3 )
+    {
+        set_value( q0, q1, q2, q3 );
+    }
+
+
+    quaternion( const matrix4 & m )
+    {
+        set_value( m );
+    }
+
+
+    quaternion( const vec3 &axis, real radians )
+    {
+        set_value( axis, radians );
+    }
+
+
+    quaternion( const vec3 &rotateFrom, const vec3 &rotateTo )
+    {
+        set_value( rotateFrom, rotateTo );
+    }
+
+    quaternion( const vec3 & from_look, const vec3 & from_up,
+		      const vec3 & to_look, const vec3& to_up)
+    {
+	    set_value(from_look, from_up, to_look, to_up);
+    }
+
+    const real * get_value() const
+    {
+        return  &q[0];
+    }
+
+    void get_value( real &q0, real &q1, real &q2, real &q3 ) const
+    {
+        q0 = q[0];
+        q1 = q[1];
+        q2 = q[2];
+        q3 = q[3];
+    }
+
+    quaternion & set_value( real q0, real q1, real q2, real q3 )
+    {
+        q[0] = q0;
+        q[1] = q1;
+        q[2] = q2;
+        q[3] = q3;
+        counter = 0;
+        return *this;
+    }
+
+    void get_value( vec3 &axis, real &radians ) const
+    {
+        radians = real(acos( q[3] ) * GLH_TWO);
+        if ( radians == GLH_ZERO )
+            axis = vec3( 0.0, 0.0, 1.0 );
+        else
+        {
+            axis.v[0] = q[0];
+            axis.v[1] = q[1];
+            axis.v[2] = q[2];
+            axis.normalize();
+        }
+    }
+
+    void get_value( matrix4 & m ) const
+    {
+        real s, xs, ys, zs, wx, wy, wz, xx, xy, xz, yy, yz, zz;
+
+        real norm = q[0] * q[0] + q[1] * q[1] + q[2] * q[2] + q[3] * q[3];
+
+        s = (equivalent(norm,GLH_ZERO)) ? GLH_ZERO : ( GLH_TWO / norm );
+
+        xs = q[0] * s;
+        ys = q[1] * s;
+        zs = q[2] * s;
+
+        wx = q[3] * xs;
+        wy = q[3] * ys;
+        wz = q[3] * zs;
+
+        xx = q[0] * xs;
+        xy = q[0] * ys;
+        xz = q[0] * zs;
+
+        yy = q[1] * ys;
+        yz = q[1] * zs;
+        zz = q[2] * zs;
+
+        m(0,0) = real( GLH_ONE - ( yy + zz ));
+        m(1,0) = real ( xy + wz );
+        m(2,0) = real ( xz - wy );
+
+        m(0,1) = real ( xy - wz );
+        m(1,1) = real ( GLH_ONE - ( xx + zz ));
+        m(2,1) = real ( yz + wx );
+
+        m(0,2) = real ( xz + wy );
+        m(1,2) = real ( yz - wx );
+        m(2,2) = real ( GLH_ONE - ( xx + yy ));
+
+        m(3,0) = m(3,1) = m(3,2) = m(0,3) = m(1,3) = m(2,3) = GLH_ZERO;
+        m(3,3) = GLH_ONE;
+    }
+
+    quaternion & set_value( const real * qp )
+    {
+        memcpy(q,qp,sizeof(real) * 4);
+
+        counter = 0;
+        return *this;
+    }
+
+    quaternion & set_value( const matrix4 & m )
+    {
+        real tr, s;
+        int i, j, k;
+        const int nxt[3] = { 1, 2, 0 };
+
+        tr = m(0,0) + m(1,1) + m(2,2);
+
+        if ( tr > GLH_ZERO )
+        {
+            s = real(sqrt( tr + m(3,3) ));
+            q[3] = real ( s * 0.5 );
+            s = real(0.5) / s;
+
+            q[0] = real ( ( m(1,2) - m(2,1) ) * s );
+            q[1] = real ( ( m(2,0) - m(0,2) ) * s );
+            q[2] = real ( ( m(0,1) - m(1,0) ) * s );
+        }
+        else
+        {
+            i = 0;
+            if ( m(1,1) > m(0,0) )
+              i = 1;
+
+            if ( m(2,2) > m(i,i) )
+              i = 2;
+
+            j = nxt[i];
+            k = nxt[j];
+
+            s = real(sqrt( ( m(i,j) - ( m(j,j) + m(k,k) )) + GLH_ONE ));
+
+            q[i] = real ( s * 0.5 );
+            s = real(0.5 / s);
+
+            q[3] = real ( ( m(j,k) - m(k,j) ) * s );
+            q[j] = real ( ( m(i,j) + m(j,i) ) * s );
+            q[k] = real ( ( m(i,k) + m(k,i) ) * s );
+        }
+
+        counter = 0;
+        return *this;
+    }
+
+    quaternion & set_value( const vec3 &axis, real theta )
+    {
+        real sqnorm = axis.square_norm();
+
+        if (sqnorm <= GLH_EPSILON)
+        {
+            // axis too small.
+            x = y = z = 0.0;
+            w = 1.0;
+        } 
+        else 
+        {
+            theta *= real(0.5);
+            real sin_theta = real(sin(theta));
+
+            if (!equivalent(sqnorm,GLH_ONE)) 
+              sin_theta /= real(sqrt(sqnorm));
+            x = sin_theta * axis.v[0];
+            y = sin_theta * axis.v[1];
+            z = sin_theta * axis.v[2];
+            w = real(cos(theta));
+        }
+        return *this;
+    }
+
+    quaternion & set_value( const vec3 & rotateFrom, const vec3 & rotateTo )
+    {
+        vec3 p1, p2;
+        real alpha;
+
+        p1 = rotateFrom; 
+        p1.normalize();
+        p2 = rotateTo;  
+        p2.normalize();
+
+        alpha = p1.dot(p2);
+
+        if(equivalent(alpha,GLH_ONE))
+        { 
+            *this = identity(); 
+            return *this; 
+        }
+
+        // ensures that the anti-parallel case leads to a positive dot
+        if(equivalent(alpha,-GLH_ONE))
+        {
+            vec3 v;
+
+            if(p1.v[0] != p1.v[1] || p1.v[0] != p1.v[2])
+    	        v = vec3(p1.v[1], p1.v[2], p1.v[0]);
+            else
+    	        v = vec3(-p1.v[0], p1.v[1], p1.v[2]);
+
+            v -= p1 * p1.dot(v);
+            v.normalize();
+
+            set_value(v, GLH_PI);
+            return *this;
+        }
+
+        p1 = p1.cross(p2);  
+        p1.normalize();
+        set_value(p1,real(acos(alpha)));
+
+        counter = 0;
+        return *this;
+    }
+
+    quaternion & set_value( const vec3 & from_look, const vec3 & from_up,
+		      const vec3 & to_look, const vec3 & to_up)
+    {
+	    quaternion r_look = quaternion(from_look, to_look);
+	    
+	    vec3 rotated_from_up(from_up);
+	    r_look.mult_vec(rotated_from_up);
+	    
+	    quaternion r_twist = quaternion(rotated_from_up, to_up);
+	    
+	    *this = r_twist;
+	    *this *= r_look;
+	    return *this;
+    }
+
+    quaternion & operator *= ( const quaternion & qr )
+    {
+        quaternion ql(*this);
+   
+        w = ql.w * qr.w - ql.x * qr.x - ql.y * qr.y - ql.z * qr.z;
+        x = ql.w * qr.x + ql.x * qr.w + ql.y * qr.z - ql.z * qr.y;
+        y = ql.w * qr.y + ql.y * qr.w + ql.z * qr.x - ql.x * qr.z;
+        z = ql.w * qr.z + ql.z * qr.w + ql.x * qr.y - ql.y * qr.x;
+
+        counter += qr.counter;
+        counter++;
+        counter_normalize();
+        return *this;
+    }
+
+    void normalize()
+    {
+        real rnorm = GLH_ONE / real(sqrt(w * w + x * x + y * y + z * z));
+        if (equivalent(rnorm, GLH_ZERO))
+            return;
+        x *= rnorm;
+        y *= rnorm;
+        z *= rnorm;
+        w *= rnorm;
+        counter = 0;
+    }
+
+    friend bool operator == ( const quaternion & q1, const quaternion & q2 );      
+
+    friend bool operator != ( const quaternion & q1, const quaternion & q2 );
+
+    friend quaternion operator * ( const quaternion & q1, const quaternion & q2 );
+
+    bool equals( const quaternion & r, real tolerance ) const
+    {
+        real t;
+
+        t = (
+			(q[0]-r.q[0])*(q[0]-r.q[0]) +
+            (q[1]-r.q[1])*(q[1]-r.q[1]) +
+            (q[2]-r.q[2])*(q[2]-r.q[2]) +
+            (q[3]-r.q[3])*(q[3]-r.q[3]) );
+        if(t > GLH_EPSILON) 
+            return false;
+        return 1;
+    }
+
+    quaternion & conjugate()
+    {
+        q[0] *= -GLH_ONE;
+        q[1] *= -GLH_ONE;
+        q[2] *= -GLH_ONE;
+        return *this;
+    }
+
+    quaternion & invert()
+    {
+        return conjugate();
+    }
+
+    quaternion inverse() const
+    {
+        quaternion r = *this;
+        return r.invert();
+    }
+
+    //
+    // Quaternion multiplication with cartesian vector
+    // v' = q*v*q(star)
+    //
+    void mult_vec( const vec3 &src, vec3 &dst ) const
+    {
+        real v_coef = w * w - x * x - y * y - z * z;                     
+        real u_coef = GLH_TWO * (src.v[0] * x + src.v[1] * y + src.v[2] * z);  
+        real c_coef = GLH_TWO * w;                                       
+
+        dst.v[0] = v_coef * src.v[0] + u_coef * x + c_coef * (y * src.v[2] - z * src.v[1]);
+        dst.v[1] = v_coef * src.v[1] + u_coef * y + c_coef * (z * src.v[0] - x * src.v[2]);
+        dst.v[2] = v_coef * src.v[2] + u_coef * z + c_coef * (x * src.v[1] - y * src.v[0]);
+    }
+
+    void mult_vec( vec3 & src_and_dst) const
+    {
+        mult_vec(vec3(src_and_dst), src_and_dst);
+    }
+
+    void scale_angle( real scaleFactor )
+    {
+        vec3 axis;
+        real radians;
+
+        get_value(axis, radians);
+        radians *= scaleFactor;
+        set_value(axis, radians);
+    }
+
+    static quaternion slerp( const quaternion & p, const quaternion & q, real alpha )
+    {
+        quaternion r;
+
+        real cos_omega = p.x * q.x + p.y * q.y + p.z * q.z + p.w * q.w;
+        // if B is on opposite hemisphere from A, use -B instead
+      
+        int bflip;
+        if ( ( bflip = (cos_omega < GLH_ZERO)) )
+            cos_omega = -cos_omega;
+
+        // complementary interpolation parameter
+        real beta = GLH_ONE - alpha;     
+
+        if(cos_omega <= GLH_ONE - GLH_EPSILON)
+            return p;
+
+        real omega = real(acos(cos_omega));
+        real one_over_sin_omega = GLH_ONE / real(sin(omega));
+
+        beta    = real(sin(omega*beta)  * one_over_sin_omega);
+        alpha   = real(sin(omega*alpha) * one_over_sin_omega);
+
+        if (bflip)
+            alpha = -alpha;
+
+        r.x = beta * p.q[0]+ alpha * q.q[0];
+        r.y = beta * p.q[1]+ alpha * q.q[1];
+        r.z = beta * p.q[2]+ alpha * q.q[2];
+        r.w = beta * p.q[3]+ alpha * q.q[3];
+        return r;
+    }
+
+    static quaternion identity()
+    {
+        static quaternion ident( vec3( 0.0, 0.0, 0.0 ), GLH_ONE );
+        return ident;
+    }
+
+    real & operator []( int i )
+    {
+        assert(i < 4);
+        return q[i];
+    }
+
+    const real & operator []( int i ) const
+    {
+        assert(i < 4);
+        return q[i];
+    }
+
+    protected:
+
+        void counter_normalize()
+        {
+            if (counter > GLH_QUATERNION_NORMALIZATION_THRESHOLD)
+                normalize();
+        }
+
+        union 
+        {
+            struct 
+            {
+                real q[4];
+            };
+            struct 
+            {
+                real x;
+                real y;
+                real z;
+                real w;
+            };
+        };
+
+        // renormalization counter
+        unsigned char counter;
+    };
+
+    inline
+    bool operator == ( const quaternion & q1, const quaternion & q2 )
+    {
+        return (equivalent(q1.x, q2.x) &&
+		        equivalent(q1.y, q2.y) &&
+		        equivalent(q1.z, q2.z) &&
+		        equivalent(q1.w, q2.w) );
+    }
+
+    inline
+    bool operator != ( const quaternion & q1, const quaternion & q2 )
+    { 
+        return ! ( q1 == q2 ); 
+    }
+
+    inline
+    quaternion operator * ( const quaternion & q1, const quaternion & q2 )
+    {	
+        quaternion r(q1); 
+        r *= q2; 
+        return r; 
+    }
+  
+      
+    
+
+
+
+
+
+  
+  
+  class plane
+  {
+  public:
+	  
+	  plane()
+      {
+		  planedistance = 0.0;
+		  planenormal.set_value( 0.0, 0.0, 1.0 );
+      }
+	  
+	  
+	  plane( const vec3 &p0, const vec3 &p1, const vec3 &p2 )
+      {
+		  vec3 v0 = p1 - p0;
+		  vec3 v1 = p2 - p0;
+		  planenormal = v0.cross(v1);  
+		  planenormal.normalize();
+		  planedistance = p0.dot(planenormal);
+      }
+	  
+	  plane( const vec3 &normal, real distance )
+      {
+		  planedistance = distance;
+		  planenormal = normal;
+		  planenormal.normalize();
+      }
+	  
+	  plane( const vec3 &normal, const vec3 &point )
+      {
+		  planenormal = normal;
+		  planenormal.normalize();
+		  planedistance = point.dot(planenormal);
+      }
+	  
+	  void offset( real d )
+      {
+		  planedistance += d;
+      }
+	  
+	  bool intersect( const line &l, vec3 &intersection ) const
+      {
+		  vec3 pos, dir;
+		  vec3 pn = planenormal;
+		  real pd = planedistance;
+		  
+		  pos = l.get_position();
+		  dir = l.get_direction();
+		  
+		  if(dir.dot(pn) == 0.0) return 0;
+		  pos -= pn*pd;
+		  // now we're talking about a plane passing through the origin
+		  if(pos.dot(pn) < 0.0) pn.negate();
+		  if(dir.dot(pn) > 0.0) dir.negate();
+		  vec3 ppos = pn * pos.dot(pn);
+		  pos = (ppos.length()/dir.dot(-pn))*dir;
+		  intersection = l.get_position();
+		  intersection += pos;
+		  return 1;
+      }
+	  void transform( const matrix4 &matrix )
+      {
+		  matrix4 invtr = matrix.inverse();
+		  invtr = invtr.transpose();
+		  
+		  vec3 pntOnplane = planenormal * planedistance;
+		  vec3 newPntOnplane;
+		  vec3 newnormal;
+		  
+		  invtr.mult_dir_matrix(planenormal, newnormal);
+		  matrix.mult_vec_matrix(pntOnplane, newPntOnplane);
+		  
+		  newnormal.normalize();
+		  planenormal = newnormal;
+		  planedistance = newPntOnplane.dot(planenormal);
+      }
+	  
+	  bool is_in_half_space( const vec3 &point ) const
+      {
+		  
+		  if(( point.dot(planenormal) - planedistance) < 0.0)
+			  return 0;
+		  return 1;
+      }
+	  
+	  
+	  real distance( const vec3 & point ) const 
+      {
+		  return planenormal.dot(point - planenormal*planedistance);
+      }
+	  
+	  const vec3 &get_normal() const
+      {
+		  return planenormal;
+      }
+	  
+	  
+	  real get_distance_from_origin() const
+      {
+		  return planedistance;
+      }
+	  
+	  
+	  friend bool operator == ( const plane & p1, const plane & p2 );
+	  
+	  
+	  friend bool operator != ( const plane & p1, const plane & p2 );
+	  
+  //protected:
+	  vec3 planenormal;
+	  real planedistance;
+  };
+  
+  inline
+  bool operator == (const plane & p1, const plane & p2 )
+  {
+	  return (  p1.planedistance == p2.planedistance && p1.planenormal == p2.planenormal);
+  }
+  
+  inline
+  bool operator != ( const plane & p1, const plane & p2 )
+  { return  ! (p1 == p2); }
+  
+  
+
+  } // "ns_##GLH_REAL"
+
+  // make common typedefs...
+#ifdef GLH_REAL_IS_FLOAT
+  typedef GLH_REAL_NAMESPACE::vec2 vec2f;
+  typedef GLH_REAL_NAMESPACE::vec3 vec3f;
+  typedef GLH_REAL_NAMESPACE::vec4 vec4f;
+  typedef GLH_REAL_NAMESPACE::quaternion quaternionf;
+  typedef GLH_REAL_NAMESPACE::quaternion rotationf;
+  typedef GLH_REAL_NAMESPACE::line linef;
+  typedef GLH_REAL_NAMESPACE::plane planef;
+  typedef GLH_REAL_NAMESPACE::matrix4 matrix4f;
+#endif
+
+  
+
+
+}  // namespace glh
+
+
+
+#endif
+
diff --git a/linden/indra/newview/llcloud.cpp b/linden/indra/newview/llcloud.cpp
index 3e9b86a..b325265 100644
--- a/linden/indra/newview/llcloud.cpp
+++ b/linden/indra/newview/llcloud.cpp
@@ -427,7 +427,7 @@ void LLCloudLayer::decompress(LLBitPack &bitpack, LLGroupHeader *group_headerp)
 	group_headerp->stride = group_headerp->patch_size; 		// offset required to step up one row
 	set_group_of_patch_header(group_headerp);
 
-	decode_patch_header(bitpack, &patch_header);
+	decode_patch_header(bitpack, &patch_header, FALSE);
 	decode_patch(bitpack, gBuffer);
 	decompress_patch(mDensityp, gBuffer, &patch_header); 
 }
diff --git a/linden/indra/newview/llfloaterregioninfo.cpp b/linden/indra/newview/llfloaterregioninfo.cpp
index d4ffe22..4880308 100644
--- a/linden/indra/newview/llfloaterregioninfo.cpp
+++ b/linden/indra/newview/llfloaterregioninfo.cpp
@@ -1244,10 +1244,10 @@ BOOL LLPanelRegionTextureInfo::sendUpdate()
 	llinfos << "LLPanelRegionTextureInfo::sendUpdate()" << llendl;
 
 	// Make sure user hasn't chosen wacky textures.
-	if (!validateTextureSizes())
-	{
-		return FALSE;
-	}
+	//if (!validateTextureSizes())
+	//{
+	//	return FALSE;
+	//}
 
 	LLTextureCtrl* texture_ctrl;
 	std::string buffer;
diff --git a/linden/indra/newview/llglsandbox.cpp b/linden/indra/newview/llglsandbox.cpp
index 98c4d06..96fd39b 100644
--- a/linden/indra/newview/llglsandbox.cpp
+++ b/linden/indra/newview/llglsandbox.cpp
@@ -710,7 +710,7 @@ void LLViewerParcelMgr::renderOneSegment(F32 x1, F32 y1, F32 x2, F32 y2, F32 hei
 {
 	// HACK: At edge of last region of world, we need to make sure the region
 	// resolves correctly so we can get a height value.
-	const F32 BORDER = REGION_WIDTH_METERS - 0.1f;
+	const F32 BORDER = regionp->getWidth() - 0.1f;
 
 	F32 clamped_x1 = x1;
 	F32 clamped_y1 = y1;
diff --git a/linden/indra/newview/llmapresponders.cpp b/linden/indra/newview/llmapresponders.cpp
index 9d974f2..b6b5c8a 100644
--- a/linden/indra/newview/llmapresponders.cpp
+++ b/linden/indra/newview/llmapresponders.cpp
@@ -120,6 +120,8 @@ void LLMapLayerResponder::result(const LLSD& result)
 		
 			S32 x_regions = map_block["X"];
 			S32 y_regions = map_block["Y"];
+			S32 size_x_regions = map_block["SizeX"];
+			S32 size_y_regions = map_block["SizeY"];
 			std::string name = map_block["Name"];
 			S32 access = map_block["Access"];
 			S32 region_flags = map_block["RegionFlags"];
@@ -168,6 +170,8 @@ void LLMapLayerResponder::result(const LLSD& result)
 				LLWorldMap::getInstance()->mSimInfoMap[handle] = siminfo;
 
 				siminfo->mHandle = handle;
+				siminfo->msizeX = size_x_regions;
+				siminfo->msizeY = size_y_regions;
 				siminfo->mName.assign( name );
 				siminfo->mAccess = access;		/*Flawfinder: ignore*/
 				siminfo->mRegionFlags = region_flags;
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 5a3a8ee..0b6d75f 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -368,6 +368,8 @@ bool idle_startup()
 	static U64 first_sim_handle = 0;
 	static LLHost first_sim;
 	static std::string first_sim_seed_cap;
+	static U32 first_sim_size_x = 256;
+	static U32 first_sim_size_y = 256;
 
 	static LLVector3 initial_sun_direction(1.f, 0.f, 0.f);
 	static LLVector3 agent_start_position_region(10.f, 10.f, 10.f);		// default for when no space server
@@ -1620,6 +1622,16 @@ bool idle_startup()
 				first_sim_handle = to_region_handle(region_x, region_y);
 			}
 			
+			text = LLUserAuth::getInstance()->getResponse("region_size_x");
+			if(!text.empty()) {
+				first_sim_size_x = strtoul(text.c_str(), NULL, 10);
+				LLViewerParcelMgr::getInstance()->init(first_sim_size_x);
+			}
+
+			//region Y size is currently unused, major refactoring required. - Patrick Sapinski (2/10/2011)
+			text = LLUserAuth::getInstance()->getResponse("region_size_y");
+			if(!text.empty()) first_sim_size_y = strtoul(text.c_str(), NULL, 10);
+			
 			const std::string look_at_str = LLUserAuth::getInstance()->getResponse("look_at");
 			if (!look_at_str.empty())
 			{
@@ -1915,7 +1927,7 @@ bool idle_startup()
 
 		gAgent.initOriginGlobal(from_region_handle(first_sim_handle));
 
-		LLWorld::getInstance()->addRegion(first_sim_handle, first_sim);
+		LLWorld::getInstance()->addRegion(first_sim_handle, first_sim, first_sim_size_x, first_sim_size_y);
 
 		LLViewerRegion *regionp = LLWorld::getInstance()->getRegionFromHandle(first_sim_handle);
 		LL_INFOS("AppInit") << "Adding initial simulator " << regionp->getOriginGlobal() << LL_ENDL;
diff --git a/linden/indra/newview/llsurface.cpp b/linden/indra/newview/llsurface.cpp
index aaafe0d..66f8076 100644
--- a/linden/indra/newview/llsurface.cpp
+++ b/linden/indra/newview/llsurface.cpp
@@ -303,7 +303,7 @@ void LLSurface::initTextures()
 		mWaterObjp = (LLVOWater *)gObjectList.createObjectViewer(LLViewerObject::LL_VO_WATER, mRegionp);
 		gPipeline.createObject(mWaterObjp);
 		LLVector3d water_pos_global = from_region_handle(mRegionp->getHandle());
-		water_pos_global += LLVector3d(128.0, 128.0, DEFAULT_WATER_HEIGHT);
+		water_pos_global += LLVector3d(mRegionp->getWidth()/2, mRegionp->getWidth()/2, DEFAULT_WATER_HEIGHT);
 		mWaterObjp->setPositionGlobal(water_pos_global);
 	}
 }
@@ -356,8 +356,8 @@ void LLSurface::setOriginGlobal(const LLVector3d &origin_global)
 	// Hack!
 	if (mWaterObjp.notNull() && mWaterObjp->mDrawable.notNull())
 	{
-		const F64 x = origin_global.mdV[VX] + 128.0;
-		const F64 y = origin_global.mdV[VY] + 128.0;
+		const F64 x = origin_global.mdV[VX] + (F64)mRegionp->getWidth()/2;
+		const F64 y = origin_global.mdV[VY] + (F64)mRegionp->getWidth()/2;
 		const F64 z = mWaterObjp->getPositionGlobal().mdV[VZ];
 
 		LLVector3d water_origin_global(x, y, z);
@@ -707,14 +707,22 @@ void LLSurface::decompressDCTPatch(LLBitPack &bitpack, LLGroupHeader *gopp, BOOL
 
 	while (1)
 	{
-		decode_patch_header(bitpack, &ph);
+		decode_patch_header(bitpack, &ph, b_large_patch);
 		if (ph.quant_wbits == END_OF_PATCHES)
 		{
 			break;
 		}
 
-		i = ph.patchids >> 5;
-		j = ph.patchids & 0x1F;
+		if (b_large_patch)
+		{
+			i = ph.patchids >> 16; //x
+			j = ph.patchids & 0xFFFF; //y
+		}
+		else
+		{
+			i = ph.patchids >> 5; //x
+			j = ph.patchids & 0x1F; //y
+		}
 
 		if ((i >= mPatchesPerEdge) || (j >= mPatchesPerEdge))
 		{
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 9ebfd04..4de4768 100755
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -3531,6 +3531,17 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
 	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;
+	msg->getU32Fast(_PREHASH_Info, _PREHASH_RegionSizeY, region_size_y);
+
+	//and a little hack for Second Life compatibility
+	if (region_size_y == 0 || region_size_x == 0)
+	{
+		region_size_x = 256;
+		region_size_y = 256;
+	}
 	
 	std::string seedCap;
 	msg->getStringFast(_PREHASH_Info, _PREHASH_SeedCapability, seedCap);
@@ -3550,7 +3561,7 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
 
 	// Viewer trusts the simulator.
 	gMessageSystem->enableCircuit(sim_host, TRUE);
-	LLViewerRegion* regionp =  LLWorld::getInstance()->addRegion(region_handle, sim_host);
+	LLViewerRegion* regionp =  LLWorld::getInstance()->addRegion(region_handle, sim_host, region_size_x, region_size_y);
 
 /*
 	// send camera update to new region
@@ -3866,9 +3877,21 @@ void process_crossed_region(LLMessageSystem* msg, void**)
 	std::string seedCap;
 	msg->getStringFast(_PREHASH_RegionData, _PREHASH_SeedCapability, seedCap);
 
+	U32 region_size_x = 256;
+	msg->getU32(_PREHASH_RegionData, _PREHASH_RegionSizeX, region_size_x);
+	U32 region_size_y = 256;
+	msg->getU32(_PREHASH_RegionData, _PREHASH_RegionSizeY, region_size_y);
+
+	//and a little hack for Second Life compatibility
+	if (region_size_y == 0 || region_size_x == 0)
+	{
+		region_size_x = 256;
+		region_size_y = 256;
+	}
+
 	send_complete_agent_movement(sim_host);
 
-	LLViewerRegion* regionp = LLWorld::getInstance()->addRegion(region_handle, sim_host);
+	LLViewerRegion* regionp = LLWorld::getInstance()->addRegion(region_handle, sim_host, region_size_x, region_size_y);
 	regionp->setSeedCapability(seedCap);
 
 	// Tell the LightShare handler that we have changed regions.
diff --git a/linden/indra/newview/llviewerparcelmgr.cpp b/linden/indra/newview/llviewerparcelmgr.cpp
index 630da54..abe0e9f 100644
--- a/linden/indra/newview/llviewerparcelmgr.cpp
+++ b/linden/indra/newview/llviewerparcelmgr.cpp
@@ -137,6 +137,18 @@ LLViewerParcelMgr::LLViewerParcelMgr()
 	mHoverParcel = new LLParcel();
 	mCollisionParcel = new LLParcel();
 
+	mBlockedImage = gImageList.getImageFromFile("noentrylines.j2c");
+	mPassImage = gImageList.getImageFromFile("noentrypasslines.j2c");
+
+	init(256);
+}
+
+//moved this stuff out of the constructor and into a function that we can call again after we get the region size.
+//LLViewerParcelMgr needs to be changed so we either get an instance per region, or it handles various region sizes
+//on a single grid properly - Patrick Sapinski (2/10/2011)
+void LLViewerParcelMgr::init(F32 region_size)
+{
+
 	mParcelsPerEdge = S32(	REGION_WIDTH_METERS / PARCEL_GRID_STEP_METERS );
 	mHighlightSegments = new U8[(mParcelsPerEdge+1)*(mParcelsPerEdge+1)];
 	resetSegments(mHighlightSegments);
@@ -144,10 +156,9 @@ LLViewerParcelMgr::LLViewerParcelMgr()
 	mCollisionSegments = new U8[(mParcelsPerEdge+1)*(mParcelsPerEdge+1)];
 	resetSegments(mCollisionSegments);
 
-	mBlockedImage = gImageList.getImageFromFile("noentrylines.j2c");
-	mPassImage = gImageList.getImageFromFile("noentrypasslines.j2c");
-
-	S32 overlay_size = mParcelsPerEdge * mParcelsPerEdge / PARCEL_OVERLAY_CHUNKS;
+	S32 mParcelOverLayChunks = region_size * region_size / (128 * 128);
+
+	S32 overlay_size = mParcelsPerEdge * mParcelsPerEdge / mParcelOverLayChunks;
 	sPackedOverlay = new U8[overlay_size];
 
 	mAgentParcelOverlay = new U8[mParcelsPerEdge * mParcelsPerEdge];
@@ -1351,8 +1362,7 @@ void LLViewerParcelMgr::processParcelOverlay(LLMessageSystem *msg, void **user)
 		return;
 	}
 
-	S32 parcels_per_edge = LLViewerParcelMgr::getInstance()->mParcelsPerEdge;
-	S32 expected_size = parcels_per_edge * parcels_per_edge / PARCEL_OVERLAY_CHUNKS;
+	S32 expected_size = 1024; //parcels_per_edge * parcels_per_edge / PARCEL_OVERLAY_CHUNKS;
 	if (packed_overlay_size != expected_size)
 	{
 		llwarns << "Got parcel overlay size " << packed_overlay_size
diff --git a/linden/indra/newview/llviewerparcelmgr.h b/linden/indra/newview/llviewerparcelmgr.h
index 9bf6096..dcdea3c 100644
--- a/linden/indra/newview/llviewerparcelmgr.h
+++ b/linden/indra/newview/llviewerparcelmgr.h
@@ -82,6 +82,8 @@ public:
 	LLViewerParcelMgr();
 	~LLViewerParcelMgr();
 
+	void init(F32 region_size);
+
 	static void cleanupGlobals();
 
 	BOOL	selectionEmpty() const;
diff --git a/linden/indra/newview/llviewerparceloverlay.cpp b/linden/indra/newview/llviewerparceloverlay.cpp
index 0bcd8f3..a31f153 100644
--- a/linden/indra/newview/llviewerparceloverlay.cpp
+++ b/linden/indra/newview/llviewerparceloverlay.cpp
@@ -58,6 +58,7 @@ const U8  OVERLAY_IMG_COMPONENTS = 4;
 LLViewerParcelOverlay::LLViewerParcelOverlay(LLViewerRegion* region, F32 region_width_meters)
 :	mRegion( region ),
 	mParcelGridsPerEdge( S32( region_width_meters / PARCEL_GRID_STEP_METERS ) ),
+	mRegionSize(S32(region_width_meters)),
 	mDirty( FALSE ),
 	mTimeSinceLastUpdate(),
 	mOverlayTextureIdx(-1),
@@ -299,7 +300,8 @@ void LLViewerParcelOverlay::uncompressLandOverlay(S32 chunk, U8 *packed_overlay)
 {
 	// Unpack the message data into the ownership array
 	S32	size	= mParcelGridsPerEdge * mParcelGridsPerEdge;
-	S32 chunk_size = size / PARCEL_OVERLAY_CHUNKS;
+	S32 mParcelOverLayChunks = mRegionSize * mRegionSize / (128 * 128);
+	S32 chunk_size = size / mParcelOverLayChunks;
 
 	memcpy(mOwnership + chunk*chunk_size, packed_overlay, chunk_size);		/*Flawfinder: ignore*/
 
diff --git a/linden/indra/newview/llviewerparceloverlay.h b/linden/indra/newview/llviewerparceloverlay.h
index 9bed1dd..d3b5980 100644
--- a/linden/indra/newview/llviewerparceloverlay.h
+++ b/linden/indra/newview/llviewerparceloverlay.h
@@ -98,6 +98,7 @@ private:
 	LLViewerRegion*	mRegion;
 
 	S32				mParcelGridsPerEdge;
+	S32				mRegionSize;
 
 	LLPointer<LLImageGL> mTexture;
 	LLPointer<LLImageRaw> mImageRaw;
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index a8047b8..4186362 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -65,6 +65,7 @@
 #include "llvoclouds.h"
 #include "llworld.h"
 #include "llspatialpartition.h"
+#include "llviewerparcelmgr.h"
 
 // Viewer object cache version, change if object update
 // format changes. JC
@@ -199,6 +200,8 @@ LLViewerRegion::LLViewerRegion(const U64 &handle,
 	if (!gNoRender)
 	{
 		mParcelOverlay = new LLViewerParcelOverlay(this, region_width_meters);
+		//Re-init the parcel mgr for this sim
+		LLViewerParcelMgr::getInstance()->init(region_width_meters);
 	}
 	else
 	{
diff --git a/linden/indra/newview/llvlmanager.cpp b/linden/indra/newview/llvlmanager.cpp
index 177093c..68b4d7b 100644
--- a/linden/indra/newview/llvlmanager.cpp
+++ b/linden/indra/newview/llvlmanager.cpp
@@ -57,21 +57,23 @@ LLVLManager::~LLVLManager()
 
 void LLVLManager::addLayerData(LLVLData *vl_datap, const S32 mesg_size)
 {
-	if (LAND_LAYER_CODE == vl_datap->mType)
-	{
-		mLandBits += mesg_size * 8;
-	}
-	else if (WIND_LAYER_CODE == vl_datap->mType)
-	{
-		mWindBits += mesg_size * 8;
-	}
-	else if (CLOUD_LAYER_CODE == vl_datap->mType)
-	{
-		mCloudBits += mesg_size * 8;
-	}
-	else
-	{
-		llerrs << "Unknown layer type!" << (S32)vl_datap->mType << llendl;
+	if (LAND_LAYER_CODE == vl_datap->mType ||
+		AURORA_LAND_LAYER_CODE == vl_datap->mType)
+	{
+		mLandBits += mesg_size * 8;
+	}
+	else if (WIND_LAYER_CODE == vl_datap->mType ||
+		AURORA_WIND_LAYER_CODE == vl_datap->mType)
+	{
+		mWindBits += mesg_size * 8;
+	}
+	else if (CLOUD_LAYER_CODE == vl_datap->mType)
+	{
+		mCloudBits += mesg_size * 8;
+	}
+	else
+	{
+		llerrs << "Unknown layer type!" << (S32)vl_datap->mType << llendl;
 	}
 
 	mPacketData.put(vl_datap);
@@ -90,18 +92,23 @@ void LLVLManager::unpackData(const S32 num_packets)
 		LLGroupHeader goph;
 
 		decode_patch_group_header(bit_pack, &goph);
-		if (LAND_LAYER_CODE == datap->mType)
-		{
-			datap->mRegionp->getLand().decompressDCTPatch(bit_pack, &goph, FALSE);
-		}
-		else if (WIND_LAYER_CODE == datap->mType)
-		{
-			datap->mRegionp->mWind.decompress(bit_pack, &goph);
-
-		}
-		else if (CLOUD_LAYER_CODE == datap->mType)
-		{
-			datap->mRegionp->mCloudLayer.decompress(bit_pack, &goph);
+		if (LAND_LAYER_CODE == datap->mType)
+		{
+			datap->mRegionp->getLand().decompressDCTPatch(bit_pack, &goph, FALSE);
+		}
+		else if (AURORA_LAND_LAYER_CODE == datap->mType)
+		{
+			datap->mRegionp->getLand().decompressDCTPatch(bit_pack, &goph, TRUE);
+		}
+		else if (WIND_LAYER_CODE == datap->mType ||
+			AURORA_WIND_LAYER_CODE == datap->mType)
+		{
+			datap->mRegionp->mWind.decompress(bit_pack, &goph);
+		}
+		else if (CLOUD_LAYER_CODE == datap->mType ||
+			AURORA_CLOUD_LAYER_CODE == datap->mType)
+		{
+			datap->mRegionp->mCloudLayer.decompress(bit_pack, &goph);
 		}
 	}
 
diff --git a/linden/indra/newview/llvowater.cpp b/linden/indra/newview/llvowater.cpp
index c66295a..8af9e4a 100644
--- a/linden/indra/newview/llvowater.cpp
+++ b/linden/indra/newview/llvowater.cpp
@@ -74,7 +74,7 @@ LLVOWater::LLVOWater(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regi
 {
 	// Terrain must draw during selection passes so it can block objects behind it.
 	mbCanSelect = FALSE;
-	setScale(LLVector3(256.f, 256.f, 0.f)); // Hack for setting scale for bounding boxes/visibility.
+	setScale(LLVector3(mRegionp->getWidth(), mRegionp->getWidth(), 0.f)); // Hack for setting scale for bounding boxes/visibility.
 
 	mUseTexture = TRUE;
 	mIsEdgePatch = FALSE;
diff --git a/linden/indra/newview/llwind.cpp b/linden/indra/newview/llwind.cpp
index ae98bea..3dcbdf6 100644
--- a/linden/indra/newview/llwind.cpp
+++ b/linden/indra/newview/llwind.cpp
@@ -120,12 +120,12 @@ void LLWind::decompress(LLBitPack &bitpack, LLGroupHeader *group_headerp)
 	set_group_of_patch_header(group_headerp);
 
 	// X component
-	decode_patch_header(bitpack, &patch_header);
+	decode_patch_header(bitpack, &patch_header, FALSE);
 	decode_patch(bitpack, buffer);
 	decompress_patch(mVelX, buffer, &patch_header);
 
 	// Y component
-	decode_patch_header(bitpack, &patch_header);
+	decode_patch_header(bitpack, &patch_header, FALSE);
 	decode_patch(bitpack, buffer);
 	decompress_patch(mVelY, buffer, &patch_header);
 
diff --git a/linden/indra/newview/llworld.cpp b/linden/indra/newview/llworld.cpp
index 7866bf8..525195d 100644
--- a/linden/indra/newview/llworld.cpp
+++ b/linden/indra/newview/llworld.cpp
@@ -80,12 +80,12 @@ const S32 WORLD_PATCH_SIZE = 16;
 
 extern LLColor4U MAX_WATER_COLOR;
 
-const U32 LLWorld::mWidth = 256;
+U32 LLWorld::mWidth = 256;
 
 // meters/point, therefore mWidth * mScale = meters per edge
 const F32 LLWorld::mScale = 1.f;
 
-const F32 LLWorld::mWidthInMeters = mWidth * mScale;
+F32 LLWorld::mWidthInMeters = mWidth * mScale;
 
 //
 // Functions
@@ -140,7 +140,7 @@ F32	LLWorld::getRegionMaxHeight() const
 	return gHippoLimits->getMaxHeight();
 }
 
-LLViewerRegion* LLWorld::addRegion(const U64 &region_handle, const LLHost &host)
+LLViewerRegion* LLWorld::addRegion(const U64 &region_handle, const LLHost &host, const U32 &region_size_x, const U32 &region_size_y)
 {
 	LLMemType mt(LLMemType::MTYPE_REGIONS);
 	
@@ -172,9 +172,11 @@ LLViewerRegion* LLWorld::addRegion(const U64 &region_handle, const LLHost &host)
 
 	U32 iindex = 0;
 	U32 jindex = 0;
+	mWidth = region_size_x;
+	mWidthInMeters = mWidth * mScale;
 	from_region_handle(region_handle, &iindex, &jindex);
-	S32 x = (S32)(iindex/mWidth);
-	S32 y = (S32)(jindex/mWidth);
+	S32 x = (S32)(iindex/256);
+	S32 y = (S32)(jindex/256);
 	llinfos << "Adding new region (" << x << ":" << y << ")" << llendl;
 	llinfos << "Host: " << host << llendl;
 
@@ -902,7 +904,7 @@ void LLWorld::updateWaterObjects()
 	}
 
 	// Region width in meters.
-	S32 const rwidth = (S32)REGION_WIDTH_U32;
+	S32 const rwidth = (S32)getRegionWidthInMeters();
 
 	// The distance we might see into the void
 	// when standing on the edge of a region, in meters.
@@ -1256,9 +1258,20 @@ void process_enable_simulator(LLMessageSystem *msg, void **user_data)
 	// which simulator should we modify?
 	LLHost sim(ip_u32, port);
 
+	U32 region_size_x = 256;
+	msg->getU32Fast(_PREHASH_SimulatorInfo, _PREHASH_RegionSizeX, region_size_x);
+	U32 region_size_y = 256;
+	msg->getU32Fast(_PREHASH_SimulatorInfo, _PREHASH_RegionSizeY, region_size_y);
+
+	if (region_size_y == 0 || region_size_x == 0)
+	{
+		region_size_x = 256;
+		region_size_y = 256;
+	}
+
 	// Viewer trusts the simulator.
 	msg->enableCircuit(sim, TRUE);
-	LLWorld::getInstance()->addRegion(handle, sim);
+	LLWorld::getInstance()->addRegion(handle, sim, region_size_x, region_size_y);
 
 	// give the simulator a message it can use to get ip and port
 	llinfos << "simulator_enable() Enabling " << sim << " with code " << msg->getOurCircuitCode() << llendl;
diff --git a/linden/indra/newview/llworld.h b/linden/indra/newview/llworld.h
index 964729d..5dbef6d 100644
--- a/linden/indra/newview/llworld.h
+++ b/linden/indra/newview/llworld.h
@@ -71,7 +71,7 @@ public:
 	LLWorld();
 	void destroyClass();
 
-	LLViewerRegion*	addRegion(const U64 &region_handle, const LLHost &host);
+	LLViewerRegion*	addRegion(const U64 &region_handle, const LLHost &host, const U32 &region_size_x, const U32 &region_size_y);
 		// safe to call if already present, does the "right thing" if
 		// hosts are same, or if hosts are different, etc...
 	void			removeRegion(const LLHost &host);
@@ -171,12 +171,12 @@ private:
 	region_list_t	mCulledRegionList;
 
 	// Number of points on edge
-	static const U32 mWidth;
+	static U32 mWidth;
 
 	// meters/point, therefore mWidth * mScale = meters per edge
 	static const F32 mScale;
 
-	static const F32 mWidthInMeters;
+	static F32 mWidthInMeters;
 
 	F32 mLandFarClip;					// Far clip distance for land.
 	LLPatchVertexArray		mLandPatch;
diff --git a/linden/indra/newview/llworldmap.cpp b/linden/indra/newview/llworldmap.cpp
index 3ada36f..ead72fa 100644
--- a/linden/indra/newview/llworldmap.cpp
+++ b/linden/indra/newview/llworldmap.cpp
@@ -237,16 +237,27 @@ LLSimInfo* LLWorldMap::simInfoFromPosGlobal(const LLVector3d& pos_global)
 	return simInfoFromHandle(handle);
 }
 
-LLSimInfo* LLWorldMap::simInfoFromHandle(const U64 handle)
+LLSimInfo* LLWorldMap::simInfoFromHandle(const U64 findhandle)
 {
-	sim_info_map_t::iterator it = mSimInfoMap.find(handle);
-	if (it != mSimInfoMap.end())
-	{
-		LLSimInfo* sim_info = (*it).second;
-		if (sim_info)
-		{
-			return sim_info;
-		}
+	std::map<U64, LLSimInfo*>::const_iterator it;
+	for (it = LLWorldMap::getInstance()->mSimInfoMap.begin(); it != LLWorldMap::getInstance()->mSimInfoMap.end(); ++it)
+	{
+		const U64 handle = (*it).first;
+		LLSimInfo* info = (*it).second;
+		if(handle == findhandle)
+		{
+			return info;
+		}
+		U32 x = 0, y = 0;
+		from_region_handle(findhandle, &x, &y);
+		U32 checkRegionX, checkRegionY;
+		from_region_handle(handle, &checkRegionX, &checkRegionY);
+
+        if(x > checkRegionX && x < (checkRegionX + info->msizeX) &&
+			y > checkRegionY && y < (checkRegionY + info->msizeY))
+		{
+			return info;
+		}
 	}
 	return NULL;
 }
diff --git a/linden/indra/newview/llworldmap.h b/linden/indra/newview/llworldmap.h
index b7089f3..6725f91 100644
--- a/linden/indra/newview/llworldmap.h
+++ b/linden/indra/newview/llworldmap.h
@@ -81,6 +81,8 @@ public:
 
 public:
 	U64 mHandle;
+	S32 msizeX;
+	S32 msizeY;
 	std::string mName;
 
 	F64 mAgentsUpdateTime;
diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index 443ee74..51de598 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -471,8 +471,8 @@ void LLWorldMapView::draw()
 		// When the view isn't panned, 0,0 = center of rectangle
 		F32 bottom =	sPanY + half_height + relative_y;
 		F32 left =		sPanX + half_width + relative_x;
-		F32 top =		bottom + sMapScale ;
-		F32 right =		left + sMapScale ;
+		F32 top =		bottom+ (sMapScale * info->msizeY / REGION_WIDTH_METERS);
+		F32 right =		left + (sMapScale * info->msizeY / REGION_WIDTH_METERS);
 
 		// Switch to world map texture (if available for this region) if either:
 		// 1. Tiles are zoomed out small enough, or
@@ -567,17 +567,21 @@ void LLWorldMapView::draw()
 		center_global.mdV[VX] += 128.0;
 		center_global.mdV[VY] += 128.0;
 
-		S32 draw_size = llround(sMapScale);
+		S32 x_draw_size = llround(sMapScale);
+		S32 y_draw_size = llround(sMapScale);
+		x_draw_size *= info->msizeX / REGION_WIDTH_METERS;
+		y_draw_size *= info->msizeY / REGION_WIDTH_METERS;
+		
 		if (simimage != NULL)
 		{
 			simimage->setBoostLevel(LLViewerImageBoostLevel::BOOST_MAP);
-			simimage->setKnownDrawSize(llround(draw_size * LLUI::sGLScaleFactor.mV[VX]), llround(draw_size * LLUI::sGLScaleFactor.mV[VY]));
+			simimage->setKnownDrawSize(llround(x_draw_size * LLUI::sGLScaleFactor.mV[VX]), llround(y_draw_size * LLUI::sGLScaleFactor.mV[VY]));
 		}
 
 		if (overlayimage != NULL)
 		{
 			overlayimage->setBoostLevel(LLViewerImageBoostLevel::BOOST_MAP);
-			overlayimage->setKnownDrawSize(llround(draw_size * LLUI::sGLScaleFactor.mV[VX]), llround(draw_size * LLUI::sGLScaleFactor.mV[VY]));
+			overlayimage->setKnownDrawSize(llround(x_draw_size * LLUI::sGLScaleFactor.mV[VX]), llround(y_draw_size * LLUI::sGLScaleFactor.mV[VY]));
 		}
 			
 // 		LLTextureView::addDebugImage(simimage);
-- 
cgit v1.1


From 44aecbf4eca7c2d94ed88f11dedd237e93b01010 Mon Sep 17 00:00:00 2001
From: RevolutionSmythe
Date: Fri, 18 Mar 2011 19:26:19 -0500
Subject: Fix setting the viewer offset time from OpenRegionSettings, and also
 have it show what UTC offset it is representing in the time bar.

---
 linden/indra/llcommon/lltimer.cpp              |  6 +++---
 linden/indra/newview/kowopenregionsettings.cpp |  6 +++++-
 linden/indra/newview/viewertime.cpp            | 18 ++++++++++++++----
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/linden/indra/llcommon/lltimer.cpp b/linden/indra/llcommon/lltimer.cpp
index 2d283ec..b825c1e 100644
--- a/linden/indra/llcommon/lltimer.cpp
+++ b/linden/indra/llcommon/lltimer.cpp
@@ -529,14 +529,14 @@ struct tm* utc_to_offset_time(time_t utc_time, S32 offset, BOOL DST)
 {
 	if (DST)
 	{
-		//Subtract one then
-		offset--;
+		//Add one then
+		offset++;
 	}
 
 	// We subtract off the PST/PDT offset _before_ getting
 	// "UTC" time, because this will handle wrapping around
 	// for 5 AM UTC -> 10 PM PDT of the previous day.
-	utc_time -= offset * MIN_PER_HOUR * SEC_PER_MIN;
+	utc_time -= (-1 * offset) * MIN_PER_HOUR * SEC_PER_MIN;
  
 	// Internal buffer to PST/PDT (see above)
 	struct tm* internal_time = gmtime(&utc_time);
diff --git a/linden/indra/newview/kowopenregionsettings.cpp b/linden/indra/newview/kowopenregionsettings.cpp
index ef14d2a..0c4bb38 100644
--- a/linden/indra/newview/kowopenregionsettings.cpp
+++ b/linden/indra/newview/kowopenregionsettings.cpp
@@ -37,6 +37,7 @@
 #include "llfloaterregioninfo.h"
 #include "llfloaterworldmap.h"
 #include "llvoiceclient.h"
+#include "viewertime.h"
 
 //DEBUG includes
 //#include "llsdserialize.h" //LLSDNotationStreamer - for dumping LLSD to string
@@ -150,12 +151,15 @@ class OpenRegionInfoUpdate : public LLHTTPNode
 		}
 		if ( body.has("OffsetOfUTC") )
 		{
-			gSavedSettings.setS32("TimeOffset", body["OffsetOfUTC"].asReal());
+			gSavedSettings.setS32("TimeOffset", body["OffsetOfUTC"].asInteger());
 			gSavedSettings.setBOOL("UseTimeOffset", true);
+			ViewerTime::sUseTimeOffset = true;
+			ViewerTime::sTimeOffset = gSavedSettings.getS32("TimeOffset");
 		}
 		if ( body.has("OffsetOfUTCDST") )
 		{
 			gSavedSettings.setBOOL("TimeOffsetDST", body["OffsetOfUTCDST"].asInteger() == 1 ? TRUE : FALSE);
+			ViewerTime::sTimeOffsetDST = gSavedSettings.getBOOL("TimeOffsetDST");
 		}
 		if ( body.has("RenderWater") )
 		{
diff --git a/linden/indra/newview/viewertime.cpp b/linden/indra/newview/viewertime.cpp
index 06436b6..8a65a23 100644
--- a/linden/indra/newview/viewertime.cpp
+++ b/linden/indra/newview/viewertime.cpp
@@ -27,7 +27,8 @@
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
 */
-
+
+#include <sstream> 
 #include "llviewerprecompiledheaders.h"
 
 #include "llappviewer.h" // for gPacificDaylightTime
@@ -129,10 +130,19 @@ void ViewerTime::refresh()
 			if (hour == 0) hour = 12;
 		}
 
-		mTZ = "PST";
-		if (gPacificDaylightTime)
+		if (sUseTimeOffset)
+		{
+			std::stringstream myString;
+			myString << "UTC " << sTimeOffset;
+			mTZ = myString.str();
+		}
+		else
 		{
-			mTZ = "PDT";
+			mTZ = "PST";
+			if (gPacificDaylightTime)
+			{
+				mTZ = "PDT";
+			}
 		}
 	}
 	else // just UTC
-- 
cgit v1.1


From 7df2707d9a70028b85eef57ae09bc2062db51f77 Mon Sep 17 00:00:00 2001
From: RevolutionSmythe
Date: Fri, 18 Mar 2011 20:41:22 -0500
Subject: Fix a bug that only occurs when not running in a debugger.

---
 linden/indra/newview/llviewerparcelmgr.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/linden/indra/newview/llviewerparcelmgr.cpp b/linden/indra/newview/llviewerparcelmgr.cpp
index abe0e9f..7373c3f 100644
--- a/linden/indra/newview/llviewerparcelmgr.cpp
+++ b/linden/indra/newview/llviewerparcelmgr.cpp
@@ -148,8 +148,7 @@ LLViewerParcelMgr::LLViewerParcelMgr()
 //on a single grid properly - Patrick Sapinski (2/10/2011)
 void LLViewerParcelMgr::init(F32 region_size)
 {
-
-	mParcelsPerEdge = S32(	REGION_WIDTH_METERS / PARCEL_GRID_STEP_METERS );
+	mParcelsPerEdge = S32(	region_size / PARCEL_GRID_STEP_METERS );
 	mHighlightSegments = new U8[(mParcelsPerEdge+1)*(mParcelsPerEdge+1)];
 	resetSegments(mHighlightSegments);
 
-- 
cgit v1.1


From e67e3f216fdb0868d05c35f105dd83c5358dd3b0 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 18 Mar 2011 21:05:23 -0500
Subject: Fixed bad line endings (CRLF) in many files.

Windows users, please set "autocrlf = input" or "autocrlf = true" in
your .git/config [core] section to avoid this in the future.
---
 linden/indra/llcommon/indra_constants.h        |   10 +-
 linden/indra/llinventory/llparcel.h            |    2 +-
 linden/indra/llmessage/message_prehash.cpp     |    4 +-
 linden/indra/llmessage/message_prehash.h       |    4 +-
 linden/indra/llmessage/patch_code.cpp          |   10 +-
 linden/indra/llwindow/glh/glh_linear.h         | 3242 +++++------
 linden/indra/newview/llfloaterregioninfo.cpp   | 6892 ++++++++++++------------
 linden/indra/newview/llfloatertos.cpp          |  610 +--
 linden/indra/newview/llmaniptranslate.cpp      |    2 +-
 linden/indra/newview/llmapresponders.cpp       |    8 +-
 linden/indra/newview/llstartup.cpp             |   22 +-
 linden/indra/newview/llsurface.cpp             |   18 +-
 linden/indra/newview/llviewermessage.cpp       |   40 +-
 linden/indra/newview/llviewerparcelmgr.cpp     |   26 +-
 linden/indra/newview/llviewerparcelmgr.h       |    4 +-
 linden/indra/newview/llviewerparceloverlay.cpp |    6 +-
 linden/indra/newview/llviewerparceloverlay.h   |    2 +-
 linden/indra/newview/llviewerregion.cpp        |    2 +-
 linden/indra/newview/llvlmanager.cpp           |   68 +-
 linden/indra/newview/llvowater.cpp             |    2 +-
 linden/indra/newview/llworld.cpp               |   26 +-
 linden/indra/newview/llworldmap.cpp            |   38 +-
 linden/indra/newview/llworldmap.h              |    4 +-
 linden/indra/newview/llworldmapview.cpp        |   14 +-
 linden/indra/newview/viewertime.cpp            |    2 +-
 25 files changed, 5529 insertions(+), 5529 deletions(-)

diff --git a/linden/indra/llcommon/indra_constants.h b/linden/indra/llcommon/indra_constants.h
index ae1e04a..b765d4d 100644
--- a/linden/indra/llcommon/indra_constants.h
+++ b/linden/indra/llcommon/indra_constants.h
@@ -151,11 +151,11 @@ const	U32		PORT_DISCOVERY_RANGE_MAX		= PORT_DISCOVERY_RANGE_MIN + 50;
 const	char	LAND_LAYER_CODE					= 'L';
 const	char	WATER_LAYER_CODE				= 'W';
 const	char	WIND_LAYER_CODE					= '7';
-const	char	CLOUD_LAYER_CODE				= '8';
-
-// Extended land layer for Aurora Sim
-const	char	AURORA_LAND_LAYER_CODE			= 'M';
-const	char	AURORA_WIND_LAYER_CODE			= '9';
+const	char	CLOUD_LAYER_CODE				= '8';
+
+// Extended land layer for Aurora Sim
+const	char	AURORA_LAND_LAYER_CODE			= 'M';
+const	char	AURORA_WIND_LAYER_CODE			= '9';
 const	char	AURORA_CLOUD_LAYER_CODE			= ':';
 
 // keys
diff --git a/linden/indra/llinventory/llparcel.h b/linden/indra/llinventory/llparcel.h
index 366f589..f102ec4 100644
--- a/linden/indra/llinventory/llparcel.h
+++ b/linden/indra/llinventory/llparcel.h
@@ -66,7 +66,7 @@ const S32 PARCEL_PASS_PRICE_DEFAULT = 10;
 const F32 PARCEL_PASS_HOURS_DEFAULT = 1.f;
 
 // Number of "chunks" in which parcel overlay data is sent
-// Chunk 0 = southern rows, entire width
+// Chunk 0 = southern rows, entire width
 // NOTE: NOT USABLE FOR VAR SIZED REGIONS!
 const S32 PARCEL_OVERLAY_CHUNKS = 4;
 
diff --git a/linden/indra/llmessage/message_prehash.cpp b/linden/indra/llmessage/message_prehash.cpp
index a8b021f..78b9d07 100644
--- a/linden/indra/llmessage/message_prehash.cpp
+++ b/linden/indra/llmessage/message_prehash.cpp
@@ -586,8 +586,8 @@ char* _PREHASH_NotecardItemID = LLMessageStringTable::getInstance()->getString("
 char* _PREHASH_LastName = LLMessageStringTable::getInstance()->getString("LastName");
 char* _PREHASH_From = LLMessageStringTable::getInstance()->getString("From");
 char* _PREHASH_RoleChange = LLMessageStringTable::getInstance()->getString("RoleChange");
-char* _PREHASH_Port = LLMessageStringTable::getInstance()->getString("Port");
-char* _PREHASH_RegionSizeX = LLMessageStringTable::getInstance()->getString("RegionSizeX");
+char* _PREHASH_Port = LLMessageStringTable::getInstance()->getString("Port");
+char* _PREHASH_RegionSizeX = LLMessageStringTable::getInstance()->getString("RegionSizeX");
 char* _PREHASH_RegionSizeY = LLMessageStringTable::getInstance()->getString("RegionSizeY");
 char* _PREHASH_MemberTitle = LLMessageStringTable::getInstance()->getString("MemberTitle");
 char* _PREHASH_LogParcelChanges = LLMessageStringTable::getInstance()->getString("LogParcelChanges");
diff --git a/linden/indra/llmessage/message_prehash.h b/linden/indra/llmessage/message_prehash.h
index adf27ee..64544dd 100644
--- a/linden/indra/llmessage/message_prehash.h
+++ b/linden/indra/llmessage/message_prehash.h
@@ -586,8 +586,8 @@ extern char * _PREHASH_NotecardItemID;
 extern char * _PREHASH_LastName;
 extern char * _PREHASH_From;
 extern char * _PREHASH_RoleChange;
-extern char * _PREHASH_Port;
-extern char * _PREHASH_RegionSizeX;
+extern char * _PREHASH_Port;
+extern char * _PREHASH_RegionSizeX;
 extern char * _PREHASH_RegionSizeY;
 extern char * _PREHASH_MemberTitle;
 extern char * _PREHASH_LogParcelChanges;
diff --git a/linden/indra/llmessage/patch_code.cpp b/linden/indra/llmessage/patch_code.cpp
index 4b4313d..0cf8d2e 100644
--- a/linden/indra/llmessage/patch_code.cpp
+++ b/linden/indra/llmessage/patch_code.cpp
@@ -280,11 +280,11 @@ void	decode_patch_header(LLBitPack &bitpack, LLPatchHeader *ph, BOOL b_large_pat
 	bitpack.bitUnpack(&(ret[1]), 8);
 	bitpack.bitUnpack(&(ret[0]), 2);
 #else
-	if (b_large_patch)
-		bitpack.bitUnpack((U8 *)&retvalu32, 32);
-	else
-		bitpack.bitUnpack((U8 *)&retvalu32, 10);
-#endif
+	if (b_large_patch)
+		bitpack.bitUnpack((U8 *)&retvalu32, 32);
+	else
+		bitpack.bitUnpack((U8 *)&retvalu32, 10);
+#endif
 	ph->patchids = retvalu32;
 
 	gWordBits = (ph->quant_wbits & 0xf) + 2;
diff --git a/linden/indra/llwindow/glh/glh_linear.h b/linden/indra/llwindow/glh/glh_linear.h
index bb59d7e..04ae1bd 100755
--- a/linden/indra/llwindow/glh/glh_linear.h
+++ b/linden/indra/llwindow/glh/glh_linear.h
@@ -1,1621 +1,1621 @@
-/*
-    glh - is a platform-indepenedent C++ OpenGL helper library 
-
-
-    Copyright (c) 2000 Cass Everitt
-	Copyright (c) 2000 NVIDIA Corporation
-    All rights reserved.
-
-    Redistribution and use in source and binary forms, with or
-	without modification, are permitted provided that the following
-	conditions are met:
-
-     * Redistributions of source code must retain the above
-	   copyright notice, this list of conditions and the following
-	   disclaimer.
-
-     * Redistributions in binary form must reproduce the above
-	   copyright notice, this list of conditions and the following
-	   disclaimer in the documentation and/or other materials
-	   provided with the distribution.
-
-     * The names of contributors to this software may not be used
-	   to endorse or promote products derived from this software
-	   without specific prior written permission. 
-
-       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-	   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-	   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-	   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-	   REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-	   INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-	   BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-	   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-	   CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-	   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-	   ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
-	   POSSIBILITY OF SUCH DAMAGE. 
-
-
-    Cass Everitt - cass@r3.nu
-*/
-
-/*
-glh_linear.h
-*/
-
-// Author:  Cass W. Everitt
-
-#ifndef GLH_LINEAR_H
-#define GLH_LINEAR_H
-
-#include <memory.h>
-#include <math.h>
-#include <assert.h>
-
-// only supports float for now...
-#define GLH_REAL_IS_FLOAT
-
-#ifdef GLH_REAL_IS_FLOAT
-# define GLH_REAL float
-# define GLH_REAL_NAMESPACE ns_float
-#endif
-
-#define     GLH_QUATERNION_NORMALIZATION_THRESHOLD  64
-
-#define     GLH_RAD_TO_DEG      GLH_REAL(57.2957795130823208767981548141052)
-#define     GLH_DEG_TO_RAD      GLH_REAL(0.0174532925199432957692369076848861)
-#define     GLH_ZERO            GLH_REAL(0.0)
-#define     GLH_ONE             GLH_REAL(1.0)
-#define     GLH_TWO             GLH_REAL(2.0)
-#define     GLH_EPSILON         GLH_REAL(10e-6)
-#define     GLH_PI              GLH_REAL(3.1415926535897932384626433832795)    
-
-#define     equivalent(a,b)     (((a < b + GLH_EPSILON) && (a > b - GLH_EPSILON)) ? true : false)
-
-namespace glh
-{
-
-	inline GLH_REAL to_degrees(GLH_REAL radians) { return radians*GLH_RAD_TO_DEG; }
-	inline GLH_REAL to_radians(GLH_REAL degrees) { return degrees*GLH_DEG_TO_RAD; }
-
-	// forward declarations for friend template functions.
-	template <int N, class T> class vec;
-	
-	// forward declarations for friend template functions.
-	template <int N, class T>
-		bool operator == ( const vec<N,T> & v1, const vec<N,T> & v2 );
-	
-	// forward declarations for friend template functions.
-	template <int N, class T>
-		bool operator != ( const vec<N,T> & v1, const vec<N,T> & v2 );
-
-	template <int N, class T>	
-	class vec
-	{				
-    public:
-		int size() const { return N; }
-		
-		vec(const T & t = T()) 
-		{ for(int i = 0; i < N; i++) v[i] = t; }
-		vec(const T * tp)
-		{ for(int i = 0; i < N; i++) v[i] = tp[i]; }
-		
-		const T * get_value() const
-		{ return v; }
-		
-		
-		T dot( const vec<N,T> & rhs ) const
-		{ 
-			T r = 0;
-			for(int i = 0; i < N; i++) r += v[i]*rhs.v[i];
-			return r;
-		}
-		
-		T length() const
-		{
-			T r = 0;
-			for(int i = 0; i < N; i++) r += v[i]*v[i]; 
-			return T(sqrt(r));
-		}	
-		
-		T square_norm() const
-		{
-			T r = 0;
-			for(int i = 0; i < N; i++) r += v[i]*v[i]; 
-			return r;
-		}	
-		
-		void  negate()
-		{ for(int i = 0; i < N; i++) v[i] = -v[i]; }
-		
-		
-		T normalize() 
-		{ 
-			T sum(0);
-			for(int i = 0; i < N; i++) 
-                sum += v[i]*v[i];
-			sum = T(sqrt(sum));
-            if (sum > GLH_EPSILON)
-			    for(int i = 0; i < N; i++) 
-                    v[i] /= sum;
-			return sum;
-		}
-		
-		
-		vec<N,T> & set_value( const T * rhs )
-		{ for(int i = 0; i < N; i++) v[i] = rhs[i]; return *this; }
-		
-		T & operator [] ( int i )
-		{ return v[i]; }
-		
-		const T & operator [] ( int i ) const
-		{ return v[i]; }
-
-		vec<N,T> & operator *= ( T d )
-		{ for(int i = 0; i < N; i++) v[i] *= d; return *this;}
-		
-		vec<N,T> & operator *= ( const vec<N,T> & u )
-		{ for(int i = 0; i < N; i++) v[i] *= u[i]; return *this;}
-		
-		vec<N,T> & operator /= ( T d )
-		{ if(d == 0) return *this; for(int i = 0; i < N; i++) v[i] /= d; return *this;}
-		
-		vec<N,T> & operator += ( const vec<N,T> & u )
-		{ for(int i = 0; i < N; i++) v[i] += u.v[i]; return *this;}
-		
-		vec<N,T> & operator -= ( const vec<N,T> & u )
-		{ for(int i = 0; i < N; i++) v[i] -= u.v[i]; return *this;}
-		
-		
-		vec<N,T> operator - () const
-		{ vec<N,T> rv = v; rv.negate(); return rv; }
-		
-		vec<N,T> operator + ( const vec<N,T> &v) const
-		{ vec<N,T> rt(*this); return rt += v; }
-		
-		vec<N,T> operator - ( const vec<N,T> &v) const
-		{ vec<N,T> rt(*this); return rt -= v; }
-		
-		vec<N,T> operator * ( T d) const
-		{ vec<N,T> rt(*this); return rt *= d; }
-		
-		friend bool operator == <> ( const vec<N,T> &v1, const vec<N,T> &v2 );
-		friend bool operator != <> ( const vec<N,T> &v1, const vec<N,T> &v2 );
-		
-		
-	//protected:
-		T v[N];
-	};
-	
-	
-	
-	// vector friend operators
-	
-	template <int N, class T> inline
-		vec<N,T> operator * ( const vec<N,T> & b, T d )
-	{
-		vec<N,T> rt(b);
-		return rt *= d;
-	}
-
-	template <int N, class T> inline
-		vec<N,T> operator * ( T d, const vec<N,T> & b )
-	{ return b*d; }
-	
-	template <int N, class T> inline
-		vec<N,T> operator * ( const vec<N,T> & b, const vec<N,T> & d )
-	{
-		vec<N,T> rt(b);
-		return rt *= d;
-	}
-
-	template <int N, class T> inline
-		vec<N,T> operator / ( const vec<N,T> & b, T d )
-	{ vec<N,T> rt(b); return rt /= d; }
-	
-	template <int N, class T> inline
-		vec<N,T> operator + ( const vec<N,T> & v1, const vec<N,T> & v2 )
-	{ vec<N,T> rt(v1); return rt += v2; }
-	
-	template <int N, class T> inline
-		vec<N,T> operator - ( const vec<N,T> & v1, const vec<N,T> & v2 )
-	{ vec<N,T> rt(v1); return rt -= v2; }
-	
-	
-	template <int N, class T> inline
-		bool operator == ( const vec<N,T> & v1, const vec<N,T> & v2 )
-	{
-		for(int i = 0; i < N; i++)
-			if(v1.v[i] != v2.v[i])
-				return false;
-			return true;
-	}
-	
-	template <int N, class T> inline
-		bool operator != ( const vec<N,T> & v1, const vec<N,T> & v2 )
-	{ return !(v1 == v2); }
-	
-
-	typedef vec<3,unsigned char> vec3ub;
-	typedef vec<4,unsigned char> vec4ub;
-
-
-
-
-
-	namespace GLH_REAL_NAMESPACE
-	{
-	typedef GLH_REAL real;
-
-	class line;
-	class plane;
-	class matrix4;
-	class quaternion;
-	typedef quaternion rotation; 
-  
-	class vec2 : public vec<2,real>
-	{
-    public:
-		vec2(const real & t = real()) : vec<2,real>(t)
-		{}
-		vec2(const vec<2,real> & t) : vec<2,real>(t)
-		{}
-		vec2(const real * tp) : vec<2,real>(tp)
-		{}
-		
-		vec2(real x, real y )
-		{ v[0] = x; v[1] = y; }
-		
-		void get_value(real & x, real & y) const
-		{ x = v[0]; y = v[1]; }
-		
-		vec2 & set_value( const real & x, const real & y)
-		{ v[0] = x; v[1] = y; return *this; }
-		
-	};
-	
-	
-	class vec3 : public vec<3,real>
-	{
-    public:
-		vec3(const real & t = real()) : vec<3,real>(t)
-		{}
-		vec3(const vec<3,real> & t) : vec<3,real>(t)
-		{}
-		vec3(const real * tp) : vec<3,real>(tp)
-		{}
-		
-		vec3(real x, real y, real z)
-		{ v[0] = x; v[1] = y; v[2] = z; }
-		
-		void get_value(real & x, real & y, real & z) const
-		{ x = v[0]; y = v[1]; z = v[2]; }
-		
-		vec3 cross( const vec3 &rhs ) const
-		{
-			vec3 rt;
-			rt.v[0] = v[1]*rhs.v[2]-v[2]*rhs.v[1];
-			rt.v[1] = v[2]*rhs.v[0]-v[0]*rhs.v[2];
-			rt.v[2] = v[0]*rhs.v[1]-v[1]*rhs.v[0];	
-			return rt;
-		}
-		
-		vec3 & set_value( const real & x, const real & y, const real & z)
-		{ v[0] = x; v[1] = y; v[2] = z; return *this; }
-		
-	};
-
-  		
-    class vec4 : public vec<4,real>
-    {
-    public:
-        vec4(const real & t = real()) : vec<4,real>(t)
-        {}
-        vec4(const vec<4,real> & t) : vec<4,real>(t)
-        {}
-
-        vec4(const vec<3,real> & t, real fourth)
-
-        { v[0] = t.v[0]; v[1] = t.v[1]; v[2] = t.v[2]; v[3] = fourth; }
-        vec4(const real * tp) : vec<4,real>(tp)
-        {}
-        vec4(real x, real y, real z, real w)
-        { v[0] = x; v[1] = y; v[2] = z; v[3] = w; }
-
-        void get_value(real & x, real & y, real & z, real & w) const
-        { x = v[0]; y = v[1]; z = v[2]; w = v[3]; }
-  
-        vec4 & set_value( const real & x, const real & y, const real & z, const real & w)
-        { v[0] = x; v[1] = y; v[2] = z; v[3] = w; return *this; }
-    };
-
-    inline
-    vec3 homogenize(const vec4 & v)
-    {
-      vec3 rt;
-      assert(v.v[3] != GLH_ZERO);
-      rt.v[0] = v.v[0]/v.v[3];
-      rt.v[1] = v.v[1]/v.v[3];
-      rt.v[2] = v.v[2]/v.v[3];
-      return rt;
-    }
-  
-
-
-    class line
-    {
-    public:
-  
-        line()
-        { set_value(vec3(0,0,0),vec3(0,0,1)); }
-
-        line( const vec3 & p0, const vec3 &p1)
-        { set_value(p0,p1); }
-
-        void set_value( const vec3 &p0, const vec3 &p1)
-        {
-          position = p0;
-          direction = p1-p0;
-          direction.normalize();
-        }
-  
-        bool get_closest_points(const line &line2, 
-					          vec3 &pointOnThis,
-					          vec3 &pointOnThat)
-        {
-  
-          // quick check to see if parallel -- if so, quit.
-          if(fabs(direction.dot(line2.direction)) == 1.0)
-	          return 0;
-          line l2 = line2;
-  
-          // Algorithm: Brian Jean
-          // 
-          register real u;
-          register real v;
-          vec3 Vr = direction;
-          vec3 Vs = l2.direction;
-          register real Vr_Dot_Vs = Vr.dot(Vs);
-          register real detA = real(1.0 - (Vr_Dot_Vs * Vr_Dot_Vs));
-          vec3 C = l2.position - position;
-          register real C_Dot_Vr =  C.dot(Vr);
-          register real C_Dot_Vs =  C.dot(Vs);
-  
-          u = (C_Dot_Vr - Vr_Dot_Vs * C_Dot_Vs)/detA;
-          v = (C_Dot_Vr * Vr_Dot_Vs - C_Dot_Vs)/detA;
-  
-          pointOnThis = position;
-          pointOnThis += direction * u;
-          pointOnThat = l2.position;
-          pointOnThat += l2.direction * v;
-  
-          return 1;
-        }
-  
-        vec3 get_closest_point(const vec3 &point)
-        {
-          vec3 np = point - position;
-          vec3 rp = direction*direction.dot(np)+position;
-          return rp;
-        }
-  
-        const vec3 & get_position() const {return position;}
-
-        const vec3 & get_direction() const {return direction;}
-  
-    //protected:
-        vec3 position;
-        vec3 direction;
-    };
-  
-  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  
-  
-
-
-
-
-
-
-
-
-
-
-
-  // matrix
-
-  
-  class matrix4
-  {
-    
-  public:
-        
-    matrix4() { make_identity(); }
-    
-	matrix4( real r ) 
-	{ set_value(r); }
-
-	matrix4( real * m )
-	{ set_value(m); }
-    
-    matrix4( real a00, real a01, real a02, real a03,
-	       real a10, real a11, real a12, real a13,
-		   real a20, real a21, real a22, real a23,
-		   real a30, real a31, real a32, real a33 )
-	{
-		element(0,0) = a00;
-		element(0,1) = a01;
-		element(0,2) = a02;
-		element(0,3) = a03;
-		
-		element(1,0) = a10;
-		element(1,1) = a11;
-		element(1,2) = a12;
-		element(1,3) = a13;
-		
-		element(2,0) = a20;
-		element(2,1) = a21;
-		element(2,2) = a22;
-		element(2,3) = a23;
-		
-		element(3,0) = a30;
-		element(3,1) = a31;
-		element(3,2) = a32;
-		element(3,3) = a33;
-	}
-            
-    
-    void get_value( real * mp ) const
-	{
-		int c = 0;
-		for(int j=0; j < 4; j++)
-			for(int i=0; i < 4; i++)
-				mp[c++] = element(i,j);
-	}
-    
-    
-    const real * get_value() const
-	{ return m; }
-    
-	void set_value( real * mp)
-	{
-		int c = 0;
-		for(int j=0; j < 4; j++)
-			for(int i=0; i < 4; i++)
-				element(i,j) = mp[c++];
-	}
-    
-	void set_value( real r ) 
-	{
-		for(int i=0; i < 4; i++)
-			for(int j=0; j < 4; j++)
-				element(i,j) = r;
-	}
-    
-    void make_identity()
-	{
-		element(0,0) = 1.0;
-		element(0,1) = 0.0;
-		element(0,2) = 0.0; 
-		element(0,3) = 0.0;
-		
-		element(1,0) = 0.0;
-		element(1,1) = 1.0; 
-		element(1,2) = 0.0;
-		element(1,3) = 0.0;
-		
-		element(2,0) = 0.0;
-		element(2,1) = 0.0;
-		element(2,2) = 1.0;
-		element(2,3) = 0.0;
-		
-		element(3,0) = 0.0; 
-		element(3,1) = 0.0; 
-		element(3,2) = 0.0;
-		element(3,3) = 1.0;
-	}
-	
-	
-    static matrix4 identity()
-	{
-		static matrix4 mident (
-			1.0, 0.0, 0.0, 0.0,
-			0.0, 1.0, 0.0, 0.0,
-			0.0, 0.0, 1.0, 0.0,
-			0.0, 0.0, 0.0, 1.0  );
-		return mident;
-	}
-    
-        
-    void set_scale( real s )
-	{
-		element(0,0) = s;
-		element(1,1) = s;
-		element(2,2) = s;
-	}
-    
-    void set_scale( const vec3 & s )
-	{
-		element(0,0) = s.v[0];
-		element(1,1) = s.v[1];
-		element(2,2) = s.v[2];
-	}
-    
-    
-    void set_translate( const vec3 & t )
-	{
-		element(0,3) = t.v[0];
-		element(1,3) = t.v[1];
-		element(2,3) = t.v[2];
-	}
-    
-	void set_row(int r, const vec4 & t)
-	{
-		element(r,0) = t.v[0];
-		element(r,1) = t.v[1];
-		element(r,2) = t.v[2];
-		element(r,3) = t.v[3];
-	}
-
-	void set_column(int c, const vec4 & t)
-	{
-		element(0,c) = t.v[0];
-		element(1,c) = t.v[1];
-		element(2,c) = t.v[2];
-		element(3,c) = t.v[3];
-	}
-
-    
-	void get_row(int r, vec4 & t) const
-	{
-		t.v[0] = element(r,0);
-		t.v[1] = element(r,1);
-		t.v[2] = element(r,2);
-		t.v[3] = element(r,3);
-	}
-
-	vec4 get_row(int r) const
-	{
-		vec4 v; get_row(r, v);
-		return v;
-	}
-
-	void get_column(int c, vec4 & t) const
-	{
-		t.v[0] = element(0,c);
-		t.v[1] = element(1,c);
-		t.v[2] = element(2,c);
-		t.v[3] = element(3,c);
-	}
-
-	vec4 get_column(int c) const
-	{
-		vec4 v; get_column(c, v);
-		return v;
-	}
-
-    matrix4 inverse() const
-	{
-		matrix4 minv;
-		
-		real r1[8], r2[8], r3[8], r4[8];
-		real *s[4], *tmprow;
-		
-		s[0] = &r1[0];
-		s[1] = &r2[0];
-		s[2] = &r3[0];
-		s[3] = &r4[0];
-		
-		register int i,j,p,jj;
-		for(i=0;i<4;i++)
-		{
-			for(j=0;j<4;j++)
-			{
-				s[i][j] = element(i,j);
-				if(i==j) s[i][j+4] = 1.0;
-				else     s[i][j+4] = 0.0;
-			}
-		}
-		real scp[4];
-		for(i=0;i<4;i++)
-		{
-			scp[i] = real(fabs(s[i][0]));
-			for(j=1;j<4;j++)
-				if(real(fabs(s[i][j])) > scp[i]) scp[i] = real(fabs(s[i][j]));
-				if(scp[i] == 0.0) return minv; // singular matrix!
-		}
-		
-		int pivot_to;
-		real scp_max;
-		for(i=0;i<4;i++)
-		{
-			// select pivot row
-			pivot_to = i;
-			scp_max = real(fabs(s[i][i]/scp[i]));
-			// find out which row should be on top
-			for(p=i+1;p<4;p++)
-				if(real(fabs(s[p][i]/scp[p])) > scp_max)
-				{ scp_max = real(fabs(s[p][i]/scp[p])); pivot_to = p; }
-				// Pivot if necessary
-				if(pivot_to != i)
-				{
-					tmprow = s[i];
-					s[i] = s[pivot_to];
-					s[pivot_to] = tmprow;
-					real tmpscp;
-					tmpscp = scp[i];
-					scp[i] = scp[pivot_to];
-					scp[pivot_to] = tmpscp;
-				}
-				
-				real mji;
-				// perform gaussian elimination
-				for(j=i+1;j<4;j++)
-				{
-					mji = s[j][i]/s[i][i];
-					s[j][i] = 0.0;
-					for(jj=i+1;jj<8;jj++)
-						s[j][jj] -= mji*s[i][jj];
-				}
-		}
-		if(s[3][3] == 0.0) return minv; // singular matrix!
-		
-		//
-		// Now we have an upper triangular matrix.
-		//
-		//  x x x x | y y y y
-		//  0 x x x | y y y y 
-		//  0 0 x x | y y y y
-		//  0 0 0 x | y y y y
-		//
-		//  we'll back substitute to get the inverse
-		//
-		//  1 0 0 0 | z z z z
-		//  0 1 0 0 | z z z z
-		//  0 0 1 0 | z z z z
-		//  0 0 0 1 | z z z z 
-		//
-		
-		real mij;
-		for(i=3;i>0;i--)
-		{
-			for(j=i-1;j > -1; j--)
-			{
-				mij = s[j][i]/s[i][i];
-				for(jj=j+1;jj<8;jj++)
-					s[j][jj] -= mij*s[i][jj];
-			}
-		}
-		
-		for(i=0;i<4;i++)
-			for(j=0;j<4;j++)
-				minv(i,j) = s[i][j+4] / s[i][i];
-			
-			return minv;
-	}
-    
-    
-    matrix4 transpose() const
-	{
-		matrix4 mtrans;
-		
-		for(int i=0;i<4;i++)
-			for(int j=0;j<4;j++)
-				mtrans(i,j) = element(j,i);		
-		return mtrans;
-	}
-    
-    matrix4 & mult_right( const matrix4 & b )
-	{
-		matrix4 mt(*this);
-		set_value(real(0));
-
-		for(int i=0; i < 4; i++)
-			for(int j=0; j < 4; j++)
-				for(int c=0; c < 4; c++)
-					element(i,j) += mt(i,c) * b(c,j);
-		return *this;
-	}    
-
-    matrix4 & mult_left( const matrix4 & b )
-	{
-		matrix4 mt(*this);
-		set_value(real(0));
-
-		for(int i=0; i < 4; i++)
-			for(int j=0; j < 4; j++)
-				for(int c=0; c < 4; c++)
-					element(i,j) += b(i,c) * mt(c,j);
-		return *this;
-	}
-	
-	// dst = M * src
-    void mult_matrix_vec( const vec3 &src, vec3 &dst ) const
-	{
-		real w = (
-			src.v[0] * element(3,0) +
-			src.v[1] * element(3,1) + 
-			src.v[2] * element(3,2) +
-			element(3,3)          );
-        
-        assert(w != GLH_ZERO);
-
-        dst.v[0]  = (
-			src.v[0] * element(0,0) +
-			src.v[1] * element(0,1) +
-			src.v[2] * element(0,2) +
-			element(0,3)          ) / w;
-		dst.v[1]  = (
-			src.v[0] * element(1,0) +
-			src.v[1] * element(1,1) +
-			src.v[2] * element(1,2) +
-			element(1,3)          ) / w;
-		dst.v[2]  = (
-			src.v[0] * element(2,0) +
-			src.v[1] * element(2,1) + 
-			src.v[2] * element(2,2) +
-			element(2,3)          ) / w;
-	}
-    
-	void mult_matrix_vec( vec3 & src_and_dst) const
-	{ mult_matrix_vec(vec3(src_and_dst), src_and_dst); }
-
-
-    // dst = src * M
-    void mult_vec_matrix( const vec3 &src, vec3 &dst ) const
-	{
-		real w = (
-			src.v[0] * element(0,3) +
-			src.v[1] * element(1,3) +
-			src.v[2] * element(2,3) +
-			element(3,3)          );
-        
-        assert(w != GLH_ZERO);
-
-		dst.v[0]  = (
-			src.v[0] * element(0,0) +
-			src.v[1] * element(1,0) + 
-			src.v[2] * element(2,0) + 
-			element(3,0)          ) / w;
-		dst.v[1]  = (
-			src.v[0] * element(0,1) +
-			src.v[1] * element(1,1) +
-			src.v[2] * element(2,1) +
-			element(3,1)          ) / w;
-		dst.v[2]  = (
-			src.v[0] * element(0,2) +
-			src.v[1] * element(1,2) +
-			src.v[2] * element(2,2) +
-			element(3,2)          ) / w;
-	}
-        
-
-	void mult_vec_matrix( vec3 & src_and_dst) const
-	{ mult_vec_matrix(vec3(src_and_dst), src_and_dst); }
-
-	// dst = M * src
-    void mult_matrix_vec( const vec4 &src, vec4 &dst ) const
-	{
-        dst.v[0]  = (
-			src.v[0] * element(0,0) +
-			src.v[1] * element(0,1) +
-			src.v[2] * element(0,2) +
-			src.v[3] * element(0,3));
-		dst.v[1]  = (
-			src.v[0] * element(1,0) +
-			src.v[1] * element(1,1) +
-			src.v[2] * element(1,2) +
-			src.v[3] * element(1,3));
-		dst.v[2]  = (
-			src.v[0] * element(2,0) +
-			src.v[1] * element(2,1) + 
-			src.v[2] * element(2,2) +
-			src.v[3] * element(2,3));
-		dst.v[3] = (
-			src.v[0] * element(3,0) +
-			src.v[1] * element(3,1) + 
-			src.v[2] * element(3,2) +
-			src.v[3] * element(3,3));
-	}
-    
-	void mult_matrix_vec( vec4 & src_and_dst) const
-	{ mult_matrix_vec(vec4(src_and_dst), src_and_dst); }
-
-
-    // dst = src * M
-    void mult_vec_matrix( const vec4 &src, vec4 &dst ) const
-	{
-		dst.v[0]  = (
-			src.v[0] * element(0,0) +
-			src.v[1] * element(1,0) + 
-			src.v[2] * element(2,0) + 
-			src.v[3] * element(3,0));
-		dst.v[1]  = (
-			src.v[0] * element(0,1) +
-			src.v[1] * element(1,1) +
-			src.v[2] * element(2,1) +
-			src.v[3] * element(3,1));
-		dst.v[2]  = (
-			src.v[0] * element(0,2) +
-			src.v[1] * element(1,2) +
-			src.v[2] * element(2,2) +
-			src.v[3] * element(3,2));
-		dst.v[3] = (
-			src.v[0] * element(0,3) +
-			src.v[1] * element(1,3) +
-			src.v[2] * element(2,3) +
-			src.v[3] * element(3,3));
-	}
-        
-
-	void mult_vec_matrix( vec4 & src_and_dst) const
-	{ mult_vec_matrix(vec4(src_and_dst), src_and_dst); }
-
-    
-    // dst = M * src
-    void mult_matrix_dir( const vec3 &src, vec3 &dst ) const
-	{
-		dst.v[0]  = (
-			src.v[0] * element(0,0) +
-			src.v[1] * element(0,1) +
-			src.v[2] * element(0,2) ) ;
-		dst.v[1]  = ( 
-			src.v[0] * element(1,0) +
-			src.v[1] * element(1,1) +
-			src.v[2] * element(1,2) ) ;
-		dst.v[2]  = ( 
-			src.v[0] * element(2,0) +
-			src.v[1] * element(2,1) + 
-			src.v[2] * element(2,2) ) ;
-	}
-        
-
-	void mult_matrix_dir( vec3 & src_and_dst) const
-	{ mult_matrix_dir(vec3(src_and_dst), src_and_dst); }
-
-
-	// dst = src * M
-    void mult_dir_matrix( const vec3 &src, vec3 &dst ) const
-	{
-		dst.v[0]  = ( 
-			src.v[0] * element(0,0) +
-			src.v[1] * element(1,0) +
-			src.v[2] * element(2,0) ) ;
-		dst.v[1]  = ( 
-			src.v[0] * element(0,1) +
-			src.v[1] * element(1,1) +
-			src.v[2] * element(2,1) ) ;
-		dst.v[2]  = (
-			src.v[0] * element(0,2) +
-			src.v[1] * element(1,2) + 
-			src.v[2] * element(2,2) ) ;
-	}
-    
-    
-	void mult_dir_matrix( vec3 & src_and_dst) const
-	{ mult_dir_matrix(vec3(src_and_dst), src_and_dst); }
-
-
-    real & operator () (int row, int col)
-    { return element(row,col); }
-
-    const real & operator () (int row, int col) const
-    { return element(row,col); }
-
-	real & element (int row, int col)
-    { return m[row | (col<<2)]; }
-
-    const real & element (int row, int col) const
-    { return m[row | (col<<2)]; }
-
-    matrix4 & operator *= ( const matrix4 & mat )
-	{
-		mult_right( mat );
-		return *this;
-	}
-    
-    matrix4 & operator *= ( const real & r )
-	{
-		for (int i = 0; i < 4; ++i)
-        {
-            element(0,i) *= r;
-            element(1,i) *= r;
-            element(2,i) *= r;
-            element(3,i) *= r;
-        }
-		return *this;
-	}
-
-    matrix4 & operator += ( const matrix4 & mat )
-	{
-		for (int i = 0; i < 4; ++i)
-        {
-            element(0,i) += mat.element(0,i);
-            element(1,i) += mat.element(1,i);
-            element(2,i) += mat.element(2,i);
-            element(3,i) += mat.element(3,i);
-        }
-		return *this;
-	}
-
-    friend matrix4 operator * ( const matrix4 & m1,	const matrix4 & m2 );
-    friend bool operator == ( const matrix4 & m1, const matrix4 & m2 );
-    friend bool operator != ( const matrix4 & m1, const matrix4 & m2 );
-    
-  //protected:
-	  real m[16];
-  };
-  
-  inline  
-  matrix4 operator * ( const matrix4 & m1, const matrix4 & m2 )
-  {
-	  matrix4 product;
-	  
-	  product = m1;
-	  product.mult_right(m2);
-	  
-	  return product;
-  }
-  
-  inline
-  bool operator ==( const matrix4 &m1, const matrix4 &m2 )
-  {
-	  return ( 
-		  m1(0,0) == m2(0,0) &&
-		  m1(0,1) == m2(0,1) &&
-		  m1(0,2) == m2(0,2) &&
-		  m1(0,3) == m2(0,3) &&
-		  m1(1,0) == m2(1,0) &&
-		  m1(1,1) == m2(1,1) &&
-		  m1(1,2) == m2(1,2) &&
-		  m1(1,3) == m2(1,3) &&
-		  m1(2,0) == m2(2,0) &&
-		  m1(2,1) == m2(2,1) &&
-		  m1(2,2) == m2(2,2) &&
-		  m1(2,3) == m2(2,3) &&
-		  m1(3,0) == m2(3,0) &&
-		  m1(3,1) == m2(3,1) &&
-		  m1(3,2) == m2(3,2) &&
-		  m1(3,3) == m2(3,3) );
-  }
-  
-  inline
-  bool operator != ( const matrix4 & m1, const matrix4 & m2 )
-  { return !( m1 == m2 ); }  
-
-
-
-
-
-
-
-
-
-
-
-
-  
-    class quaternion
-    {
-    public:
-    
-    quaternion()
-    {
-        *this = identity();
-    }
-
-    quaternion( const real v[4] )
-    {
-        set_value( v );
-    }
-
-
-    quaternion( real q0, real q1, real q2, real q3 )
-    {
-        set_value( q0, q1, q2, q3 );
-    }
-
-
-    quaternion( const matrix4 & m )
-    {
-        set_value( m );
-    }
-
-
-    quaternion( const vec3 &axis, real radians )
-    {
-        set_value( axis, radians );
-    }
-
-
-    quaternion( const vec3 &rotateFrom, const vec3 &rotateTo )
-    {
-        set_value( rotateFrom, rotateTo );
-    }
-
-    quaternion( const vec3 & from_look, const vec3 & from_up,
-		      const vec3 & to_look, const vec3& to_up)
-    {
-	    set_value(from_look, from_up, to_look, to_up);
-    }
-
-    const real * get_value() const
-    {
-        return  &q[0];
-    }
-
-    void get_value( real &q0, real &q1, real &q2, real &q3 ) const
-    {
-        q0 = q[0];
-        q1 = q[1];
-        q2 = q[2];
-        q3 = q[3];
-    }
-
-    quaternion & set_value( real q0, real q1, real q2, real q3 )
-    {
-        q[0] = q0;
-        q[1] = q1;
-        q[2] = q2;
-        q[3] = q3;
-        counter = 0;
-        return *this;
-    }
-
-    void get_value( vec3 &axis, real &radians ) const
-    {
-        radians = real(acos( q[3] ) * GLH_TWO);
-        if ( radians == GLH_ZERO )
-            axis = vec3( 0.0, 0.0, 1.0 );
-        else
-        {
-            axis.v[0] = q[0];
-            axis.v[1] = q[1];
-            axis.v[2] = q[2];
-            axis.normalize();
-        }
-    }
-
-    void get_value( matrix4 & m ) const
-    {
-        real s, xs, ys, zs, wx, wy, wz, xx, xy, xz, yy, yz, zz;
-
-        real norm = q[0] * q[0] + q[1] * q[1] + q[2] * q[2] + q[3] * q[3];
-
-        s = (equivalent(norm,GLH_ZERO)) ? GLH_ZERO : ( GLH_TWO / norm );
-
-        xs = q[0] * s;
-        ys = q[1] * s;
-        zs = q[2] * s;
-
-        wx = q[3] * xs;
-        wy = q[3] * ys;
-        wz = q[3] * zs;
-
-        xx = q[0] * xs;
-        xy = q[0] * ys;
-        xz = q[0] * zs;
-
-        yy = q[1] * ys;
-        yz = q[1] * zs;
-        zz = q[2] * zs;
-
-        m(0,0) = real( GLH_ONE - ( yy + zz ));
-        m(1,0) = real ( xy + wz );
-        m(2,0) = real ( xz - wy );
-
-        m(0,1) = real ( xy - wz );
-        m(1,1) = real ( GLH_ONE - ( xx + zz ));
-        m(2,1) = real ( yz + wx );
-
-        m(0,2) = real ( xz + wy );
-        m(1,2) = real ( yz - wx );
-        m(2,2) = real ( GLH_ONE - ( xx + yy ));
-
-        m(3,0) = m(3,1) = m(3,2) = m(0,3) = m(1,3) = m(2,3) = GLH_ZERO;
-        m(3,3) = GLH_ONE;
-    }
-
-    quaternion & set_value( const real * qp )
-    {
-        memcpy(q,qp,sizeof(real) * 4);
-
-        counter = 0;
-        return *this;
-    }
-
-    quaternion & set_value( const matrix4 & m )
-    {
-        real tr, s;
-        int i, j, k;
-        const int nxt[3] = { 1, 2, 0 };
-
-        tr = m(0,0) + m(1,1) + m(2,2);
-
-        if ( tr > GLH_ZERO )
-        {
-            s = real(sqrt( tr + m(3,3) ));
-            q[3] = real ( s * 0.5 );
-            s = real(0.5) / s;
-
-            q[0] = real ( ( m(1,2) - m(2,1) ) * s );
-            q[1] = real ( ( m(2,0) - m(0,2) ) * s );
-            q[2] = real ( ( m(0,1) - m(1,0) ) * s );
-        }
-        else
-        {
-            i = 0;
-            if ( m(1,1) > m(0,0) )
-              i = 1;
-
-            if ( m(2,2) > m(i,i) )
-              i = 2;
-
-            j = nxt[i];
-            k = nxt[j];
-
-            s = real(sqrt( ( m(i,j) - ( m(j,j) + m(k,k) )) + GLH_ONE ));
-
-            q[i] = real ( s * 0.5 );
-            s = real(0.5 / s);
-
-            q[3] = real ( ( m(j,k) - m(k,j) ) * s );
-            q[j] = real ( ( m(i,j) + m(j,i) ) * s );
-            q[k] = real ( ( m(i,k) + m(k,i) ) * s );
-        }
-
-        counter = 0;
-        return *this;
-    }
-
-    quaternion & set_value( const vec3 &axis, real theta )
-    {
-        real sqnorm = axis.square_norm();
-
-        if (sqnorm <= GLH_EPSILON)
-        {
-            // axis too small.
-            x = y = z = 0.0;
-            w = 1.0;
-        } 
-        else 
-        {
-            theta *= real(0.5);
-            real sin_theta = real(sin(theta));
-
-            if (!equivalent(sqnorm,GLH_ONE)) 
-              sin_theta /= real(sqrt(sqnorm));
-            x = sin_theta * axis.v[0];
-            y = sin_theta * axis.v[1];
-            z = sin_theta * axis.v[2];
-            w = real(cos(theta));
-        }
-        return *this;
-    }
-
-    quaternion & set_value( const vec3 & rotateFrom, const vec3 & rotateTo )
-    {
-        vec3 p1, p2;
-        real alpha;
-
-        p1 = rotateFrom; 
-        p1.normalize();
-        p2 = rotateTo;  
-        p2.normalize();
-
-        alpha = p1.dot(p2);
-
-        if(equivalent(alpha,GLH_ONE))
-        { 
-            *this = identity(); 
-            return *this; 
-        }
-
-        // ensures that the anti-parallel case leads to a positive dot
-        if(equivalent(alpha,-GLH_ONE))
-        {
-            vec3 v;
-
-            if(p1.v[0] != p1.v[1] || p1.v[0] != p1.v[2])
-    	        v = vec3(p1.v[1], p1.v[2], p1.v[0]);
-            else
-    	        v = vec3(-p1.v[0], p1.v[1], p1.v[2]);
-
-            v -= p1 * p1.dot(v);
-            v.normalize();
-
-            set_value(v, GLH_PI);
-            return *this;
-        }
-
-        p1 = p1.cross(p2);  
-        p1.normalize();
-        set_value(p1,real(acos(alpha)));
-
-        counter = 0;
-        return *this;
-    }
-
-    quaternion & set_value( const vec3 & from_look, const vec3 & from_up,
-		      const vec3 & to_look, const vec3 & to_up)
-    {
-	    quaternion r_look = quaternion(from_look, to_look);
-	    
-	    vec3 rotated_from_up(from_up);
-	    r_look.mult_vec(rotated_from_up);
-	    
-	    quaternion r_twist = quaternion(rotated_from_up, to_up);
-	    
-	    *this = r_twist;
-	    *this *= r_look;
-	    return *this;
-    }
-
-    quaternion & operator *= ( const quaternion & qr )
-    {
-        quaternion ql(*this);
-   
-        w = ql.w * qr.w - ql.x * qr.x - ql.y * qr.y - ql.z * qr.z;
-        x = ql.w * qr.x + ql.x * qr.w + ql.y * qr.z - ql.z * qr.y;
-        y = ql.w * qr.y + ql.y * qr.w + ql.z * qr.x - ql.x * qr.z;
-        z = ql.w * qr.z + ql.z * qr.w + ql.x * qr.y - ql.y * qr.x;
-
-        counter += qr.counter;
-        counter++;
-        counter_normalize();
-        return *this;
-    }
-
-    void normalize()
-    {
-        real rnorm = GLH_ONE / real(sqrt(w * w + x * x + y * y + z * z));
-        if (equivalent(rnorm, GLH_ZERO))
-            return;
-        x *= rnorm;
-        y *= rnorm;
-        z *= rnorm;
-        w *= rnorm;
-        counter = 0;
-    }
-
-    friend bool operator == ( const quaternion & q1, const quaternion & q2 );      
-
-    friend bool operator != ( const quaternion & q1, const quaternion & q2 );
-
-    friend quaternion operator * ( const quaternion & q1, const quaternion & q2 );
-
-    bool equals( const quaternion & r, real tolerance ) const
-    {
-        real t;
-
-        t = (
-			(q[0]-r.q[0])*(q[0]-r.q[0]) +
-            (q[1]-r.q[1])*(q[1]-r.q[1]) +
-            (q[2]-r.q[2])*(q[2]-r.q[2]) +
-            (q[3]-r.q[3])*(q[3]-r.q[3]) );
-        if(t > GLH_EPSILON) 
-            return false;
-        return 1;
-    }
-
-    quaternion & conjugate()
-    {
-        q[0] *= -GLH_ONE;
-        q[1] *= -GLH_ONE;
-        q[2] *= -GLH_ONE;
-        return *this;
-    }
-
-    quaternion & invert()
-    {
-        return conjugate();
-    }
-
-    quaternion inverse() const
-    {
-        quaternion r = *this;
-        return r.invert();
-    }
-
-    //
-    // Quaternion multiplication with cartesian vector
-    // v' = q*v*q(star)
-    //
-    void mult_vec( const vec3 &src, vec3 &dst ) const
-    {
-        real v_coef = w * w - x * x - y * y - z * z;                     
-        real u_coef = GLH_TWO * (src.v[0] * x + src.v[1] * y + src.v[2] * z);  
-        real c_coef = GLH_TWO * w;                                       
-
-        dst.v[0] = v_coef * src.v[0] + u_coef * x + c_coef * (y * src.v[2] - z * src.v[1]);
-        dst.v[1] = v_coef * src.v[1] + u_coef * y + c_coef * (z * src.v[0] - x * src.v[2]);
-        dst.v[2] = v_coef * src.v[2] + u_coef * z + c_coef * (x * src.v[1] - y * src.v[0]);
-    }
-
-    void mult_vec( vec3 & src_and_dst) const
-    {
-        mult_vec(vec3(src_and_dst), src_and_dst);
-    }
-
-    void scale_angle( real scaleFactor )
-    {
-        vec3 axis;
-        real radians;
-
-        get_value(axis, radians);
-        radians *= scaleFactor;
-        set_value(axis, radians);
-    }
-
-    static quaternion slerp( const quaternion & p, const quaternion & q, real alpha )
-    {
-        quaternion r;
-
-        real cos_omega = p.x * q.x + p.y * q.y + p.z * q.z + p.w * q.w;
-        // if B is on opposite hemisphere from A, use -B instead
-      
-        int bflip;
-        if ( ( bflip = (cos_omega < GLH_ZERO)) )
-            cos_omega = -cos_omega;
-
-        // complementary interpolation parameter
-        real beta = GLH_ONE - alpha;     
-
-        if(cos_omega <= GLH_ONE - GLH_EPSILON)
-            return p;
-
-        real omega = real(acos(cos_omega));
-        real one_over_sin_omega = GLH_ONE / real(sin(omega));
-
-        beta    = real(sin(omega*beta)  * one_over_sin_omega);
-        alpha   = real(sin(omega*alpha) * one_over_sin_omega);
-
-        if (bflip)
-            alpha = -alpha;
-
-        r.x = beta * p.q[0]+ alpha * q.q[0];
-        r.y = beta * p.q[1]+ alpha * q.q[1];
-        r.z = beta * p.q[2]+ alpha * q.q[2];
-        r.w = beta * p.q[3]+ alpha * q.q[3];
-        return r;
-    }
-
-    static quaternion identity()
-    {
-        static quaternion ident( vec3( 0.0, 0.0, 0.0 ), GLH_ONE );
-        return ident;
-    }
-
-    real & operator []( int i )
-    {
-        assert(i < 4);
-        return q[i];
-    }
-
-    const real & operator []( int i ) const
-    {
-        assert(i < 4);
-        return q[i];
-    }
-
-    protected:
-
-        void counter_normalize()
-        {
-            if (counter > GLH_QUATERNION_NORMALIZATION_THRESHOLD)
-                normalize();
-        }
-
-        union 
-        {
-            struct 
-            {
-                real q[4];
-            };
-            struct 
-            {
-                real x;
-                real y;
-                real z;
-                real w;
-            };
-        };
-
-        // renormalization counter
-        unsigned char counter;
-    };
-
-    inline
-    bool operator == ( const quaternion & q1, const quaternion & q2 )
-    {
-        return (equivalent(q1.x, q2.x) &&
-		        equivalent(q1.y, q2.y) &&
-		        equivalent(q1.z, q2.z) &&
-		        equivalent(q1.w, q2.w) );
-    }
-
-    inline
-    bool operator != ( const quaternion & q1, const quaternion & q2 )
-    { 
-        return ! ( q1 == q2 ); 
-    }
-
-    inline
-    quaternion operator * ( const quaternion & q1, const quaternion & q2 )
-    {	
-        quaternion r(q1); 
-        r *= q2; 
-        return r; 
-    }
-  
-      
-    
-
-
-
-
-
-  
-  
-  class plane
-  {
-  public:
-	  
-	  plane()
-      {
-		  planedistance = 0.0;
-		  planenormal.set_value( 0.0, 0.0, 1.0 );
-      }
-	  
-	  
-	  plane( const vec3 &p0, const vec3 &p1, const vec3 &p2 )
-      {
-		  vec3 v0 = p1 - p0;
-		  vec3 v1 = p2 - p0;
-		  planenormal = v0.cross(v1);  
-		  planenormal.normalize();
-		  planedistance = p0.dot(planenormal);
-      }
-	  
-	  plane( const vec3 &normal, real distance )
-      {
-		  planedistance = distance;
-		  planenormal = normal;
-		  planenormal.normalize();
-      }
-	  
-	  plane( const vec3 &normal, const vec3 &point )
-      {
-		  planenormal = normal;
-		  planenormal.normalize();
-		  planedistance = point.dot(planenormal);
-      }
-	  
-	  void offset( real d )
-      {
-		  planedistance += d;
-      }
-	  
-	  bool intersect( const line &l, vec3 &intersection ) const
-      {
-		  vec3 pos, dir;
-		  vec3 pn = planenormal;
-		  real pd = planedistance;
-		  
-		  pos = l.get_position();
-		  dir = l.get_direction();
-		  
-		  if(dir.dot(pn) == 0.0) return 0;
-		  pos -= pn*pd;
-		  // now we're talking about a plane passing through the origin
-		  if(pos.dot(pn) < 0.0) pn.negate();
-		  if(dir.dot(pn) > 0.0) dir.negate();
-		  vec3 ppos = pn * pos.dot(pn);
-		  pos = (ppos.length()/dir.dot(-pn))*dir;
-		  intersection = l.get_position();
-		  intersection += pos;
-		  return 1;
-      }
-	  void transform( const matrix4 &matrix )
-      {
-		  matrix4 invtr = matrix.inverse();
-		  invtr = invtr.transpose();
-		  
-		  vec3 pntOnplane = planenormal * planedistance;
-		  vec3 newPntOnplane;
-		  vec3 newnormal;
-		  
-		  invtr.mult_dir_matrix(planenormal, newnormal);
-		  matrix.mult_vec_matrix(pntOnplane, newPntOnplane);
-		  
-		  newnormal.normalize();
-		  planenormal = newnormal;
-		  planedistance = newPntOnplane.dot(planenormal);
-      }
-	  
-	  bool is_in_half_space( const vec3 &point ) const
-      {
-		  
-		  if(( point.dot(planenormal) - planedistance) < 0.0)
-			  return 0;
-		  return 1;
-      }
-	  
-	  
-	  real distance( const vec3 & point ) const 
-      {
-		  return planenormal.dot(point - planenormal*planedistance);
-      }
-	  
-	  const vec3 &get_normal() const
-      {
-		  return planenormal;
-      }
-	  
-	  
-	  real get_distance_from_origin() const
-      {
-		  return planedistance;
-      }
-	  
-	  
-	  friend bool operator == ( const plane & p1, const plane & p2 );
-	  
-	  
-	  friend bool operator != ( const plane & p1, const plane & p2 );
-	  
-  //protected:
-	  vec3 planenormal;
-	  real planedistance;
-  };
-  
-  inline
-  bool operator == (const plane & p1, const plane & p2 )
-  {
-	  return (  p1.planedistance == p2.planedistance && p1.planenormal == p2.planenormal);
-  }
-  
-  inline
-  bool operator != ( const plane & p1, const plane & p2 )
-  { return  ! (p1 == p2); }
-  
-  
-
-  } // "ns_##GLH_REAL"
-
-  // make common typedefs...
-#ifdef GLH_REAL_IS_FLOAT
-  typedef GLH_REAL_NAMESPACE::vec2 vec2f;
-  typedef GLH_REAL_NAMESPACE::vec3 vec3f;
-  typedef GLH_REAL_NAMESPACE::vec4 vec4f;
-  typedef GLH_REAL_NAMESPACE::quaternion quaternionf;
-  typedef GLH_REAL_NAMESPACE::quaternion rotationf;
-  typedef GLH_REAL_NAMESPACE::line linef;
-  typedef GLH_REAL_NAMESPACE::plane planef;
-  typedef GLH_REAL_NAMESPACE::matrix4 matrix4f;
-#endif
-
-  
-
-
-}  // namespace glh
-
-
-
-#endif
-
+/*
+    glh - is a platform-indepenedent C++ OpenGL helper library 
+
+
+    Copyright (c) 2000 Cass Everitt
+	Copyright (c) 2000 NVIDIA Corporation
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or
+	without modification, are permitted provided that the following
+	conditions are met:
+
+     * Redistributions of source code must retain the above
+	   copyright notice, this list of conditions and the following
+	   disclaimer.
+
+     * Redistributions in binary form must reproduce the above
+	   copyright notice, this list of conditions and the following
+	   disclaimer in the documentation and/or other materials
+	   provided with the distribution.
+
+     * The names of contributors to this software may not be used
+	   to endorse or promote products derived from this software
+	   without specific prior written permission. 
+
+       THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+	   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+	   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+	   FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+	   REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+	   INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+	   BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+	   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+	   CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+	   LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+	   ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+	   POSSIBILITY OF SUCH DAMAGE. 
+
+
+    Cass Everitt - cass@r3.nu
+*/
+
+/*
+glh_linear.h
+*/
+
+// Author:  Cass W. Everitt
+
+#ifndef GLH_LINEAR_H
+#define GLH_LINEAR_H
+
+#include <memory.h>
+#include <math.h>
+#include <assert.h>
+
+// only supports float for now...
+#define GLH_REAL_IS_FLOAT
+
+#ifdef GLH_REAL_IS_FLOAT
+# define GLH_REAL float
+# define GLH_REAL_NAMESPACE ns_float
+#endif
+
+#define     GLH_QUATERNION_NORMALIZATION_THRESHOLD  64
+
+#define     GLH_RAD_TO_DEG      GLH_REAL(57.2957795130823208767981548141052)
+#define     GLH_DEG_TO_RAD      GLH_REAL(0.0174532925199432957692369076848861)
+#define     GLH_ZERO            GLH_REAL(0.0)
+#define     GLH_ONE             GLH_REAL(1.0)
+#define     GLH_TWO             GLH_REAL(2.0)
+#define     GLH_EPSILON         GLH_REAL(10e-6)
+#define     GLH_PI              GLH_REAL(3.1415926535897932384626433832795)    
+
+#define     equivalent(a,b)     (((a < b + GLH_EPSILON) && (a > b - GLH_EPSILON)) ? true : false)
+
+namespace glh
+{
+
+	inline GLH_REAL to_degrees(GLH_REAL radians) { return radians*GLH_RAD_TO_DEG; }
+	inline GLH_REAL to_radians(GLH_REAL degrees) { return degrees*GLH_DEG_TO_RAD; }
+
+	// forward declarations for friend template functions.
+	template <int N, class T> class vec;
+	
+	// forward declarations for friend template functions.
+	template <int N, class T>
+		bool operator == ( const vec<N,T> & v1, const vec<N,T> & v2 );
+	
+	// forward declarations for friend template functions.
+	template <int N, class T>
+		bool operator != ( const vec<N,T> & v1, const vec<N,T> & v2 );
+
+	template <int N, class T>	
+	class vec
+	{				
+    public:
+		int size() const { return N; }
+		
+		vec(const T & t = T()) 
+		{ for(int i = 0; i < N; i++) v[i] = t; }
+		vec(const T * tp)
+		{ for(int i = 0; i < N; i++) v[i] = tp[i]; }
+		
+		const T * get_value() const
+		{ return v; }
+		
+		
+		T dot( const vec<N,T> & rhs ) const
+		{ 
+			T r = 0;
+			for(int i = 0; i < N; i++) r += v[i]*rhs.v[i];
+			return r;
+		}
+		
+		T length() const
+		{
+			T r = 0;
+			for(int i = 0; i < N; i++) r += v[i]*v[i]; 
+			return T(sqrt(r));
+		}	
+		
+		T square_norm() const
+		{
+			T r = 0;
+			for(int i = 0; i < N; i++) r += v[i]*v[i]; 
+			return r;
+		}	
+		
+		void  negate()
+		{ for(int i = 0; i < N; i++) v[i] = -v[i]; }
+		
+		
+		T normalize() 
+		{ 
+			T sum(0);
+			for(int i = 0; i < N; i++) 
+                sum += v[i]*v[i];
+			sum = T(sqrt(sum));
+            if (sum > GLH_EPSILON)
+			    for(int i = 0; i < N; i++) 
+                    v[i] /= sum;
+			return sum;
+		}
+		
+		
+		vec<N,T> & set_value( const T * rhs )
+		{ for(int i = 0; i < N; i++) v[i] = rhs[i]; return *this; }
+		
+		T & operator [] ( int i )
+		{ return v[i]; }
+		
+		const T & operator [] ( int i ) const
+		{ return v[i]; }
+
+		vec<N,T> & operator *= ( T d )
+		{ for(int i = 0; i < N; i++) v[i] *= d; return *this;}
+		
+		vec<N,T> & operator *= ( const vec<N,T> & u )
+		{ for(int i = 0; i < N; i++) v[i] *= u[i]; return *this;}
+		
+		vec<N,T> & operator /= ( T d )
+		{ if(d == 0) return *this; for(int i = 0; i < N; i++) v[i] /= d; return *this;}
+		
+		vec<N,T> & operator += ( const vec<N,T> & u )
+		{ for(int i = 0; i < N; i++) v[i] += u.v[i]; return *this;}
+		
+		vec<N,T> & operator -= ( const vec<N,T> & u )
+		{ for(int i = 0; i < N; i++) v[i] -= u.v[i]; return *this;}
+		
+		
+		vec<N,T> operator - () const
+		{ vec<N,T> rv = v; rv.negate(); return rv; }
+		
+		vec<N,T> operator + ( const vec<N,T> &v) const
+		{ vec<N,T> rt(*this); return rt += v; }
+		
+		vec<N,T> operator - ( const vec<N,T> &v) const
+		{ vec<N,T> rt(*this); return rt -= v; }
+		
+		vec<N,T> operator * ( T d) const
+		{ vec<N,T> rt(*this); return rt *= d; }
+		
+		friend bool operator == <> ( const vec<N,T> &v1, const vec<N,T> &v2 );
+		friend bool operator != <> ( const vec<N,T> &v1, const vec<N,T> &v2 );
+		
+		
+	//protected:
+		T v[N];
+	};
+	
+	
+	
+	// vector friend operators
+	
+	template <int N, class T> inline
+		vec<N,T> operator * ( const vec<N,T> & b, T d )
+	{
+		vec<N,T> rt(b);
+		return rt *= d;
+	}
+
+	template <int N, class T> inline
+		vec<N,T> operator * ( T d, const vec<N,T> & b )
+	{ return b*d; }
+	
+	template <int N, class T> inline
+		vec<N,T> operator * ( const vec<N,T> & b, const vec<N,T> & d )
+	{
+		vec<N,T> rt(b);
+		return rt *= d;
+	}
+
+	template <int N, class T> inline
+		vec<N,T> operator / ( const vec<N,T> & b, T d )
+	{ vec<N,T> rt(b); return rt /= d; }
+	
+	template <int N, class T> inline
+		vec<N,T> operator + ( const vec<N,T> & v1, const vec<N,T> & v2 )
+	{ vec<N,T> rt(v1); return rt += v2; }
+	
+	template <int N, class T> inline
+		vec<N,T> operator - ( const vec<N,T> & v1, const vec<N,T> & v2 )
+	{ vec<N,T> rt(v1); return rt -= v2; }
+	
+	
+	template <int N, class T> inline
+		bool operator == ( const vec<N,T> & v1, const vec<N,T> & v2 )
+	{
+		for(int i = 0; i < N; i++)
+			if(v1.v[i] != v2.v[i])
+				return false;
+			return true;
+	}
+	
+	template <int N, class T> inline
+		bool operator != ( const vec<N,T> & v1, const vec<N,T> & v2 )
+	{ return !(v1 == v2); }
+	
+
+	typedef vec<3,unsigned char> vec3ub;
+	typedef vec<4,unsigned char> vec4ub;
+
+
+
+
+
+	namespace GLH_REAL_NAMESPACE
+	{
+	typedef GLH_REAL real;
+
+	class line;
+	class plane;
+	class matrix4;
+	class quaternion;
+	typedef quaternion rotation; 
+  
+	class vec2 : public vec<2,real>
+	{
+    public:
+		vec2(const real & t = real()) : vec<2,real>(t)
+		{}
+		vec2(const vec<2,real> & t) : vec<2,real>(t)
+		{}
+		vec2(const real * tp) : vec<2,real>(tp)
+		{}
+		
+		vec2(real x, real y )
+		{ v[0] = x; v[1] = y; }
+		
+		void get_value(real & x, real & y) const
+		{ x = v[0]; y = v[1]; }
+		
+		vec2 & set_value( const real & x, const real & y)
+		{ v[0] = x; v[1] = y; return *this; }
+		
+	};
+	
+	
+	class vec3 : public vec<3,real>
+	{
+    public:
+		vec3(const real & t = real()) : vec<3,real>(t)
+		{}
+		vec3(const vec<3,real> & t) : vec<3,real>(t)
+		{}
+		vec3(const real * tp) : vec<3,real>(tp)
+		{}
+		
+		vec3(real x, real y, real z)
+		{ v[0] = x; v[1] = y; v[2] = z; }
+		
+		void get_value(real & x, real & y, real & z) const
+		{ x = v[0]; y = v[1]; z = v[2]; }
+		
+		vec3 cross( const vec3 &rhs ) const
+		{
+			vec3 rt;
+			rt.v[0] = v[1]*rhs.v[2]-v[2]*rhs.v[1];
+			rt.v[1] = v[2]*rhs.v[0]-v[0]*rhs.v[2];
+			rt.v[2] = v[0]*rhs.v[1]-v[1]*rhs.v[0];	
+			return rt;
+		}
+		
+		vec3 & set_value( const real & x, const real & y, const real & z)
+		{ v[0] = x; v[1] = y; v[2] = z; return *this; }
+		
+	};
+
+  		
+    class vec4 : public vec<4,real>
+    {
+    public:
+        vec4(const real & t = real()) : vec<4,real>(t)
+        {}
+        vec4(const vec<4,real> & t) : vec<4,real>(t)
+        {}
+
+        vec4(const vec<3,real> & t, real fourth)
+
+        { v[0] = t.v[0]; v[1] = t.v[1]; v[2] = t.v[2]; v[3] = fourth; }
+        vec4(const real * tp) : vec<4,real>(tp)
+        {}
+        vec4(real x, real y, real z, real w)
+        { v[0] = x; v[1] = y; v[2] = z; v[3] = w; }
+
+        void get_value(real & x, real & y, real & z, real & w) const
+        { x = v[0]; y = v[1]; z = v[2]; w = v[3]; }
+  
+        vec4 & set_value( const real & x, const real & y, const real & z, const real & w)
+        { v[0] = x; v[1] = y; v[2] = z; v[3] = w; return *this; }
+    };
+
+    inline
+    vec3 homogenize(const vec4 & v)
+    {
+      vec3 rt;
+      assert(v.v[3] != GLH_ZERO);
+      rt.v[0] = v.v[0]/v.v[3];
+      rt.v[1] = v.v[1]/v.v[3];
+      rt.v[2] = v.v[2]/v.v[3];
+      return rt;
+    }
+  
+
+
+    class line
+    {
+    public:
+  
+        line()
+        { set_value(vec3(0,0,0),vec3(0,0,1)); }
+
+        line( const vec3 & p0, const vec3 &p1)
+        { set_value(p0,p1); }
+
+        void set_value( const vec3 &p0, const vec3 &p1)
+        {
+          position = p0;
+          direction = p1-p0;
+          direction.normalize();
+        }
+  
+        bool get_closest_points(const line &line2, 
+					          vec3 &pointOnThis,
+					          vec3 &pointOnThat)
+        {
+  
+          // quick check to see if parallel -- if so, quit.
+          if(fabs(direction.dot(line2.direction)) == 1.0)
+	          return 0;
+          line l2 = line2;
+  
+          // Algorithm: Brian Jean
+          // 
+          register real u;
+          register real v;
+          vec3 Vr = direction;
+          vec3 Vs = l2.direction;
+          register real Vr_Dot_Vs = Vr.dot(Vs);
+          register real detA = real(1.0 - (Vr_Dot_Vs * Vr_Dot_Vs));
+          vec3 C = l2.position - position;
+          register real C_Dot_Vr =  C.dot(Vr);
+          register real C_Dot_Vs =  C.dot(Vs);
+  
+          u = (C_Dot_Vr - Vr_Dot_Vs * C_Dot_Vs)/detA;
+          v = (C_Dot_Vr * Vr_Dot_Vs - C_Dot_Vs)/detA;
+  
+          pointOnThis = position;
+          pointOnThis += direction * u;
+          pointOnThat = l2.position;
+          pointOnThat += l2.direction * v;
+  
+          return 1;
+        }
+  
+        vec3 get_closest_point(const vec3 &point)
+        {
+          vec3 np = point - position;
+          vec3 rp = direction*direction.dot(np)+position;
+          return rp;
+        }
+  
+        const vec3 & get_position() const {return position;}
+
+        const vec3 & get_direction() const {return direction;}
+  
+    //protected:
+        vec3 position;
+        vec3 direction;
+    };
+  
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+
+
+
+
+
+
+
+
+
+
+
+  // matrix
+
+  
+  class matrix4
+  {
+    
+  public:
+        
+    matrix4() { make_identity(); }
+    
+	matrix4( real r ) 
+	{ set_value(r); }
+
+	matrix4( real * m )
+	{ set_value(m); }
+    
+    matrix4( real a00, real a01, real a02, real a03,
+	       real a10, real a11, real a12, real a13,
+		   real a20, real a21, real a22, real a23,
+		   real a30, real a31, real a32, real a33 )
+	{
+		element(0,0) = a00;
+		element(0,1) = a01;
+		element(0,2) = a02;
+		element(0,3) = a03;
+		
+		element(1,0) = a10;
+		element(1,1) = a11;
+		element(1,2) = a12;
+		element(1,3) = a13;
+		
+		element(2,0) = a20;
+		element(2,1) = a21;
+		element(2,2) = a22;
+		element(2,3) = a23;
+		
+		element(3,0) = a30;
+		element(3,1) = a31;
+		element(3,2) = a32;
+		element(3,3) = a33;
+	}
+            
+    
+    void get_value( real * mp ) const
+	{
+		int c = 0;
+		for(int j=0; j < 4; j++)
+			for(int i=0; i < 4; i++)
+				mp[c++] = element(i,j);
+	}
+    
+    
+    const real * get_value() const
+	{ return m; }
+    
+	void set_value( real * mp)
+	{
+		int c = 0;
+		for(int j=0; j < 4; j++)
+			for(int i=0; i < 4; i++)
+				element(i,j) = mp[c++];
+	}
+    
+	void set_value( real r ) 
+	{
+		for(int i=0; i < 4; i++)
+			for(int j=0; j < 4; j++)
+				element(i,j) = r;
+	}
+    
+    void make_identity()
+	{
+		element(0,0) = 1.0;
+		element(0,1) = 0.0;
+		element(0,2) = 0.0; 
+		element(0,3) = 0.0;
+		
+		element(1,0) = 0.0;
+		element(1,1) = 1.0; 
+		element(1,2) = 0.0;
+		element(1,3) = 0.0;
+		
+		element(2,0) = 0.0;
+		element(2,1) = 0.0;
+		element(2,2) = 1.0;
+		element(2,3) = 0.0;
+		
+		element(3,0) = 0.0; 
+		element(3,1) = 0.0; 
+		element(3,2) = 0.0;
+		element(3,3) = 1.0;
+	}
+	
+	
+    static matrix4 identity()
+	{
+		static matrix4 mident (
+			1.0, 0.0, 0.0, 0.0,
+			0.0, 1.0, 0.0, 0.0,
+			0.0, 0.0, 1.0, 0.0,
+			0.0, 0.0, 0.0, 1.0  );
+		return mident;
+	}
+    
+        
+    void set_scale( real s )
+	{
+		element(0,0) = s;
+		element(1,1) = s;
+		element(2,2) = s;
+	}
+    
+    void set_scale( const vec3 & s )
+	{
+		element(0,0) = s.v[0];
+		element(1,1) = s.v[1];
+		element(2,2) = s.v[2];
+	}
+    
+    
+    void set_translate( const vec3 & t )
+	{
+		element(0,3) = t.v[0];
+		element(1,3) = t.v[1];
+		element(2,3) = t.v[2];
+	}
+    
+	void set_row(int r, const vec4 & t)
+	{
+		element(r,0) = t.v[0];
+		element(r,1) = t.v[1];
+		element(r,2) = t.v[2];
+		element(r,3) = t.v[3];
+	}
+
+	void set_column(int c, const vec4 & t)
+	{
+		element(0,c) = t.v[0];
+		element(1,c) = t.v[1];
+		element(2,c) = t.v[2];
+		element(3,c) = t.v[3];
+	}
+
+    
+	void get_row(int r, vec4 & t) const
+	{
+		t.v[0] = element(r,0);
+		t.v[1] = element(r,1);
+		t.v[2] = element(r,2);
+		t.v[3] = element(r,3);
+	}
+
+	vec4 get_row(int r) const
+	{
+		vec4 v; get_row(r, v);
+		return v;
+	}
+
+	void get_column(int c, vec4 & t) const
+	{
+		t.v[0] = element(0,c);
+		t.v[1] = element(1,c);
+		t.v[2] = element(2,c);
+		t.v[3] = element(3,c);
+	}
+
+	vec4 get_column(int c) const
+	{
+		vec4 v; get_column(c, v);
+		return v;
+	}
+
+    matrix4 inverse() const
+	{
+		matrix4 minv;
+		
+		real r1[8], r2[8], r3[8], r4[8];
+		real *s[4], *tmprow;
+		
+		s[0] = &r1[0];
+		s[1] = &r2[0];
+		s[2] = &r3[0];
+		s[3] = &r4[0];
+		
+		register int i,j,p,jj;
+		for(i=0;i<4;i++)
+		{
+			for(j=0;j<4;j++)
+			{
+				s[i][j] = element(i,j);
+				if(i==j) s[i][j+4] = 1.0;
+				else     s[i][j+4] = 0.0;
+			}
+		}
+		real scp[4];
+		for(i=0;i<4;i++)
+		{
+			scp[i] = real(fabs(s[i][0]));
+			for(j=1;j<4;j++)
+				if(real(fabs(s[i][j])) > scp[i]) scp[i] = real(fabs(s[i][j]));
+				if(scp[i] == 0.0) return minv; // singular matrix!
+		}
+		
+		int pivot_to;
+		real scp_max;
+		for(i=0;i<4;i++)
+		{
+			// select pivot row
+			pivot_to = i;
+			scp_max = real(fabs(s[i][i]/scp[i]));
+			// find out which row should be on top
+			for(p=i+1;p<4;p++)
+				if(real(fabs(s[p][i]/scp[p])) > scp_max)
+				{ scp_max = real(fabs(s[p][i]/scp[p])); pivot_to = p; }
+				// Pivot if necessary
+				if(pivot_to != i)
+				{
+					tmprow = s[i];
+					s[i] = s[pivot_to];
+					s[pivot_to] = tmprow;
+					real tmpscp;
+					tmpscp = scp[i];
+					scp[i] = scp[pivot_to];
+					scp[pivot_to] = tmpscp;
+				}
+				
+				real mji;
+				// perform gaussian elimination
+				for(j=i+1;j<4;j++)
+				{
+					mji = s[j][i]/s[i][i];
+					s[j][i] = 0.0;
+					for(jj=i+1;jj<8;jj++)
+						s[j][jj] -= mji*s[i][jj];
+				}
+		}
+		if(s[3][3] == 0.0) return minv; // singular matrix!
+		
+		//
+		// Now we have an upper triangular matrix.
+		//
+		//  x x x x | y y y y
+		//  0 x x x | y y y y 
+		//  0 0 x x | y y y y
+		//  0 0 0 x | y y y y
+		//
+		//  we'll back substitute to get the inverse
+		//
+		//  1 0 0 0 | z z z z
+		//  0 1 0 0 | z z z z
+		//  0 0 1 0 | z z z z
+		//  0 0 0 1 | z z z z 
+		//
+		
+		real mij;
+		for(i=3;i>0;i--)
+		{
+			for(j=i-1;j > -1; j--)
+			{
+				mij = s[j][i]/s[i][i];
+				for(jj=j+1;jj<8;jj++)
+					s[j][jj] -= mij*s[i][jj];
+			}
+		}
+		
+		for(i=0;i<4;i++)
+			for(j=0;j<4;j++)
+				minv(i,j) = s[i][j+4] / s[i][i];
+			
+			return minv;
+	}
+    
+    
+    matrix4 transpose() const
+	{
+		matrix4 mtrans;
+		
+		for(int i=0;i<4;i++)
+			for(int j=0;j<4;j++)
+				mtrans(i,j) = element(j,i);		
+		return mtrans;
+	}
+    
+    matrix4 & mult_right( const matrix4 & b )
+	{
+		matrix4 mt(*this);
+		set_value(real(0));
+
+		for(int i=0; i < 4; i++)
+			for(int j=0; j < 4; j++)
+				for(int c=0; c < 4; c++)
+					element(i,j) += mt(i,c) * b(c,j);
+		return *this;
+	}    
+
+    matrix4 & mult_left( const matrix4 & b )
+	{
+		matrix4 mt(*this);
+		set_value(real(0));
+
+		for(int i=0; i < 4; i++)
+			for(int j=0; j < 4; j++)
+				for(int c=0; c < 4; c++)
+					element(i,j) += b(i,c) * mt(c,j);
+		return *this;
+	}
+	
+	// dst = M * src
+    void mult_matrix_vec( const vec3 &src, vec3 &dst ) const
+	{
+		real w = (
+			src.v[0] * element(3,0) +
+			src.v[1] * element(3,1) + 
+			src.v[2] * element(3,2) +
+			element(3,3)          );
+        
+        assert(w != GLH_ZERO);
+
+        dst.v[0]  = (
+			src.v[0] * element(0,0) +
+			src.v[1] * element(0,1) +
+			src.v[2] * element(0,2) +
+			element(0,3)          ) / w;
+		dst.v[1]  = (
+			src.v[0] * element(1,0) +
+			src.v[1] * element(1,1) +
+			src.v[2] * element(1,2) +
+			element(1,3)          ) / w;
+		dst.v[2]  = (
+			src.v[0] * element(2,0) +
+			src.v[1] * element(2,1) + 
+			src.v[2] * element(2,2) +
+			element(2,3)          ) / w;
+	}
+    
+	void mult_matrix_vec( vec3 & src_and_dst) const
+	{ mult_matrix_vec(vec3(src_and_dst), src_and_dst); }
+
+
+    // dst = src * M
+    void mult_vec_matrix( const vec3 &src, vec3 &dst ) const
+	{
+		real w = (
+			src.v[0] * element(0,3) +
+			src.v[1] * element(1,3) +
+			src.v[2] * element(2,3) +
+			element(3,3)          );
+        
+        assert(w != GLH_ZERO);
+
+		dst.v[0]  = (
+			src.v[0] * element(0,0) +
+			src.v[1] * element(1,0) + 
+			src.v[2] * element(2,0) + 
+			element(3,0)          ) / w;
+		dst.v[1]  = (
+			src.v[0] * element(0,1) +
+			src.v[1] * element(1,1) +
+			src.v[2] * element(2,1) +
+			element(3,1)          ) / w;
+		dst.v[2]  = (
+			src.v[0] * element(0,2) +
+			src.v[1] * element(1,2) +
+			src.v[2] * element(2,2) +
+			element(3,2)          ) / w;
+	}
+        
+
+	void mult_vec_matrix( vec3 & src_and_dst) const
+	{ mult_vec_matrix(vec3(src_and_dst), src_and_dst); }
+
+	// dst = M * src
+    void mult_matrix_vec( const vec4 &src, vec4 &dst ) const
+	{
+        dst.v[0]  = (
+			src.v[0] * element(0,0) +
+			src.v[1] * element(0,1) +
+			src.v[2] * element(0,2) +
+			src.v[3] * element(0,3));
+		dst.v[1]  = (
+			src.v[0] * element(1,0) +
+			src.v[1] * element(1,1) +
+			src.v[2] * element(1,2) +
+			src.v[3] * element(1,3));
+		dst.v[2]  = (
+			src.v[0] * element(2,0) +
+			src.v[1] * element(2,1) + 
+			src.v[2] * element(2,2) +
+			src.v[3] * element(2,3));
+		dst.v[3] = (
+			src.v[0] * element(3,0) +
+			src.v[1] * element(3,1) + 
+			src.v[2] * element(3,2) +
+			src.v[3] * element(3,3));
+	}
+    
+	void mult_matrix_vec( vec4 & src_and_dst) const
+	{ mult_matrix_vec(vec4(src_and_dst), src_and_dst); }
+
+
+    // dst = src * M
+    void mult_vec_matrix( const vec4 &src, vec4 &dst ) const
+	{
+		dst.v[0]  = (
+			src.v[0] * element(0,0) +
+			src.v[1] * element(1,0) + 
+			src.v[2] * element(2,0) + 
+			src.v[3] * element(3,0));
+		dst.v[1]  = (
+			src.v[0] * element(0,1) +
+			src.v[1] * element(1,1) +
+			src.v[2] * element(2,1) +
+			src.v[3] * element(3,1));
+		dst.v[2]  = (
+			src.v[0] * element(0,2) +
+			src.v[1] * element(1,2) +
+			src.v[2] * element(2,2) +
+			src.v[3] * element(3,2));
+		dst.v[3] = (
+			src.v[0] * element(0,3) +
+			src.v[1] * element(1,3) +
+			src.v[2] * element(2,3) +
+			src.v[3] * element(3,3));
+	}
+        
+
+	void mult_vec_matrix( vec4 & src_and_dst) const
+	{ mult_vec_matrix(vec4(src_and_dst), src_and_dst); }
+
+    
+    // dst = M * src
+    void mult_matrix_dir( const vec3 &src, vec3 &dst ) const
+	{
+		dst.v[0]  = (
+			src.v[0] * element(0,0) +
+			src.v[1] * element(0,1) +
+			src.v[2] * element(0,2) ) ;
+		dst.v[1]  = ( 
+			src.v[0] * element(1,0) +
+			src.v[1] * element(1,1) +
+			src.v[2] * element(1,2) ) ;
+		dst.v[2]  = ( 
+			src.v[0] * element(2,0) +
+			src.v[1] * element(2,1) + 
+			src.v[2] * element(2,2) ) ;
+	}
+        
+
+	void mult_matrix_dir( vec3 & src_and_dst) const
+	{ mult_matrix_dir(vec3(src_and_dst), src_and_dst); }
+
+
+	// dst = src * M
+    void mult_dir_matrix( const vec3 &src, vec3 &dst ) const
+	{
+		dst.v[0]  = ( 
+			src.v[0] * element(0,0) +
+			src.v[1] * element(1,0) +
+			src.v[2] * element(2,0) ) ;
+		dst.v[1]  = ( 
+			src.v[0] * element(0,1) +
+			src.v[1] * element(1,1) +
+			src.v[2] * element(2,1) ) ;
+		dst.v[2]  = (
+			src.v[0] * element(0,2) +
+			src.v[1] * element(1,2) + 
+			src.v[2] * element(2,2) ) ;
+	}
+    
+    
+	void mult_dir_matrix( vec3 & src_and_dst) const
+	{ mult_dir_matrix(vec3(src_and_dst), src_and_dst); }
+
+
+    real & operator () (int row, int col)
+    { return element(row,col); }
+
+    const real & operator () (int row, int col) const
+    { return element(row,col); }
+
+	real & element (int row, int col)
+    { return m[row | (col<<2)]; }
+
+    const real & element (int row, int col) const
+    { return m[row | (col<<2)]; }
+
+    matrix4 & operator *= ( const matrix4 & mat )
+	{
+		mult_right( mat );
+		return *this;
+	}
+    
+    matrix4 & operator *= ( const real & r )
+	{
+		for (int i = 0; i < 4; ++i)
+        {
+            element(0,i) *= r;
+            element(1,i) *= r;
+            element(2,i) *= r;
+            element(3,i) *= r;
+        }
+		return *this;
+	}
+
+    matrix4 & operator += ( const matrix4 & mat )
+	{
+		for (int i = 0; i < 4; ++i)
+        {
+            element(0,i) += mat.element(0,i);
+            element(1,i) += mat.element(1,i);
+            element(2,i) += mat.element(2,i);
+            element(3,i) += mat.element(3,i);
+        }
+		return *this;
+	}
+
+    friend matrix4 operator * ( const matrix4 & m1,	const matrix4 & m2 );
+    friend bool operator == ( const matrix4 & m1, const matrix4 & m2 );
+    friend bool operator != ( const matrix4 & m1, const matrix4 & m2 );
+    
+  //protected:
+	  real m[16];
+  };
+  
+  inline  
+  matrix4 operator * ( const matrix4 & m1, const matrix4 & m2 )
+  {
+	  matrix4 product;
+	  
+	  product = m1;
+	  product.mult_right(m2);
+	  
+	  return product;
+  }
+  
+  inline
+  bool operator ==( const matrix4 &m1, const matrix4 &m2 )
+  {
+	  return ( 
+		  m1(0,0) == m2(0,0) &&
+		  m1(0,1) == m2(0,1) &&
+		  m1(0,2) == m2(0,2) &&
+		  m1(0,3) == m2(0,3) &&
+		  m1(1,0) == m2(1,0) &&
+		  m1(1,1) == m2(1,1) &&
+		  m1(1,2) == m2(1,2) &&
+		  m1(1,3) == m2(1,3) &&
+		  m1(2,0) == m2(2,0) &&
+		  m1(2,1) == m2(2,1) &&
+		  m1(2,2) == m2(2,2) &&
+		  m1(2,3) == m2(2,3) &&
+		  m1(3,0) == m2(3,0) &&
+		  m1(3,1) == m2(3,1) &&
+		  m1(3,2) == m2(3,2) &&
+		  m1(3,3) == m2(3,3) );
+  }
+  
+  inline
+  bool operator != ( const matrix4 & m1, const matrix4 & m2 )
+  { return !( m1 == m2 ); }  
+
+
+
+
+
+
+
+
+
+
+
+
+  
+    class quaternion
+    {
+    public:
+    
+    quaternion()
+    {
+        *this = identity();
+    }
+
+    quaternion( const real v[4] )
+    {
+        set_value( v );
+    }
+
+
+    quaternion( real q0, real q1, real q2, real q3 )
+    {
+        set_value( q0, q1, q2, q3 );
+    }
+
+
+    quaternion( const matrix4 & m )
+    {
+        set_value( m );
+    }
+
+
+    quaternion( const vec3 &axis, real radians )
+    {
+        set_value( axis, radians );
+    }
+
+
+    quaternion( const vec3 &rotateFrom, const vec3 &rotateTo )
+    {
+        set_value( rotateFrom, rotateTo );
+    }
+
+    quaternion( const vec3 & from_look, const vec3 & from_up,
+		      const vec3 & to_look, const vec3& to_up)
+    {
+	    set_value(from_look, from_up, to_look, to_up);
+    }
+
+    const real * get_value() const
+    {
+        return  &q[0];
+    }
+
+    void get_value( real &q0, real &q1, real &q2, real &q3 ) const
+    {
+        q0 = q[0];
+        q1 = q[1];
+        q2 = q[2];
+        q3 = q[3];
+    }
+
+    quaternion & set_value( real q0, real q1, real q2, real q3 )
+    {
+        q[0] = q0;
+        q[1] = q1;
+        q[2] = q2;
+        q[3] = q3;
+        counter = 0;
+        return *this;
+    }
+
+    void get_value( vec3 &axis, real &radians ) const
+    {
+        radians = real(acos( q[3] ) * GLH_TWO);
+        if ( radians == GLH_ZERO )
+            axis = vec3( 0.0, 0.0, 1.0 );
+        else
+        {
+            axis.v[0] = q[0];
+            axis.v[1] = q[1];
+            axis.v[2] = q[2];
+            axis.normalize();
+        }
+    }
+
+    void get_value( matrix4 & m ) const
+    {
+        real s, xs, ys, zs, wx, wy, wz, xx, xy, xz, yy, yz, zz;
+
+        real norm = q[0] * q[0] + q[1] * q[1] + q[2] * q[2] + q[3] * q[3];
+
+        s = (equivalent(norm,GLH_ZERO)) ? GLH_ZERO : ( GLH_TWO / norm );
+
+        xs = q[0] * s;
+        ys = q[1] * s;
+        zs = q[2] * s;
+
+        wx = q[3] * xs;
+        wy = q[3] * ys;
+        wz = q[3] * zs;
+
+        xx = q[0] * xs;
+        xy = q[0] * ys;
+        xz = q[0] * zs;
+
+        yy = q[1] * ys;
+        yz = q[1] * zs;
+        zz = q[2] * zs;
+
+        m(0,0) = real( GLH_ONE - ( yy + zz ));
+        m(1,0) = real ( xy + wz );
+        m(2,0) = real ( xz - wy );
+
+        m(0,1) = real ( xy - wz );
+        m(1,1) = real ( GLH_ONE - ( xx + zz ));
+        m(2,1) = real ( yz + wx );
+
+        m(0,2) = real ( xz + wy );
+        m(1,2) = real ( yz - wx );
+        m(2,2) = real ( GLH_ONE - ( xx + yy ));
+
+        m(3,0) = m(3,1) = m(3,2) = m(0,3) = m(1,3) = m(2,3) = GLH_ZERO;
+        m(3,3) = GLH_ONE;
+    }
+
+    quaternion & set_value( const real * qp )
+    {
+        memcpy(q,qp,sizeof(real) * 4);
+
+        counter = 0;
+        return *this;
+    }
+
+    quaternion & set_value( const matrix4 & m )
+    {
+        real tr, s;
+        int i, j, k;
+        const int nxt[3] = { 1, 2, 0 };
+
+        tr = m(0,0) + m(1,1) + m(2,2);
+
+        if ( tr > GLH_ZERO )
+        {
+            s = real(sqrt( tr + m(3,3) ));
+            q[3] = real ( s * 0.5 );
+            s = real(0.5) / s;
+
+            q[0] = real ( ( m(1,2) - m(2,1) ) * s );
+            q[1] = real ( ( m(2,0) - m(0,2) ) * s );
+            q[2] = real ( ( m(0,1) - m(1,0) ) * s );
+        }
+        else
+        {
+            i = 0;
+            if ( m(1,1) > m(0,0) )
+              i = 1;
+
+            if ( m(2,2) > m(i,i) )
+              i = 2;
+
+            j = nxt[i];
+            k = nxt[j];
+
+            s = real(sqrt( ( m(i,j) - ( m(j,j) + m(k,k) )) + GLH_ONE ));
+
+            q[i] = real ( s * 0.5 );
+            s = real(0.5 / s);
+
+            q[3] = real ( ( m(j,k) - m(k,j) ) * s );
+            q[j] = real ( ( m(i,j) + m(j,i) ) * s );
+            q[k] = real ( ( m(i,k) + m(k,i) ) * s );
+        }
+
+        counter = 0;
+        return *this;
+    }
+
+    quaternion & set_value( const vec3 &axis, real theta )
+    {
+        real sqnorm = axis.square_norm();
+
+        if (sqnorm <= GLH_EPSILON)
+        {
+            // axis too small.
+            x = y = z = 0.0;
+            w = 1.0;
+        } 
+        else 
+        {
+            theta *= real(0.5);
+            real sin_theta = real(sin(theta));
+
+            if (!equivalent(sqnorm,GLH_ONE)) 
+              sin_theta /= real(sqrt(sqnorm));
+            x = sin_theta * axis.v[0];
+            y = sin_theta * axis.v[1];
+            z = sin_theta * axis.v[2];
+            w = real(cos(theta));
+        }
+        return *this;
+    }
+
+    quaternion & set_value( const vec3 & rotateFrom, const vec3 & rotateTo )
+    {
+        vec3 p1, p2;
+        real alpha;
+
+        p1 = rotateFrom; 
+        p1.normalize();
+        p2 = rotateTo;  
+        p2.normalize();
+
+        alpha = p1.dot(p2);
+
+        if(equivalent(alpha,GLH_ONE))
+        { 
+            *this = identity(); 
+            return *this; 
+        }
+
+        // ensures that the anti-parallel case leads to a positive dot
+        if(equivalent(alpha,-GLH_ONE))
+        {
+            vec3 v;
+
+            if(p1.v[0] != p1.v[1] || p1.v[0] != p1.v[2])
+    	        v = vec3(p1.v[1], p1.v[2], p1.v[0]);
+            else
+    	        v = vec3(-p1.v[0], p1.v[1], p1.v[2]);
+
+            v -= p1 * p1.dot(v);
+            v.normalize();
+
+            set_value(v, GLH_PI);
+            return *this;
+        }
+
+        p1 = p1.cross(p2);  
+        p1.normalize();
+        set_value(p1,real(acos(alpha)));
+
+        counter = 0;
+        return *this;
+    }
+
+    quaternion & set_value( const vec3 & from_look, const vec3 & from_up,
+		      const vec3 & to_look, const vec3 & to_up)
+    {
+	    quaternion r_look = quaternion(from_look, to_look);
+	    
+	    vec3 rotated_from_up(from_up);
+	    r_look.mult_vec(rotated_from_up);
+	    
+	    quaternion r_twist = quaternion(rotated_from_up, to_up);
+	    
+	    *this = r_twist;
+	    *this *= r_look;
+	    return *this;
+    }
+
+    quaternion & operator *= ( const quaternion & qr )
+    {
+        quaternion ql(*this);
+   
+        w = ql.w * qr.w - ql.x * qr.x - ql.y * qr.y - ql.z * qr.z;
+        x = ql.w * qr.x + ql.x * qr.w + ql.y * qr.z - ql.z * qr.y;
+        y = ql.w * qr.y + ql.y * qr.w + ql.z * qr.x - ql.x * qr.z;
+        z = ql.w * qr.z + ql.z * qr.w + ql.x * qr.y - ql.y * qr.x;
+
+        counter += qr.counter;
+        counter++;
+        counter_normalize();
+        return *this;
+    }
+
+    void normalize()
+    {
+        real rnorm = GLH_ONE / real(sqrt(w * w + x * x + y * y + z * z));
+        if (equivalent(rnorm, GLH_ZERO))
+            return;
+        x *= rnorm;
+        y *= rnorm;
+        z *= rnorm;
+        w *= rnorm;
+        counter = 0;
+    }
+
+    friend bool operator == ( const quaternion & q1, const quaternion & q2 );      
+
+    friend bool operator != ( const quaternion & q1, const quaternion & q2 );
+
+    friend quaternion operator * ( const quaternion & q1, const quaternion & q2 );
+
+    bool equals( const quaternion & r, real tolerance ) const
+    {
+        real t;
+
+        t = (
+			(q[0]-r.q[0])*(q[0]-r.q[0]) +
+            (q[1]-r.q[1])*(q[1]-r.q[1]) +
+            (q[2]-r.q[2])*(q[2]-r.q[2]) +
+            (q[3]-r.q[3])*(q[3]-r.q[3]) );
+        if(t > GLH_EPSILON) 
+            return false;
+        return 1;
+    }
+
+    quaternion & conjugate()
+    {
+        q[0] *= -GLH_ONE;
+        q[1] *= -GLH_ONE;
+        q[2] *= -GLH_ONE;
+        return *this;
+    }
+
+    quaternion & invert()
+    {
+        return conjugate();
+    }
+
+    quaternion inverse() const
+    {
+        quaternion r = *this;
+        return r.invert();
+    }
+
+    //
+    // Quaternion multiplication with cartesian vector
+    // v' = q*v*q(star)
+    //
+    void mult_vec( const vec3 &src, vec3 &dst ) const
+    {
+        real v_coef = w * w - x * x - y * y - z * z;                     
+        real u_coef = GLH_TWO * (src.v[0] * x + src.v[1] * y + src.v[2] * z);  
+        real c_coef = GLH_TWO * w;                                       
+
+        dst.v[0] = v_coef * src.v[0] + u_coef * x + c_coef * (y * src.v[2] - z * src.v[1]);
+        dst.v[1] = v_coef * src.v[1] + u_coef * y + c_coef * (z * src.v[0] - x * src.v[2]);
+        dst.v[2] = v_coef * src.v[2] + u_coef * z + c_coef * (x * src.v[1] - y * src.v[0]);
+    }
+
+    void mult_vec( vec3 & src_and_dst) const
+    {
+        mult_vec(vec3(src_and_dst), src_and_dst);
+    }
+
+    void scale_angle( real scaleFactor )
+    {
+        vec3 axis;
+        real radians;
+
+        get_value(axis, radians);
+        radians *= scaleFactor;
+        set_value(axis, radians);
+    }
+
+    static quaternion slerp( const quaternion & p, const quaternion & q, real alpha )
+    {
+        quaternion r;
+
+        real cos_omega = p.x * q.x + p.y * q.y + p.z * q.z + p.w * q.w;
+        // if B is on opposite hemisphere from A, use -B instead
+      
+        int bflip;
+        if ( ( bflip = (cos_omega < GLH_ZERO)) )
+            cos_omega = -cos_omega;
+
+        // complementary interpolation parameter
+        real beta = GLH_ONE - alpha;     
+
+        if(cos_omega <= GLH_ONE - GLH_EPSILON)
+            return p;
+
+        real omega = real(acos(cos_omega));
+        real one_over_sin_omega = GLH_ONE / real(sin(omega));
+
+        beta    = real(sin(omega*beta)  * one_over_sin_omega);
+        alpha   = real(sin(omega*alpha) * one_over_sin_omega);
+
+        if (bflip)
+            alpha = -alpha;
+
+        r.x = beta * p.q[0]+ alpha * q.q[0];
+        r.y = beta * p.q[1]+ alpha * q.q[1];
+        r.z = beta * p.q[2]+ alpha * q.q[2];
+        r.w = beta * p.q[3]+ alpha * q.q[3];
+        return r;
+    }
+
+    static quaternion identity()
+    {
+        static quaternion ident( vec3( 0.0, 0.0, 0.0 ), GLH_ONE );
+        return ident;
+    }
+
+    real & operator []( int i )
+    {
+        assert(i < 4);
+        return q[i];
+    }
+
+    const real & operator []( int i ) const
+    {
+        assert(i < 4);
+        return q[i];
+    }
+
+    protected:
+
+        void counter_normalize()
+        {
+            if (counter > GLH_QUATERNION_NORMALIZATION_THRESHOLD)
+                normalize();
+        }
+
+        union 
+        {
+            struct 
+            {
+                real q[4];
+            };
+            struct 
+            {
+                real x;
+                real y;
+                real z;
+                real w;
+            };
+        };
+
+        // renormalization counter
+        unsigned char counter;
+    };
+
+    inline
+    bool operator == ( const quaternion & q1, const quaternion & q2 )
+    {
+        return (equivalent(q1.x, q2.x) &&
+		        equivalent(q1.y, q2.y) &&
+		        equivalent(q1.z, q2.z) &&
+		        equivalent(q1.w, q2.w) );
+    }
+
+    inline
+    bool operator != ( const quaternion & q1, const quaternion & q2 )
+    { 
+        return ! ( q1 == q2 ); 
+    }
+
+    inline
+    quaternion operator * ( const quaternion & q1, const quaternion & q2 )
+    {	
+        quaternion r(q1); 
+        r *= q2; 
+        return r; 
+    }
+  
+      
+    
+
+
+
+
+
+  
+  
+  class plane
+  {
+  public:
+	  
+	  plane()
+      {
+		  planedistance = 0.0;
+		  planenormal.set_value( 0.0, 0.0, 1.0 );
+      }
+	  
+	  
+	  plane( const vec3 &p0, const vec3 &p1, const vec3 &p2 )
+      {
+		  vec3 v0 = p1 - p0;
+		  vec3 v1 = p2 - p0;
+		  planenormal = v0.cross(v1);  
+		  planenormal.normalize();
+		  planedistance = p0.dot(planenormal);
+      }
+	  
+	  plane( const vec3 &normal, real distance )
+      {
+		  planedistance = distance;
+		  planenormal = normal;
+		  planenormal.normalize();
+      }
+	  
+	  plane( const vec3 &normal, const vec3 &point )
+      {
+		  planenormal = normal;
+		  planenormal.normalize();
+		  planedistance = point.dot(planenormal);
+      }
+	  
+	  void offset( real d )
+      {
+		  planedistance += d;
+      }
+	  
+	  bool intersect( const line &l, vec3 &intersection ) const
+      {
+		  vec3 pos, dir;
+		  vec3 pn = planenormal;
+		  real pd = planedistance;
+		  
+		  pos = l.get_position();
+		  dir = l.get_direction();
+		  
+		  if(dir.dot(pn) == 0.0) return 0;
+		  pos -= pn*pd;
+		  // now we're talking about a plane passing through the origin
+		  if(pos.dot(pn) < 0.0) pn.negate();
+		  if(dir.dot(pn) > 0.0) dir.negate();
+		  vec3 ppos = pn * pos.dot(pn);
+		  pos = (ppos.length()/dir.dot(-pn))*dir;
+		  intersection = l.get_position();
+		  intersection += pos;
+		  return 1;
+      }
+	  void transform( const matrix4 &matrix )
+      {
+		  matrix4 invtr = matrix.inverse();
+		  invtr = invtr.transpose();
+		  
+		  vec3 pntOnplane = planenormal * planedistance;
+		  vec3 newPntOnplane;
+		  vec3 newnormal;
+		  
+		  invtr.mult_dir_matrix(planenormal, newnormal);
+		  matrix.mult_vec_matrix(pntOnplane, newPntOnplane);
+		  
+		  newnormal.normalize();
+		  planenormal = newnormal;
+		  planedistance = newPntOnplane.dot(planenormal);
+      }
+	  
+	  bool is_in_half_space( const vec3 &point ) const
+      {
+		  
+		  if(( point.dot(planenormal) - planedistance) < 0.0)
+			  return 0;
+		  return 1;
+      }
+	  
+	  
+	  real distance( const vec3 & point ) const 
+      {
+		  return planenormal.dot(point - planenormal*planedistance);
+      }
+	  
+	  const vec3 &get_normal() const
+      {
+		  return planenormal;
+      }
+	  
+	  
+	  real get_distance_from_origin() const
+      {
+		  return planedistance;
+      }
+	  
+	  
+	  friend bool operator == ( const plane & p1, const plane & p2 );
+	  
+	  
+	  friend bool operator != ( const plane & p1, const plane & p2 );
+	  
+  //protected:
+	  vec3 planenormal;
+	  real planedistance;
+  };
+  
+  inline
+  bool operator == (const plane & p1, const plane & p2 )
+  {
+	  return (  p1.planedistance == p2.planedistance && p1.planenormal == p2.planenormal);
+  }
+  
+  inline
+  bool operator != ( const plane & p1, const plane & p2 )
+  { return  ! (p1 == p2); }
+  
+  
+
+  } // "ns_##GLH_REAL"
+
+  // make common typedefs...
+#ifdef GLH_REAL_IS_FLOAT
+  typedef GLH_REAL_NAMESPACE::vec2 vec2f;
+  typedef GLH_REAL_NAMESPACE::vec3 vec3f;
+  typedef GLH_REAL_NAMESPACE::vec4 vec4f;
+  typedef GLH_REAL_NAMESPACE::quaternion quaternionf;
+  typedef GLH_REAL_NAMESPACE::quaternion rotationf;
+  typedef GLH_REAL_NAMESPACE::line linef;
+  typedef GLH_REAL_NAMESPACE::plane planef;
+  typedef GLH_REAL_NAMESPACE::matrix4 matrix4f;
+#endif
+
+  
+
+
+}  // namespace glh
+
+
+
+#endif
+
diff --git a/linden/indra/newview/llfloaterregioninfo.cpp b/linden/indra/newview/llfloaterregioninfo.cpp
index 4880308..3c3625b 100644
--- a/linden/indra/newview/llfloaterregioninfo.cpp
+++ b/linden/indra/newview/llfloaterregioninfo.cpp
@@ -1,3446 +1,3446 @@
-/** 
- * @file llfloaterregioninfo.cpp
- * @author Aaron Brashears
- * @brief Implementation of the region info and controls floater and panels.
- *
- * $LicenseInfo:firstyear=2004&license=viewergpl$
- * 
- * Copyright (c) 2004-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 "llfloaterregioninfo.h"
-
-#include <algorithm>
-#include <functional>
-
-#include "llcachename.h"
-#include "lldir.h"
-#include "lldispatcher.h"
-#include "llglheaders.h"
-#include "llregionflags.h"
-#include "llstl.h"
-#include "indra_constants.h"
-#include "message.h"
-
-#include "llagent.h"
-#include "llalertdialog.h"
-#include "llappviewer.h"
-#include "llfloateravatarpicker.h"
-#include "llbutton.h" 
-#include "llcheckboxctrl.h"
-#include "llcombobox.h"
-#include "llfilepicker.h"
-#include "llfloaterdaycycle.h"
-#include "llfloatergodtools.h"	// for send_sim_wide_deletes()
-#include "llfloatertopobjects.h" // added to fix SL-32336
-#include "llfloatergroups.h"
-#include "llfloatertelehub.h"
-#include "llfloaterwindlight.h"
-#include "llinventorymodel.h"
-#include "lllineeditor.h"
-#include "llalertdialog.h"
-#include "llnamelistctrl.h"
-#include "llsliderctrl.h"
-#include "llspinctrl.h"
-#include "lltabcontainer.h"
-#include "lltextbox.h"
-#include "llinventory.h"
-#include "lltexturectrl.h"
-#include "lltrans.h"
-#include "llviewercontrol.h"
-#include "lluictrlfactory.h"
-#include "llviewerimage.h"
-#include "llviewerimagelist.h"
-#include "llviewerregion.h"
-#include "llviewerstats.h"
-#include "llviewertexteditor.h"
-#include "llviewerwindow.h"
-#include "llvlcomposition.h"
-#include "hippolimits.h"
-
-// [RLVa:KB]
-#include "rlvhandler.h"
-// [/RLVa:KB]
-
-#define ELAR_ENABLED 0 // Enable when server support is implemented
-
-const S32 TERRAIN_TEXTURE_COUNT = 4;
-const S32 CORNER_COUNT = 4;
-
-///----------------------------------------------------------------------------
-/// Local class declaration
-///----------------------------------------------------------------------------
-
-class LLDispatchEstateUpdateInfo : public LLDispatchHandler
-{
-public:
-	LLDispatchEstateUpdateInfo() {}
-	virtual ~LLDispatchEstateUpdateInfo() {}
-	virtual bool operator()(
-		const LLDispatcher* dispatcher,
-		const std::string& key,
-		const LLUUID& invoice,
-		const sparam_t& strings);
-};
-
-class LLDispatchSetEstateAccess : public LLDispatchHandler
-{
-public:
-	LLDispatchSetEstateAccess() {}
-	virtual ~LLDispatchSetEstateAccess() {}
-	virtual bool operator()(
-		const LLDispatcher* dispatcher,
-		const std::string& key,
-		const LLUUID& invoice,
-		const sparam_t& strings);
-};
-
-
-/*
-void unpack_request_params(
-	LLMessageSystem* msg,
-	LLDispatcher::sparam_t& strings,
-	LLDispatcher::iparam_t& integers)
-{
-	char str_buf[MAX_STRING];
-	S32 str_count = msg->getNumberOfBlocksFast(_PREHASH_StringData);
-	S32 i;
-	for (i = 0; i < str_count; ++i)
-	{
-		// we treat the SParam as binary data (since it might be an 
-		// LLUUID in compressed form which may have embedded \0's,)
-		str_buf[0] = '\0';
-		S32 data_size = msg->getSizeFast(_PREHASH_StringData, i, _PREHASH_SParam);
-		if (data_size >= 0)
-		{
-			msg->getBinaryDataFast(_PREHASH_StringData, _PREHASH_SParam,
-								   str_buf, data_size, i, MAX_STRING - 1);
-			strings.push_back(std::string(str_buf, data_size));
-		}
-	}
-
-	U32 int_buf;
-	S32 int_count = msg->getNumberOfBlocksFast(_PREHASH_IntegerData);
-	for (i = 0; i < int_count; ++i)
-	{
-		msg->getU32("IntegerData", "IParam", int_buf, i);
-		integers.push_back(int_buf);
-	}
-}
-*/
-
-
-
-bool estate_dispatch_initialized = false;
-
-
-///----------------------------------------------------------------------------
-/// LLFloaterRegionInfo
-///----------------------------------------------------------------------------
-
-//S32 LLFloaterRegionInfo::sRequestSerial = 0;
-LLUUID LLFloaterRegionInfo::sRequestInvoice;
-
-LLFloaterRegionInfo::LLFloaterRegionInfo(const LLSD& seed)
-{
-	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_region_info.xml", NULL, FALSE);
-}
-
-BOOL LLFloaterRegionInfo::postBuild()
-{
-	mTab = getChild<LLTabContainer>("region_panels");
-
-	// contruct the panels
-	LLPanelRegionInfo* panel;
-
-	panel = new LLPanelRegionGeneralInfo;
-	mInfoPanels.push_back(panel);
-	LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_general.xml");
-	mTab->addTabPanel(panel, panel->getLabel(), TRUE);
-
-	// We only use this panel on Aurora-based sims -- MC
-	std::string url = gAgent.getRegion()->getCapability("DispatchOpenRegionSettings");
-	if (!url.empty())
-	{
-		panel = new LLPanelRegionOpenSettingsInfo;
-		mInfoPanels.push_back(panel);
-		LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_open_region_settings.xml");
-		mTab->addTabPanel(panel, panel->getLabel(), FALSE);
-	}
-
-	panel = new LLPanelRegionDebugInfo;
-	mInfoPanels.push_back(panel);
-	LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_debug.xml");
-	mTab->addTabPanel(panel, panel->getLabel(), FALSE);
-
-	panel = new LLPanelRegionTextureInfo;
-	mInfoPanels.push_back(panel);
-	LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_texture.xml");
-	mTab->addTabPanel(panel, panel->getLabel(), FALSE);
-
-	panel = new LLPanelRegionTerrainInfo;
-	mInfoPanels.push_back(panel);
-	LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_terrain.xml");
-	mTab->addTabPanel(panel, panel->getLabel(), FALSE);
-
-	panel = new LLPanelEstateInfo;
-	mInfoPanels.push_back(panel);
-	LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_estate.xml");
-	mTab->addTabPanel(panel, panel->getLabel(), FALSE);
-
-	panel = new LLPanelEstateCovenant;
-	mInfoPanels.push_back(panel);
-	LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_covenant.xml");
-	mTab->addTabPanel(panel, panel->getLabel(), FALSE);
-
-	gMessageSystem->setHandlerFunc(
-		"EstateOwnerMessage", 
-		&processEstateOwnerRequest);
-
-	return TRUE;
-}
-
-LLFloaterRegionInfo::~LLFloaterRegionInfo()
-{
-}
-
-void LLFloaterRegionInfo::onOpen()
-{
-	LLRect rect = gSavedSettings.getRect("FloaterRegionInfo");
-	S32 left, top;
-	gFloaterView->getNewFloaterPosition(&left, &top);
-	rect.translate(left,top);
-
-	refreshFromRegion(gAgent.getRegion());
-	requestRegionInfo();
-	LLFloater::onOpen();
-}
-
-// static
-void LLFloaterRegionInfo::requestRegionInfo()
-{
-	LLTabContainer* tab = findInstance()->getChild<LLTabContainer>("region_panels");
-
-	tab->getChild<LLPanel>("General")->setCtrlsEnabled(FALSE);
-	tab->getChild<LLPanel>("Debug")->setCtrlsEnabled(FALSE);
-	tab->getChild<LLPanel>("Terrain")->setCtrlsEnabled(FALSE);
-	tab->getChild<LLPanel>("Estate")->setCtrlsEnabled(FALSE);
-	tab->getChild<LLPanel>("RegionSettings")->setCtrlsEnabled(FALSE);
-
-	// Must allow anyone to request the RegionInfo data
-	// so non-owners/non-gods can see the values. 
-	// Therefore can't use an EstateOwnerMessage JC
-	LLMessageSystem* msg = gMessageSystem;
-	msg->newMessage("RequestRegionInfo");
-	msg->nextBlock("AgentData");
-	msg->addUUID("AgentID", gAgent.getID());
-	msg->addUUID("SessionID", gAgent.getSessionID());
-	gAgent.sendReliableMessage();
-}
-
-// static
-void LLFloaterRegionInfo::processEstateOwnerRequest(LLMessageSystem* msg,void**)
-{
-	static LLDispatcher dispatch;
-	if(!findInstance())
-	{
-		return;
-	}
-	
-	if (!estate_dispatch_initialized)
-	{
-		LLPanelEstateInfo::initDispatch(dispatch);
-	}
-
-	LLTabContainer* tab = findInstance()->getChild<LLTabContainer>("region_panels");
-	LLPanelEstateInfo* panel = (LLPanelEstateInfo*)tab->getChild<LLPanel>("Estate");
-
-	// unpack the message
-	std::string request;
-	LLUUID invoice;
-	LLDispatcher::sparam_t strings;
-	LLDispatcher::unpackMessage(msg, request, invoice, strings);
-	if(invoice != getLastInvoice())
-	{
-		llwarns << "Mismatched Estate message: " << request << llendl;
-		return;
-	}
-
-	//dispatch the message
-	dispatch.dispatch(request, invoice, strings);
-
-	LLViewerRegion* region = gAgent.getRegion();
-	panel->updateControls(region);
-}
-
-
-// static
-void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg)
-{
-	LLPanel* panel;
-
-	llinfos << "LLFloaterRegionInfo::processRegionInfo" << llendl;
-	if(!findInstance())
-	{
-		return;
-	}
-	
-	LLTabContainer* tab = findInstance()->getChild<LLTabContainer>("region_panels");
-
-	LLViewerRegion* region = gAgent.getRegion();
-	BOOL allow_modify = gAgent.isGodlike() || (region && region->canManageEstate());
-
-	// extract message
-	std::string sim_name;
-	std::string sim_type = LLTrans::getString("land_type_unknown");
-	U32 region_flags;
-	U8 agent_limit;
-	F32 object_bonus_factor;
-	U8 sim_access;
-	F32 water_height;
-	F32 terrain_raise_limit;
-	F32 terrain_lower_limit;
-	BOOL use_estate_sun;
-	F32 sun_hour;
-	msg->getString("RegionInfo", "SimName", sim_name);
-	msg->getU32("RegionInfo", "RegionFlags", region_flags);
-	msg->getU8("RegionInfo", "MaxAgents", agent_limit);
-	msg->getF32("RegionInfo", "ObjectBonusFactor", object_bonus_factor);
-	msg->getU8("RegionInfo", "SimAccess", sim_access);
-	msg->getF32Fast(_PREHASH_RegionInfo, _PREHASH_WaterHeight, water_height);
-	msg->getF32Fast(_PREHASH_RegionInfo, _PREHASH_TerrainRaiseLimit, terrain_raise_limit);
-	msg->getF32Fast(_PREHASH_RegionInfo, _PREHASH_TerrainLowerLimit, terrain_lower_limit);
-	msg->getBOOL("RegionInfo", "UseEstateSun", use_estate_sun);
-	// actually the "last set" sun hour, not the current sun hour. JC
-	msg->getF32("RegionInfo", "SunHour", sun_hour);
-	// the only reasonable way to decide if we actually have any data is to
-	// check to see if any of these fields have nonzero sizes
-	if (msg->getSize("RegionInfo2", "ProductSKU") > 0 ||
-		msg->getSize("RegionInfo2", "ProductName") > 0)
-	{
-		msg->getString("RegionInfo2", "ProductName", sim_type);
-	}
-
-	// GENERAL PANEL
-	panel = tab->getChild<LLPanel>("General");
-	panel->childSetValue("region_text", LLSD(sim_name));
-	panel->childSetValue("region_type", LLSD(sim_type));
-	panel->childSetValue("version_channel_text", gLastVersionChannel);
-
-	panel->childSetValue("block_terraform_check", (region_flags & REGION_FLAGS_BLOCK_TERRAFORM) ? TRUE : FALSE );
-	panel->childSetValue("block_fly_check", (region_flags & REGION_FLAGS_BLOCK_FLY) ? TRUE : FALSE );
-	panel->childSetValue("allow_damage_check", (region_flags & REGION_FLAGS_ALLOW_DAMAGE) ? TRUE : FALSE );
-	panel->childSetValue("restrict_pushobject", (region_flags & REGION_FLAGS_RESTRICT_PUSHOBJECT) ? TRUE : FALSE );
-	panel->childSetValue("allow_land_resell_check", (region_flags & REGION_FLAGS_BLOCK_LAND_RESELL) ? FALSE : TRUE );
-	panel->childSetValue("allow_parcel_changes_check", (region_flags & REGION_FLAGS_ALLOW_PARCEL_CHANGES) ? TRUE : FALSE );
-	panel->childSetValue("block_parcel_search_check", (region_flags & REGION_FLAGS_BLOCK_PARCEL_SEARCH) ? TRUE : FALSE );
-	panel->childSetValue("agent_limit_spin", LLSD((F32)agent_limit) );
-	panel->childSetValue("object_bonus_spin", LLSD(object_bonus_factor) );
-	panel->childSetValue("access_combo", LLSD(sim_access) );
-
-
- 	// detect teen grid for maturity
-
-	U32 parent_estate_id;
-	msg->getU32("RegionInfo", "ParentEstateID", parent_estate_id);
-	BOOL teen_grid = (parent_estate_id == 5);  // *TODO add field to estate table and test that
-	panel->childSetEnabled("access_combo", gAgent.isGodlike() || (region && region->canManageEstate() && !teen_grid));
-	panel->setCtrlsEnabled(allow_modify);
-	
-	// RegionSettings PANEL
-	panel = tab->getChild<LLPanel>("RegionSettings");
-	panel->setCtrlsEnabled(allow_modify);
-
-	// DEBUG PANEL
-	panel = tab->getChild<LLPanel>("Debug");
-
-	panel->childSetValue("region_text", LLSD(sim_name) );
-	panel->childSetValue("disable_scripts_check", LLSD((BOOL)(region_flags & REGION_FLAGS_SKIP_SCRIPTS)) );
-	panel->childSetValue("disable_collisions_check", LLSD((BOOL)(region_flags & REGION_FLAGS_SKIP_COLLISIONS)) );
-	panel->childSetValue("disable_physics_check", LLSD((BOOL)(region_flags & REGION_FLAGS_SKIP_PHYSICS)) );
-	panel->setCtrlsEnabled(allow_modify);
-
-	// TERRAIN PANEL
-	panel = tab->getChild<LLPanel>("Terrain");
-
-	panel->childSetValue("region_text", LLSD(sim_name));
-	panel->childSetValue("water_height_spin", LLSD(water_height));
-	panel->childSetValue("terrain_raise_spin", LLSD(terrain_raise_limit));
-	panel->childSetValue("terrain_lower_spin", LLSD(terrain_lower_limit));
-	panel->childSetValue("use_estate_sun_check", LLSD(use_estate_sun));
-
-	panel->childSetValue("fixed_sun_check", LLSD((BOOL)(region_flags & REGION_FLAGS_SUN_FIXED)));
-	panel->childSetEnabled("fixed_sun_check", allow_modify && !use_estate_sun);
-	panel->childSetValue("sun_hour_slider", LLSD(sun_hour));
-	panel->childSetEnabled("sun_hour_slider", allow_modify && !use_estate_sun);
-	panel->setCtrlsEnabled(allow_modify);
-
-	getInstance()->refreshFromRegion( gAgent.getRegion() );
-}
-
-// static
-LLPanelEstateInfo* LLFloaterRegionInfo::getPanelEstate()
-{
-	LLFloaterRegionInfo* floater = LLFloaterRegionInfo::getInstance();
-	if (!floater) return NULL;
-	LLTabContainer* tab = floater->getChild<LLTabContainer>("region_panels");
-	LLPanelEstateInfo* panel = (LLPanelEstateInfo*)tab->getChild<LLPanel>("Estate");
-	return panel;
-}
-
-// static
-LLPanelEstateCovenant* LLFloaterRegionInfo::getPanelCovenant()
-{
-	LLFloaterRegionInfo* floater = LLFloaterRegionInfo::getInstance();
-	if (!floater) return NULL;
-	LLTabContainer* tab = floater->getChild<LLTabContainer>("region_panels");
-	LLPanelEstateCovenant* panel = (LLPanelEstateCovenant*)tab->getChild<LLPanel>("Covenant");
-	return panel;
-}
-
-// static
-LLPanelRegionOpenSettingsInfo* LLFloaterRegionInfo::getPanelOpenSettings()
-{
-	LLFloaterRegionInfo* floater = LLFloaterRegionInfo::getInstance();
-	if (floater) 
-	{
-		LLTabContainer* tab = floater->getChild<LLTabContainer>("region_panels");
-		LLPanelRegionOpenSettingsInfo* panel = (LLPanelRegionOpenSettingsInfo*)tab->getChild<LLPanel>("RegionSettings", FALSE, FALSE);
-		if (panel)
-		{
-			return panel;
-		}
-	}
-	return NULL;
-}
-
-void LLFloaterRegionInfo::refreshFromRegion(LLViewerRegion* region)
-{
-	// call refresh from region on all panels
-	std::for_each(
-		mInfoPanels.begin(),
-		mInfoPanels.end(),
-		llbind2nd(
-#if LL_WINDOWS
-			std::mem_fun1(&LLPanelRegionInfo::refreshFromRegion),
-#else
-			std::mem_fun(&LLPanelRegionInfo::refreshFromRegion),
-#endif
-			region));
-}
-
-// public
-void LLFloaterRegionInfo::refresh()
-{
-	for(info_panels_t::iterator iter = mInfoPanels.begin();
-		iter != mInfoPanels.end(); ++iter)
-	{
-		(*iter)->refresh();
-	}
-}
-
-
-///----------------------------------------------------------------------------
-/// Local class implementation
-///----------------------------------------------------------------------------
-
-//
-// LLPanelRegionInfo
-//
-
-// static
-void LLPanelRegionInfo::onBtnSet(void* user_data)
-{
-	LLPanelRegionInfo* panel = (LLPanelRegionInfo*)user_data;
-	if(!panel) return;
-	if (panel->sendUpdate())
-	{
-		panel->disableButton("apply_btn");
-	}
-}
-
-//static 
-void LLPanelRegionInfo::onChangeChildCtrl(LLUICtrl* ctrl, void* user_data)
-{
-	if (ctrl)
-	{
-		LLPanelRegionInfo* panel = (LLPanelRegionInfo*) ctrl->getParent();
-		panel->updateChild(ctrl);
-	}
-}
-
-// static
-// Enables the "set" button if it is not already enabled
-void LLPanelRegionInfo::onChangeAnything(LLUICtrl* ctrl, void* user_data)
-{
-	LLPanelRegionInfo* panel = (LLPanelRegionInfo*)user_data;
-	if(panel)
-	{
-		panel->enableButton("apply_btn");
-		panel->refresh();
-	}
-}
-
-// static
-// Enables set button on change to line editor
-void LLPanelRegionInfo::onChangeText(LLLineEditor* caller, void* user_data)
-{
-	// reuse the previous method
-	onChangeAnything(0, user_data);
-}
-
-
-// virtual
-BOOL LLPanelRegionInfo::postBuild()
-{
-	childSetAction("apply_btn", onBtnSet, this);
-	childDisable("apply_btn");
-	refresh();
-	return TRUE;
-}
-
-// virtual 
-void LLPanelRegionInfo::updateChild(LLUICtrl* child_ctr)
-{
-}
-
-// virtual
-bool LLPanelRegionInfo::refreshFromRegion(LLViewerRegion* region)
-{
-	if (region) mHost = region->getHost();
-	return true;
-}
-
-void LLPanelRegionInfo::sendEstateOwnerMessage(
-	LLMessageSystem* msg,
-	const std::string& request,
-	const LLUUID& invoice,
-	const strings_t& strings)
-{
-	llinfos << "Sending estate request '" << request << "'" << llendl;
-	msg->newMessage("EstateOwnerMessage");
-	msg->nextBlockFast(_PREHASH_AgentData);
-	msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-	msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-	msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used
-	msg->nextBlock("MethodData");
-	msg->addString("Method", request);
-	msg->addUUID("Invoice", invoice);
-	if(strings.empty())
-	{
-		msg->nextBlock("ParamList");
-		msg->addString("Parameter", NULL);
-	}
-	else
-	{
-		strings_t::const_iterator it = strings.begin();
-		strings_t::const_iterator end = strings.end();
-		for(; it != end; ++it)
-		{
-			msg->nextBlock("ParamList");
-			msg->addString("Parameter", *it);
-		}
-	}
-	msg->sendReliable(mHost);
-}
-
-void LLPanelRegionInfo::enableButton(const std::string& btn_name, BOOL enable)
-{
-	childSetEnabled(btn_name, enable);
-}
-
-void LLPanelRegionInfo::disableButton(const std::string& btn_name)
-{
-	childDisable(btn_name);
-}
-
-void LLPanelRegionInfo::initCtrl(const std::string& name)
-{
-	childSetCommitCallback(name, onChangeAnything, this);
-}
-
-void LLPanelRegionInfo::initHelpBtn(const std::string& name, const std::string& xml_alert)
-{
-	childSetAction(name, onClickHelp, new std::string(xml_alert));
-}
-
-// static
-void LLPanelRegionInfo::onClickHelp(void* data)
-{
-	std::string* xml_alert = (std::string*)data;
-	LLNotifications::instance().add(*xml_alert);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// LLPanelRegionGeneralInfo
-//
-bool LLPanelRegionGeneralInfo::refreshFromRegion(LLViewerRegion* region)
-{
-	BOOL allow_modify = gAgent.isGodlike() || (region && region->canManageEstate());
-	setCtrlsEnabled(allow_modify);
-	childDisable("apply_btn");
-	childSetEnabled("access_text", allow_modify);
-	// childSetEnabled("access_combo", allow_modify);
-	// now set in processRegionInfo for teen grid detection
-	childSetEnabled("kick_btn", allow_modify);
-	childSetEnabled("kick_all_btn", allow_modify);
-	childSetEnabled("im_btn", allow_modify);
-	childSetEnabled("manage_telehub_btn", allow_modify);
-
-	// Data gets filled in by processRegionInfo
-
-	return LLPanelRegionInfo::refreshFromRegion(region);
-}
-
-BOOL LLPanelRegionGeneralInfo::postBuild()
-{
-	// Enable the "Apply" button if something is changed. JC
-	initCtrl("block_terraform_check");
-	initCtrl("block_fly_check");
-	initCtrl("allow_damage_check");
-	initCtrl("allow_land_resell_check");
-	initCtrl("allow_parcel_changes_check");
-	initCtrl("agent_limit_spin");
-	initCtrl("object_bonus_spin");
-	initCtrl("access_combo");
-	initCtrl("restrict_pushobject");
-	initCtrl("block_parcel_search_check");
-	initCtrl("minimum_agent_age");
-
-	initHelpBtn("terraform_help",		"HelpRegionBlockTerraform");
-	initHelpBtn("fly_help",				"HelpRegionBlockFly");
-	initHelpBtn("damage_help",			"HelpRegionAllowDamage");
-	initHelpBtn("agent_limit_help",		"HelpRegionAgentLimit");
-	initHelpBtn("object_bonus_help",	"HelpRegionObjectBonus");
-	initHelpBtn("access_help",			"HelpRegionMaturity");
-	initHelpBtn("restrict_pushobject_help",		"HelpRegionRestrictPushObject");
-	initHelpBtn("land_resell_help",	"HelpRegionLandResell");
-	initHelpBtn("parcel_changes_help", "HelpParcelChanges");
-	initHelpBtn("parcel_search_help", "HelpRegionSearch");
-
-	childSetAction("kick_btn", onClickKick, this);
-	childSetAction("kick_all_btn", onClickKickAll, this);
-	childSetAction("im_btn", onClickMessage, this);
-	childSetAction("manage_telehub_btn", onClickManageTelehub, this);
-
-	return LLPanelRegionInfo::postBuild();
-}
-
-// static
-void LLPanelRegionGeneralInfo::onClickKick(void* userdata)
-{
-	llinfos << "LLPanelRegionGeneralInfo::onClickKick" << llendl;
-	LLPanelRegionGeneralInfo* panelp = (LLPanelRegionGeneralInfo*)userdata;
-
-	// this depends on the grandparent view being a floater
-	// in order to set up floater dependency
-	LLFloater* parent_floater = gFloaterView->getParentFloater(panelp);
-	LLFloater* child_floater = LLFloaterAvatarPicker::show(onKickCommit, userdata, FALSE, TRUE);
-	parent_floater->addDependentFloater(child_floater);
-}
-
-// static
-void LLPanelRegionGeneralInfo::onKickCommit(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* userdata)
-{
-	if (names.empty() || ids.empty()) return;
-	if(ids[0].notNull())
-	{
-		LLPanelRegionGeneralInfo* self = (LLPanelRegionGeneralInfo*)userdata;
-		if(!self) return;
-		strings_t strings;
-		// [0] = our agent id
-		// [1] = target agent id
-		std::string buffer;
-		gAgent.getID().toString(buffer);
-		strings.push_back(buffer);
-
-		ids[0].toString(buffer);
-		strings.push_back(strings_t::value_type(buffer));
-
-		LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-		self->sendEstateOwnerMessage(gMessageSystem, "teleporthomeuser", invoice, strings);
-	}
-}
-
-// static
-void LLPanelRegionGeneralInfo::onClickKickAll(void* userdata)
-{
-	llinfos << "LLPanelRegionGeneralInfo::onClickKickAll" << llendl;
-	LLNotifications::instance().add("KickUsersFromRegion", 
-									LLSD(), 
-									LLSD(), 
-									boost::bind(&LLPanelRegionGeneralInfo::onKickAllCommit, (LLPanelRegionGeneralInfo*)userdata, _1, _2));
-}
-
-bool LLPanelRegionGeneralInfo::onKickAllCommit(const LLSD& notification, const LLSD& response)
-{
-	S32 option = LLNotification::getSelectedOption(notification, response);
-	if (option == 0)
-	{
-		strings_t strings;
-		// [0] = our agent id
-		std::string buffer;
-		gAgent.getID().toString(buffer);
-		strings.push_back(buffer);
-
-		LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-		// historical message name
-		sendEstateOwnerMessage(gMessageSystem, "teleporthomeallusers", invoice, strings);
-	}
-	return false;
-}
-
-// static
-void LLPanelRegionGeneralInfo::onClickMessage(void* userdata)
-{
-	llinfos << "LLPanelRegionGeneralInfo::onClickMessage" << llendl;
-	LLNotifications::instance().add("MessageRegion", 
-		LLSD(), 
-		LLSD(), 
-		boost::bind(&LLPanelRegionGeneralInfo::onMessageCommit, (LLPanelRegionGeneralInfo*)userdata, _1, _2));
-}
-
-// static
-bool LLPanelRegionGeneralInfo::onMessageCommit(const LLSD& notification, const LLSD& response)
-{
-	if(LLNotification::getSelectedOption(notification, response) != 0) return false;
-
-	std::string text = response["message"].asString();
-	if (text.empty()) return false;
-
-	llinfos << "Message to everyone: " << text << llendl;
-	strings_t strings;
-	// [0] grid_x, unused here
-	// [1] grid_y, unused here
-	// [2] agent_id of sender
-	// [3] sender name
-	// [4] message
-	strings.push_back("-1");
-	strings.push_back("-1");
-	std::string buffer;
-	gAgent.getID().toString(buffer);
-	strings.push_back(buffer);
-	std::string name;
-	gAgent.buildFullname(name);
-	strings.push_back(strings_t::value_type(name));
-	strings.push_back(strings_t::value_type(text));
-	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-	sendEstateOwnerMessage(gMessageSystem, "simulatormessage", invoice, strings);
-	return false;
-}
-
-// static
-void LLPanelRegionGeneralInfo::onClickManageTelehub(void* data)
-{
-	LLFloaterRegionInfo::getInstance()->close();
-
-	LLFloaterTelehub::show();
-}
-
-// setregioninfo
-// strings[0] = 'Y' - block terraform, 'N' - not
-// strings[1] = 'Y' - block fly, 'N' - not
-// strings[2] = 'Y' - allow damage, 'N' - not
-// strings[3] = 'Y' - allow land sale, 'N' - not
-// strings[4] = agent limit
-// strings[5] = object bonus
-// strings[6] = sim access (0 = unknown, 13 = PG, 21 = Mature, 42 = Adult)
-// strings[7] = restrict pushobject
-// strings[8] = 'Y' - allow parcel subdivide, 'N' - not
-// strings[9] = 'Y' - block parcel search, 'N' - allow
-BOOL LLPanelRegionGeneralInfo::sendUpdate()
-{
-	llinfos << "LLPanelRegionGeneralInfo::sendUpdate()" << llendl;
-
-	// First try using a Cap.  If that fails use the old method.
-	LLSD body;
-	std::string url = gAgent.getRegion()->getCapability("DispatchRegionInfo");
-	if (!url.empty())
-	{
-		body["block_terraform"] = childGetValue("block_terraform_check");
-		body["block_fly"] = childGetValue("block_fly_check");
-		body["allow_damage"] = childGetValue("allow_damage_check");
-		body["allow_land_resell"] = childGetValue("allow_land_resell_check");
-		body["agent_limit"] = childGetValue("agent_limit_spin");
-		body["prim_bonus"] = childGetValue("object_bonus_spin");
-		body["sim_access"] = childGetValue("access_combo");
-		body["restrict_pushobject"] = childGetValue("restrict_pushobject");
-		body["allow_parcel_changes"] = childGetValue("allow_parcel_changes_check");
-		body["block_parcel_search"] = childGetValue("block_parcel_search_check");
-		body["minimum_agent_age"] = childGetValue("minimum_agent_age");
-
-		LLHTTPClient::post(url, body, new LLHTTPClient::Responder());
-	}
-	else
-	{
-		strings_t strings;
-		std::string buffer;
-
-		buffer = llformat("%s", (childGetValue("block_terraform_check").asBoolean() ? "Y" : "N"));
-		strings.push_back(strings_t::value_type(buffer));
-
-		buffer = llformat("%s", (childGetValue("block_fly_check").asBoolean() ? "Y" : "N"));
-		strings.push_back(strings_t::value_type(buffer));
-
-		buffer = llformat("%s", (childGetValue("allow_damage_check").asBoolean() ? "Y" : "N"));
-		strings.push_back(strings_t::value_type(buffer));
-
-		buffer = llformat("%s", (childGetValue("allow_land_resell_check").asBoolean() ? "Y" : "N"));
-		strings.push_back(strings_t::value_type(buffer));
-
-		F32 value = (F32)childGetValue("agent_limit_spin").asReal();
-		buffer = llformat("%f", value);
-		strings.push_back(strings_t::value_type(buffer));
-
-		value = (F32)childGetValue("object_bonus_spin").asReal();
-		buffer = llformat("%f", value);
-		strings.push_back(strings_t::value_type(buffer));
-
-		buffer = llformat("%d", childGetValue("access_combo").asInteger());
-		strings.push_back(strings_t::value_type(buffer));
-
-		buffer = llformat("%s", (childGetValue("restrict_pushobject").asBoolean() ? "Y" : "N"));
-		strings.push_back(strings_t::value_type(buffer));
-
-		buffer = llformat("%s", (childGetValue("allow_parcel_changes_check").asBoolean() ? "Y" : "N"));
-		strings.push_back(strings_t::value_type(buffer));
-
-		LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-		sendEstateOwnerMessage(gMessageSystem, "setregioninfo", invoice, strings);
-	}
-
-	// if we changed access levels, tell user about it
-	LLViewerRegion* region = gAgent.getRegion();
-	if (region && (childGetValue("access_combo").asInteger() != region->getSimAccess()) )
-	{
-		LLNotifications::instance().add("RegionMaturityChange");
-	}	
-
-	return TRUE;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// LLPanelRegionOpenSettingsInfo
-//
-bool LLPanelRegionOpenSettingsInfo::refreshFromRegion(LLViewerRegion* region)
-{
-	// Data gets filled in by hippo manager
-	BOOL allow_modify = gAgent.isGodlike() || (region && region->canManageEstate());
-	
-	childSetValue("draw_distance", gAgent.mDrawDistance);
-	childSetValue("force_draw_distance", gAgent.mLockedDrawDistance);
-	childSetValue("allow_minimap", LLSD(gHippoLimits->mAllowMinimap));
-	childSetValue("allow_physical_prims", (gHippoLimits->mAllowPhysicalPrims == 1 ? TRUE : FALSE));
-	childSetValue("max_drag_distance", LLSD(gHippoLimits->mMaxDragDistance));
-	childSetValue("min_hole_size", LLSD(gHippoLimits->mMinHoleSize));
-	childSetValue("max_hollow_size", LLSD(gHippoLimits->mMaxHollow));
-	childSetValue("max_inventory_items_transfer", LLSD(gHippoLimits->mMaxInventoryItemsTransfer));
-	childSetValue("max_link_count", LLSD(gHippoLimits->mMaxLinkedPrims));
-	childSetValue("max_link_count_phys", LLSD(gHippoLimits->mMaxPhysLinkedPrims));
-	childSetValue("max_phys_prim_scale", LLSD(gHippoLimits->mMaxPrimScale));//Todo:Fix
-	childSetValue("max_prim_scale", LLSD(gHippoLimits->mMaxPrimScale));
-	childSetValue("min_prim_scale", LLSD(gHippoLimits->mMinPrimScale));
-	childSetValue("render_water", LLSD(gHippoLimits->mRenderWater));
-	childSetValue("show_tags", LLSD(gHippoLimits->mRenderName));
-	childSetValue("max_groups", LLSD(gHippoLimits->mMaxAgentGroups));
-	childSetValue("allow_parcel_windlight", LLSD(gHippoLimits->mAllowParcelWindLight));
-	childSetValue("enable_teen_mode", LLSD(gHippoLimits->mEnableTeenMode));
-	childSetValue("enforce_max_build", LLSD(gHippoLimits->mEnforceMaxBuild));
-
-	setCtrlsEnabled(allow_modify);
- 
-	return LLPanelRegionInfo::refreshFromRegion(region);
-}
-
-BOOL LLPanelRegionOpenSettingsInfo::postBuild()
-{
-	// Enable the "Apply" button if something is changed. JC
-	initCtrl("draw_distance");
-	initCtrl("force_draw_distance");
-	initCtrl("max_drag_distance");
-	initCtrl("max_prim_scale");
-	initCtrl("min_prim_scale");
-	initCtrl("max_phys_prim_scale");
-	initCtrl("max_hollow_size");
-	initCtrl("min_hole_size");
-	initCtrl("max_link_count");
-	initCtrl("max_link_count_phys");
-	initCtrl("max_inventory_items_transfer");
-	initCtrl("max_groups");
-	initCtrl("render_water");
-	initCtrl("allow_minimap");
-	initCtrl("allow_physical_prims");
-	initCtrl("enable_teen_mode");
-	initCtrl("show_tags");
-	initCtrl("allow_parcel_windlight");
-
-	initHelpBtn("force_draw_distance_help",		"HelpForceDrawDistance");
-	initHelpBtn("max_inventory_items_transfer_help",				"HelpMaxInventoryItemsTransfer");
-	initHelpBtn("max_groups_help",			"HelpMaxGroups");
-	initHelpBtn("render_water_help",		"HelpRenderWater");
-	initHelpBtn("allow_minimap_help",	"HelpAllowMinimap");
-	initHelpBtn("allow_physical_prims_help",			"HelpAllowPhysicalPrims");
-	initHelpBtn("enable_teen_mode_help",		"HelpEnableTeenMode");
-	initHelpBtn("show_tags_help",	"HelpShowTags");
-	initHelpBtn("allow_parcel_windlight_help", "HelpAllowParcelWindLight");
-
-	childSetAction("apply_ors_btn", onClickOrs, this);
-
-	refreshFromRegion(gAgent.getRegion());
-
-	return LLPanelRegionInfo::postBuild();
-}
-
-// setregioninfo
-// strings[0] = 'Y' - block terraform, 'N' - not
-// strings[1] = 'Y' - block fly, 'N' - not
-// strings[2] = 'Y' - allow damage, 'N' - not
-// strings[3] = 'Y' - allow land sale, 'N' - not
-// strings[4] = agent limit
-// strings[5] = object bonus
-// strings[6] = sim access (0 = unknown, 13 = PG, 21 = Mature, 42 = Adult)
-// strings[7] = restrict pushobject
-// strings[8] = 'Y' - allow parcel subdivide, 'N' - not
-// strings[9] = 'Y' - block parcel search, 'N' - allow
-void LLPanelRegionOpenSettingsInfo::onClickOrs(void* userdata)
-{
-	LLPanelRegionOpenSettingsInfo* self;
-	self = (LLPanelRegionOpenSettingsInfo*)userdata;
-	
-	llinfos << "LLPanelRegionOpenSettingsInfo::onClickOrs()" << llendl;
-
-	LLSD body;
-	std::string url = gAgent.getRegion()->getCapability("DispatchOpenRegionSettings");
-	if (!url.empty())
-	{
-		body["draw_distance"] = self->childGetValue("draw_distance");
-		body["force_draw_distance"] = self->childGetValue("force_draw_distance");
-		body["allow_minimap"] = self->childGetValue("allow_minimap");
-		body["allow_physical_prims"] = self->childGetValue("allow_physical_prims");
-		body["max_drag_distance"] = self->childGetValue("max_drag_distance");
-		body["min_hole_size"] = self->childGetValue("min_hole_size");
-		body["max_hollow_size"] = self->childGetValue("max_hollow_size");
-		body["max_inventory_items_transfer"] = self->childGetValue("max_inventory_items_transfer");
-		body["max_link_count"] = self->childGetValue("max_link_count");
-		body["max_link_count_phys"] = self->childGetValue("max_link_count_phys");
-		body["max_phys_prim_scale"] = self->childGetValue("max_phys_prim_scale");
-		body["max_prim_scale"] = self->childGetValue("max_prim_scale");
-		body["min_prim_scale"] = self->childGetValue("min_prim_scale");
-		body["render_water"] = self->childGetValue("render_water");
-		body["show_tags"] = self->childGetValue("show_tags");
-		body["max_groups"] = self->childGetValue("max_groups");
-		body["allow_parcel_windlight"] = self->childGetValue("allow_parcel_windlight");
-		body["enable_teen_mode"] = self->childGetValue("enable_teen_mode");
-		body["enforce_max_build"] = self->childGetValue("enforce_max_build");
-
-		LLHTTPClient::post(url, body, new LLHTTPClient::Responder());
-	}
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// LLPanelRegionDebugInfo
-/////////////////////////////////////////////////////////////////////////////
-BOOL LLPanelRegionDebugInfo::postBuild()
-{
-	LLPanelRegionInfo::postBuild();
-	initCtrl("disable_scripts_check");
-	initCtrl("disable_collisions_check");
-	initCtrl("disable_physics_check");
-
-	initHelpBtn("disable_scripts_help",		"HelpRegionDisableScripts");
-	initHelpBtn("disable_collisions_help",	"HelpRegionDisableCollisions");
-	initHelpBtn("disable_physics_help",		"HelpRegionDisablePhysics");
-	initHelpBtn("top_colliders_help",		"HelpRegionTopColliders");
-	initHelpBtn("top_scripts_help",			"HelpRegionTopScripts");
-	initHelpBtn("restart_help",				"HelpRegionRestart");
-	initHelpBtn("minimum_agent_age_help",	"HelpRegionMinimumAge");
-	
-
-	childSetAction("choose_avatar_btn", onClickChooseAvatar, this);
-	childSetAction("return_btn", onClickReturn, this);
-	childSetAction("top_colliders_btn", onClickTopColliders, this);
-	childSetAction("top_scripts_btn", onClickTopScripts, this);
-	childSetAction("restart_btn", onClickRestart, this);
-	childSetAction("cancel_restart_btn", onClickCancelRestart, this);
-
-	return TRUE;
-}
-
-// virtual
-bool LLPanelRegionDebugInfo::refreshFromRegion(LLViewerRegion* region)
-{
-	BOOL allow_modify = gAgent.isGodlike() || (region && region->canManageEstate());
-	setCtrlsEnabled(allow_modify);
-	childDisable("apply_btn");
-	childDisable("target_avatar_name");
-	
-	childSetEnabled("choose_avatar_btn", allow_modify);
-	childSetEnabled("return_scripts", allow_modify && !mTargetAvatar.isNull());
-	childSetEnabled("return_other_land", allow_modify && !mTargetAvatar.isNull());
-	childSetEnabled("return_estate_wide", allow_modify && !mTargetAvatar.isNull());
-	childSetEnabled("return_btn", allow_modify && !mTargetAvatar.isNull());
-	childSetEnabled("top_colliders_btn", allow_modify);
-	childSetEnabled("top_scripts_btn", allow_modify);
-	childSetEnabled("restart_btn", allow_modify);
-	childSetEnabled("cancel_restart_btn", allow_modify);
-
-	return LLPanelRegionInfo::refreshFromRegion(region);
-}
-
-// virtual
-BOOL LLPanelRegionDebugInfo::sendUpdate()
-{
-	llinfos << "LLPanelRegionDebugInfo::sendUpdate" << llendl;
-	strings_t strings;
-	std::string buffer;
-
-	buffer = llformat("%s", (childGetValue("disable_scripts_check").asBoolean() ? "Y" : "N"));
-	strings.push_back(buffer);
-
-	buffer = llformat("%s", (childGetValue("disable_collisions_check").asBoolean() ? "Y" : "N"));
-	strings.push_back(buffer);
-
-	buffer = llformat("%s", (childGetValue("disable_physics_check").asBoolean() ? "Y" : "N"));
-	strings.push_back(buffer);
-
-	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-	sendEstateOwnerMessage(gMessageSystem, "setregiondebug", invoice, strings);
-	return TRUE;
-}
-
-void LLPanelRegionDebugInfo::onClickChooseAvatar(void* data)
-{
-	LLFloaterAvatarPicker::show(callbackAvatarID, data, FALSE, TRUE);
-}
-
-// static
-void LLPanelRegionDebugInfo::callbackAvatarID(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* data)
-{
-	LLPanelRegionDebugInfo* self = (LLPanelRegionDebugInfo*) data;
-	if (ids.empty() || names.empty()) return;
-	self->mTargetAvatar = ids[0];
-	self->childSetValue("target_avatar_name", LLSD(names[0]));
-	self->refreshFromRegion( gAgent.getRegion() );
-}
-
-// static
-void LLPanelRegionDebugInfo::onClickReturn(void* data)
-{
-	LLPanelRegionDebugInfo* panelp = (LLPanelRegionDebugInfo*) data;
-	if (panelp->mTargetAvatar.isNull()) return;
-
-	LLSD args;
-	args["USER_NAME"] = panelp->childGetValue("target_avatar_name").asString();
-	LLSD payload;
-	payload["avatar_id"] = panelp->mTargetAvatar;
-	
-	U32 flags = SWD_ALWAYS_RETURN_OBJECTS;
-
-	if (panelp->childGetValue("return_scripts").asBoolean())
-	{
-		flags |= SWD_SCRIPTED_ONLY;
-	}
-	
-	if (panelp->childGetValue("return_other_land").asBoolean())
-	{
-		flags |= SWD_OTHERS_LAND_ONLY;
-	}
-	payload["flags"] = int(flags);
-	payload["return_estate_wide"] = panelp->childGetValue("return_estate_wide").asBoolean();
-	LLNotifications::instance().add("EstateObjectReturn", args, payload, 
-									boost::bind(&LLPanelRegionDebugInfo::callbackReturn, panelp, _1, _2));
-}
-
-bool LLPanelRegionDebugInfo::callbackReturn(const LLSD& notification, const LLSD& response)
-{
-	S32 option = LLNotification::getSelectedOption(notification, response);
-	if (option != 0) return false;
-
-	LLUUID target_avatar = notification["payload"]["avatar_id"].asUUID();
-	if (!target_avatar.isNull())
-	{
-		U32 flags = notification["payload"]["flags"].asInteger();
-		bool return_estate_wide = notification["payload"]["return_estate_wide"];
-		if (return_estate_wide)
-		{
-			// send as estate message - routed by spaceserver to all regions in estate
-			strings_t strings;
-			strings.push_back(llformat("%d", flags));
-			strings.push_back(target_avatar.asString());
-
-			LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-		
-			sendEstateOwnerMessage(gMessageSystem, "estateobjectreturn", invoice, strings);
-		}
-		else
-		{
-			// send to this simulator only
-  			send_sim_wide_deletes(target_avatar, flags);
-  		}
-	}
-	return false;
-}
-
-
-// static
-void LLPanelRegionDebugInfo::onClickTopColliders(void* data)
-{
-	LLPanelRegionDebugInfo* self = (LLPanelRegionDebugInfo*)data;
-	strings_t strings;
-	strings.push_back("1");	// one physics step
-	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-	LLFloaterTopObjects::show();
-	LLFloaterTopObjects::clearList();
-	self->sendEstateOwnerMessage(gMessageSystem, "colliders", invoice, strings);
-}
-
-// static
-void LLPanelRegionDebugInfo::onClickTopScripts(void* data)
-{
-	LLPanelRegionDebugInfo* self = (LLPanelRegionDebugInfo*)data;
-	strings_t strings;
-	strings.push_back("6");	// top 5 scripts
-	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-	LLFloaterTopObjects::show();
-	LLFloaterTopObjects::clearList();
-	self->sendEstateOwnerMessage(gMessageSystem, "scripts", invoice, strings);
-}
-
-// static
-void LLPanelRegionDebugInfo::onClickRestart(void* data)
-{
-	LLNotifications::instance().add("ConfirmRestart", LLSD(), LLSD(), 
-		boost::bind(&LLPanelRegionDebugInfo::callbackRestart, (LLPanelRegionDebugInfo*)data, _1, _2));
-}
-
-bool LLPanelRegionDebugInfo::callbackRestart(const LLSD& notification, const LLSD& response)
-{
-	S32 option = LLNotification::getSelectedOption(notification, response);
-	if (option != 0) return false;
-
-	strings_t strings;
-	strings.push_back("120");
-	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-	sendEstateOwnerMessage(gMessageSystem, "restart", invoice, strings);
-	return false;
-}
-
-// static
-void LLPanelRegionDebugInfo::onClickCancelRestart(void* data)
-{
-	LLPanelRegionDebugInfo* self = (LLPanelRegionDebugInfo*)data;
-	strings_t strings;
-	strings.push_back("-1");
-	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-	self->sendEstateOwnerMessage(gMessageSystem, "restart", invoice, strings);
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// LLPanelRegionTextureInfo
-//
-LLPanelRegionTextureInfo::LLPanelRegionTextureInfo() : LLPanelRegionInfo()
-{
-	// nothing.
-}
-
-bool LLPanelRegionTextureInfo::refreshFromRegion(LLViewerRegion* region)
-{
-	BOOL allow_modify = gAgent.isGodlike() || (region && region->canManageEstate());
-	setCtrlsEnabled(allow_modify);
-	childDisable("apply_btn");
-
-	if (region)
-	{
-		childSetValue("region_text", LLSD(region->getName()));
-	}
-	else
-	{
-		childSetValue("region_text", LLSD(""));
-	}
-
-	if (!region) return LLPanelRegionInfo::refreshFromRegion(region);
-
-	LLVLComposition* compp = region->getComposition();
-	LLTextureCtrl* texture_ctrl;
-	std::string buffer;
-	for(S32 i = 0; i < TERRAIN_TEXTURE_COUNT; ++i)
-	{
-		buffer = llformat("texture_detail_%d", i);
-		texture_ctrl = getChild<LLTextureCtrl>(buffer);
-		if(texture_ctrl)
-		{
-			lldebugs << "Detail Texture " << i << ": "
-					 << compp->getDetailTextureID(i) << llendl;
-			LLUUID tmp_id(compp->getDetailTextureID(i));
-			texture_ctrl->setImageAssetID(tmp_id);
-		}
-	}
-
-	for(S32 i = 0; i < CORNER_COUNT; ++i)
-    {
-		buffer = llformat("height_start_spin_%d", i);
-		childSetValue(buffer, LLSD(compp->getStartHeight(i)));
-		buffer = llformat("height_range_spin_%d", i);
-		childSetValue(buffer, LLSD(compp->getHeightRange(i)));
-	}
-
-	// Call the parent for common book-keeping
-	return LLPanelRegionInfo::refreshFromRegion(region);
-}
-
-
-BOOL LLPanelRegionTextureInfo::postBuild()
-{
-	LLPanelRegionInfo::postBuild();
-	std::string buffer;
-	for(S32 i = 0; i < TERRAIN_TEXTURE_COUNT; ++i)
-	{
-		buffer = llformat("texture_detail_%d", i);
-		initCtrl(buffer);
-	}
-
-	for(S32 i = 0; i < CORNER_COUNT; ++i)
-	{
-		buffer = llformat("height_start_spin_%d", i);
-		initCtrl(buffer);
-		buffer = llformat("height_range_spin_%d", i);
-		initCtrl(buffer);
-	}
-
-//	LLButton* btn = new LLButton("dump", LLRect(0, 20, 100, 0), "", onClickDump, this);
-//	btn->setFollows(FOLLOWS_TOP|FOLLOWS_LEFT);
-//	addChild(btn);
-
-	return LLPanelRegionInfo::postBuild();
-}
-
-BOOL LLPanelRegionTextureInfo::sendUpdate()
-{
-	llinfos << "LLPanelRegionTextureInfo::sendUpdate()" << llendl;
-
-	// Make sure user hasn't chosen wacky textures.
-	//if (!validateTextureSizes())
-	//{
-	//	return FALSE;
-	//}
-
-	LLTextureCtrl* texture_ctrl;
-	std::string buffer;
-	std::string id_str;
-	LLMessageSystem* msg = gMessageSystem;
-	strings_t strings;
-
-	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-	
-	for(S32 i = 0; i < TERRAIN_TEXTURE_COUNT; ++i)
-	{
-		buffer = llformat("texture_detail_%d", i);
-		texture_ctrl = getChild<LLTextureCtrl>(buffer);
-		if(texture_ctrl)
-		{
-			LLUUID tmp_id(texture_ctrl->getImageAssetID());
-			tmp_id.toString(id_str);
-			buffer = llformat("%d %s", i, id_str.c_str());
-			strings.push_back(buffer);
-		}
-	}
-	sendEstateOwnerMessage(msg, "texturedetail", invoice, strings);
-	strings.clear();
-	for(S32 i = 0; i < CORNER_COUNT; ++i)
-	{
-		buffer = llformat("height_start_spin_%d", i);
-		std::string buffer2 = llformat("height_range_spin_%d", i);
-		std::string buffer3 = llformat("%d %f %f", i, (F32)childGetValue(buffer).asReal(), (F32)childGetValue(buffer2).asReal());
-		strings.push_back(buffer3);
-	}
-	sendEstateOwnerMessage(msg, "textureheights", invoice, strings);
-	strings.clear();
-	sendEstateOwnerMessage(msg, "texturecommit", invoice, strings);
-	return TRUE;
-}
-
-BOOL LLPanelRegionTextureInfo::validateTextureSizes()
-{
-	for(S32 i = 0; i < TERRAIN_TEXTURE_COUNT; ++i)
-	{
-		std::string buffer;
-		buffer = llformat("texture_detail_%d", i);
-		LLTextureCtrl* texture_ctrl = getChild<LLTextureCtrl>(buffer);
-		if (!texture_ctrl) continue;
-
-		LLUUID image_asset_id = texture_ctrl->getImageAssetID();
-		LLViewerImage* img = gImageList.getImage(image_asset_id);
-		S32 components = img->getComponents();
-		// Must ask for highest resolution version's width. JC
-		S32 width = img->getWidth(0);
-		S32 height = img->getHeight(0);
-
-		//llinfos << "texture detail " << i << " is " << width << "x" << height << "x" << components << llendl;
-
-		if (components != 3)
-		{
-			LLSD args;
-			args["TEXTURE_NUM"] = i+1;
-			args["TEXTURE_BIT_DEPTH"] = llformat("%d",components * 8);
-			LLNotifications::instance().add("InvalidTerrainBitDepth", args);
-			return FALSE;
-		}
-
-		if (width > 512 || height > 512)
-		{
-
-			LLSD args;
-			args["TEXTURE_NUM"] = i+1;
-			args["TEXTURE_SIZE_X"] = width;
-			args["TEXTURE_SIZE_Y"] = height;
-			LLNotifications::instance().add("InvalidTerrainSize", args);
-			return FALSE;
-			
-		}
-	}
-
-	return TRUE;
-}
-
-
-// static
-void LLPanelRegionTextureInfo::onClickDump(void* data)
-{
-	llinfos << "LLPanelRegionTextureInfo::onClickDump()" << llendl;
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// LLPanelRegionTerrainInfo
-/////////////////////////////////////////////////////////////////////////////
-BOOL LLPanelRegionTerrainInfo::postBuild()
-{
-	LLPanelRegionInfo::postBuild();
-
-	initHelpBtn("water_height_help",	"HelpRegionWaterHeight");
-	initHelpBtn("terrain_raise_help",	"HelpRegionTerrainRaise");
-	initHelpBtn("terrain_lower_help",	"HelpRegionTerrainLower");
-	initHelpBtn("upload_raw_help",		"HelpRegionUploadRaw");
-	initHelpBtn("download_raw_help",	"HelpRegionDownloadRaw");
-	initHelpBtn("use_estate_sun_help",	"HelpRegionUseEstateSun");
-	initHelpBtn("fixed_sun_help",		"HelpRegionFixedSun");
-	initHelpBtn("bake_terrain_help",	"HelpRegionBakeTerrain");
-
-	initCtrl("water_height_spin");
-	initCtrl("terrain_raise_spin");
-	initCtrl("terrain_lower_spin");
-
-	initCtrl("fixed_sun_check");
-	childSetCommitCallback("fixed_sun_check", onChangeFixedSun, this);
-	childSetCommitCallback("use_estate_sun_check", onChangeUseEstateTime, this);
-	childSetCommitCallback("sun_hour_slider", onChangeSunHour, this);
-
-	childSetAction("download_raw_btn", onClickDownloadRaw, this);
-	childSetAction("upload_raw_btn", onClickUploadRaw, this);
-	childSetAction("bake_terrain_btn", onClickBakeTerrain, this);
-
-	return TRUE;
-}
-
-// virtual
-bool LLPanelRegionTerrainInfo::refreshFromRegion(LLViewerRegion* region)
-{
-	llinfos << "LLPanelRegionTerrainInfo::refreshFromRegion" << llendl;
-
-	BOOL owner_or_god = gAgent.isGodlike() 
-						|| (region && (region->getOwner() == gAgent.getID()));
-	BOOL owner_or_god_or_manager = owner_or_god
-						|| (region && region->isEstateManager());
-	setCtrlsEnabled(owner_or_god_or_manager);
-	childDisable("apply_btn");
-
-	childSetEnabled("download_raw_btn", owner_or_god);
-	childSetEnabled("upload_raw_btn", owner_or_god);
-	childSetEnabled("bake_terrain_btn", owner_or_god);
-
-	return LLPanelRegionInfo::refreshFromRegion(region);
-}
-
-// virtual
-BOOL LLPanelRegionTerrainInfo::sendUpdate()
-{
-	llinfos << "LLPanelRegionTerrainInfo::sendUpdate" << llendl;
-	std::string buffer;
-	strings_t strings;
-	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-
-	buffer = llformat("%f", (F32)childGetValue("water_height_spin").asReal());
-	strings.push_back(buffer);
-	buffer = llformat("%f", (F32)childGetValue("terrain_raise_spin").asReal());
-	strings.push_back(buffer);
-	buffer = llformat("%f", (F32)childGetValue("terrain_lower_spin").asReal());
-	strings.push_back(buffer);
-	buffer = llformat("%s", (childGetValue("use_estate_sun_check").asBoolean() ? "Y" : "N"));
-	strings.push_back(buffer);
-	buffer = llformat("%s", (childGetValue("fixed_sun_check").asBoolean() ? "Y" : "N"));
-	strings.push_back(buffer);
-	buffer = llformat("%f", (F32)childGetValue("sun_hour_slider").asReal() );
-	strings.push_back(buffer);
-
-	// Grab estate information in case the user decided to set the
-	// region back to estate time. JC
-	LLFloaterRegionInfo* floater = LLFloaterRegionInfo::getInstance();
-	if (!floater) return true;
-
-	LLTabContainer* tab = floater->getChild<LLTabContainer>("region_panels");
-	if (!tab) return true;
-
-	LLPanelEstateInfo* panel = (LLPanelEstateInfo*)tab->getChild<LLPanel>("Estate");
-	if (!panel) return true;
-
-	BOOL estate_global_time = panel->getGlobalTime();
-	BOOL estate_fixed_sun = panel->getFixedSun();
-	F32 estate_sun_hour;
-	if (estate_global_time)
-	{
-		estate_sun_hour = 0.f;
-	}
-	else
-	{
-		estate_sun_hour = panel->getSunHour();
-	}
-
-	buffer = llformat("%s", (estate_global_time ? "Y" : "N") );
-	strings.push_back(buffer);
-	buffer = llformat("%s", (estate_fixed_sun ? "Y" : "N") );
-	strings.push_back(buffer);
-	buffer = llformat("%f", estate_sun_hour);
-	strings.push_back(buffer);
-
-	sendEstateOwnerMessage(gMessageSystem, "setregionterrain", invoice, strings);
-	return TRUE;
-}
-
-// static 
-void LLPanelRegionTerrainInfo::onChangeUseEstateTime(LLUICtrl* ctrl, void* user_data)
-{
-	LLPanelRegionTerrainInfo* panel = (LLPanelRegionTerrainInfo*) user_data;
-	if (!panel) return;
-	BOOL use_estate_sun = panel->childGetValue("use_estate_sun_check").asBoolean();
-	panel->childSetEnabled("fixed_sun_check", !use_estate_sun);
-	panel->childSetEnabled("sun_hour_slider", !use_estate_sun);
-	if (use_estate_sun)
-	{
-		panel->childSetValue("fixed_sun_check", LLSD(FALSE));
-		panel->childSetValue("sun_hour_slider", LLSD(0.f));
-	}
-	panel->childEnable("apply_btn");
-}
-
-// static 
-void LLPanelRegionTerrainInfo::onChangeFixedSun(LLUICtrl* ctrl, void* user_data)
-{
-	LLPanelRegionTerrainInfo* panel = (LLPanelRegionTerrainInfo*) user_data;
-	if (!panel) return;
-	// Just enable the apply button.  We let the sun-hour slider be enabled
-	// for both fixed-sun and non-fixed-sun. JC
-	panel->childEnable("apply_btn");
-}
-
-// static 
-void LLPanelRegionTerrainInfo::onChangeSunHour(LLUICtrl* ctrl, void*)
-{
-	// can't use userdata to get panel, slider uses it internally
-	LLPanelRegionTerrainInfo* panel = (LLPanelRegionTerrainInfo*) ctrl->getParent();
-	if (!panel) return;
-	panel->childEnable("apply_btn");
-}
-
-// static
-void LLPanelRegionTerrainInfo::onClickDownloadRaw(void* data)
-{
-	LLFilePicker& picker = LLFilePicker::instance();
-	if (!picker.getSaveFile(LLFilePicker::FFSAVE_RAW, "terrain.raw"))
-	{
-		llwarns << "No file" << llendl;
-		return;
-	}
-	std::string filepath = picker.getFirstFile();
-	gXferManager->expectFileForRequest(filepath);
-
-	LLPanelRegionTerrainInfo* self = (LLPanelRegionTerrainInfo*)data;
-	strings_t strings;
-	strings.push_back("download filename");
-	strings.push_back(filepath);
-	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-	self->sendEstateOwnerMessage(gMessageSystem, "terrain", invoice, strings);
-}
-
-// static
-void LLPanelRegionTerrainInfo::onClickUploadRaw(void* data)
-{
-	LLFilePicker& picker = LLFilePicker::instance();
-	if (!picker.getOpenFile(LLFilePicker::FFLOAD_RAW))
-	{
-		llwarns << "No file" << llendl;
-		return;
-	}
-	std::string filepath = picker.getFirstFile();
-	gXferManager->expectFileForTransfer(filepath);
-
-	LLPanelRegionTerrainInfo* self = (LLPanelRegionTerrainInfo*)data;
-	strings_t strings;
-	strings.push_back("upload filename");
-	strings.push_back(filepath);
-	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-	self->sendEstateOwnerMessage(gMessageSystem, "terrain", invoice, strings);
-
-	LLNotifications::instance().add("RawUploadStarted");
-}
-
-// static
-void LLPanelRegionTerrainInfo::onClickBakeTerrain(void* data)
-{
-	LLNotifications::instance().add(
-		LLNotification::Params("ConfirmBakeTerrain")
-		.functor(boost::bind(&LLPanelRegionTerrainInfo::callbackBakeTerrain, (LLPanelRegionTerrainInfo*)data, _1, _2)));
-}
-
-bool LLPanelRegionTerrainInfo::callbackBakeTerrain(const LLSD& notification, const LLSD& response)
-{
-	S32 option = LLNotification::getSelectedOption(notification, response);
-	if (option != 0) return false;
-
-	strings_t strings;
-	strings.push_back("bake");
-	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-	sendEstateOwnerMessage(gMessageSystem, "terrain", invoice, strings);
-	return false;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// LLPanelEstateInfo
-//
-
-LLPanelEstateInfo::LLPanelEstateInfo() 
-:	LLPanelRegionInfo(),
-	mEstateID(0)	// invalid
-{
-}
-
-// static
-void LLPanelEstateInfo::initDispatch(LLDispatcher& dispatch)
-{
-	std::string name;
-
-//	name.assign("setowner");
-//	static LLDispatchSetEstateOwner set_owner;
-//	dispatch.addHandler(name, &set_owner);
-
-	name.assign("estateupdateinfo");
-	static LLDispatchEstateUpdateInfo estate_update_info;
-	dispatch.addHandler(name, &estate_update_info);
-
-	name.assign("setaccess");
-	static LLDispatchSetEstateAccess set_access;
-	dispatch.addHandler(name, &set_access);
-
-	estate_dispatch_initialized = true;
-}
-
-// static
-// Disables the sun-hour slider and the use fixed time check if the use global time is check
-void LLPanelEstateInfo::onChangeUseGlobalTime(LLUICtrl* ctrl, void* user_data)
-{
-	LLPanelEstateInfo* panel = (LLPanelEstateInfo*) user_data;
-	if (panel)
-	{
-		bool enabled = !panel->childGetValue("use_global_time_check").asBoolean();
-		panel->childSetEnabled("sun_hour_slider", enabled);
-		panel->childSetEnabled("fixed_sun_check", enabled);
-		panel->childSetValue("fixed_sun_check", LLSD(FALSE));
-		panel->enableButton("apply_btn");
-	}
-}
-
-// Enables the sun-hour slider if the fixed-sun checkbox is set
-void LLPanelEstateInfo::onChangeFixedSun(LLUICtrl* ctrl, void* user_data)
-{
-	LLPanelEstateInfo* panel = (LLPanelEstateInfo*) user_data;
-	if (panel)
-	{
-		bool enabled = !panel->childGetValue("fixed_sun_check").asBoolean();
-		panel->childSetEnabled("use_global_time_check", enabled);
-		panel->childSetValue("use_global_time_check", LLSD(FALSE));
-		panel->enableButton("apply_btn");
-	}
-}
-
-
-
-
-//---------------------------------------------------------------------------
-// Add/Remove estate access button callbacks
-//---------------------------------------------------------------------------
-void LLPanelEstateInfo::onClickEditSky(void* user_data)
-{
-	LLFloaterWindLight::show();
-}
-
-void LLPanelEstateInfo::onClickEditDayCycle(void* user_data)
-{
-	LLFloaterDayCycle::show();
-}
-
-// static
-void LLPanelEstateInfo::onClickAddAllowedAgent(void* user_data)
-{
-	LLPanelEstateInfo* self = (LLPanelEstateInfo*)user_data;
-	LLCtrlListInterface *list = self->childGetListInterface("allowed_avatar_name_list");
-	if (!list) return;
-	if (list->getItemCount() >= ESTATE_MAX_ACCESS_IDS)
-	{
-		//args
-
-		LLSD args;
-		args["MAX_AGENTS"] = llformat("%d",ESTATE_MAX_ACCESS_IDS);
-		LLNotifications::instance().add("MaxAllowedAgentOnRegion", args);
-		return;
-	}
-	accessAddCore(ESTATE_ACCESS_ALLOWED_AGENT_ADD, "EstateAllowedAgentAdd");
-}
-
-// static
-void LLPanelEstateInfo::onClickRemoveAllowedAgent(void* user_data)
-{
-	accessRemoveCore(ESTATE_ACCESS_ALLOWED_AGENT_REMOVE, "EstateAllowedAgentRemove", "allowed_avatar_name_list");
-}
-
-// static
-void LLPanelEstateInfo::onClickAddAllowedGroup(void* user_data)
-{
-	LLPanelEstateInfo* self = (LLPanelEstateInfo*)user_data;
-	LLCtrlListInterface *list = self->childGetListInterface("allowed_group_name_list");
-	if (!list) return;
-	if (list->getItemCount() >= ESTATE_MAX_ACCESS_IDS)
-	{
-		LLSD args;
-		args["MAX_GROUPS"] = llformat("%d",ESTATE_MAX_ACCESS_IDS);
-		LLNotifications::instance().add("MaxAllowedGroupsOnRegion", args);
-		return;
-	}
-
-	LLNotification::Params params("ChangeLindenAccess");
-	params.functor(boost::bind(&LLPanelEstateInfo::addAllowedGroup, self, _1, _2));
-	if (isLindenEstate())
-	{
-		LLNotifications::instance().add(params);
-	}
-	else
-	{
-		LLNotifications::instance().forceResponse(params, 0);
-	}
-}
-
-bool LLPanelEstateInfo::addAllowedGroup(const LLSD& notification, const LLSD& response)
-{
-	S32 option = LLNotification::getSelectedOption(notification, response);
-	if (option != 0) return false;
-
-	LLFloater* parent_floater = gFloaterView->getParentFloater(this);
-
-	LLFloaterGroupPicker* widget;
-	widget = LLFloaterGroupPicker::showInstance(LLSD(gAgent.getID()));
-	if (widget)
-	{
-		widget->setSelectCallback(addAllowedGroup2, NULL);
-		if (parent_floater)
-		{
-			LLRect new_rect = gFloaterView->findNeighboringPosition(parent_floater, widget);
-			widget->setOrigin(new_rect.mLeft, new_rect.mBottom);
-			parent_floater->addDependentFloater(widget);
-		}
-	}
-
-	return false;
-}
-
-// static
-void LLPanelEstateInfo::onClickRemoveAllowedGroup(void* user_data)
-{
-	accessRemoveCore(ESTATE_ACCESS_ALLOWED_GROUP_REMOVE, "EstateAllowedGroupRemove", "allowed_group_name_list");
-}
-
-// static
-void LLPanelEstateInfo::onClickAddBannedAgent(void* user_data)
-{
-	LLPanelEstateInfo* self = (LLPanelEstateInfo*)user_data;
-	LLCtrlListInterface *list = self->childGetListInterface("banned_avatar_name_list");
-	if (!list) return;
-	if (list->getItemCount() >= ESTATE_MAX_ACCESS_IDS)
-	{
-		LLSD args;
-		args["MAX_BANNED"] = llformat("%d",ESTATE_MAX_ACCESS_IDS);
-		LLNotifications::instance().add("MaxBannedAgentsOnRegion", args);
-		return;
-	}
-	accessAddCore(ESTATE_ACCESS_BANNED_AGENT_ADD, "EstateBannedAgentAdd");
-}
-
-// static
-void LLPanelEstateInfo::onClickRemoveBannedAgent(void* user_data)
-{
-	accessRemoveCore(ESTATE_ACCESS_BANNED_AGENT_REMOVE, "EstateBannedAgentRemove", "banned_avatar_name_list");
-}
-
-// static
-void LLPanelEstateInfo::onClickAddEstateManager(void* user_data)
-{
-	LLPanelEstateInfo* self = (LLPanelEstateInfo*)user_data;
-	LLCtrlListInterface *list = self->childGetListInterface("estate_manager_name_list");
-	if (!list) return;
-	if (list->getItemCount() >= ESTATE_MAX_MANAGERS)
-	{	// Tell user they can't add more managers
-		LLSD args;
-		args["MAX_MANAGER"] = llformat("%d",ESTATE_MAX_MANAGERS);
-		LLNotifications::instance().add("MaxManagersOnRegion", args);
-	}
-	else
-	{	// Go pick managers to add
-		accessAddCore(ESTATE_ACCESS_MANAGER_ADD, "EstateManagerAdd");
-	}
-}
-
-// static
-void LLPanelEstateInfo::onClickRemoveEstateManager(void* user_data)
-{
-	accessRemoveCore(ESTATE_ACCESS_MANAGER_REMOVE, "EstateManagerRemove", "estate_manager_name_list");
-}
-
-//---------------------------------------------------------------------------
-// Kick from estate methods
-//---------------------------------------------------------------------------
-struct LLKickFromEstateInfo
-{
-	LLPanelEstateInfo *mEstatePanelp;
-	LLUUID      mAgentID;
-};
-
-void LLPanelEstateInfo::onClickKickUser(void *user_data)
-{
-	LLPanelEstateInfo* panelp = (LLPanelEstateInfo*)user_data;
-
-	// this depends on the grandparent view being a floater
-	// in order to set up floater dependency
-	LLFloater* parent_floater = gFloaterView->getParentFloater(panelp);
-	LLFloater* child_floater = LLFloaterAvatarPicker::show(LLPanelEstateInfo::onKickUserCommit, user_data, FALSE, TRUE);
-	parent_floater->addDependentFloater(child_floater);
-}
-
-void LLPanelEstateInfo::onKickUserCommit(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* userdata)
-{
-	if (names.empty() || ids.empty()) return;
-	
-	//check to make sure there is one valid user and id
-	if( (ids[0].isNull()) ||
-		(names[0].length() == 0) )
-	{
-		return;
-	}
-
-	LLPanelEstateInfo* self = (LLPanelEstateInfo*)userdata;
-	if(!self) return;
-
-	//keep track of what user they want to kick and other misc info
-	LLKickFromEstateInfo *kick_info = new LLKickFromEstateInfo();
-	kick_info->mEstatePanelp = self;
-	kick_info->mAgentID     = ids[0];
-
-	//Bring up a confirmation dialog
-	LLSD args;
-	args["EVIL_USER"] = names[0];
-	LLSD payload;
-	payload["agent_id"] = ids[0];
-	LLNotifications::instance().add("EstateKickUser", args, payload, boost::bind(&LLPanelEstateInfo::kickUserConfirm, self, _1, _2));
-
-}
-
-bool LLPanelEstateInfo::kickUserConfirm(const LLSD& notification, const LLSD& response)
-{
-	S32 option = LLNotification::getSelectedOption(notification, response);
-	switch(option)
-	{
-	case 0:
-		{
-			//Kick User
-			strings_t strings;
-			strings.push_back(notification["payload"]["agent_id"].asString());
-
-			sendEstateOwnerMessage(gMessageSystem, "kickestate", LLFloaterRegionInfo::getLastInvoice(), strings);
-			break;
-		}
-	default:
-		break;
-	}
-	return false;
-}
-
-//---------------------------------------------------------------------------
-// Core Add/Remove estate access methods
-// TODO: INTERNATIONAL: don't build message text here;
-// instead, create multiple translatable messages and choose
-// one based on the status.
-//---------------------------------------------------------------------------
-std::string all_estates_text()
-{
-	LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();
-	if (!panel) return "(error)";
-
-	std::string owner = panel->getOwnerName();
-
-	LLViewerRegion* region = gAgent.getRegion();
-	if (gAgent.isGodlike())
-	{
-		return llformat("all estates\nowned by %s", owner.c_str());
-	}
-	else if (region && region->getOwner() == gAgent.getID())
-	{
-		return "all estates you own";
-	}
-	else if (region && region->isEstateManager())
-	{
-		return llformat("all estates that\nyou manage for %s", owner.c_str());
-	}
-	else
-	{
-		return "(error)";
-	}
-}
-
-// static
-bool LLPanelEstateInfo::isLindenEstate()
-{
-	LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();
-	if (!panel) return false;
-
-	U32 estate_id = panel->getEstateID();
-	return (estate_id <= ESTATE_LAST_LINDEN);
-}
-
-typedef std::vector<LLUUID> AgentOrGroupIDsVector;
-struct LLEstateAccessChangeInfo
-{
-	LLEstateAccessChangeInfo(const LLSD& sd)
-	{
-		mDialogName = sd["dialog_name"].asString();
-		mOperationFlag = (U32)sd["operation"].asInteger();
-		LLSD::array_const_iterator end_it = sd["allowed_ids"].endArray();
-		for (LLSD::array_const_iterator id_it = sd["allowed_ids"].beginArray();
-			id_it != end_it;
-			++id_it)
-		{
-			mAgentOrGroupIDs.push_back(id_it->asUUID());
-		}
-	}
-
-	const LLSD asLLSD() const
-	{
-		LLSD sd;
-		sd["name"] = mDialogName;
-		sd["operation"] = (S32)mOperationFlag;
-		for (AgentOrGroupIDsVector::const_iterator it = mAgentOrGroupIDs.begin();
-			it != mAgentOrGroupIDs.end();
-			++it)
-		{
-			sd["allowed_ids"].append(*it);
-		}
-		return sd;
-	}
-
-	U32 mOperationFlag;	// ESTATE_ACCESS_BANNED_AGENT_ADD, _REMOVE, etc.
-	std::string mDialogName;
-	AgentOrGroupIDsVector mAgentOrGroupIDs; // List of agent IDs to apply to this change
-};
-
-// Special case callback for groups, since it has different callback format than names
-// static
-void LLPanelEstateInfo::addAllowedGroup2(LLUUID id, void* user_data)
-{
-	LLSD payload;
-	payload["operation"] = (S32)ESTATE_ACCESS_ALLOWED_GROUP_ADD;
-	payload["dialog_name"] = "EstateAllowedGroupAdd";
-	payload["allowed_ids"].append(id);
-
-	LLSD args;
-	args["ALL_ESTATES"] = all_estates_text();
-
-	LLNotification::Params params("EstateAllowedGroupAdd");
-	params.payload(payload)
-		.substitutions(args)
-		.functor(accessCoreConfirm);
-	if (isLindenEstate())
-	{
-		LLNotifications::instance().forceResponse(params, 0);
-	}
-	else
-	{
-		LLNotifications::instance().add(params);
-	}
-}
-
-// static
-void LLPanelEstateInfo::accessAddCore(U32 operation_flag, const std::string& dialog_name)
-{
-	LLSD payload;
-	payload["operation"] = (S32)operation_flag;
-	payload["dialog_name"] = dialog_name;
-	// agent id filled in after avatar picker
-
-	LLNotification::Params params("ChangeLindenAccess");
-	params.payload(payload)
-		.functor(accessAddCore2);
-
-	if (isLindenEstate())
-	{
-		LLNotifications::instance().add(params);
-	}
-	else
-	{
-		// same as clicking "OK"
-		LLNotifications::instance().forceResponse(params, 0);
-	}
-}
-
-// static
-bool LLPanelEstateInfo::accessAddCore2(const LLSD& notification, const LLSD& response)
-{
-	S32 option = LLNotification::getSelectedOption(notification, response);
-	if (option != 0)
-	{
-		// abort change
-		return false;
-	}
-
-	LLEstateAccessChangeInfo* change_info = new LLEstateAccessChangeInfo(notification["payload"]);
-	// avatar picker yes multi-select, yes close-on-select
-	LLFloaterAvatarPicker::show(accessAddCore3, (void*)change_info, TRUE, TRUE);
-	return false;
-}
-
-// static
-void LLPanelEstateInfo::accessAddCore3(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* data)
-{
-	LLEstateAccessChangeInfo* change_info = (LLEstateAccessChangeInfo*)data;
-	if (!change_info) return;
-	if (ids.empty()) 
-	{
-		// User didn't select a name.
-		delete change_info;
-		change_info = NULL;
-		return;
-	}
-	// User did select a name.
-	change_info->mAgentOrGroupIDs = ids;
-	// Can't put estate owner on ban list
-	LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();
-	if (!panel) return;
-	LLViewerRegion* region = gAgent.getRegion();
-	if (!region) return;
-	
-	if (change_info->mOperationFlag & ESTATE_ACCESS_ALLOWED_AGENT_ADD)
-	{
-		LLCtrlListInterface *list = panel->childGetListInterface("allowed_avatar_name_list");
-		int currentCount = (list ? list->getItemCount() : 0);
-		if (ids.size() + currentCount > ESTATE_MAX_ACCESS_IDS)
-		{
-			LLSD args;
-			args["NUM_ADDED"] = llformat("%d",ids.size());
-			args["MAX_AGENTS"] = llformat("%d",ESTATE_MAX_ACCESS_IDS);
-			args["LIST_TYPE"] = "Allowed Residents";
-			args["NUM_EXCESS"] = llformat("%d",(ids.size()+currentCount)-ESTATE_MAX_ACCESS_IDS);
-			LLNotifications::instance().add("MaxAgentOnRegionBatch", args);
-			delete change_info;
-			return;
-		}
-	}
-	if (change_info->mOperationFlag & ESTATE_ACCESS_BANNED_AGENT_ADD)
-	{
-		LLCtrlListInterface *list = panel->childGetListInterface("banned_avatar_name_list");
-		int currentCount = (list ? list->getItemCount() : 0);
-		if (ids.size() + currentCount > ESTATE_MAX_ACCESS_IDS)
-		{
-			LLSD args;
-			args["NUM_ADDED"] = llformat("%d",ids.size());
-			args["MAX_AGENTS"] = llformat("%d",ESTATE_MAX_ACCESS_IDS);
-			args["LIST_TYPE"] = "Banned Residents";
-			args["NUM_EXCESS"] = llformat("%d",(ids.size()+currentCount)-ESTATE_MAX_ACCESS_IDS);
-			LLNotifications::instance().add("MaxAgentOnRegionBatch", args);
-			delete change_info;
-			return;
-		}
-	}
-
-	LLSD args;
-	args["ALL_ESTATES"] = all_estates_text();
-
-	LLNotification::Params params(change_info->mDialogName);
-	params.substitutions(args)
-		.payload(change_info->asLLSD())
-		.functor(accessCoreConfirm);
-
-	if (isLindenEstate())
-	{
-		// just apply to this estate
-		LLNotifications::instance().forceResponse(params, 0);
-	}
-	else
-	{
-		// ask if this estate or all estates with this owner
-		LLNotifications::instance().add(params);
-	}
-}
-
-// static
-void LLPanelEstateInfo::accessRemoveCore(U32 operation_flag, const std::string& dialog_name, const std::string& list_ctrl_name)
-{
-	LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();
-	if (!panel) return;
-	LLNameListCtrl* name_list = panel->getChild<LLNameListCtrl>(list_ctrl_name);
-	if (!name_list) return;
-
-	std::vector<LLScrollListItem*> list_vector = name_list->getAllSelected();
-	if (list_vector.size() == 0)
-		return;
-
-	LLSD payload;
-	payload["operation"] = (S32)operation_flag;
-	payload["dialog_name"] = dialog_name;
-	
-	for (std::vector<LLScrollListItem*>::const_iterator iter = list_vector.begin();
-	     iter != list_vector.end();
-	     iter++)
-	{
-		LLScrollListItem *item = (*iter);
-		payload["allowed_ids"].append(item->getUUID());
-	}
-	
-	LLNotification::Params params("ChangeLindenAccess");
-	params.payload(payload)
-		.functor(accessRemoveCore2);
-
-	if (isLindenEstate())
-	{
-		// warn on change linden estate
-		LLNotifications::instance().add(params);
-	}
-	else
-	{
-		// just proceed, as if clicking OK
-		LLNotifications::instance().forceResponse(params, 0);
-	}
-}
-
-// static
-bool LLPanelEstateInfo::accessRemoveCore2(const LLSD& notification, const LLSD& response)
-{
-	S32 option = LLNotification::getSelectedOption(notification, response);
-	if (option != 0)
-	{
-		// abort
-		return false;
-	}
-
-	// If Linden estate, can only apply to "this" estate, not all estates
-	// owned by NULL.
-	if (isLindenEstate())
-	{
-		accessCoreConfirm(notification, response);
-	}
-	else
-	{
-		LLSD args;
-		args["ALL_ESTATES"] = all_estates_text();
-		LLNotifications::instance().add(notification["payload"]["dialog_name"], 
-										args,
-										notification["payload"],
-										accessCoreConfirm);
-	}
-	return false;
-}
-
-// Used for both access add and remove operations, depending on the mOperationFlag
-// passed in (ESTATE_ACCESS_BANNED_AGENT_ADD, ESTATE_ACCESS_ALLOWED_AGENT_REMOVE, etc.)
-// static
-bool LLPanelEstateInfo::accessCoreConfirm(const LLSD& notification, const LLSD& response)
-{
-	S32 option = LLNotification::getSelectedOption(notification, response);
-	const U32 originalFlags = (U32)notification["payload"]["operation"].asInteger();
-
-	LLViewerRegion* region = gAgent.getRegion();
-	
-	LLSD::array_const_iterator end_it = notification["payload"]["allowed_ids"].endArray();
-
-	for (LLSD::array_const_iterator iter = notification["payload"]["allowed_ids"].beginArray();
-		iter != end_it;
-	     iter++)
-	{
-		U32 flags = originalFlags;
-		if (iter + 1 != end_it)
-			flags |= ESTATE_ACCESS_NO_REPLY;
-
-		const LLUUID id = iter->asUUID();
-		if (((U32)notification["payload"]["operation"].asInteger() & ESTATE_ACCESS_BANNED_AGENT_ADD)
-		    && region && (region->getOwner() == id))
-		{
-			LLNotifications::instance().add("OwnerCanNotBeDenied");
-			break;
-		}
-		switch(option)
-		{
-			case 0:
-			    // This estate
-			    sendEstateAccessDelta(flags, id);
-			    break;
-			case 1:
-			{
-				// All estates, either than I own or manage for this owner.  
-				// This will be verified on simulator. JC
-				if (!region) break;
-				if (region->getOwner() == gAgent.getID()
-				    || gAgent.isGodlike())
-				{
-					flags |= ESTATE_ACCESS_APPLY_TO_ALL_ESTATES;
-					sendEstateAccessDelta(flags, id);
-				}
-				else if (region->isEstateManager())
-				{
-					flags |= ESTATE_ACCESS_APPLY_TO_MANAGED_ESTATES;
-					sendEstateAccessDelta(flags, id);
-				}
-				break;
-			}
-			case 2:
-			default:
-			    break;
-		}
-	}
-	return false;
-}
-
-// key = "estateaccessdelta"
-// str(estate_id) will be added to front of list by forward_EstateOwnerRequest_to_dataserver
-// str[0] = str(agent_id) requesting the change
-// str[1] = str(flags) (ESTATE_ACCESS_DELTA_*)
-// str[2] = str(agent_id) to add or remove
-// static
-void LLPanelEstateInfo::sendEstateAccessDelta(U32 flags, const LLUUID& agent_or_group_id)
-{
-	LLMessageSystem* msg = gMessageSystem;
-	msg->newMessage("EstateOwnerMessage");
-	msg->nextBlockFast(_PREHASH_AgentData);
-	msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-	msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-	msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used
-
-	msg->nextBlock("MethodData");
-	msg->addString("Method", "estateaccessdelta");
-	msg->addUUID("Invoice", LLFloaterRegionInfo::getLastInvoice());
-
-	std::string buf;
-	gAgent.getID().toString(buf);
-	msg->nextBlock("ParamList");
-	msg->addString("Parameter", buf);
-
-	buf = llformat("%u", flags);
-	msg->nextBlock("ParamList");
-	msg->addString("Parameter", buf);
-
-	agent_or_group_id.toString(buf);
-	msg->nextBlock("ParamList");
-	msg->addString("Parameter", buf);
-
-
-	LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();
-
-	if (flags & (ESTATE_ACCESS_ALLOWED_AGENT_ADD | ESTATE_ACCESS_ALLOWED_AGENT_REMOVE |
-		         ESTATE_ACCESS_BANNED_AGENT_ADD | ESTATE_ACCESS_BANNED_AGENT_REMOVE))
-	{
-		
-		panel->clearAccessLists();
-	}
-
-	gAgent.sendReliableMessage();
-}
-
-void LLPanelEstateInfo::updateControls(LLViewerRegion* region)
-{
-	BOOL god = gAgent.isGodlike();
-	BOOL owner = (region && (region->getOwner() == gAgent.getID()));
-	BOOL manager = (region && region->isEstateManager());
-	setCtrlsEnabled(god || owner || manager);
-	
-	childDisable("apply_btn");
-	childSetEnabled("add_allowed_avatar_btn",		god || owner || manager);
-	childSetEnabled("remove_allowed_avatar_btn",	god || owner || manager);
-	childSetEnabled("add_allowed_group_btn",		god || owner || manager);
-	childSetEnabled("remove_allowed_group_btn",		god || owner || manager);
-	childSetEnabled("add_banned_avatar_btn",		god || owner || manager);
-	childSetEnabled("remove_banned_avatar_btn",		god || owner || manager);
-	childSetEnabled("message_estate_btn",			god || owner || manager);
-	childSetEnabled("kick_user_from_estate_btn",	god || owner || manager);
-	childSetEnabled("abuse_email_address", 			god || owner || manager);
-
-	// estate managers can't add estate managers
-	childSetEnabled("add_estate_manager_btn",		god || owner);
-	childSetEnabled("remove_estate_manager_btn",	god || owner);
-	childSetEnabled("estate_manager_name_list",		god || owner);
-}
-
-bool LLPanelEstateInfo::refreshFromRegion(LLViewerRegion* region)
-{
-	updateControls(region);
-	
-	// let the parent class handle the general data collection. 
-	bool rv = LLPanelRegionInfo::refreshFromRegion(region);
-
-	// We want estate info. To make sure it works across region
-	// boundaries and multiple packets, we add a serial number to the
-	// integers and track against that on update.
-	strings_t strings;
-	//integers_t integers;
-	//LLFloaterRegionInfo::incrementSerial();
-	LLFloaterRegionInfo::nextInvoice();
-	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-	//integers.push_back(LLFloaterRegionInfo::());::getPanelEstate();
-
-	
-	LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();
-	panel->clearAccessLists();
-	
-
-	sendEstateOwnerMessage(gMessageSystem, "getinfo", invoice, strings);
-
-	refresh();
-
-	return rv;
-}
-
-void LLPanelEstateInfo::updateChild(LLUICtrl* child_ctrl)
-{
-	if (checkRemovalButton(child_ctrl->getName()))
-	{
-		// do nothing
-	}
-	else if (checkSunHourSlider(child_ctrl))
-	{
-		// do nothing
-	}
-}
-
-bool LLPanelEstateInfo::estateUpdate(LLMessageSystem* msg)
-{
-	llinfos << "LLPanelEstateInfo::estateUpdate()" << llendl;
-	return false;
-}
-
-
-BOOL LLPanelEstateInfo::postBuild()
-{
-	// set up the callbacks for the generic controls
-	initCtrl("externally_visible_check");
-	initCtrl("use_global_time_check");
-	initCtrl("fixed_sun_check");
-	initCtrl("allow_direct_teleport");
-	initCtrl("limit_payment");
-	initCtrl("limit_age_verified");
-	initCtrl("voice_chat_check");
-	childSetCommitCallback("abuse_email_address", onChangeAnything, this);
-	childSetKeystrokeCallback("abuse_email_address", onChangeText, this);
-
-	initHelpBtn("estate_manager_help",			"HelpEstateEstateManager");
-	initHelpBtn("use_global_time_help",			"HelpEstateUseGlobalTime");
-	initHelpBtn("fixed_sun_help",				"HelpEstateFixedSun");
-	initHelpBtn("WLEditSkyHelp",				"HelpEditSky");
-	initHelpBtn("WLEditDayCycleHelp",			"HelpEditDayCycle");
-
-	initHelpBtn("externally_visible_help",		"HelpEstateExternallyVisible");
-	initHelpBtn("allow_direct_teleport_help",	"HelpEstateAllowDirectTeleport");
-	initHelpBtn("allow_resident_help",			"HelpEstateAllowResident");
-	initHelpBtn("allow_group_help",				"HelpEstateAllowGroup");
-	initHelpBtn("ban_resident_help",			"HelpEstateBanResident");
-	initHelpBtn("abuse_email_address_help",         "HelpEstateAbuseEmailAddress");
-	initHelpBtn("voice_chat_help",                  "HelpEstateVoiceChat");
-
-	// set up the use global time checkbox
-	childSetCommitCallback("use_global_time_check", onChangeUseGlobalTime, this);
-	childSetCommitCallback("fixed_sun_check", onChangeFixedSun, this);
-	childSetCommitCallback("sun_hour_slider", onChangeChildCtrl, this);
-
-	childSetCommitCallback("allowed_avatar_name_list", onChangeChildCtrl, this);
-	LLNameListCtrl *avatar_name_list = getChild<LLNameListCtrl>("allowed_avatar_name_list");
-	if (avatar_name_list)
-	{
-		avatar_name_list->setCommitOnSelectionChange(TRUE);
-		avatar_name_list->setMaxItemCount(ESTATE_MAX_ACCESS_IDS);
-	}
-
-	childSetAction("add_allowed_avatar_btn", onClickAddAllowedAgent, this);
-	childSetAction("remove_allowed_avatar_btn", onClickRemoveAllowedAgent, this);
-
-	childSetCommitCallback("allowed_group_name_list", onChangeChildCtrl, this);
-	LLNameListCtrl* group_name_list = getChild<LLNameListCtrl>("allowed_group_name_list");
-	if (group_name_list)
-	{
-		group_name_list->setCommitOnSelectionChange(TRUE);
-		group_name_list->setMaxItemCount(ESTATE_MAX_ACCESS_IDS);
-	}
-
-	childSetAction("add_allowed_group_btn", onClickAddAllowedGroup, this);
-	childSetAction("remove_allowed_group_btn", onClickRemoveAllowedGroup, this);
-
-	childSetCommitCallback("banned_avatar_name_list", onChangeChildCtrl, this);
-	LLNameListCtrl* banned_name_list = getChild<LLNameListCtrl>("banned_avatar_name_list");
-	if (banned_name_list)
-	{
-		banned_name_list->setCommitOnSelectionChange(TRUE);
-		banned_name_list->setMaxItemCount(ESTATE_MAX_ACCESS_IDS);
-	}
-
-	childSetAction("add_banned_avatar_btn", onClickAddBannedAgent, this);
-	childSetAction("remove_banned_avatar_btn", onClickRemoveBannedAgent, this);
-
-	childSetCommitCallback("estate_manager_name_list", onChangeChildCtrl, this);
-	LLNameListCtrl* manager_name_list = getChild<LLNameListCtrl>("estate_manager_name_list");
-	if (manager_name_list)
-	{
-		manager_name_list->setCommitOnSelectionChange(TRUE);
-		manager_name_list->setMaxItemCount(ESTATE_MAX_MANAGERS * 4);	// Allow extras for dupe issue
-	}
-
-	childSetAction("add_estate_manager_btn", onClickAddEstateManager, this);
-	childSetAction("remove_estate_manager_btn", onClickRemoveEstateManager, this);
-	childSetAction("message_estate_btn", onClickMessageEstate, this);
-	childSetAction("kick_user_from_estate_btn", onClickKickUser, this);
-
-	childSetAction("WLEditSky", onClickEditSky, this);
-	childSetAction("WLEditDayCycle", onClickEditDayCycle, this);
-
-	return LLPanelRegionInfo::postBuild();
-}
-
-void LLPanelEstateInfo::refresh()
-{
-	bool public_access = childGetValue("externally_visible_check").asBoolean();
-	childSetEnabled("Only Allow", public_access);
-	childSetEnabled("limit_payment", public_access);
-	childSetEnabled("limit_age_verified", public_access);
-	// if this is set to false, then the limit fields are meaningless and should be turned off
-	if (public_access == false)
-	{
-		childSetValue("limit_payment", false);
-		childSetValue("limit_age_verified", false);
-	}
-}
-
-BOOL LLPanelEstateInfo::sendUpdate()
-{
-	llinfos << "LLPanelEsateInfo::sendUpdate()" << llendl;
-
-	LLNotification::Params params("ChangeLindenEstate");
-	params.functor(boost::bind(&LLPanelEstateInfo::callbackChangeLindenEstate, this, _1, _2));
-
-	if (getEstateID() <= ESTATE_LAST_LINDEN)
-	{
-		// trying to change reserved estate, warn
-		LLNotifications::instance().add(params);
-	}
-	else
-	{
-		// for normal estates, just make the change
-		LLNotifications::instance().forceResponse(params, 0);
-	}
-	return TRUE;
-}
-
-bool LLPanelEstateInfo::callbackChangeLindenEstate(const LLSD& notification, const LLSD& response)
-{
-	S32 option = LLNotification::getSelectedOption(notification, response);
-	switch(option)
-	{
-	case 0:
-		// send the update
-		if (!commitEstateInfoCaps())
-		{
-			// the caps method failed, try the old way
-			LLFloaterRegionInfo::nextInvoice();
-			commitEstateInfoDataserver();
-		}
-		// we don't want to do this because we'll get it automatically from the sim
-		// after the spaceserver processes it
-//		else
-//		{
-//			// caps method does not automatically send this info
-//			LLFloaterRegionInfo::requestRegionInfo();
-//		}
-		break;
-	case 1:
-	default:
-		// do nothing
-		break;
-	}
-	return false;
-}
-
-
-/*
-// Request = "getowner"
-// SParam[0] = "" (empty string)
-// IParam[0] = serial
-void LLPanelEstateInfo::getEstateOwner()
-{
-	// TODO -- disable the panel
-	// and call this function whenever we cross a region boundary
-	// re-enable when owner matches, and get new estate info
-	LLMessageSystem* msg = gMessageSystem;
-	msg->newMessageFast(_PREHASH_EstateOwnerRequest);
-	msg->nextBlockFast(_PREHASH_AgentData);
-	msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-
-	msg->nextBlockFast(_PREHASH_RequestData);
-	msg->addStringFast(_PREHASH_Request, "getowner");
-
-	// we send an empty string so that the variable block is not empty
-	msg->nextBlockFast(_PREHASH_StringData);
-	msg->addStringFast(_PREHASH_SParam, "");
-
-	msg->nextBlockFast(_PREHASH_IntegerData);
-	msg->addS32Fast(_PREHASH_IParam, LLFloaterRegionInfo::getSerial());
-
-	gAgent.sendMessage();
-}
-*/
-
-class LLEstateChangeInfoResponder : public LLHTTPClient::Responder
-{
-public:
-	LLEstateChangeInfoResponder(void* userdata) : mpPanel((LLPanelEstateInfo*)userdata) {};
-	
-	// if we get a normal response, handle it here
-	virtual void result(const LLSD& content)
-	{
-	    // refresh the panel from the database
-		mpPanel->refresh();
-	}
-	
-	// if we get an error response
-	virtual void error(U32 status, const std::string& reason)
-	{
-		llinfos << "LLEstateChangeInfoResponder::error "
-			<< status << ": " << reason << llendl;
-	}
-private:
-	LLPanelEstateInfo* mpPanel;
-};
-
-// tries to send estate info using a cap; returns true if it succeeded
-bool LLPanelEstateInfo::commitEstateInfoCaps()
-{
-	std::string url = gAgent.getRegion()->getCapability("EstateChangeInfo");
-	
-	if (url.empty())
-	{
-		// whoops, couldn't find the cap, so bail out
-		return false;
-	}
-	
-	LLSD body;
-	body["estate_name"] = getEstateName();
-
-	body["is_externally_visible"] = childGetValue("externally_visible_check").asBoolean();
-	body["allow_direct_teleport"] = childGetValue("allow_direct_teleport").asBoolean();
-	body["is_sun_fixed"         ] = childGetValue("fixed_sun_check").asBoolean();
-	body["deny_anonymous"       ] = childGetValue("limit_payment").asBoolean();
-	body["deny_age_unverified"  ] = childGetValue("limit_age_verified").asBoolean();
-	body["allow_voice_chat"     ] = childGetValue("voice_chat_check").asBoolean();
-	body["invoice"              ] = LLFloaterRegionInfo::getLastInvoice();
-
-	// block fly is in estate database but not in estate UI, so we're not supporting it
-	//body["block_fly"            ] = childGetValue("").asBoolean();
-
-	F32 sun_hour = getSunHour();
-	if (childGetValue("use_global_time_check").asBoolean())
-	{
-		sun_hour = 0.f;			// 0 = global time
-	}
-	body["sun_hour"] = sun_hour;
-
-	body["owner_abuse_email"] = childGetValue("abuse_email_address").asString();
-
-	// we use a responder so that we can re-get the data after committing to the database
-	LLHTTPClient::post(url, body, new LLEstateChangeInfoResponder((void*)this));
-    return true;
-}
-
-/* This is the old way of doing things, is deprecated, and should be 
-   deleted when the dataserver model can be removed */
-// key = "estatechangeinfo"
-// strings[0] = str(estate_id) (added by simulator before relay - not here)
-// strings[1] = estate_name
-// strings[2] = str(estate_flags)
-// strings[3] = str((S32)(sun_hour * 1024.f))
-void LLPanelEstateInfo::commitEstateInfoDataserver()
-{
-	LLMessageSystem* msg = gMessageSystem;
-	msg->newMessage("EstateOwnerMessage");
-	msg->nextBlockFast(_PREHASH_AgentData);
-	msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-	msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-	msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used
-
-	msg->nextBlock("MethodData");
-	msg->addString("Method", "estatechangeinfo");
-	msg->addUUID("Invoice", LLFloaterRegionInfo::getLastInvoice());
-
-	msg->nextBlock("ParamList");
-	msg->addString("Parameter", getEstateName());
-
-	std::string buffer;
-	buffer = llformat("%u", computeEstateFlags());
-	msg->nextBlock("ParamList");
-	msg->addString("Parameter", buffer);
-
-	F32 sun_hour = getSunHour();
-	if (childGetValue("use_global_time_check").asBoolean())
-	{
-		sun_hour = 0.f;	// 0 = global time
-	}
-
-	buffer = llformat("%d", (S32)(sun_hour*1024.0f));
-	msg->nextBlock("ParamList");
-	msg->addString("Parameter", buffer);
-
-	gAgent.sendMessage();
-}
-
-void LLPanelEstateInfo::setEstateFlags(U32 flags)
-{
-	childSetValue("externally_visible_check", LLSD(flags & REGION_FLAGS_EXTERNALLY_VISIBLE ? TRUE : FALSE) );
-	childSetValue("fixed_sun_check", LLSD(flags & REGION_FLAGS_SUN_FIXED ? TRUE : FALSE) );
-	childSetValue(
-		"voice_chat_check",
-		LLSD(flags & REGION_FLAGS_ALLOW_VOICE ? TRUE : FALSE));
-	childSetValue("allow_direct_teleport", LLSD(flags & REGION_FLAGS_ALLOW_DIRECT_TELEPORT ? TRUE : FALSE) );
-	childSetValue("limit_payment", LLSD(flags & REGION_FLAGS_DENY_ANONYMOUS ? TRUE : FALSE) );
-	childSetValue("limit_age_verified", LLSD(flags & REGION_FLAGS_DENY_AGEUNVERIFIED ? TRUE : FALSE) );
-
-	refresh();
-}
-
-U32 LLPanelEstateInfo::computeEstateFlags()
-{
-	U32 flags = 0;
-
-	if (childGetValue("externally_visible_check").asBoolean())
-	{
-		flags |= REGION_FLAGS_EXTERNALLY_VISIBLE;
-	}
-
-	if ( childGetValue("voice_chat_check").asBoolean() )
-	{
-		flags |= REGION_FLAGS_ALLOW_VOICE;
-	}
-	
-	if (childGetValue("allow_direct_teleport").asBoolean())
-	{
-		flags |= REGION_FLAGS_ALLOW_DIRECT_TELEPORT;
-	}
-
-	if (childGetValue("fixed_sun_check").asBoolean())
-	{
-		flags |= REGION_FLAGS_SUN_FIXED;
-	}
-	
-	if (childGetValue("limit_payment").asBoolean())
-	{
-		flags |= REGION_FLAGS_DENY_ANONYMOUS;
-	}
-	
-	if (childGetValue("limit_age_verified").asBoolean())
-	{
-		flags |= REGION_FLAGS_DENY_AGEUNVERIFIED;
-	}
-
-	
-	return flags;
-}
-
-BOOL LLPanelEstateInfo::getGlobalTime()
-{
-	return childGetValue("use_global_time_check").asBoolean();
-}
-
-void LLPanelEstateInfo::setGlobalTime(bool b)
-{
-	childSetValue("use_global_time_check", LLSD(b));
-	childSetEnabled("fixed_sun_check", LLSD(!b));
-	childSetEnabled("sun_hour_slider", LLSD(!b));
-	if (b)
-	{
-		childSetValue("sun_hour_slider", LLSD(0.f));
-	}
-}
-
-
-BOOL LLPanelEstateInfo::getFixedSun()
-{
-	return childGetValue("fixed_sun_check").asBoolean();
-}
-
-void LLPanelEstateInfo::setSunHour(F32 sun_hour)
-{
-	if(sun_hour < 6.0f)
-	{
-		sun_hour = 24.0f + sun_hour;
-	}
-	childSetValue("sun_hour_slider", LLSD(sun_hour));
-}
-
-F32 LLPanelEstateInfo::getSunHour()
-{
-	if (childIsEnabled("sun_hour_slider"))
-	{
-		return (F32)childGetValue("sun_hour_slider").asReal();
-	}
-	return 0.f;
-}
-
-const std::string LLPanelEstateInfo::getEstateName() const
-{
-	return childGetValue("estate_name").asString();
-}
-
-void LLPanelEstateInfo::setEstateName(const std::string& name)
-{
-	childSetValue("estate_name", LLSD(name));
-}
-
-const std::string LLPanelEstateInfo::getOwnerName() const
-{
-	return childGetValue("estate_owner").asString();
-}
-
-void LLPanelEstateInfo::setOwnerName(const std::string& name)
-{
-	childSetValue("estate_owner", LLSD(name));
-}
-
-const std::string LLPanelEstateInfo::getAbuseEmailAddress() const
-{
-	return childGetValue("abuse_email_address").asString();
-}
-
-void LLPanelEstateInfo::setAbuseEmailAddress(const std::string& address)
-{
-	childSetValue("abuse_email_address", LLSD(address));
-}
-
-void LLPanelEstateInfo::setAccessAllowedEnabled(bool enable_agent,
-												bool enable_group,
-												bool enable_ban)
-{
-	childSetEnabled("allow_resident_label", enable_agent);
-	childSetEnabled("allowed_avatar_name_list", enable_agent);
-	childSetVisible("allowed_avatar_name_list", enable_agent);
-	childSetEnabled("add_allowed_avatar_btn", enable_agent);
-	childSetEnabled("remove_allowed_avatar_btn", enable_agent);
-
-	// Groups
-	childSetEnabled("allow_group_label", enable_group);
-	childSetEnabled("allowed_group_name_list", enable_group);
-	childSetVisible("allowed_group_name_list", enable_group);
-	childSetEnabled("add_allowed_group_btn", enable_group);
-	childSetEnabled("remove_allowed_group_btn", enable_group);
-
-	// Ban
-	childSetEnabled("ban_resident_label", enable_ban);
-	childSetEnabled("banned_avatar_name_list", enable_ban);
-	childSetVisible("banned_avatar_name_list", enable_ban);
-	childSetEnabled("add_banned_avatar_btn", enable_ban);
-	childSetEnabled("remove_banned_avatar_btn", enable_ban);
-
-	// Update removal buttons if needed
-	if (enable_agent)
-	{
-		checkRemovalButton("allowed_avatar_name_list");
-	}
-
-	if (enable_group)
-	{
-		checkRemovalButton("allowed_group_name_list");
-	}
-
-	if (enable_ban)
-	{
-		checkRemovalButton("banned_avatar_name_list");
-	}
-}
-
-// static
-void LLPanelEstateInfo::callbackCacheName(
-	const LLUUID& id,
-	const std::string& first,
-	const std::string& last,
-	BOOL is_group,
-	void*)
-{
-	LLPanelEstateInfo* self = LLFloaterRegionInfo::getPanelEstate();
-	if (!self) return;
-
-	std::string name;
-	
-	if (id.isNull())
-	{
-		name = "(none)";
-	}
-	else
-	{
-		name = first + " " + last;
-	}
-
-	self->setOwnerName(name);
-}
-
-void LLPanelEstateInfo::clearAccessLists() 
-{
-	LLNameListCtrl* name_list = getChild<LLNameListCtrl>("allowed_avatar_name_list");
-	if (name_list)
-	{
-		name_list->deleteAllItems();
-	}
-
-	name_list = getChild<LLNameListCtrl>("banned_avatar_name_list");
-	if (name_list)
-	{
-		name_list->deleteAllItems();
-	}
-}
-
-// enables/disables the "remove" button for the various allow/ban lists
-BOOL LLPanelEstateInfo::checkRemovalButton(std::string name)
-{
-	std::string btn_name = "";
-	if (name == "allowed_avatar_name_list")
-	{
-		btn_name = "remove_allowed_avatar_btn";
-	}
-	else if (name == "allowed_group_name_list")
-	{
-		btn_name = "remove_allowed_group_btn";
-	}
-	else if (name == "banned_avatar_name_list")
-	{
-		btn_name = "remove_banned_avatar_btn";
-	}
-	else if (name == "estate_manager_name_list")
-	{
-		//ONLY OWNER CAN ADD /DELET ESTATE MANAGER
-		LLViewerRegion* region = gAgent.getRegion();
-		if (region && (region->getOwner() == gAgent.getID()))
-		{
-			btn_name = "remove_estate_manager_btn";
-		}
-	}
-
-	// enable the remove button if something is selected
-	LLNameListCtrl* name_list = getChild<LLNameListCtrl>(name);
-	childSetEnabled(btn_name, name_list && name_list->getFirstSelected() ? TRUE : FALSE);
-
-	return (btn_name != "");
-}
-
-BOOL LLPanelEstateInfo::checkSunHourSlider(LLUICtrl* child_ctrl)
-{
-	BOOL found_child_ctrl = FALSE;
-	if (child_ctrl->getName() == "sun_hour_slider")
-	{
-		enableButton("apply_btn");
-		found_child_ctrl = TRUE;
-	}
-	return found_child_ctrl;
-}
-
-// static
-void LLPanelEstateInfo::onClickMessageEstate(void* userdata)
-{
-	llinfos << "LLPanelEstateInfo::onClickMessageEstate" << llendl;
-	LLNotifications::instance().add("MessageEstate", LLSD(), LLSD(), boost::bind(&LLPanelEstateInfo::onMessageCommit, (LLPanelEstateInfo*)userdata, _1, _2));
-}
-
-bool LLPanelEstateInfo::onMessageCommit(const LLSD& notification, const LLSD& response)
-{
-	S32 option = LLNotification::getSelectedOption(notification, response);
-	std::string text = response["message"].asString();
-	if(option != 0) return false;
-	if(text.empty()) return false;
-	llinfos << "Message to everyone: " << text << llendl;
-	strings_t strings;
-	//integers_t integers;
-	std::string name;
-	gAgent.buildFullname(name);
-	strings.push_back(strings_t::value_type(name));
-	strings.push_back(strings_t::value_type(text));
-	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
-	sendEstateOwnerMessage(gMessageSystem, "instantmessage", invoice, strings);
-	return false;
-}
-
-LLPanelEstateCovenant::LLPanelEstateCovenant()
-: mCovenantID(LLUUID::null)
-{
-}
-
-// virtual 
-bool LLPanelEstateCovenant::refreshFromRegion(LLViewerRegion* region)
-{
-	LLTextBox* region_name = getChild<LLTextBox>("region_name_text");
-	if (region_name)
-	{
-		region_name->setText(region->getName());
-	}
-
-	LLTextBox* resellable_clause = getChild<LLTextBox>("resellable_clause");
-	if (resellable_clause)
-	{
-		if (region->getRegionFlags() & REGION_FLAGS_BLOCK_LAND_RESELL)
-		{
-			resellable_clause->setText(getString("can_not_resell"));
-		}
-		else
-		{
-			resellable_clause->setText(getString("can_resell"));
-		}
-	}
-	
-	LLTextBox* changeable_clause = getChild<LLTextBox>("changeable_clause");
-	if (changeable_clause)
-	{
-		if (region->getRegionFlags() & REGION_FLAGS_ALLOW_PARCEL_CHANGES)
-		{
-			changeable_clause->setText(getString("can_change"));
-		}
-		else
-		{
-			changeable_clause->setText(getString("can_not_change"));
-		}
-	}
-
-	LLTextBox* region_maturity = getChild<LLTextBox>("region_maturity_text");
-	if (region_maturity)
-	{
-		region_maturity->setText(region->getSimAccessString());
-	}
-	
-	LLTextBox* region_landtype = getChild<LLTextBox>("region_landtype_text");
-	if (region_landtype)
-	{
-		region_landtype->setText(region->getSimProductName());
-	}
-	
-	
-	// let the parent class handle the general data collection. 
-	bool rv = LLPanelRegionInfo::refreshFromRegion(region);
-	LLMessageSystem *msg = gMessageSystem;
-	msg->newMessage("EstateCovenantRequest");
-	msg->nextBlockFast(_PREHASH_AgentData);
-	msg->addUUIDFast(_PREHASH_AgentID,	gAgent.getID());
-	msg->addUUIDFast(_PREHASH_SessionID,gAgent.getSessionID());
-	msg->sendReliable(region->getHost());
-	return rv;
-}
-
-// virtual 
-bool LLPanelEstateCovenant::estateUpdate(LLMessageSystem* msg)
-{
-	llinfos << "LLPanelEstateCovenant::estateUpdate()" << llendl;
-	return true;
-}
-	
-// virtual 
-BOOL LLPanelEstateCovenant::postBuild()
-{
-	initHelpBtn("covenant_help",		"HelpEstateCovenant");
-	mEstateNameText = getChild<LLTextBox>("estate_name_text");
-	mEstateOwnerText = getChild<LLTextBox>("estate_owner_text");
-	mLastModifiedText = getChild<LLTextBox>("covenant_timestamp_text");
-	mEditor = getChild<LLViewerTextEditor>("covenant_editor");
-	if (mEditor) mEditor->setHandleEditKeysDirectly(TRUE);
-	LLButton* reset_button = getChild<LLButton>("reset_covenant");
-	reset_button->setEnabled(gAgent.canManageEstate());
-	reset_button->setClickedCallback(LLPanelEstateCovenant::resetCovenantID, NULL);
-
-	return LLPanelRegionInfo::postBuild();
-}
-
-// virtual 
-void LLPanelEstateCovenant::updateChild(LLUICtrl* child_ctrl)
-{
-}
-
-// virtual
-BOOL LLPanelEstateCovenant::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
-								  EDragAndDropType cargo_type,
-								  void* cargo_data,
-								  EAcceptance* accept,
-								  std::string& tooltip_msg)
-{
-	LLInventoryItem* item = (LLInventoryItem*)cargo_data;
-
-	if (!gAgent.canManageEstate())
-	{
-		*accept = ACCEPT_NO;
-		return TRUE;
-	}
-
-	switch(cargo_type)
-	{
-	case DAD_NOTECARD:
-		*accept = ACCEPT_YES_COPY_SINGLE;
-		if (item && drop)
-		{
-			LLSD payload;
-			payload["item_id"] = item->getUUID();
-			LLNotifications::instance().add("EstateChangeCovenant", LLSD(), payload,
-									LLPanelEstateCovenant::confirmChangeCovenantCallback);
-		}
-		break;
-	default:
-		*accept = ACCEPT_NO;
-		break;
-	}
-
-	return TRUE;
-} 
-
-// static 
-bool LLPanelEstateCovenant::confirmChangeCovenantCallback(const LLSD& notification, const LLSD& response)
-{
-	S32 option = LLNotification::getSelectedOption(notification, response);
-	LLInventoryItem* item = gInventory.getItem(notification["payload"]["item_id"].asUUID());
-	LLPanelEstateCovenant* self = LLFloaterRegionInfo::getPanelCovenant();
-
-	if (!item || !self) return false;
-
-	switch(option)
-	{
-	case 0:
-		self->loadInvItem(item);
-		break;
-	default:
-		break;
-	}
-	return false;
-}
-
-// static
-void LLPanelEstateCovenant::resetCovenantID(void* userdata)
-{
-	LLNotifications::instance().add("EstateChangeCovenant", LLSD(), LLSD(), confirmResetCovenantCallback);
-}
-
-// static
-bool LLPanelEstateCovenant::confirmResetCovenantCallback(const LLSD& notification, const LLSD& response)
-{
-	LLPanelEstateCovenant* self = LLFloaterRegionInfo::getPanelCovenant();
-	if (!self) return false;
-
-	S32 option = LLNotification::getSelectedOption(notification, response);
-	switch(option)
-	{
-	case 0:		
-		self->loadInvItem(NULL);
-		break;
-	default:
-		break;
-	}
-	return false;
-}
-
-void LLPanelEstateCovenant::loadInvItem(LLInventoryItem *itemp)
-{
-	const BOOL high_priority = TRUE;	
-	if (itemp)
-	{
-		gAssetStorage->getInvItemAsset(gAgent.getRegionHost(),
-									gAgent.getID(),
-									gAgent.getSessionID(),
-									itemp->getPermissions().getOwner(),
-									LLUUID::null,
-									itemp->getUUID(),
-									itemp->getAssetUUID(),
-									itemp->getType(),
-                                    onLoadComplete,
-									(void*)this,
-									high_priority);
-		mAssetStatus = ASSET_LOADING;
-	}
-	else
-	{
-		mAssetStatus = ASSET_LOADED;
-		setCovenantTextEditor("There is no Covenant provided for this Estate.");
-		sendChangeCovenantID(LLUUID::null);
-	}
-}
-
-// static
-void LLPanelEstateCovenant::onLoadComplete(LLVFS *vfs,
-									   const LLUUID& asset_uuid,
-									   LLAssetType::EType type,
-									   void* user_data, S32 status, LLExtStat ext_status)
-{
-	llinfos << "LLPanelEstateCovenant::onLoadComplete()" << llendl;
-	LLPanelEstateCovenant* panelp = (LLPanelEstateCovenant*)user_data;
-	if( panelp )
-	{
-		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)
-			{
-				llerrs << "Memory Allocation Failed" << llendl;
-				return;
-			}
-
-			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 ) )
-			{
-				if( !panelp->mEditor->importBuffer( buffer, file_length+1 ) )
-				{
-					llwarns << "Problem importing estate covenant." << llendl;
-					LLNotifications::instance().add("ProblemImportingEstateCovenant");
-				}
-				else
-				{
-					panelp->sendChangeCovenantID(asset_uuid);	
-				}
-			}
-			else
-			{
-				// Version 0 (just text, doesn't include version number)
-				panelp->sendChangeCovenantID(asset_uuid);
-			}
-			delete[] buffer;
-		}
-		else
-		{
-			LLViewerStats::getInstance()->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
-
-			if( LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE == status ||
-				LL_ERR_FILE_EMPTY == status)
-			{
-				LLNotifications::instance().add("MissingNotecardAssetID");
-			}
-			else if (LL_ERR_INSUFFICIENT_PERMISSIONS == status)
-			{
-				LLNotifications::instance().add("NotAllowedToViewNotecard");
-			}
-			else
-			{
-				LLNotifications::instance().add("UnableToLoadNotecardAsset");
-			}
-
-			llwarns << "Problem loading notecard: " << status << llendl;
-		}
-		panelp->mAssetStatus = ASSET_LOADED;
-		panelp->setCovenantID(asset_uuid);
-	}
-}
-
-// key = "estatechangecovenantid"
-// strings[0] = str(estate_id) (added by simulator before relay - not here)
-// strings[1] = str(covenant_id)
-void LLPanelEstateCovenant::sendChangeCovenantID(const LLUUID &asset_id)
-{
-	if (asset_id != getCovenantID())
-	{
-        setCovenantID(asset_id);
-
-		LLMessageSystem* msg = gMessageSystem;
-		msg->newMessage("EstateOwnerMessage");
-		msg->nextBlockFast(_PREHASH_AgentData);
-		msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-		msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-		msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used
-
-		msg->nextBlock("MethodData");
-		msg->addString("Method", "estatechangecovenantid");
-		msg->addUUID("Invoice", LLFloaterRegionInfo::getLastInvoice());
-
-		msg->nextBlock("ParamList");
-		msg->addString("Parameter", getCovenantID().asString());
-		gAgent.sendReliableMessage();
-	}
-}
-
-// virtual 
-BOOL LLPanelEstateCovenant::sendUpdate()
-{
-	return TRUE;
-}
-
-const std::string& LLPanelEstateCovenant::getEstateName() const
-{
-	return mEstateNameText->getText();
-}
-
-void LLPanelEstateCovenant::setEstateName(const std::string& name)
-{
-	mEstateNameText->setText(name);
-}
-
-// static
-void LLPanelEstateCovenant::updateCovenantText(const std::string& string, const LLUUID& asset_id)
-{
-	LLPanelEstateCovenant* panelp = LLFloaterRegionInfo::getPanelCovenant();
-	if( panelp )
-	{
-		panelp->mEditor->setText(string);
-		panelp->setCovenantID(asset_id);
-	}
-}
-
-// static
-void LLPanelEstateCovenant::updateEstateName(const std::string& name)
-{
-	LLPanelEstateCovenant* panelp = LLFloaterRegionInfo::getPanelCovenant();
-	if( panelp )
-	{
-		panelp->mEstateNameText->setText(name);
-	}
-}
-
-// static
-void LLPanelEstateCovenant::updateLastModified(const std::string& text)
-{
-	LLPanelEstateCovenant* panelp = LLFloaterRegionInfo::getPanelCovenant();
-	if( panelp )
-	{
-		panelp->mLastModifiedText->setText(text);
-	}
-}
-
-// static
-void LLPanelEstateCovenant::updateEstateOwnerName(const std::string& name)
-{
-	LLPanelEstateCovenant* panelp = LLFloaterRegionInfo::getPanelCovenant();
-	if( panelp )
-	{
-		panelp->mEstateOwnerText->setText(name);
-	}
-}
-
-const std::string& LLPanelEstateCovenant::getOwnerName() const
-{
-	return mEstateOwnerText->getText();
-}
-
-void LLPanelEstateCovenant::setOwnerName(const std::string& name)
-{
-	mEstateOwnerText->setText(name);
-}
-
-void LLPanelEstateCovenant::setCovenantTextEditor(const std::string& text)
-{
-	mEditor->setText(text);
-}
-
-// key = "estateupdateinfo"
-// strings[0] = estate name
-// strings[1] = str(owner_id)
-// strings[2] = str(estate_id)
-// strings[3] = str(estate_flags)
-// strings[4] = str((S32)(sun_hour * 1024))
-// strings[5] = str(parent_estate_id)
-// strings[6] = str(covenant_id)
-// strings[7] = str(covenant_timestamp)
-// strings[8] = str(send_to_agent_only)
-// strings[9] = str(abuse_email_addr)
-bool LLDispatchEstateUpdateInfo::operator()(
-		const LLDispatcher* dispatcher,
-		const std::string& key,
-		const LLUUID& invoice,
-		const sparam_t& strings)
-{
-	LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();
-	if (!panel) return true;
-
-	// NOTE: LLDispatcher extracts strings with an extra \0 at the
-	// end.  If we pass the std::string direct to the UI/renderer
-	// it draws with a weird character at the end of the string.
-	std::string estate_name = strings[0].c_str(); // preserve c_str() call!
-	panel->setEstateName(estate_name);
-	
-	if (strings.size() > 3)
-	{
-		std::string abuse_email = strings[9].c_str(); // preserve c_str() call!
-		panel->setAbuseEmailAddress(abuse_email);
-	}
-	else
-	{
-		panel->setAbuseEmailAddress(panel->getString("email_unsupported"));
-	}
-
-	LLViewerRegion* regionp = gAgent.getRegion();
-
-	LLUUID owner_id(strings[1]);
-	regionp->setOwner(owner_id);
-	// Update estate owner name in UI
-	const BOOL is_group = FALSE;
-	gCacheName->get(owner_id, is_group, LLPanelEstateInfo::callbackCacheName);
-
-	U32 estate_id = strtoul(strings[2].c_str(), NULL, 10);
-	panel->setEstateID(estate_id);
-
-	U32 flags = strtoul(strings[3].c_str(), NULL, 10);
-	panel->setEstateFlags(flags);
-
-	F32 sun_hour = ((F32)(strtod(strings[4].c_str(), NULL)))/1024.0f;
-	if(sun_hour == 0 && (flags & REGION_FLAGS_SUN_FIXED ? FALSE : TRUE))
-	{
-		panel->setGlobalTime(TRUE);
-	} 
-	else
-	{
-		panel->setGlobalTime(FALSE);
-		panel->setSunHour(sun_hour);
-	}
-
-	bool visible_from_mainland = (bool)(flags & REGION_FLAGS_EXTERNALLY_VISIBLE);
-	bool god = gAgent.isGodlike();
-	bool linden_estate = (estate_id <= ESTATE_LAST_LINDEN);
-
-	// If visible from mainland, disable the access allowed
-	// UI, as anyone can teleport there.
-	// However, gods need to be able to edit the access list for
-	// linden estates, regardless of visibility, to allow object
-	// and L$ transfers.
-	bool enable_agent = (!visible_from_mainland || (god && linden_estate));
-	bool enable_group = enable_agent;
-	bool enable_ban = !linden_estate;
-	panel->setAccessAllowedEnabled(enable_agent, enable_group, enable_ban);
-
-	return true;
-}
-
-
-// key = "setaccess"
-// strings[0] = str(estate_id)
-// strings[1] = str(packed_access_lists)
-// strings[2] = str(num allowed agent ids)
-// strings[3] = str(num allowed group ids)
-// strings[4] = str(num banned agent ids)
-// strings[5] = str(num estate manager agent ids)
-// strings[6] = bin(uuid)
-// strings[7] = bin(uuid)
-// strings[8] = bin(uuid)
-// ...
-bool LLDispatchSetEstateAccess::operator()(
-		const LLDispatcher* dispatcher,
-		const std::string& key,
-		const LLUUID& invoice,
-		const sparam_t& strings)
-{
-	LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();
-	if (!panel) return true;
-
-	S32 index = 1;	// skip estate_id
-	U32 access_flags = strtoul(strings[index++].c_str(), NULL,10);
-	S32 num_allowed_agents = strtol(strings[index++].c_str(), NULL, 10);
-	S32 num_allowed_groups = strtol(strings[index++].c_str(), NULL, 10);
-	S32 num_banned_agents = strtol(strings[index++].c_str(), NULL, 10);
-	S32 num_estate_managers = strtol(strings[index++].c_str(), NULL, 10);
-
-	// sanity ckecks
-	if (num_allowed_agents > 0
-		&& !(access_flags & ESTATE_ACCESS_ALLOWED_AGENTS))
-	{
-		llwarns << "non-zero count for allowed agents, but no corresponding flag" << llendl;
-	}
-	if (num_allowed_groups > 0
-		&& !(access_flags & ESTATE_ACCESS_ALLOWED_GROUPS))
-	{
-		llwarns << "non-zero count for allowed groups, but no corresponding flag" << llendl;
-	}
-	if (num_banned_agents > 0
-		&& !(access_flags & ESTATE_ACCESS_BANNED_AGENTS))
-	{
-		llwarns << "non-zero count for banned agents, but no corresponding flag" << llendl;
-	}
-	if (num_estate_managers > 0
-		&& !(access_flags & ESTATE_ACCESS_MANAGERS))
-	{
-		llwarns << "non-zero count for managers, but no corresponding flag" << llendl;
-	}
-
-	// grab the UUID's out of the string fields
-	if (access_flags & ESTATE_ACCESS_ALLOWED_AGENTS)
-	{
-		LLNameListCtrl* allowed_agent_name_list;
-		allowed_agent_name_list = panel->getChild<LLNameListCtrl>("allowed_avatar_name_list");
-
-		int totalAllowedAgents = num_allowed_agents;
-		
-		if (allowed_agent_name_list) 
-		{
-			totalAllowedAgents += allowed_agent_name_list->getItemCount();
-		}
-
-		std::string msg = llformat("Allowed residents: (%d, max %d)",
-									totalAllowedAgents,
-									ESTATE_MAX_ACCESS_IDS);
-		panel->childSetValue("allow_resident_label", LLSD(msg));
-
-		if (allowed_agent_name_list)
-		{
-			//allowed_agent_name_list->deleteAllItems();
-			for (S32 i = 0; i < num_allowed_agents && i < ESTATE_MAX_ACCESS_IDS; i++)
-			{
-				LLUUID id;
-				memcpy(id.mData, strings[index++].data(), UUID_BYTES);		/* Flawfinder: ignore */
-				allowed_agent_name_list->addNameItem(id);
-			}
-			panel->childSetEnabled("remove_allowed_avatar_btn", allowed_agent_name_list->getFirstSelected() ? TRUE : FALSE);
-			allowed_agent_name_list->sortByColumnIndex(0, TRUE);
-		}
-	}
-
-	if (access_flags & ESTATE_ACCESS_ALLOWED_GROUPS)
-	{
-		LLNameListCtrl* allowed_group_name_list;
-		allowed_group_name_list = panel->getChild<LLNameListCtrl>("allowed_group_name_list");
-
-		std::string msg = llformat("Allowed groups: (%d, max %d)",
-									num_allowed_groups,
-									(S32) ESTATE_MAX_GROUP_IDS);
-		panel->childSetValue("allow_group_label", LLSD(msg));
-
-		if (allowed_group_name_list)
-		{
-			allowed_group_name_list->deleteAllItems();
-			for (S32 i = 0; i < num_allowed_groups && i < ESTATE_MAX_GROUP_IDS; i++)
-			{
-				LLUUID id;
-				memcpy(id.mData, strings[index++].data(), UUID_BYTES);		/* Flawfinder: ignore */
-				allowed_group_name_list->addGroupNameItem(id);
-			}
-			panel->childSetEnabled("remove_allowed_group_btn", allowed_group_name_list->getFirstSelected() ? TRUE : FALSE);
-			allowed_group_name_list->sortByColumnIndex(0, TRUE);
-		}
-	}
-
-	if (access_flags & ESTATE_ACCESS_BANNED_AGENTS)
-	{
-		LLNameListCtrl* banned_agent_name_list;
-		banned_agent_name_list = panel->getChild<LLNameListCtrl>("banned_avatar_name_list");
-
-		int totalBannedAgents = num_banned_agents;
-		
-		if (banned_agent_name_list) 
-		{
-			totalBannedAgents += banned_agent_name_list->getItemCount();
-		}
-
-
-		std::string msg = llformat("Banned residents: (%d, max %d)",
-									totalBannedAgents,
-									ESTATE_MAX_ACCESS_IDS);
-		panel->childSetValue("ban_resident_label", LLSD(msg));
-
-		if (banned_agent_name_list)
-		{
-			//banned_agent_name_list->deleteAllItems();
-			for (S32 i = 0; i < num_banned_agents && i < ESTATE_MAX_ACCESS_IDS; i++)
-			{
-				LLUUID id;
-				memcpy(id.mData, strings[index++].data(), UUID_BYTES);		/* Flawfinder: ignore */
-				banned_agent_name_list->addNameItem(id);
-			}
-			panel->childSetEnabled("remove_banned_avatar_btn", banned_agent_name_list->getFirstSelected() ? TRUE : FALSE);
-			banned_agent_name_list->sortByColumnIndex(0, TRUE);
-		}
-	}
-
-	if (access_flags & ESTATE_ACCESS_MANAGERS)
-	{
-		std::string msg = llformat("Estate Managers: (%d, max %d)",
-									num_estate_managers,
-									ESTATE_MAX_MANAGERS);
-		panel->childSetValue("estate_manager_label", LLSD(msg));
-
-		LLNameListCtrl* estate_manager_name_list =
-			panel->getChild<LLNameListCtrl>("estate_manager_name_list");
-		if (estate_manager_name_list)
-		{	
-			estate_manager_name_list->deleteAllItems();		// Clear existing entries
-
-			// There should be only ESTATE_MAX_MANAGERS people in the list, but if the database gets more (SL-46107) don't 
-			// truncate the list unless it's really big.  Go ahead and show the extras so the user doesn't get confused, 
-			// and they can still remove them.
-			for (S32 i = 0; i < num_estate_managers && i < (ESTATE_MAX_MANAGERS * 4); i++)
-			{
-				LLUUID id;
-				memcpy(id.mData, strings[index++].data(), UUID_BYTES);		/* Flawfinder: ignore */
-				estate_manager_name_list->addNameItem(id);
-			}
-			panel->childSetEnabled("remove_estate_manager_btn", estate_manager_name_list->getFirstSelected() ? TRUE : FALSE);
-			estate_manager_name_list->sortByColumnIndex(0, TRUE);
-		}
-	}
-
-	return true;
-}
-
-// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
-void LLFloaterRegionInfo::open()
-{
-	// We'll allow access to the estate tools for estate managers (and for the sim owner)
-	if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
-	{
-		LLViewerRegion* pRegion = gAgent.getRegion();
-		if (!pRegion)
-			return;
-
-		// Should be able to call LLRegion::canManageEstate() but then we can fake god like
-		if ( (!pRegion->isEstateManager()) && (pRegion->getOwner() != gAgent.getID()) )
-			return;
-	}
-
-	LLFloater::open();
-}
-// [/RLVa:KB]
+/** 
+ * @file llfloaterregioninfo.cpp
+ * @author Aaron Brashears
+ * @brief Implementation of the region info and controls floater and panels.
+ *
+ * $LicenseInfo:firstyear=2004&license=viewergpl$
+ * 
+ * Copyright (c) 2004-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 "llfloaterregioninfo.h"
+
+#include <algorithm>
+#include <functional>
+
+#include "llcachename.h"
+#include "lldir.h"
+#include "lldispatcher.h"
+#include "llglheaders.h"
+#include "llregionflags.h"
+#include "llstl.h"
+#include "indra_constants.h"
+#include "message.h"
+
+#include "llagent.h"
+#include "llalertdialog.h"
+#include "llappviewer.h"
+#include "llfloateravatarpicker.h"
+#include "llbutton.h" 
+#include "llcheckboxctrl.h"
+#include "llcombobox.h"
+#include "llfilepicker.h"
+#include "llfloaterdaycycle.h"
+#include "llfloatergodtools.h"	// for send_sim_wide_deletes()
+#include "llfloatertopobjects.h" // added to fix SL-32336
+#include "llfloatergroups.h"
+#include "llfloatertelehub.h"
+#include "llfloaterwindlight.h"
+#include "llinventorymodel.h"
+#include "lllineeditor.h"
+#include "llalertdialog.h"
+#include "llnamelistctrl.h"
+#include "llsliderctrl.h"
+#include "llspinctrl.h"
+#include "lltabcontainer.h"
+#include "lltextbox.h"
+#include "llinventory.h"
+#include "lltexturectrl.h"
+#include "lltrans.h"
+#include "llviewercontrol.h"
+#include "lluictrlfactory.h"
+#include "llviewerimage.h"
+#include "llviewerimagelist.h"
+#include "llviewerregion.h"
+#include "llviewerstats.h"
+#include "llviewertexteditor.h"
+#include "llviewerwindow.h"
+#include "llvlcomposition.h"
+#include "hippolimits.h"
+
+// [RLVa:KB]
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
+#define ELAR_ENABLED 0 // Enable when server support is implemented
+
+const S32 TERRAIN_TEXTURE_COUNT = 4;
+const S32 CORNER_COUNT = 4;
+
+///----------------------------------------------------------------------------
+/// Local class declaration
+///----------------------------------------------------------------------------
+
+class LLDispatchEstateUpdateInfo : public LLDispatchHandler
+{
+public:
+	LLDispatchEstateUpdateInfo() {}
+	virtual ~LLDispatchEstateUpdateInfo() {}
+	virtual bool operator()(
+		const LLDispatcher* dispatcher,
+		const std::string& key,
+		const LLUUID& invoice,
+		const sparam_t& strings);
+};
+
+class LLDispatchSetEstateAccess : public LLDispatchHandler
+{
+public:
+	LLDispatchSetEstateAccess() {}
+	virtual ~LLDispatchSetEstateAccess() {}
+	virtual bool operator()(
+		const LLDispatcher* dispatcher,
+		const std::string& key,
+		const LLUUID& invoice,
+		const sparam_t& strings);
+};
+
+
+/*
+void unpack_request_params(
+	LLMessageSystem* msg,
+	LLDispatcher::sparam_t& strings,
+	LLDispatcher::iparam_t& integers)
+{
+	char str_buf[MAX_STRING];
+	S32 str_count = msg->getNumberOfBlocksFast(_PREHASH_StringData);
+	S32 i;
+	for (i = 0; i < str_count; ++i)
+	{
+		// we treat the SParam as binary data (since it might be an 
+		// LLUUID in compressed form which may have embedded \0's,)
+		str_buf[0] = '\0';
+		S32 data_size = msg->getSizeFast(_PREHASH_StringData, i, _PREHASH_SParam);
+		if (data_size >= 0)
+		{
+			msg->getBinaryDataFast(_PREHASH_StringData, _PREHASH_SParam,
+								   str_buf, data_size, i, MAX_STRING - 1);
+			strings.push_back(std::string(str_buf, data_size));
+		}
+	}
+
+	U32 int_buf;
+	S32 int_count = msg->getNumberOfBlocksFast(_PREHASH_IntegerData);
+	for (i = 0; i < int_count; ++i)
+	{
+		msg->getU32("IntegerData", "IParam", int_buf, i);
+		integers.push_back(int_buf);
+	}
+}
+*/
+
+
+
+bool estate_dispatch_initialized = false;
+
+
+///----------------------------------------------------------------------------
+/// LLFloaterRegionInfo
+///----------------------------------------------------------------------------
+
+//S32 LLFloaterRegionInfo::sRequestSerial = 0;
+LLUUID LLFloaterRegionInfo::sRequestInvoice;
+
+LLFloaterRegionInfo::LLFloaterRegionInfo(const LLSD& seed)
+{
+	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_region_info.xml", NULL, FALSE);
+}
+
+BOOL LLFloaterRegionInfo::postBuild()
+{
+	mTab = getChild<LLTabContainer>("region_panels");
+
+	// contruct the panels
+	LLPanelRegionInfo* panel;
+
+	panel = new LLPanelRegionGeneralInfo;
+	mInfoPanels.push_back(panel);
+	LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_general.xml");
+	mTab->addTabPanel(panel, panel->getLabel(), TRUE);
+
+	// We only use this panel on Aurora-based sims -- MC
+	std::string url = gAgent.getRegion()->getCapability("DispatchOpenRegionSettings");
+	if (!url.empty())
+	{
+		panel = new LLPanelRegionOpenSettingsInfo;
+		mInfoPanels.push_back(panel);
+		LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_open_region_settings.xml");
+		mTab->addTabPanel(panel, panel->getLabel(), FALSE);
+	}
+
+	panel = new LLPanelRegionDebugInfo;
+	mInfoPanels.push_back(panel);
+	LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_debug.xml");
+	mTab->addTabPanel(panel, panel->getLabel(), FALSE);
+
+	panel = new LLPanelRegionTextureInfo;
+	mInfoPanels.push_back(panel);
+	LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_texture.xml");
+	mTab->addTabPanel(panel, panel->getLabel(), FALSE);
+
+	panel = new LLPanelRegionTerrainInfo;
+	mInfoPanels.push_back(panel);
+	LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_terrain.xml");
+	mTab->addTabPanel(panel, panel->getLabel(), FALSE);
+
+	panel = new LLPanelEstateInfo;
+	mInfoPanels.push_back(panel);
+	LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_estate.xml");
+	mTab->addTabPanel(panel, panel->getLabel(), FALSE);
+
+	panel = new LLPanelEstateCovenant;
+	mInfoPanels.push_back(panel);
+	LLUICtrlFactory::getInstance()->buildPanel(panel, "panel_region_covenant.xml");
+	mTab->addTabPanel(panel, panel->getLabel(), FALSE);
+
+	gMessageSystem->setHandlerFunc(
+		"EstateOwnerMessage", 
+		&processEstateOwnerRequest);
+
+	return TRUE;
+}
+
+LLFloaterRegionInfo::~LLFloaterRegionInfo()
+{
+}
+
+void LLFloaterRegionInfo::onOpen()
+{
+	LLRect rect = gSavedSettings.getRect("FloaterRegionInfo");
+	S32 left, top;
+	gFloaterView->getNewFloaterPosition(&left, &top);
+	rect.translate(left,top);
+
+	refreshFromRegion(gAgent.getRegion());
+	requestRegionInfo();
+	LLFloater::onOpen();
+}
+
+// static
+void LLFloaterRegionInfo::requestRegionInfo()
+{
+	LLTabContainer* tab = findInstance()->getChild<LLTabContainer>("region_panels");
+
+	tab->getChild<LLPanel>("General")->setCtrlsEnabled(FALSE);
+	tab->getChild<LLPanel>("Debug")->setCtrlsEnabled(FALSE);
+	tab->getChild<LLPanel>("Terrain")->setCtrlsEnabled(FALSE);
+	tab->getChild<LLPanel>("Estate")->setCtrlsEnabled(FALSE);
+	tab->getChild<LLPanel>("RegionSettings")->setCtrlsEnabled(FALSE);
+
+	// Must allow anyone to request the RegionInfo data
+	// so non-owners/non-gods can see the values. 
+	// Therefore can't use an EstateOwnerMessage JC
+	LLMessageSystem* msg = gMessageSystem;
+	msg->newMessage("RequestRegionInfo");
+	msg->nextBlock("AgentData");
+	msg->addUUID("AgentID", gAgent.getID());
+	msg->addUUID("SessionID", gAgent.getSessionID());
+	gAgent.sendReliableMessage();
+}
+
+// static
+void LLFloaterRegionInfo::processEstateOwnerRequest(LLMessageSystem* msg,void**)
+{
+	static LLDispatcher dispatch;
+	if(!findInstance())
+	{
+		return;
+	}
+	
+	if (!estate_dispatch_initialized)
+	{
+		LLPanelEstateInfo::initDispatch(dispatch);
+	}
+
+	LLTabContainer* tab = findInstance()->getChild<LLTabContainer>("region_panels");
+	LLPanelEstateInfo* panel = (LLPanelEstateInfo*)tab->getChild<LLPanel>("Estate");
+
+	// unpack the message
+	std::string request;
+	LLUUID invoice;
+	LLDispatcher::sparam_t strings;
+	LLDispatcher::unpackMessage(msg, request, invoice, strings);
+	if(invoice != getLastInvoice())
+	{
+		llwarns << "Mismatched Estate message: " << request << llendl;
+		return;
+	}
+
+	//dispatch the message
+	dispatch.dispatch(request, invoice, strings);
+
+	LLViewerRegion* region = gAgent.getRegion();
+	panel->updateControls(region);
+}
+
+
+// static
+void LLFloaterRegionInfo::processRegionInfo(LLMessageSystem* msg)
+{
+	LLPanel* panel;
+
+	llinfos << "LLFloaterRegionInfo::processRegionInfo" << llendl;
+	if(!findInstance())
+	{
+		return;
+	}
+	
+	LLTabContainer* tab = findInstance()->getChild<LLTabContainer>("region_panels");
+
+	LLViewerRegion* region = gAgent.getRegion();
+	BOOL allow_modify = gAgent.isGodlike() || (region && region->canManageEstate());
+
+	// extract message
+	std::string sim_name;
+	std::string sim_type = LLTrans::getString("land_type_unknown");
+	U32 region_flags;
+	U8 agent_limit;
+	F32 object_bonus_factor;
+	U8 sim_access;
+	F32 water_height;
+	F32 terrain_raise_limit;
+	F32 terrain_lower_limit;
+	BOOL use_estate_sun;
+	F32 sun_hour;
+	msg->getString("RegionInfo", "SimName", sim_name);
+	msg->getU32("RegionInfo", "RegionFlags", region_flags);
+	msg->getU8("RegionInfo", "MaxAgents", agent_limit);
+	msg->getF32("RegionInfo", "ObjectBonusFactor", object_bonus_factor);
+	msg->getU8("RegionInfo", "SimAccess", sim_access);
+	msg->getF32Fast(_PREHASH_RegionInfo, _PREHASH_WaterHeight, water_height);
+	msg->getF32Fast(_PREHASH_RegionInfo, _PREHASH_TerrainRaiseLimit, terrain_raise_limit);
+	msg->getF32Fast(_PREHASH_RegionInfo, _PREHASH_TerrainLowerLimit, terrain_lower_limit);
+	msg->getBOOL("RegionInfo", "UseEstateSun", use_estate_sun);
+	// actually the "last set" sun hour, not the current sun hour. JC
+	msg->getF32("RegionInfo", "SunHour", sun_hour);
+	// the only reasonable way to decide if we actually have any data is to
+	// check to see if any of these fields have nonzero sizes
+	if (msg->getSize("RegionInfo2", "ProductSKU") > 0 ||
+		msg->getSize("RegionInfo2", "ProductName") > 0)
+	{
+		msg->getString("RegionInfo2", "ProductName", sim_type);
+	}
+
+	// GENERAL PANEL
+	panel = tab->getChild<LLPanel>("General");
+	panel->childSetValue("region_text", LLSD(sim_name));
+	panel->childSetValue("region_type", LLSD(sim_type));
+	panel->childSetValue("version_channel_text", gLastVersionChannel);
+
+	panel->childSetValue("block_terraform_check", (region_flags & REGION_FLAGS_BLOCK_TERRAFORM) ? TRUE : FALSE );
+	panel->childSetValue("block_fly_check", (region_flags & REGION_FLAGS_BLOCK_FLY) ? TRUE : FALSE );
+	panel->childSetValue("allow_damage_check", (region_flags & REGION_FLAGS_ALLOW_DAMAGE) ? TRUE : FALSE );
+	panel->childSetValue("restrict_pushobject", (region_flags & REGION_FLAGS_RESTRICT_PUSHOBJECT) ? TRUE : FALSE );
+	panel->childSetValue("allow_land_resell_check", (region_flags & REGION_FLAGS_BLOCK_LAND_RESELL) ? FALSE : TRUE );
+	panel->childSetValue("allow_parcel_changes_check", (region_flags & REGION_FLAGS_ALLOW_PARCEL_CHANGES) ? TRUE : FALSE );
+	panel->childSetValue("block_parcel_search_check", (region_flags & REGION_FLAGS_BLOCK_PARCEL_SEARCH) ? TRUE : FALSE );
+	panel->childSetValue("agent_limit_spin", LLSD((F32)agent_limit) );
+	panel->childSetValue("object_bonus_spin", LLSD(object_bonus_factor) );
+	panel->childSetValue("access_combo", LLSD(sim_access) );
+
+
+ 	// detect teen grid for maturity
+
+	U32 parent_estate_id;
+	msg->getU32("RegionInfo", "ParentEstateID", parent_estate_id);
+	BOOL teen_grid = (parent_estate_id == 5);  // *TODO add field to estate table and test that
+	panel->childSetEnabled("access_combo", gAgent.isGodlike() || (region && region->canManageEstate() && !teen_grid));
+	panel->setCtrlsEnabled(allow_modify);
+	
+	// RegionSettings PANEL
+	panel = tab->getChild<LLPanel>("RegionSettings");
+	panel->setCtrlsEnabled(allow_modify);
+
+	// DEBUG PANEL
+	panel = tab->getChild<LLPanel>("Debug");
+
+	panel->childSetValue("region_text", LLSD(sim_name) );
+	panel->childSetValue("disable_scripts_check", LLSD((BOOL)(region_flags & REGION_FLAGS_SKIP_SCRIPTS)) );
+	panel->childSetValue("disable_collisions_check", LLSD((BOOL)(region_flags & REGION_FLAGS_SKIP_COLLISIONS)) );
+	panel->childSetValue("disable_physics_check", LLSD((BOOL)(region_flags & REGION_FLAGS_SKIP_PHYSICS)) );
+	panel->setCtrlsEnabled(allow_modify);
+
+	// TERRAIN PANEL
+	panel = tab->getChild<LLPanel>("Terrain");
+
+	panel->childSetValue("region_text", LLSD(sim_name));
+	panel->childSetValue("water_height_spin", LLSD(water_height));
+	panel->childSetValue("terrain_raise_spin", LLSD(terrain_raise_limit));
+	panel->childSetValue("terrain_lower_spin", LLSD(terrain_lower_limit));
+	panel->childSetValue("use_estate_sun_check", LLSD(use_estate_sun));
+
+	panel->childSetValue("fixed_sun_check", LLSD((BOOL)(region_flags & REGION_FLAGS_SUN_FIXED)));
+	panel->childSetEnabled("fixed_sun_check", allow_modify && !use_estate_sun);
+	panel->childSetValue("sun_hour_slider", LLSD(sun_hour));
+	panel->childSetEnabled("sun_hour_slider", allow_modify && !use_estate_sun);
+	panel->setCtrlsEnabled(allow_modify);
+
+	getInstance()->refreshFromRegion( gAgent.getRegion() );
+}
+
+// static
+LLPanelEstateInfo* LLFloaterRegionInfo::getPanelEstate()
+{
+	LLFloaterRegionInfo* floater = LLFloaterRegionInfo::getInstance();
+	if (!floater) return NULL;
+	LLTabContainer* tab = floater->getChild<LLTabContainer>("region_panels");
+	LLPanelEstateInfo* panel = (LLPanelEstateInfo*)tab->getChild<LLPanel>("Estate");
+	return panel;
+}
+
+// static
+LLPanelEstateCovenant* LLFloaterRegionInfo::getPanelCovenant()
+{
+	LLFloaterRegionInfo* floater = LLFloaterRegionInfo::getInstance();
+	if (!floater) return NULL;
+	LLTabContainer* tab = floater->getChild<LLTabContainer>("region_panels");
+	LLPanelEstateCovenant* panel = (LLPanelEstateCovenant*)tab->getChild<LLPanel>("Covenant");
+	return panel;
+}
+
+// static
+LLPanelRegionOpenSettingsInfo* LLFloaterRegionInfo::getPanelOpenSettings()
+{
+	LLFloaterRegionInfo* floater = LLFloaterRegionInfo::getInstance();
+	if (floater) 
+	{
+		LLTabContainer* tab = floater->getChild<LLTabContainer>("region_panels");
+		LLPanelRegionOpenSettingsInfo* panel = (LLPanelRegionOpenSettingsInfo*)tab->getChild<LLPanel>("RegionSettings", FALSE, FALSE);
+		if (panel)
+		{
+			return panel;
+		}
+	}
+	return NULL;
+}
+
+void LLFloaterRegionInfo::refreshFromRegion(LLViewerRegion* region)
+{
+	// call refresh from region on all panels
+	std::for_each(
+		mInfoPanels.begin(),
+		mInfoPanels.end(),
+		llbind2nd(
+#if LL_WINDOWS
+			std::mem_fun1(&LLPanelRegionInfo::refreshFromRegion),
+#else
+			std::mem_fun(&LLPanelRegionInfo::refreshFromRegion),
+#endif
+			region));
+}
+
+// public
+void LLFloaterRegionInfo::refresh()
+{
+	for(info_panels_t::iterator iter = mInfoPanels.begin();
+		iter != mInfoPanels.end(); ++iter)
+	{
+		(*iter)->refresh();
+	}
+}
+
+
+///----------------------------------------------------------------------------
+/// Local class implementation
+///----------------------------------------------------------------------------
+
+//
+// LLPanelRegionInfo
+//
+
+// static
+void LLPanelRegionInfo::onBtnSet(void* user_data)
+{
+	LLPanelRegionInfo* panel = (LLPanelRegionInfo*)user_data;
+	if(!panel) return;
+	if (panel->sendUpdate())
+	{
+		panel->disableButton("apply_btn");
+	}
+}
+
+//static 
+void LLPanelRegionInfo::onChangeChildCtrl(LLUICtrl* ctrl, void* user_data)
+{
+	if (ctrl)
+	{
+		LLPanelRegionInfo* panel = (LLPanelRegionInfo*) ctrl->getParent();
+		panel->updateChild(ctrl);
+	}
+}
+
+// static
+// Enables the "set" button if it is not already enabled
+void LLPanelRegionInfo::onChangeAnything(LLUICtrl* ctrl, void* user_data)
+{
+	LLPanelRegionInfo* panel = (LLPanelRegionInfo*)user_data;
+	if(panel)
+	{
+		panel->enableButton("apply_btn");
+		panel->refresh();
+	}
+}
+
+// static
+// Enables set button on change to line editor
+void LLPanelRegionInfo::onChangeText(LLLineEditor* caller, void* user_data)
+{
+	// reuse the previous method
+	onChangeAnything(0, user_data);
+}
+
+
+// virtual
+BOOL LLPanelRegionInfo::postBuild()
+{
+	childSetAction("apply_btn", onBtnSet, this);
+	childDisable("apply_btn");
+	refresh();
+	return TRUE;
+}
+
+// virtual 
+void LLPanelRegionInfo::updateChild(LLUICtrl* child_ctr)
+{
+}
+
+// virtual
+bool LLPanelRegionInfo::refreshFromRegion(LLViewerRegion* region)
+{
+	if (region) mHost = region->getHost();
+	return true;
+}
+
+void LLPanelRegionInfo::sendEstateOwnerMessage(
+	LLMessageSystem* msg,
+	const std::string& request,
+	const LLUUID& invoice,
+	const strings_t& strings)
+{
+	llinfos << "Sending estate request '" << request << "'" << llendl;
+	msg->newMessage("EstateOwnerMessage");
+	msg->nextBlockFast(_PREHASH_AgentData);
+	msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+	msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+	msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used
+	msg->nextBlock("MethodData");
+	msg->addString("Method", request);
+	msg->addUUID("Invoice", invoice);
+	if(strings.empty())
+	{
+		msg->nextBlock("ParamList");
+		msg->addString("Parameter", NULL);
+	}
+	else
+	{
+		strings_t::const_iterator it = strings.begin();
+		strings_t::const_iterator end = strings.end();
+		for(; it != end; ++it)
+		{
+			msg->nextBlock("ParamList");
+			msg->addString("Parameter", *it);
+		}
+	}
+	msg->sendReliable(mHost);
+}
+
+void LLPanelRegionInfo::enableButton(const std::string& btn_name, BOOL enable)
+{
+	childSetEnabled(btn_name, enable);
+}
+
+void LLPanelRegionInfo::disableButton(const std::string& btn_name)
+{
+	childDisable(btn_name);
+}
+
+void LLPanelRegionInfo::initCtrl(const std::string& name)
+{
+	childSetCommitCallback(name, onChangeAnything, this);
+}
+
+void LLPanelRegionInfo::initHelpBtn(const std::string& name, const std::string& xml_alert)
+{
+	childSetAction(name, onClickHelp, new std::string(xml_alert));
+}
+
+// static
+void LLPanelRegionInfo::onClickHelp(void* data)
+{
+	std::string* xml_alert = (std::string*)data;
+	LLNotifications::instance().add(*xml_alert);
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// LLPanelRegionGeneralInfo
+//
+bool LLPanelRegionGeneralInfo::refreshFromRegion(LLViewerRegion* region)
+{
+	BOOL allow_modify = gAgent.isGodlike() || (region && region->canManageEstate());
+	setCtrlsEnabled(allow_modify);
+	childDisable("apply_btn");
+	childSetEnabled("access_text", allow_modify);
+	// childSetEnabled("access_combo", allow_modify);
+	// now set in processRegionInfo for teen grid detection
+	childSetEnabled("kick_btn", allow_modify);
+	childSetEnabled("kick_all_btn", allow_modify);
+	childSetEnabled("im_btn", allow_modify);
+	childSetEnabled("manage_telehub_btn", allow_modify);
+
+	// Data gets filled in by processRegionInfo
+
+	return LLPanelRegionInfo::refreshFromRegion(region);
+}
+
+BOOL LLPanelRegionGeneralInfo::postBuild()
+{
+	// Enable the "Apply" button if something is changed. JC
+	initCtrl("block_terraform_check");
+	initCtrl("block_fly_check");
+	initCtrl("allow_damage_check");
+	initCtrl("allow_land_resell_check");
+	initCtrl("allow_parcel_changes_check");
+	initCtrl("agent_limit_spin");
+	initCtrl("object_bonus_spin");
+	initCtrl("access_combo");
+	initCtrl("restrict_pushobject");
+	initCtrl("block_parcel_search_check");
+	initCtrl("minimum_agent_age");
+
+	initHelpBtn("terraform_help",		"HelpRegionBlockTerraform");
+	initHelpBtn("fly_help",				"HelpRegionBlockFly");
+	initHelpBtn("damage_help",			"HelpRegionAllowDamage");
+	initHelpBtn("agent_limit_help",		"HelpRegionAgentLimit");
+	initHelpBtn("object_bonus_help",	"HelpRegionObjectBonus");
+	initHelpBtn("access_help",			"HelpRegionMaturity");
+	initHelpBtn("restrict_pushobject_help",		"HelpRegionRestrictPushObject");
+	initHelpBtn("land_resell_help",	"HelpRegionLandResell");
+	initHelpBtn("parcel_changes_help", "HelpParcelChanges");
+	initHelpBtn("parcel_search_help", "HelpRegionSearch");
+
+	childSetAction("kick_btn", onClickKick, this);
+	childSetAction("kick_all_btn", onClickKickAll, this);
+	childSetAction("im_btn", onClickMessage, this);
+	childSetAction("manage_telehub_btn", onClickManageTelehub, this);
+
+	return LLPanelRegionInfo::postBuild();
+}
+
+// static
+void LLPanelRegionGeneralInfo::onClickKick(void* userdata)
+{
+	llinfos << "LLPanelRegionGeneralInfo::onClickKick" << llendl;
+	LLPanelRegionGeneralInfo* panelp = (LLPanelRegionGeneralInfo*)userdata;
+
+	// this depends on the grandparent view being a floater
+	// in order to set up floater dependency
+	LLFloater* parent_floater = gFloaterView->getParentFloater(panelp);
+	LLFloater* child_floater = LLFloaterAvatarPicker::show(onKickCommit, userdata, FALSE, TRUE);
+	parent_floater->addDependentFloater(child_floater);
+}
+
+// static
+void LLPanelRegionGeneralInfo::onKickCommit(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* userdata)
+{
+	if (names.empty() || ids.empty()) return;
+	if(ids[0].notNull())
+	{
+		LLPanelRegionGeneralInfo* self = (LLPanelRegionGeneralInfo*)userdata;
+		if(!self) return;
+		strings_t strings;
+		// [0] = our agent id
+		// [1] = target agent id
+		std::string buffer;
+		gAgent.getID().toString(buffer);
+		strings.push_back(buffer);
+
+		ids[0].toString(buffer);
+		strings.push_back(strings_t::value_type(buffer));
+
+		LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
+		self->sendEstateOwnerMessage(gMessageSystem, "teleporthomeuser", invoice, strings);
+	}
+}
+
+// static
+void LLPanelRegionGeneralInfo::onClickKickAll(void* userdata)
+{
+	llinfos << "LLPanelRegionGeneralInfo::onClickKickAll" << llendl;
+	LLNotifications::instance().add("KickUsersFromRegion", 
+									LLSD(), 
+									LLSD(), 
+									boost::bind(&LLPanelRegionGeneralInfo::onKickAllCommit, (LLPanelRegionGeneralInfo*)userdata, _1, _2));
+}
+
+bool LLPanelRegionGeneralInfo::onKickAllCommit(const LLSD& notification, const LLSD& response)
+{
+	S32 option = LLNotification::getSelectedOption(notification, response);
+	if (option == 0)
+	{
+		strings_t strings;
+		// [0] = our agent id
+		std::string buffer;
+		gAgent.getID().toString(buffer);
+		strings.push_back(buffer);
+
+		LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
+		// historical message name
+		sendEstateOwnerMessage(gMessageSystem, "teleporthomeallusers", invoice, strings);
+	}
+	return false;
+}
+
+// static
+void LLPanelRegionGeneralInfo::onClickMessage(void* userdata)
+{
+	llinfos << "LLPanelRegionGeneralInfo::onClickMessage" << llendl;
+	LLNotifications::instance().add("MessageRegion", 
+		LLSD(), 
+		LLSD(), 
+		boost::bind(&LLPanelRegionGeneralInfo::onMessageCommit, (LLPanelRegionGeneralInfo*)userdata, _1, _2));
+}
+
+// static
+bool LLPanelRegionGeneralInfo::onMessageCommit(const LLSD& notification, const LLSD& response)
+{
+	if(LLNotification::getSelectedOption(notification, response) != 0) return false;
+
+	std::string text = response["message"].asString();
+	if (text.empty()) return false;
+
+	llinfos << "Message to everyone: " << text << llendl;
+	strings_t strings;
+	// [0] grid_x, unused here
+	// [1] grid_y, unused here
+	// [2] agent_id of sender
+	// [3] sender name
+	// [4] message
+	strings.push_back("-1");
+	strings.push_back("-1");
+	std::string buffer;
+	gAgent.getID().toString(buffer);
+	strings.push_back(buffer);
+	std::string name;
+	gAgent.buildFullname(name);
+	strings.push_back(strings_t::value_type(name));
+	strings.push_back(strings_t::value_type(text));
+	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
+	sendEstateOwnerMessage(gMessageSystem, "simulatormessage", invoice, strings);
+	return false;
+}
+
+// static
+void LLPanelRegionGeneralInfo::onClickManageTelehub(void* data)
+{
+	LLFloaterRegionInfo::getInstance()->close();
+
+	LLFloaterTelehub::show();
+}
+
+// setregioninfo
+// strings[0] = 'Y' - block terraform, 'N' - not
+// strings[1] = 'Y' - block fly, 'N' - not
+// strings[2] = 'Y' - allow damage, 'N' - not
+// strings[3] = 'Y' - allow land sale, 'N' - not
+// strings[4] = agent limit
+// strings[5] = object bonus
+// strings[6] = sim access (0 = unknown, 13 = PG, 21 = Mature, 42 = Adult)
+// strings[7] = restrict pushobject
+// strings[8] = 'Y' - allow parcel subdivide, 'N' - not
+// strings[9] = 'Y' - block parcel search, 'N' - allow
+BOOL LLPanelRegionGeneralInfo::sendUpdate()
+{
+	llinfos << "LLPanelRegionGeneralInfo::sendUpdate()" << llendl;
+
+	// First try using a Cap.  If that fails use the old method.
+	LLSD body;
+	std::string url = gAgent.getRegion()->getCapability("DispatchRegionInfo");
+	if (!url.empty())
+	{
+		body["block_terraform"] = childGetValue("block_terraform_check");
+		body["block_fly"] = childGetValue("block_fly_check");
+		body["allow_damage"] = childGetValue("allow_damage_check");
+		body["allow_land_resell"] = childGetValue("allow_land_resell_check");
+		body["agent_limit"] = childGetValue("agent_limit_spin");
+		body["prim_bonus"] = childGetValue("object_bonus_spin");
+		body["sim_access"] = childGetValue("access_combo");
+		body["restrict_pushobject"] = childGetValue("restrict_pushobject");
+		body["allow_parcel_changes"] = childGetValue("allow_parcel_changes_check");
+		body["block_parcel_search"] = childGetValue("block_parcel_search_check");
+		body["minimum_agent_age"] = childGetValue("minimum_agent_age");
+
+		LLHTTPClient::post(url, body, new LLHTTPClient::Responder());
+	}
+	else
+	{
+		strings_t strings;
+		std::string buffer;
+
+		buffer = llformat("%s", (childGetValue("block_terraform_check").asBoolean() ? "Y" : "N"));
+		strings.push_back(strings_t::value_type(buffer));
+
+		buffer = llformat("%s", (childGetValue("block_fly_check").asBoolean() ? "Y" : "N"));
+		strings.push_back(strings_t::value_type(buffer));
+
+		buffer = llformat("%s", (childGetValue("allow_damage_check").asBoolean() ? "Y" : "N"));
+		strings.push_back(strings_t::value_type(buffer));
+
+		buffer = llformat("%s", (childGetValue("allow_land_resell_check").asBoolean() ? "Y" : "N"));
+		strings.push_back(strings_t::value_type(buffer));
+
+		F32 value = (F32)childGetValue("agent_limit_spin").asReal();
+		buffer = llformat("%f", value);
+		strings.push_back(strings_t::value_type(buffer));
+
+		value = (F32)childGetValue("object_bonus_spin").asReal();
+		buffer = llformat("%f", value);
+		strings.push_back(strings_t::value_type(buffer));
+
+		buffer = llformat("%d", childGetValue("access_combo").asInteger());
+		strings.push_back(strings_t::value_type(buffer));
+
+		buffer = llformat("%s", (childGetValue("restrict_pushobject").asBoolean() ? "Y" : "N"));
+		strings.push_back(strings_t::value_type(buffer));
+
+		buffer = llformat("%s", (childGetValue("allow_parcel_changes_check").asBoolean() ? "Y" : "N"));
+		strings.push_back(strings_t::value_type(buffer));
+
+		LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
+		sendEstateOwnerMessage(gMessageSystem, "setregioninfo", invoice, strings);
+	}
+
+	// if we changed access levels, tell user about it
+	LLViewerRegion* region = gAgent.getRegion();
+	if (region && (childGetValue("access_combo").asInteger() != region->getSimAccess()) )
+	{
+		LLNotifications::instance().add("RegionMaturityChange");
+	}	
+
+	return TRUE;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// LLPanelRegionOpenSettingsInfo
+//
+bool LLPanelRegionOpenSettingsInfo::refreshFromRegion(LLViewerRegion* region)
+{
+	// Data gets filled in by hippo manager
+	BOOL allow_modify = gAgent.isGodlike() || (region && region->canManageEstate());
+	
+	childSetValue("draw_distance", gAgent.mDrawDistance);
+	childSetValue("force_draw_distance", gAgent.mLockedDrawDistance);
+	childSetValue("allow_minimap", LLSD(gHippoLimits->mAllowMinimap));
+	childSetValue("allow_physical_prims", (gHippoLimits->mAllowPhysicalPrims == 1 ? TRUE : FALSE));
+	childSetValue("max_drag_distance", LLSD(gHippoLimits->mMaxDragDistance));
+	childSetValue("min_hole_size", LLSD(gHippoLimits->mMinHoleSize));
+	childSetValue("max_hollow_size", LLSD(gHippoLimits->mMaxHollow));
+	childSetValue("max_inventory_items_transfer", LLSD(gHippoLimits->mMaxInventoryItemsTransfer));
+	childSetValue("max_link_count", LLSD(gHippoLimits->mMaxLinkedPrims));
+	childSetValue("max_link_count_phys", LLSD(gHippoLimits->mMaxPhysLinkedPrims));
+	childSetValue("max_phys_prim_scale", LLSD(gHippoLimits->mMaxPrimScale));//Todo:Fix
+	childSetValue("max_prim_scale", LLSD(gHippoLimits->mMaxPrimScale));
+	childSetValue("min_prim_scale", LLSD(gHippoLimits->mMinPrimScale));
+	childSetValue("render_water", LLSD(gHippoLimits->mRenderWater));
+	childSetValue("show_tags", LLSD(gHippoLimits->mRenderName));
+	childSetValue("max_groups", LLSD(gHippoLimits->mMaxAgentGroups));
+	childSetValue("allow_parcel_windlight", LLSD(gHippoLimits->mAllowParcelWindLight));
+	childSetValue("enable_teen_mode", LLSD(gHippoLimits->mEnableTeenMode));
+	childSetValue("enforce_max_build", LLSD(gHippoLimits->mEnforceMaxBuild));
+
+	setCtrlsEnabled(allow_modify);
+ 
+	return LLPanelRegionInfo::refreshFromRegion(region);
+}
+
+BOOL LLPanelRegionOpenSettingsInfo::postBuild()
+{
+	// Enable the "Apply" button if something is changed. JC
+	initCtrl("draw_distance");
+	initCtrl("force_draw_distance");
+	initCtrl("max_drag_distance");
+	initCtrl("max_prim_scale");
+	initCtrl("min_prim_scale");
+	initCtrl("max_phys_prim_scale");
+	initCtrl("max_hollow_size");
+	initCtrl("min_hole_size");
+	initCtrl("max_link_count");
+	initCtrl("max_link_count_phys");
+	initCtrl("max_inventory_items_transfer");
+	initCtrl("max_groups");
+	initCtrl("render_water");
+	initCtrl("allow_minimap");
+	initCtrl("allow_physical_prims");
+	initCtrl("enable_teen_mode");
+	initCtrl("show_tags");
+	initCtrl("allow_parcel_windlight");
+
+	initHelpBtn("force_draw_distance_help",		"HelpForceDrawDistance");
+	initHelpBtn("max_inventory_items_transfer_help",				"HelpMaxInventoryItemsTransfer");
+	initHelpBtn("max_groups_help",			"HelpMaxGroups");
+	initHelpBtn("render_water_help",		"HelpRenderWater");
+	initHelpBtn("allow_minimap_help",	"HelpAllowMinimap");
+	initHelpBtn("allow_physical_prims_help",			"HelpAllowPhysicalPrims");
+	initHelpBtn("enable_teen_mode_help",		"HelpEnableTeenMode");
+	initHelpBtn("show_tags_help",	"HelpShowTags");
+	initHelpBtn("allow_parcel_windlight_help", "HelpAllowParcelWindLight");
+
+	childSetAction("apply_ors_btn", onClickOrs, this);
+
+	refreshFromRegion(gAgent.getRegion());
+
+	return LLPanelRegionInfo::postBuild();
+}
+
+// setregioninfo
+// strings[0] = 'Y' - block terraform, 'N' - not
+// strings[1] = 'Y' - block fly, 'N' - not
+// strings[2] = 'Y' - allow damage, 'N' - not
+// strings[3] = 'Y' - allow land sale, 'N' - not
+// strings[4] = agent limit
+// strings[5] = object bonus
+// strings[6] = sim access (0 = unknown, 13 = PG, 21 = Mature, 42 = Adult)
+// strings[7] = restrict pushobject
+// strings[8] = 'Y' - allow parcel subdivide, 'N' - not
+// strings[9] = 'Y' - block parcel search, 'N' - allow
+void LLPanelRegionOpenSettingsInfo::onClickOrs(void* userdata)
+{
+	LLPanelRegionOpenSettingsInfo* self;
+	self = (LLPanelRegionOpenSettingsInfo*)userdata;
+	
+	llinfos << "LLPanelRegionOpenSettingsInfo::onClickOrs()" << llendl;
+
+	LLSD body;
+	std::string url = gAgent.getRegion()->getCapability("DispatchOpenRegionSettings");
+	if (!url.empty())
+	{
+		body["draw_distance"] = self->childGetValue("draw_distance");
+		body["force_draw_distance"] = self->childGetValue("force_draw_distance");
+		body["allow_minimap"] = self->childGetValue("allow_minimap");
+		body["allow_physical_prims"] = self->childGetValue("allow_physical_prims");
+		body["max_drag_distance"] = self->childGetValue("max_drag_distance");
+		body["min_hole_size"] = self->childGetValue("min_hole_size");
+		body["max_hollow_size"] = self->childGetValue("max_hollow_size");
+		body["max_inventory_items_transfer"] = self->childGetValue("max_inventory_items_transfer");
+		body["max_link_count"] = self->childGetValue("max_link_count");
+		body["max_link_count_phys"] = self->childGetValue("max_link_count_phys");
+		body["max_phys_prim_scale"] = self->childGetValue("max_phys_prim_scale");
+		body["max_prim_scale"] = self->childGetValue("max_prim_scale");
+		body["min_prim_scale"] = self->childGetValue("min_prim_scale");
+		body["render_water"] = self->childGetValue("render_water");
+		body["show_tags"] = self->childGetValue("show_tags");
+		body["max_groups"] = self->childGetValue("max_groups");
+		body["allow_parcel_windlight"] = self->childGetValue("allow_parcel_windlight");
+		body["enable_teen_mode"] = self->childGetValue("enable_teen_mode");
+		body["enforce_max_build"] = self->childGetValue("enforce_max_build");
+
+		LLHTTPClient::post(url, body, new LLHTTPClient::Responder());
+	}
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// LLPanelRegionDebugInfo
+/////////////////////////////////////////////////////////////////////////////
+BOOL LLPanelRegionDebugInfo::postBuild()
+{
+	LLPanelRegionInfo::postBuild();
+	initCtrl("disable_scripts_check");
+	initCtrl("disable_collisions_check");
+	initCtrl("disable_physics_check");
+
+	initHelpBtn("disable_scripts_help",		"HelpRegionDisableScripts");
+	initHelpBtn("disable_collisions_help",	"HelpRegionDisableCollisions");
+	initHelpBtn("disable_physics_help",		"HelpRegionDisablePhysics");
+	initHelpBtn("top_colliders_help",		"HelpRegionTopColliders");
+	initHelpBtn("top_scripts_help",			"HelpRegionTopScripts");
+	initHelpBtn("restart_help",				"HelpRegionRestart");
+	initHelpBtn("minimum_agent_age_help",	"HelpRegionMinimumAge");
+	
+
+	childSetAction("choose_avatar_btn", onClickChooseAvatar, this);
+	childSetAction("return_btn", onClickReturn, this);
+	childSetAction("top_colliders_btn", onClickTopColliders, this);
+	childSetAction("top_scripts_btn", onClickTopScripts, this);
+	childSetAction("restart_btn", onClickRestart, this);
+	childSetAction("cancel_restart_btn", onClickCancelRestart, this);
+
+	return TRUE;
+}
+
+// virtual
+bool LLPanelRegionDebugInfo::refreshFromRegion(LLViewerRegion* region)
+{
+	BOOL allow_modify = gAgent.isGodlike() || (region && region->canManageEstate());
+	setCtrlsEnabled(allow_modify);
+	childDisable("apply_btn");
+	childDisable("target_avatar_name");
+	
+	childSetEnabled("choose_avatar_btn", allow_modify);
+	childSetEnabled("return_scripts", allow_modify && !mTargetAvatar.isNull());
+	childSetEnabled("return_other_land", allow_modify && !mTargetAvatar.isNull());
+	childSetEnabled("return_estate_wide", allow_modify && !mTargetAvatar.isNull());
+	childSetEnabled("return_btn", allow_modify && !mTargetAvatar.isNull());
+	childSetEnabled("top_colliders_btn", allow_modify);
+	childSetEnabled("top_scripts_btn", allow_modify);
+	childSetEnabled("restart_btn", allow_modify);
+	childSetEnabled("cancel_restart_btn", allow_modify);
+
+	return LLPanelRegionInfo::refreshFromRegion(region);
+}
+
+// virtual
+BOOL LLPanelRegionDebugInfo::sendUpdate()
+{
+	llinfos << "LLPanelRegionDebugInfo::sendUpdate" << llendl;
+	strings_t strings;
+	std::string buffer;
+
+	buffer = llformat("%s", (childGetValue("disable_scripts_check").asBoolean() ? "Y" : "N"));
+	strings.push_back(buffer);
+
+	buffer = llformat("%s", (childGetValue("disable_collisions_check").asBoolean() ? "Y" : "N"));
+	strings.push_back(buffer);
+
+	buffer = llformat("%s", (childGetValue("disable_physics_check").asBoolean() ? "Y" : "N"));
+	strings.push_back(buffer);
+
+	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
+	sendEstateOwnerMessage(gMessageSystem, "setregiondebug", invoice, strings);
+	return TRUE;
+}
+
+void LLPanelRegionDebugInfo::onClickChooseAvatar(void* data)
+{
+	LLFloaterAvatarPicker::show(callbackAvatarID, data, FALSE, TRUE);
+}
+
+// static
+void LLPanelRegionDebugInfo::callbackAvatarID(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* data)
+{
+	LLPanelRegionDebugInfo* self = (LLPanelRegionDebugInfo*) data;
+	if (ids.empty() || names.empty()) return;
+	self->mTargetAvatar = ids[0];
+	self->childSetValue("target_avatar_name", LLSD(names[0]));
+	self->refreshFromRegion( gAgent.getRegion() );
+}
+
+// static
+void LLPanelRegionDebugInfo::onClickReturn(void* data)
+{
+	LLPanelRegionDebugInfo* panelp = (LLPanelRegionDebugInfo*) data;
+	if (panelp->mTargetAvatar.isNull()) return;
+
+	LLSD args;
+	args["USER_NAME"] = panelp->childGetValue("target_avatar_name").asString();
+	LLSD payload;
+	payload["avatar_id"] = panelp->mTargetAvatar;
+	
+	U32 flags = SWD_ALWAYS_RETURN_OBJECTS;
+
+	if (panelp->childGetValue("return_scripts").asBoolean())
+	{
+		flags |= SWD_SCRIPTED_ONLY;
+	}
+	
+	if (panelp->childGetValue("return_other_land").asBoolean())
+	{
+		flags |= SWD_OTHERS_LAND_ONLY;
+	}
+	payload["flags"] = int(flags);
+	payload["return_estate_wide"] = panelp->childGetValue("return_estate_wide").asBoolean();
+	LLNotifications::instance().add("EstateObjectReturn", args, payload, 
+									boost::bind(&LLPanelRegionDebugInfo::callbackReturn, panelp, _1, _2));
+}
+
+bool LLPanelRegionDebugInfo::callbackReturn(const LLSD& notification, const LLSD& response)
+{
+	S32 option = LLNotification::getSelectedOption(notification, response);
+	if (option != 0) return false;
+
+	LLUUID target_avatar = notification["payload"]["avatar_id"].asUUID();
+	if (!target_avatar.isNull())
+	{
+		U32 flags = notification["payload"]["flags"].asInteger();
+		bool return_estate_wide = notification["payload"]["return_estate_wide"];
+		if (return_estate_wide)
+		{
+			// send as estate message - routed by spaceserver to all regions in estate
+			strings_t strings;
+			strings.push_back(llformat("%d", flags));
+			strings.push_back(target_avatar.asString());
+
+			LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
+		
+			sendEstateOwnerMessage(gMessageSystem, "estateobjectreturn", invoice, strings);
+		}
+		else
+		{
+			// send to this simulator only
+  			send_sim_wide_deletes(target_avatar, flags);
+  		}
+	}
+	return false;
+}
+
+
+// static
+void LLPanelRegionDebugInfo::onClickTopColliders(void* data)
+{
+	LLPanelRegionDebugInfo* self = (LLPanelRegionDebugInfo*)data;
+	strings_t strings;
+	strings.push_back("1");	// one physics step
+	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
+	LLFloaterTopObjects::show();
+	LLFloaterTopObjects::clearList();
+	self->sendEstateOwnerMessage(gMessageSystem, "colliders", invoice, strings);
+}
+
+// static
+void LLPanelRegionDebugInfo::onClickTopScripts(void* data)
+{
+	LLPanelRegionDebugInfo* self = (LLPanelRegionDebugInfo*)data;
+	strings_t strings;
+	strings.push_back("6");	// top 5 scripts
+	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
+	LLFloaterTopObjects::show();
+	LLFloaterTopObjects::clearList();
+	self->sendEstateOwnerMessage(gMessageSystem, "scripts", invoice, strings);
+}
+
+// static
+void LLPanelRegionDebugInfo::onClickRestart(void* data)
+{
+	LLNotifications::instance().add("ConfirmRestart", LLSD(), LLSD(), 
+		boost::bind(&LLPanelRegionDebugInfo::callbackRestart, (LLPanelRegionDebugInfo*)data, _1, _2));
+}
+
+bool LLPanelRegionDebugInfo::callbackRestart(const LLSD& notification, const LLSD& response)
+{
+	S32 option = LLNotification::getSelectedOption(notification, response);
+	if (option != 0) return false;
+
+	strings_t strings;
+	strings.push_back("120");
+	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
+	sendEstateOwnerMessage(gMessageSystem, "restart", invoice, strings);
+	return false;
+}
+
+// static
+void LLPanelRegionDebugInfo::onClickCancelRestart(void* data)
+{
+	LLPanelRegionDebugInfo* self = (LLPanelRegionDebugInfo*)data;
+	strings_t strings;
+	strings.push_back("-1");
+	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
+	self->sendEstateOwnerMessage(gMessageSystem, "restart", invoice, strings);
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// LLPanelRegionTextureInfo
+//
+LLPanelRegionTextureInfo::LLPanelRegionTextureInfo() : LLPanelRegionInfo()
+{
+	// nothing.
+}
+
+bool LLPanelRegionTextureInfo::refreshFromRegion(LLViewerRegion* region)
+{
+	BOOL allow_modify = gAgent.isGodlike() || (region && region->canManageEstate());
+	setCtrlsEnabled(allow_modify);
+	childDisable("apply_btn");
+
+	if (region)
+	{
+		childSetValue("region_text", LLSD(region->getName()));
+	}
+	else
+	{
+		childSetValue("region_text", LLSD(""));
+	}
+
+	if (!region) return LLPanelRegionInfo::refreshFromRegion(region);
+
+	LLVLComposition* compp = region->getComposition();
+	LLTextureCtrl* texture_ctrl;
+	std::string buffer;
+	for(S32 i = 0; i < TERRAIN_TEXTURE_COUNT; ++i)
+	{
+		buffer = llformat("texture_detail_%d", i);
+		texture_ctrl = getChild<LLTextureCtrl>(buffer);
+		if(texture_ctrl)
+		{
+			lldebugs << "Detail Texture " << i << ": "
+					 << compp->getDetailTextureID(i) << llendl;
+			LLUUID tmp_id(compp->getDetailTextureID(i));
+			texture_ctrl->setImageAssetID(tmp_id);
+		}
+	}
+
+	for(S32 i = 0; i < CORNER_COUNT; ++i)
+    {
+		buffer = llformat("height_start_spin_%d", i);
+		childSetValue(buffer, LLSD(compp->getStartHeight(i)));
+		buffer = llformat("height_range_spin_%d", i);
+		childSetValue(buffer, LLSD(compp->getHeightRange(i)));
+	}
+
+	// Call the parent for common book-keeping
+	return LLPanelRegionInfo::refreshFromRegion(region);
+}
+
+
+BOOL LLPanelRegionTextureInfo::postBuild()
+{
+	LLPanelRegionInfo::postBuild();
+	std::string buffer;
+	for(S32 i = 0; i < TERRAIN_TEXTURE_COUNT; ++i)
+	{
+		buffer = llformat("texture_detail_%d", i);
+		initCtrl(buffer);
+	}
+
+	for(S32 i = 0; i < CORNER_COUNT; ++i)
+	{
+		buffer = llformat("height_start_spin_%d", i);
+		initCtrl(buffer);
+		buffer = llformat("height_range_spin_%d", i);
+		initCtrl(buffer);
+	}
+
+//	LLButton* btn = new LLButton("dump", LLRect(0, 20, 100, 0), "", onClickDump, this);
+//	btn->setFollows(FOLLOWS_TOP|FOLLOWS_LEFT);
+//	addChild(btn);
+
+	return LLPanelRegionInfo::postBuild();
+}
+
+BOOL LLPanelRegionTextureInfo::sendUpdate()
+{
+	llinfos << "LLPanelRegionTextureInfo::sendUpdate()" << llendl;
+
+	// Make sure user hasn't chosen wacky textures.
+	//if (!validateTextureSizes())
+	//{
+	//	return FALSE;
+	//}
+
+	LLTextureCtrl* texture_ctrl;
+	std::string buffer;
+	std::string id_str;
+	LLMessageSystem* msg = gMessageSystem;
+	strings_t strings;
+
+	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
+	
+	for(S32 i = 0; i < TERRAIN_TEXTURE_COUNT; ++i)
+	{
+		buffer = llformat("texture_detail_%d", i);
+		texture_ctrl = getChild<LLTextureCtrl>(buffer);
+		if(texture_ctrl)
+		{
+			LLUUID tmp_id(texture_ctrl->getImageAssetID());
+			tmp_id.toString(id_str);
+			buffer = llformat("%d %s", i, id_str.c_str());
+			strings.push_back(buffer);
+		}
+	}
+	sendEstateOwnerMessage(msg, "texturedetail", invoice, strings);
+	strings.clear();
+	for(S32 i = 0; i < CORNER_COUNT; ++i)
+	{
+		buffer = llformat("height_start_spin_%d", i);
+		std::string buffer2 = llformat("height_range_spin_%d", i);
+		std::string buffer3 = llformat("%d %f %f", i, (F32)childGetValue(buffer).asReal(), (F32)childGetValue(buffer2).asReal());
+		strings.push_back(buffer3);
+	}
+	sendEstateOwnerMessage(msg, "textureheights", invoice, strings);
+	strings.clear();
+	sendEstateOwnerMessage(msg, "texturecommit", invoice, strings);
+	return TRUE;
+}
+
+BOOL LLPanelRegionTextureInfo::validateTextureSizes()
+{
+	for(S32 i = 0; i < TERRAIN_TEXTURE_COUNT; ++i)
+	{
+		std::string buffer;
+		buffer = llformat("texture_detail_%d", i);
+		LLTextureCtrl* texture_ctrl = getChild<LLTextureCtrl>(buffer);
+		if (!texture_ctrl) continue;
+
+		LLUUID image_asset_id = texture_ctrl->getImageAssetID();
+		LLViewerImage* img = gImageList.getImage(image_asset_id);
+		S32 components = img->getComponents();
+		// Must ask for highest resolution version's width. JC
+		S32 width = img->getWidth(0);
+		S32 height = img->getHeight(0);
+
+		//llinfos << "texture detail " << i << " is " << width << "x" << height << "x" << components << llendl;
+
+		if (components != 3)
+		{
+			LLSD args;
+			args["TEXTURE_NUM"] = i+1;
+			args["TEXTURE_BIT_DEPTH"] = llformat("%d",components * 8);
+			LLNotifications::instance().add("InvalidTerrainBitDepth", args);
+			return FALSE;
+		}
+
+		if (width > 512 || height > 512)
+		{
+
+			LLSD args;
+			args["TEXTURE_NUM"] = i+1;
+			args["TEXTURE_SIZE_X"] = width;
+			args["TEXTURE_SIZE_Y"] = height;
+			LLNotifications::instance().add("InvalidTerrainSize", args);
+			return FALSE;
+			
+		}
+	}
+
+	return TRUE;
+}
+
+
+// static
+void LLPanelRegionTextureInfo::onClickDump(void* data)
+{
+	llinfos << "LLPanelRegionTextureInfo::onClickDump()" << llendl;
+}
+
+
+/////////////////////////////////////////////////////////////////////////////
+// LLPanelRegionTerrainInfo
+/////////////////////////////////////////////////////////////////////////////
+BOOL LLPanelRegionTerrainInfo::postBuild()
+{
+	LLPanelRegionInfo::postBuild();
+
+	initHelpBtn("water_height_help",	"HelpRegionWaterHeight");
+	initHelpBtn("terrain_raise_help",	"HelpRegionTerrainRaise");
+	initHelpBtn("terrain_lower_help",	"HelpRegionTerrainLower");
+	initHelpBtn("upload_raw_help",		"HelpRegionUploadRaw");
+	initHelpBtn("download_raw_help",	"HelpRegionDownloadRaw");
+	initHelpBtn("use_estate_sun_help",	"HelpRegionUseEstateSun");
+	initHelpBtn("fixed_sun_help",		"HelpRegionFixedSun");
+	initHelpBtn("bake_terrain_help",	"HelpRegionBakeTerrain");
+
+	initCtrl("water_height_spin");
+	initCtrl("terrain_raise_spin");
+	initCtrl("terrain_lower_spin");
+
+	initCtrl("fixed_sun_check");
+	childSetCommitCallback("fixed_sun_check", onChangeFixedSun, this);
+	childSetCommitCallback("use_estate_sun_check", onChangeUseEstateTime, this);
+	childSetCommitCallback("sun_hour_slider", onChangeSunHour, this);
+
+	childSetAction("download_raw_btn", onClickDownloadRaw, this);
+	childSetAction("upload_raw_btn", onClickUploadRaw, this);
+	childSetAction("bake_terrain_btn", onClickBakeTerrain, this);
+
+	return TRUE;
+}
+
+// virtual
+bool LLPanelRegionTerrainInfo::refreshFromRegion(LLViewerRegion* region)
+{
+	llinfos << "LLPanelRegionTerrainInfo::refreshFromRegion" << llendl;
+
+	BOOL owner_or_god = gAgent.isGodlike() 
+						|| (region && (region->getOwner() == gAgent.getID()));
+	BOOL owner_or_god_or_manager = owner_or_god
+						|| (region && region->isEstateManager());
+	setCtrlsEnabled(owner_or_god_or_manager);
+	childDisable("apply_btn");
+
+	childSetEnabled("download_raw_btn", owner_or_god);
+	childSetEnabled("upload_raw_btn", owner_or_god);
+	childSetEnabled("bake_terrain_btn", owner_or_god);
+
+	return LLPanelRegionInfo::refreshFromRegion(region);
+}
+
+// virtual
+BOOL LLPanelRegionTerrainInfo::sendUpdate()
+{
+	llinfos << "LLPanelRegionTerrainInfo::sendUpdate" << llendl;
+	std::string buffer;
+	strings_t strings;
+	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
+
+	buffer = llformat("%f", (F32)childGetValue("water_height_spin").asReal());
+	strings.push_back(buffer);
+	buffer = llformat("%f", (F32)childGetValue("terrain_raise_spin").asReal());
+	strings.push_back(buffer);
+	buffer = llformat("%f", (F32)childGetValue("terrain_lower_spin").asReal());
+	strings.push_back(buffer);
+	buffer = llformat("%s", (childGetValue("use_estate_sun_check").asBoolean() ? "Y" : "N"));
+	strings.push_back(buffer);
+	buffer = llformat("%s", (childGetValue("fixed_sun_check").asBoolean() ? "Y" : "N"));
+	strings.push_back(buffer);
+	buffer = llformat("%f", (F32)childGetValue("sun_hour_slider").asReal() );
+	strings.push_back(buffer);
+
+	// Grab estate information in case the user decided to set the
+	// region back to estate time. JC
+	LLFloaterRegionInfo* floater = LLFloaterRegionInfo::getInstance();
+	if (!floater) return true;
+
+	LLTabContainer* tab = floater->getChild<LLTabContainer>("region_panels");
+	if (!tab) return true;
+
+	LLPanelEstateInfo* panel = (LLPanelEstateInfo*)tab->getChild<LLPanel>("Estate");
+	if (!panel) return true;
+
+	BOOL estate_global_time = panel->getGlobalTime();
+	BOOL estate_fixed_sun = panel->getFixedSun();
+	F32 estate_sun_hour;
+	if (estate_global_time)
+	{
+		estate_sun_hour = 0.f;
+	}
+	else
+	{
+		estate_sun_hour = panel->getSunHour();
+	}
+
+	buffer = llformat("%s", (estate_global_time ? "Y" : "N") );
+	strings.push_back(buffer);
+	buffer = llformat("%s", (estate_fixed_sun ? "Y" : "N") );
+	strings.push_back(buffer);
+	buffer = llformat("%f", estate_sun_hour);
+	strings.push_back(buffer);
+
+	sendEstateOwnerMessage(gMessageSystem, "setregionterrain", invoice, strings);
+	return TRUE;
+}
+
+// static 
+void LLPanelRegionTerrainInfo::onChangeUseEstateTime(LLUICtrl* ctrl, void* user_data)
+{
+	LLPanelRegionTerrainInfo* panel = (LLPanelRegionTerrainInfo*) user_data;
+	if (!panel) return;
+	BOOL use_estate_sun = panel->childGetValue("use_estate_sun_check").asBoolean();
+	panel->childSetEnabled("fixed_sun_check", !use_estate_sun);
+	panel->childSetEnabled("sun_hour_slider", !use_estate_sun);
+	if (use_estate_sun)
+	{
+		panel->childSetValue("fixed_sun_check", LLSD(FALSE));
+		panel->childSetValue("sun_hour_slider", LLSD(0.f));
+	}
+	panel->childEnable("apply_btn");
+}
+
+// static 
+void LLPanelRegionTerrainInfo::onChangeFixedSun(LLUICtrl* ctrl, void* user_data)
+{
+	LLPanelRegionTerrainInfo* panel = (LLPanelRegionTerrainInfo*) user_data;
+	if (!panel) return;
+	// Just enable the apply button.  We let the sun-hour slider be enabled
+	// for both fixed-sun and non-fixed-sun. JC
+	panel->childEnable("apply_btn");
+}
+
+// static 
+void LLPanelRegionTerrainInfo::onChangeSunHour(LLUICtrl* ctrl, void*)
+{
+	// can't use userdata to get panel, slider uses it internally
+	LLPanelRegionTerrainInfo* panel = (LLPanelRegionTerrainInfo*) ctrl->getParent();
+	if (!panel) return;
+	panel->childEnable("apply_btn");
+}
+
+// static
+void LLPanelRegionTerrainInfo::onClickDownloadRaw(void* data)
+{
+	LLFilePicker& picker = LLFilePicker::instance();
+	if (!picker.getSaveFile(LLFilePicker::FFSAVE_RAW, "terrain.raw"))
+	{
+		llwarns << "No file" << llendl;
+		return;
+	}
+	std::string filepath = picker.getFirstFile();
+	gXferManager->expectFileForRequest(filepath);
+
+	LLPanelRegionTerrainInfo* self = (LLPanelRegionTerrainInfo*)data;
+	strings_t strings;
+	strings.push_back("download filename");
+	strings.push_back(filepath);
+	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
+	self->sendEstateOwnerMessage(gMessageSystem, "terrain", invoice, strings);
+}
+
+// static
+void LLPanelRegionTerrainInfo::onClickUploadRaw(void* data)
+{
+	LLFilePicker& picker = LLFilePicker::instance();
+	if (!picker.getOpenFile(LLFilePicker::FFLOAD_RAW))
+	{
+		llwarns << "No file" << llendl;
+		return;
+	}
+	std::string filepath = picker.getFirstFile();
+	gXferManager->expectFileForTransfer(filepath);
+
+	LLPanelRegionTerrainInfo* self = (LLPanelRegionTerrainInfo*)data;
+	strings_t strings;
+	strings.push_back("upload filename");
+	strings.push_back(filepath);
+	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
+	self->sendEstateOwnerMessage(gMessageSystem, "terrain", invoice, strings);
+
+	LLNotifications::instance().add("RawUploadStarted");
+}
+
+// static
+void LLPanelRegionTerrainInfo::onClickBakeTerrain(void* data)
+{
+	LLNotifications::instance().add(
+		LLNotification::Params("ConfirmBakeTerrain")
+		.functor(boost::bind(&LLPanelRegionTerrainInfo::callbackBakeTerrain, (LLPanelRegionTerrainInfo*)data, _1, _2)));
+}
+
+bool LLPanelRegionTerrainInfo::callbackBakeTerrain(const LLSD& notification, const LLSD& response)
+{
+	S32 option = LLNotification::getSelectedOption(notification, response);
+	if (option != 0) return false;
+
+	strings_t strings;
+	strings.push_back("bake");
+	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
+	sendEstateOwnerMessage(gMessageSystem, "terrain", invoice, strings);
+	return false;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+// LLPanelEstateInfo
+//
+
+LLPanelEstateInfo::LLPanelEstateInfo() 
+:	LLPanelRegionInfo(),
+	mEstateID(0)	// invalid
+{
+}
+
+// static
+void LLPanelEstateInfo::initDispatch(LLDispatcher& dispatch)
+{
+	std::string name;
+
+//	name.assign("setowner");
+//	static LLDispatchSetEstateOwner set_owner;
+//	dispatch.addHandler(name, &set_owner);
+
+	name.assign("estateupdateinfo");
+	static LLDispatchEstateUpdateInfo estate_update_info;
+	dispatch.addHandler(name, &estate_update_info);
+
+	name.assign("setaccess");
+	static LLDispatchSetEstateAccess set_access;
+	dispatch.addHandler(name, &set_access);
+
+	estate_dispatch_initialized = true;
+}
+
+// static
+// Disables the sun-hour slider and the use fixed time check if the use global time is check
+void LLPanelEstateInfo::onChangeUseGlobalTime(LLUICtrl* ctrl, void* user_data)
+{
+	LLPanelEstateInfo* panel = (LLPanelEstateInfo*) user_data;
+	if (panel)
+	{
+		bool enabled = !panel->childGetValue("use_global_time_check").asBoolean();
+		panel->childSetEnabled("sun_hour_slider", enabled);
+		panel->childSetEnabled("fixed_sun_check", enabled);
+		panel->childSetValue("fixed_sun_check", LLSD(FALSE));
+		panel->enableButton("apply_btn");
+	}
+}
+
+// Enables the sun-hour slider if the fixed-sun checkbox is set
+void LLPanelEstateInfo::onChangeFixedSun(LLUICtrl* ctrl, void* user_data)
+{
+	LLPanelEstateInfo* panel = (LLPanelEstateInfo*) user_data;
+	if (panel)
+	{
+		bool enabled = !panel->childGetValue("fixed_sun_check").asBoolean();
+		panel->childSetEnabled("use_global_time_check", enabled);
+		panel->childSetValue("use_global_time_check", LLSD(FALSE));
+		panel->enableButton("apply_btn");
+	}
+}
+
+
+
+
+//---------------------------------------------------------------------------
+// Add/Remove estate access button callbacks
+//---------------------------------------------------------------------------
+void LLPanelEstateInfo::onClickEditSky(void* user_data)
+{
+	LLFloaterWindLight::show();
+}
+
+void LLPanelEstateInfo::onClickEditDayCycle(void* user_data)
+{
+	LLFloaterDayCycle::show();
+}
+
+// static
+void LLPanelEstateInfo::onClickAddAllowedAgent(void* user_data)
+{
+	LLPanelEstateInfo* self = (LLPanelEstateInfo*)user_data;
+	LLCtrlListInterface *list = self->childGetListInterface("allowed_avatar_name_list");
+	if (!list) return;
+	if (list->getItemCount() >= ESTATE_MAX_ACCESS_IDS)
+	{
+		//args
+
+		LLSD args;
+		args["MAX_AGENTS"] = llformat("%d",ESTATE_MAX_ACCESS_IDS);
+		LLNotifications::instance().add("MaxAllowedAgentOnRegion", args);
+		return;
+	}
+	accessAddCore(ESTATE_ACCESS_ALLOWED_AGENT_ADD, "EstateAllowedAgentAdd");
+}
+
+// static
+void LLPanelEstateInfo::onClickRemoveAllowedAgent(void* user_data)
+{
+	accessRemoveCore(ESTATE_ACCESS_ALLOWED_AGENT_REMOVE, "EstateAllowedAgentRemove", "allowed_avatar_name_list");
+}
+
+// static
+void LLPanelEstateInfo::onClickAddAllowedGroup(void* user_data)
+{
+	LLPanelEstateInfo* self = (LLPanelEstateInfo*)user_data;
+	LLCtrlListInterface *list = self->childGetListInterface("allowed_group_name_list");
+	if (!list) return;
+	if (list->getItemCount() >= ESTATE_MAX_ACCESS_IDS)
+	{
+		LLSD args;
+		args["MAX_GROUPS"] = llformat("%d",ESTATE_MAX_ACCESS_IDS);
+		LLNotifications::instance().add("MaxAllowedGroupsOnRegion", args);
+		return;
+	}
+
+	LLNotification::Params params("ChangeLindenAccess");
+	params.functor(boost::bind(&LLPanelEstateInfo::addAllowedGroup, self, _1, _2));
+	if (isLindenEstate())
+	{
+		LLNotifications::instance().add(params);
+	}
+	else
+	{
+		LLNotifications::instance().forceResponse(params, 0);
+	}
+}
+
+bool LLPanelEstateInfo::addAllowedGroup(const LLSD& notification, const LLSD& response)
+{
+	S32 option = LLNotification::getSelectedOption(notification, response);
+	if (option != 0) return false;
+
+	LLFloater* parent_floater = gFloaterView->getParentFloater(this);
+
+	LLFloaterGroupPicker* widget;
+	widget = LLFloaterGroupPicker::showInstance(LLSD(gAgent.getID()));
+	if (widget)
+	{
+		widget->setSelectCallback(addAllowedGroup2, NULL);
+		if (parent_floater)
+		{
+			LLRect new_rect = gFloaterView->findNeighboringPosition(parent_floater, widget);
+			widget->setOrigin(new_rect.mLeft, new_rect.mBottom);
+			parent_floater->addDependentFloater(widget);
+		}
+	}
+
+	return false;
+}
+
+// static
+void LLPanelEstateInfo::onClickRemoveAllowedGroup(void* user_data)
+{
+	accessRemoveCore(ESTATE_ACCESS_ALLOWED_GROUP_REMOVE, "EstateAllowedGroupRemove", "allowed_group_name_list");
+}
+
+// static
+void LLPanelEstateInfo::onClickAddBannedAgent(void* user_data)
+{
+	LLPanelEstateInfo* self = (LLPanelEstateInfo*)user_data;
+	LLCtrlListInterface *list = self->childGetListInterface("banned_avatar_name_list");
+	if (!list) return;
+	if (list->getItemCount() >= ESTATE_MAX_ACCESS_IDS)
+	{
+		LLSD args;
+		args["MAX_BANNED"] = llformat("%d",ESTATE_MAX_ACCESS_IDS);
+		LLNotifications::instance().add("MaxBannedAgentsOnRegion", args);
+		return;
+	}
+	accessAddCore(ESTATE_ACCESS_BANNED_AGENT_ADD, "EstateBannedAgentAdd");
+}
+
+// static
+void LLPanelEstateInfo::onClickRemoveBannedAgent(void* user_data)
+{
+	accessRemoveCore(ESTATE_ACCESS_BANNED_AGENT_REMOVE, "EstateBannedAgentRemove", "banned_avatar_name_list");
+}
+
+// static
+void LLPanelEstateInfo::onClickAddEstateManager(void* user_data)
+{
+	LLPanelEstateInfo* self = (LLPanelEstateInfo*)user_data;
+	LLCtrlListInterface *list = self->childGetListInterface("estate_manager_name_list");
+	if (!list) return;
+	if (list->getItemCount() >= ESTATE_MAX_MANAGERS)
+	{	// Tell user they can't add more managers
+		LLSD args;
+		args["MAX_MANAGER"] = llformat("%d",ESTATE_MAX_MANAGERS);
+		LLNotifications::instance().add("MaxManagersOnRegion", args);
+	}
+	else
+	{	// Go pick managers to add
+		accessAddCore(ESTATE_ACCESS_MANAGER_ADD, "EstateManagerAdd");
+	}
+}
+
+// static
+void LLPanelEstateInfo::onClickRemoveEstateManager(void* user_data)
+{
+	accessRemoveCore(ESTATE_ACCESS_MANAGER_REMOVE, "EstateManagerRemove", "estate_manager_name_list");
+}
+
+//---------------------------------------------------------------------------
+// Kick from estate methods
+//---------------------------------------------------------------------------
+struct LLKickFromEstateInfo
+{
+	LLPanelEstateInfo *mEstatePanelp;
+	LLUUID      mAgentID;
+};
+
+void LLPanelEstateInfo::onClickKickUser(void *user_data)
+{
+	LLPanelEstateInfo* panelp = (LLPanelEstateInfo*)user_data;
+
+	// this depends on the grandparent view being a floater
+	// in order to set up floater dependency
+	LLFloater* parent_floater = gFloaterView->getParentFloater(panelp);
+	LLFloater* child_floater = LLFloaterAvatarPicker::show(LLPanelEstateInfo::onKickUserCommit, user_data, FALSE, TRUE);
+	parent_floater->addDependentFloater(child_floater);
+}
+
+void LLPanelEstateInfo::onKickUserCommit(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* userdata)
+{
+	if (names.empty() || ids.empty()) return;
+	
+	//check to make sure there is one valid user and id
+	if( (ids[0].isNull()) ||
+		(names[0].length() == 0) )
+	{
+		return;
+	}
+
+	LLPanelEstateInfo* self = (LLPanelEstateInfo*)userdata;
+	if(!self) return;
+
+	//keep track of what user they want to kick and other misc info
+	LLKickFromEstateInfo *kick_info = new LLKickFromEstateInfo();
+	kick_info->mEstatePanelp = self;
+	kick_info->mAgentID     = ids[0];
+
+	//Bring up a confirmation dialog
+	LLSD args;
+	args["EVIL_USER"] = names[0];
+	LLSD payload;
+	payload["agent_id"] = ids[0];
+	LLNotifications::instance().add("EstateKickUser", args, payload, boost::bind(&LLPanelEstateInfo::kickUserConfirm, self, _1, _2));
+
+}
+
+bool LLPanelEstateInfo::kickUserConfirm(const LLSD& notification, const LLSD& response)
+{
+	S32 option = LLNotification::getSelectedOption(notification, response);
+	switch(option)
+	{
+	case 0:
+		{
+			//Kick User
+			strings_t strings;
+			strings.push_back(notification["payload"]["agent_id"].asString());
+
+			sendEstateOwnerMessage(gMessageSystem, "kickestate", LLFloaterRegionInfo::getLastInvoice(), strings);
+			break;
+		}
+	default:
+		break;
+	}
+	return false;
+}
+
+//---------------------------------------------------------------------------
+// Core Add/Remove estate access methods
+// TODO: INTERNATIONAL: don't build message text here;
+// instead, create multiple translatable messages and choose
+// one based on the status.
+//---------------------------------------------------------------------------
+std::string all_estates_text()
+{
+	LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();
+	if (!panel) return "(error)";
+
+	std::string owner = panel->getOwnerName();
+
+	LLViewerRegion* region = gAgent.getRegion();
+	if (gAgent.isGodlike())
+	{
+		return llformat("all estates\nowned by %s", owner.c_str());
+	}
+	else if (region && region->getOwner() == gAgent.getID())
+	{
+		return "all estates you own";
+	}
+	else if (region && region->isEstateManager())
+	{
+		return llformat("all estates that\nyou manage for %s", owner.c_str());
+	}
+	else
+	{
+		return "(error)";
+	}
+}
+
+// static
+bool LLPanelEstateInfo::isLindenEstate()
+{
+	LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();
+	if (!panel) return false;
+
+	U32 estate_id = panel->getEstateID();
+	return (estate_id <= ESTATE_LAST_LINDEN);
+}
+
+typedef std::vector<LLUUID> AgentOrGroupIDsVector;
+struct LLEstateAccessChangeInfo
+{
+	LLEstateAccessChangeInfo(const LLSD& sd)
+	{
+		mDialogName = sd["dialog_name"].asString();
+		mOperationFlag = (U32)sd["operation"].asInteger();
+		LLSD::array_const_iterator end_it = sd["allowed_ids"].endArray();
+		for (LLSD::array_const_iterator id_it = sd["allowed_ids"].beginArray();
+			id_it != end_it;
+			++id_it)
+		{
+			mAgentOrGroupIDs.push_back(id_it->asUUID());
+		}
+	}
+
+	const LLSD asLLSD() const
+	{
+		LLSD sd;
+		sd["name"] = mDialogName;
+		sd["operation"] = (S32)mOperationFlag;
+		for (AgentOrGroupIDsVector::const_iterator it = mAgentOrGroupIDs.begin();
+			it != mAgentOrGroupIDs.end();
+			++it)
+		{
+			sd["allowed_ids"].append(*it);
+		}
+		return sd;
+	}
+
+	U32 mOperationFlag;	// ESTATE_ACCESS_BANNED_AGENT_ADD, _REMOVE, etc.
+	std::string mDialogName;
+	AgentOrGroupIDsVector mAgentOrGroupIDs; // List of agent IDs to apply to this change
+};
+
+// Special case callback for groups, since it has different callback format than names
+// static
+void LLPanelEstateInfo::addAllowedGroup2(LLUUID id, void* user_data)
+{
+	LLSD payload;
+	payload["operation"] = (S32)ESTATE_ACCESS_ALLOWED_GROUP_ADD;
+	payload["dialog_name"] = "EstateAllowedGroupAdd";
+	payload["allowed_ids"].append(id);
+
+	LLSD args;
+	args["ALL_ESTATES"] = all_estates_text();
+
+	LLNotification::Params params("EstateAllowedGroupAdd");
+	params.payload(payload)
+		.substitutions(args)
+		.functor(accessCoreConfirm);
+	if (isLindenEstate())
+	{
+		LLNotifications::instance().forceResponse(params, 0);
+	}
+	else
+	{
+		LLNotifications::instance().add(params);
+	}
+}
+
+// static
+void LLPanelEstateInfo::accessAddCore(U32 operation_flag, const std::string& dialog_name)
+{
+	LLSD payload;
+	payload["operation"] = (S32)operation_flag;
+	payload["dialog_name"] = dialog_name;
+	// agent id filled in after avatar picker
+
+	LLNotification::Params params("ChangeLindenAccess");
+	params.payload(payload)
+		.functor(accessAddCore2);
+
+	if (isLindenEstate())
+	{
+		LLNotifications::instance().add(params);
+	}
+	else
+	{
+		// same as clicking "OK"
+		LLNotifications::instance().forceResponse(params, 0);
+	}
+}
+
+// static
+bool LLPanelEstateInfo::accessAddCore2(const LLSD& notification, const LLSD& response)
+{
+	S32 option = LLNotification::getSelectedOption(notification, response);
+	if (option != 0)
+	{
+		// abort change
+		return false;
+	}
+
+	LLEstateAccessChangeInfo* change_info = new LLEstateAccessChangeInfo(notification["payload"]);
+	// avatar picker yes multi-select, yes close-on-select
+	LLFloaterAvatarPicker::show(accessAddCore3, (void*)change_info, TRUE, TRUE);
+	return false;
+}
+
+// static
+void LLPanelEstateInfo::accessAddCore3(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* data)
+{
+	LLEstateAccessChangeInfo* change_info = (LLEstateAccessChangeInfo*)data;
+	if (!change_info) return;
+	if (ids.empty()) 
+	{
+		// User didn't select a name.
+		delete change_info;
+		change_info = NULL;
+		return;
+	}
+	// User did select a name.
+	change_info->mAgentOrGroupIDs = ids;
+	// Can't put estate owner on ban list
+	LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();
+	if (!panel) return;
+	LLViewerRegion* region = gAgent.getRegion();
+	if (!region) return;
+	
+	if (change_info->mOperationFlag & ESTATE_ACCESS_ALLOWED_AGENT_ADD)
+	{
+		LLCtrlListInterface *list = panel->childGetListInterface("allowed_avatar_name_list");
+		int currentCount = (list ? list->getItemCount() : 0);
+		if (ids.size() + currentCount > ESTATE_MAX_ACCESS_IDS)
+		{
+			LLSD args;
+			args["NUM_ADDED"] = llformat("%d",ids.size());
+			args["MAX_AGENTS"] = llformat("%d",ESTATE_MAX_ACCESS_IDS);
+			args["LIST_TYPE"] = "Allowed Residents";
+			args["NUM_EXCESS"] = llformat("%d",(ids.size()+currentCount)-ESTATE_MAX_ACCESS_IDS);
+			LLNotifications::instance().add("MaxAgentOnRegionBatch", args);
+			delete change_info;
+			return;
+		}
+	}
+	if (change_info->mOperationFlag & ESTATE_ACCESS_BANNED_AGENT_ADD)
+	{
+		LLCtrlListInterface *list = panel->childGetListInterface("banned_avatar_name_list");
+		int currentCount = (list ? list->getItemCount() : 0);
+		if (ids.size() + currentCount > ESTATE_MAX_ACCESS_IDS)
+		{
+			LLSD args;
+			args["NUM_ADDED"] = llformat("%d",ids.size());
+			args["MAX_AGENTS"] = llformat("%d",ESTATE_MAX_ACCESS_IDS);
+			args["LIST_TYPE"] = "Banned Residents";
+			args["NUM_EXCESS"] = llformat("%d",(ids.size()+currentCount)-ESTATE_MAX_ACCESS_IDS);
+			LLNotifications::instance().add("MaxAgentOnRegionBatch", args);
+			delete change_info;
+			return;
+		}
+	}
+
+	LLSD args;
+	args["ALL_ESTATES"] = all_estates_text();
+
+	LLNotification::Params params(change_info->mDialogName);
+	params.substitutions(args)
+		.payload(change_info->asLLSD())
+		.functor(accessCoreConfirm);
+
+	if (isLindenEstate())
+	{
+		// just apply to this estate
+		LLNotifications::instance().forceResponse(params, 0);
+	}
+	else
+	{
+		// ask if this estate or all estates with this owner
+		LLNotifications::instance().add(params);
+	}
+}
+
+// static
+void LLPanelEstateInfo::accessRemoveCore(U32 operation_flag, const std::string& dialog_name, const std::string& list_ctrl_name)
+{
+	LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();
+	if (!panel) return;
+	LLNameListCtrl* name_list = panel->getChild<LLNameListCtrl>(list_ctrl_name);
+	if (!name_list) return;
+
+	std::vector<LLScrollListItem*> list_vector = name_list->getAllSelected();
+	if (list_vector.size() == 0)
+		return;
+
+	LLSD payload;
+	payload["operation"] = (S32)operation_flag;
+	payload["dialog_name"] = dialog_name;
+	
+	for (std::vector<LLScrollListItem*>::const_iterator iter = list_vector.begin();
+	     iter != list_vector.end();
+	     iter++)
+	{
+		LLScrollListItem *item = (*iter);
+		payload["allowed_ids"].append(item->getUUID());
+	}
+	
+	LLNotification::Params params("ChangeLindenAccess");
+	params.payload(payload)
+		.functor(accessRemoveCore2);
+
+	if (isLindenEstate())
+	{
+		// warn on change linden estate
+		LLNotifications::instance().add(params);
+	}
+	else
+	{
+		// just proceed, as if clicking OK
+		LLNotifications::instance().forceResponse(params, 0);
+	}
+}
+
+// static
+bool LLPanelEstateInfo::accessRemoveCore2(const LLSD& notification, const LLSD& response)
+{
+	S32 option = LLNotification::getSelectedOption(notification, response);
+	if (option != 0)
+	{
+		// abort
+		return false;
+	}
+
+	// If Linden estate, can only apply to "this" estate, not all estates
+	// owned by NULL.
+	if (isLindenEstate())
+	{
+		accessCoreConfirm(notification, response);
+	}
+	else
+	{
+		LLSD args;
+		args["ALL_ESTATES"] = all_estates_text();
+		LLNotifications::instance().add(notification["payload"]["dialog_name"], 
+										args,
+										notification["payload"],
+										accessCoreConfirm);
+	}
+	return false;
+}
+
+// Used for both access add and remove operations, depending on the mOperationFlag
+// passed in (ESTATE_ACCESS_BANNED_AGENT_ADD, ESTATE_ACCESS_ALLOWED_AGENT_REMOVE, etc.)
+// static
+bool LLPanelEstateInfo::accessCoreConfirm(const LLSD& notification, const LLSD& response)
+{
+	S32 option = LLNotification::getSelectedOption(notification, response);
+	const U32 originalFlags = (U32)notification["payload"]["operation"].asInteger();
+
+	LLViewerRegion* region = gAgent.getRegion();
+	
+	LLSD::array_const_iterator end_it = notification["payload"]["allowed_ids"].endArray();
+
+	for (LLSD::array_const_iterator iter = notification["payload"]["allowed_ids"].beginArray();
+		iter != end_it;
+	     iter++)
+	{
+		U32 flags = originalFlags;
+		if (iter + 1 != end_it)
+			flags |= ESTATE_ACCESS_NO_REPLY;
+
+		const LLUUID id = iter->asUUID();
+		if (((U32)notification["payload"]["operation"].asInteger() & ESTATE_ACCESS_BANNED_AGENT_ADD)
+		    && region && (region->getOwner() == id))
+		{
+			LLNotifications::instance().add("OwnerCanNotBeDenied");
+			break;
+		}
+		switch(option)
+		{
+			case 0:
+			    // This estate
+			    sendEstateAccessDelta(flags, id);
+			    break;
+			case 1:
+			{
+				// All estates, either than I own or manage for this owner.  
+				// This will be verified on simulator. JC
+				if (!region) break;
+				if (region->getOwner() == gAgent.getID()
+				    || gAgent.isGodlike())
+				{
+					flags |= ESTATE_ACCESS_APPLY_TO_ALL_ESTATES;
+					sendEstateAccessDelta(flags, id);
+				}
+				else if (region->isEstateManager())
+				{
+					flags |= ESTATE_ACCESS_APPLY_TO_MANAGED_ESTATES;
+					sendEstateAccessDelta(flags, id);
+				}
+				break;
+			}
+			case 2:
+			default:
+			    break;
+		}
+	}
+	return false;
+}
+
+// key = "estateaccessdelta"
+// str(estate_id) will be added to front of list by forward_EstateOwnerRequest_to_dataserver
+// str[0] = str(agent_id) requesting the change
+// str[1] = str(flags) (ESTATE_ACCESS_DELTA_*)
+// str[2] = str(agent_id) to add or remove
+// static
+void LLPanelEstateInfo::sendEstateAccessDelta(U32 flags, const LLUUID& agent_or_group_id)
+{
+	LLMessageSystem* msg = gMessageSystem;
+	msg->newMessage("EstateOwnerMessage");
+	msg->nextBlockFast(_PREHASH_AgentData);
+	msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+	msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+	msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used
+
+	msg->nextBlock("MethodData");
+	msg->addString("Method", "estateaccessdelta");
+	msg->addUUID("Invoice", LLFloaterRegionInfo::getLastInvoice());
+
+	std::string buf;
+	gAgent.getID().toString(buf);
+	msg->nextBlock("ParamList");
+	msg->addString("Parameter", buf);
+
+	buf = llformat("%u", flags);
+	msg->nextBlock("ParamList");
+	msg->addString("Parameter", buf);
+
+	agent_or_group_id.toString(buf);
+	msg->nextBlock("ParamList");
+	msg->addString("Parameter", buf);
+
+
+	LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();
+
+	if (flags & (ESTATE_ACCESS_ALLOWED_AGENT_ADD | ESTATE_ACCESS_ALLOWED_AGENT_REMOVE |
+		         ESTATE_ACCESS_BANNED_AGENT_ADD | ESTATE_ACCESS_BANNED_AGENT_REMOVE))
+	{
+		
+		panel->clearAccessLists();
+	}
+
+	gAgent.sendReliableMessage();
+}
+
+void LLPanelEstateInfo::updateControls(LLViewerRegion* region)
+{
+	BOOL god = gAgent.isGodlike();
+	BOOL owner = (region && (region->getOwner() == gAgent.getID()));
+	BOOL manager = (region && region->isEstateManager());
+	setCtrlsEnabled(god || owner || manager);
+	
+	childDisable("apply_btn");
+	childSetEnabled("add_allowed_avatar_btn",		god || owner || manager);
+	childSetEnabled("remove_allowed_avatar_btn",	god || owner || manager);
+	childSetEnabled("add_allowed_group_btn",		god || owner || manager);
+	childSetEnabled("remove_allowed_group_btn",		god || owner || manager);
+	childSetEnabled("add_banned_avatar_btn",		god || owner || manager);
+	childSetEnabled("remove_banned_avatar_btn",		god || owner || manager);
+	childSetEnabled("message_estate_btn",			god || owner || manager);
+	childSetEnabled("kick_user_from_estate_btn",	god || owner || manager);
+	childSetEnabled("abuse_email_address", 			god || owner || manager);
+
+	// estate managers can't add estate managers
+	childSetEnabled("add_estate_manager_btn",		god || owner);
+	childSetEnabled("remove_estate_manager_btn",	god || owner);
+	childSetEnabled("estate_manager_name_list",		god || owner);
+}
+
+bool LLPanelEstateInfo::refreshFromRegion(LLViewerRegion* region)
+{
+	updateControls(region);
+	
+	// let the parent class handle the general data collection. 
+	bool rv = LLPanelRegionInfo::refreshFromRegion(region);
+
+	// We want estate info. To make sure it works across region
+	// boundaries and multiple packets, we add a serial number to the
+	// integers and track against that on update.
+	strings_t strings;
+	//integers_t integers;
+	//LLFloaterRegionInfo::incrementSerial();
+	LLFloaterRegionInfo::nextInvoice();
+	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
+	//integers.push_back(LLFloaterRegionInfo::());::getPanelEstate();
+
+	
+	LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();
+	panel->clearAccessLists();
+	
+
+	sendEstateOwnerMessage(gMessageSystem, "getinfo", invoice, strings);
+
+	refresh();
+
+	return rv;
+}
+
+void LLPanelEstateInfo::updateChild(LLUICtrl* child_ctrl)
+{
+	if (checkRemovalButton(child_ctrl->getName()))
+	{
+		// do nothing
+	}
+	else if (checkSunHourSlider(child_ctrl))
+	{
+		// do nothing
+	}
+}
+
+bool LLPanelEstateInfo::estateUpdate(LLMessageSystem* msg)
+{
+	llinfos << "LLPanelEstateInfo::estateUpdate()" << llendl;
+	return false;
+}
+
+
+BOOL LLPanelEstateInfo::postBuild()
+{
+	// set up the callbacks for the generic controls
+	initCtrl("externally_visible_check");
+	initCtrl("use_global_time_check");
+	initCtrl("fixed_sun_check");
+	initCtrl("allow_direct_teleport");
+	initCtrl("limit_payment");
+	initCtrl("limit_age_verified");
+	initCtrl("voice_chat_check");
+	childSetCommitCallback("abuse_email_address", onChangeAnything, this);
+	childSetKeystrokeCallback("abuse_email_address", onChangeText, this);
+
+	initHelpBtn("estate_manager_help",			"HelpEstateEstateManager");
+	initHelpBtn("use_global_time_help",			"HelpEstateUseGlobalTime");
+	initHelpBtn("fixed_sun_help",				"HelpEstateFixedSun");
+	initHelpBtn("WLEditSkyHelp",				"HelpEditSky");
+	initHelpBtn("WLEditDayCycleHelp",			"HelpEditDayCycle");
+
+	initHelpBtn("externally_visible_help",		"HelpEstateExternallyVisible");
+	initHelpBtn("allow_direct_teleport_help",	"HelpEstateAllowDirectTeleport");
+	initHelpBtn("allow_resident_help",			"HelpEstateAllowResident");
+	initHelpBtn("allow_group_help",				"HelpEstateAllowGroup");
+	initHelpBtn("ban_resident_help",			"HelpEstateBanResident");
+	initHelpBtn("abuse_email_address_help",         "HelpEstateAbuseEmailAddress");
+	initHelpBtn("voice_chat_help",                  "HelpEstateVoiceChat");
+
+	// set up the use global time checkbox
+	childSetCommitCallback("use_global_time_check", onChangeUseGlobalTime, this);
+	childSetCommitCallback("fixed_sun_check", onChangeFixedSun, this);
+	childSetCommitCallback("sun_hour_slider", onChangeChildCtrl, this);
+
+	childSetCommitCallback("allowed_avatar_name_list", onChangeChildCtrl, this);
+	LLNameListCtrl *avatar_name_list = getChild<LLNameListCtrl>("allowed_avatar_name_list");
+	if (avatar_name_list)
+	{
+		avatar_name_list->setCommitOnSelectionChange(TRUE);
+		avatar_name_list->setMaxItemCount(ESTATE_MAX_ACCESS_IDS);
+	}
+
+	childSetAction("add_allowed_avatar_btn", onClickAddAllowedAgent, this);
+	childSetAction("remove_allowed_avatar_btn", onClickRemoveAllowedAgent, this);
+
+	childSetCommitCallback("allowed_group_name_list", onChangeChildCtrl, this);
+	LLNameListCtrl* group_name_list = getChild<LLNameListCtrl>("allowed_group_name_list");
+	if (group_name_list)
+	{
+		group_name_list->setCommitOnSelectionChange(TRUE);
+		group_name_list->setMaxItemCount(ESTATE_MAX_ACCESS_IDS);
+	}
+
+	childSetAction("add_allowed_group_btn", onClickAddAllowedGroup, this);
+	childSetAction("remove_allowed_group_btn", onClickRemoveAllowedGroup, this);
+
+	childSetCommitCallback("banned_avatar_name_list", onChangeChildCtrl, this);
+	LLNameListCtrl* banned_name_list = getChild<LLNameListCtrl>("banned_avatar_name_list");
+	if (banned_name_list)
+	{
+		banned_name_list->setCommitOnSelectionChange(TRUE);
+		banned_name_list->setMaxItemCount(ESTATE_MAX_ACCESS_IDS);
+	}
+
+	childSetAction("add_banned_avatar_btn", onClickAddBannedAgent, this);
+	childSetAction("remove_banned_avatar_btn", onClickRemoveBannedAgent, this);
+
+	childSetCommitCallback("estate_manager_name_list", onChangeChildCtrl, this);
+	LLNameListCtrl* manager_name_list = getChild<LLNameListCtrl>("estate_manager_name_list");
+	if (manager_name_list)
+	{
+		manager_name_list->setCommitOnSelectionChange(TRUE);
+		manager_name_list->setMaxItemCount(ESTATE_MAX_MANAGERS * 4);	// Allow extras for dupe issue
+	}
+
+	childSetAction("add_estate_manager_btn", onClickAddEstateManager, this);
+	childSetAction("remove_estate_manager_btn", onClickRemoveEstateManager, this);
+	childSetAction("message_estate_btn", onClickMessageEstate, this);
+	childSetAction("kick_user_from_estate_btn", onClickKickUser, this);
+
+	childSetAction("WLEditSky", onClickEditSky, this);
+	childSetAction("WLEditDayCycle", onClickEditDayCycle, this);
+
+	return LLPanelRegionInfo::postBuild();
+}
+
+void LLPanelEstateInfo::refresh()
+{
+	bool public_access = childGetValue("externally_visible_check").asBoolean();
+	childSetEnabled("Only Allow", public_access);
+	childSetEnabled("limit_payment", public_access);
+	childSetEnabled("limit_age_verified", public_access);
+	// if this is set to false, then the limit fields are meaningless and should be turned off
+	if (public_access == false)
+	{
+		childSetValue("limit_payment", false);
+		childSetValue("limit_age_verified", false);
+	}
+}
+
+BOOL LLPanelEstateInfo::sendUpdate()
+{
+	llinfos << "LLPanelEsateInfo::sendUpdate()" << llendl;
+
+	LLNotification::Params params("ChangeLindenEstate");
+	params.functor(boost::bind(&LLPanelEstateInfo::callbackChangeLindenEstate, this, _1, _2));
+
+	if (getEstateID() <= ESTATE_LAST_LINDEN)
+	{
+		// trying to change reserved estate, warn
+		LLNotifications::instance().add(params);
+	}
+	else
+	{
+		// for normal estates, just make the change
+		LLNotifications::instance().forceResponse(params, 0);
+	}
+	return TRUE;
+}
+
+bool LLPanelEstateInfo::callbackChangeLindenEstate(const LLSD& notification, const LLSD& response)
+{
+	S32 option = LLNotification::getSelectedOption(notification, response);
+	switch(option)
+	{
+	case 0:
+		// send the update
+		if (!commitEstateInfoCaps())
+		{
+			// the caps method failed, try the old way
+			LLFloaterRegionInfo::nextInvoice();
+			commitEstateInfoDataserver();
+		}
+		// we don't want to do this because we'll get it automatically from the sim
+		// after the spaceserver processes it
+//		else
+//		{
+//			// caps method does not automatically send this info
+//			LLFloaterRegionInfo::requestRegionInfo();
+//		}
+		break;
+	case 1:
+	default:
+		// do nothing
+		break;
+	}
+	return false;
+}
+
+
+/*
+// Request = "getowner"
+// SParam[0] = "" (empty string)
+// IParam[0] = serial
+void LLPanelEstateInfo::getEstateOwner()
+{
+	// TODO -- disable the panel
+	// and call this function whenever we cross a region boundary
+	// re-enable when owner matches, and get new estate info
+	LLMessageSystem* msg = gMessageSystem;
+	msg->newMessageFast(_PREHASH_EstateOwnerRequest);
+	msg->nextBlockFast(_PREHASH_AgentData);
+	msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+
+	msg->nextBlockFast(_PREHASH_RequestData);
+	msg->addStringFast(_PREHASH_Request, "getowner");
+
+	// we send an empty string so that the variable block is not empty
+	msg->nextBlockFast(_PREHASH_StringData);
+	msg->addStringFast(_PREHASH_SParam, "");
+
+	msg->nextBlockFast(_PREHASH_IntegerData);
+	msg->addS32Fast(_PREHASH_IParam, LLFloaterRegionInfo::getSerial());
+
+	gAgent.sendMessage();
+}
+*/
+
+class LLEstateChangeInfoResponder : public LLHTTPClient::Responder
+{
+public:
+	LLEstateChangeInfoResponder(void* userdata) : mpPanel((LLPanelEstateInfo*)userdata) {};
+	
+	// if we get a normal response, handle it here
+	virtual void result(const LLSD& content)
+	{
+	    // refresh the panel from the database
+		mpPanel->refresh();
+	}
+	
+	// if we get an error response
+	virtual void error(U32 status, const std::string& reason)
+	{
+		llinfos << "LLEstateChangeInfoResponder::error "
+			<< status << ": " << reason << llendl;
+	}
+private:
+	LLPanelEstateInfo* mpPanel;
+};
+
+// tries to send estate info using a cap; returns true if it succeeded
+bool LLPanelEstateInfo::commitEstateInfoCaps()
+{
+	std::string url = gAgent.getRegion()->getCapability("EstateChangeInfo");
+	
+	if (url.empty())
+	{
+		// whoops, couldn't find the cap, so bail out
+		return false;
+	}
+	
+	LLSD body;
+	body["estate_name"] = getEstateName();
+
+	body["is_externally_visible"] = childGetValue("externally_visible_check").asBoolean();
+	body["allow_direct_teleport"] = childGetValue("allow_direct_teleport").asBoolean();
+	body["is_sun_fixed"         ] = childGetValue("fixed_sun_check").asBoolean();
+	body["deny_anonymous"       ] = childGetValue("limit_payment").asBoolean();
+	body["deny_age_unverified"  ] = childGetValue("limit_age_verified").asBoolean();
+	body["allow_voice_chat"     ] = childGetValue("voice_chat_check").asBoolean();
+	body["invoice"              ] = LLFloaterRegionInfo::getLastInvoice();
+
+	// block fly is in estate database but not in estate UI, so we're not supporting it
+	//body["block_fly"            ] = childGetValue("").asBoolean();
+
+	F32 sun_hour = getSunHour();
+	if (childGetValue("use_global_time_check").asBoolean())
+	{
+		sun_hour = 0.f;			// 0 = global time
+	}
+	body["sun_hour"] = sun_hour;
+
+	body["owner_abuse_email"] = childGetValue("abuse_email_address").asString();
+
+	// we use a responder so that we can re-get the data after committing to the database
+	LLHTTPClient::post(url, body, new LLEstateChangeInfoResponder((void*)this));
+    return true;
+}
+
+/* This is the old way of doing things, is deprecated, and should be 
+   deleted when the dataserver model can be removed */
+// key = "estatechangeinfo"
+// strings[0] = str(estate_id) (added by simulator before relay - not here)
+// strings[1] = estate_name
+// strings[2] = str(estate_flags)
+// strings[3] = str((S32)(sun_hour * 1024.f))
+void LLPanelEstateInfo::commitEstateInfoDataserver()
+{
+	LLMessageSystem* msg = gMessageSystem;
+	msg->newMessage("EstateOwnerMessage");
+	msg->nextBlockFast(_PREHASH_AgentData);
+	msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+	msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+	msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used
+
+	msg->nextBlock("MethodData");
+	msg->addString("Method", "estatechangeinfo");
+	msg->addUUID("Invoice", LLFloaterRegionInfo::getLastInvoice());
+
+	msg->nextBlock("ParamList");
+	msg->addString("Parameter", getEstateName());
+
+	std::string buffer;
+	buffer = llformat("%u", computeEstateFlags());
+	msg->nextBlock("ParamList");
+	msg->addString("Parameter", buffer);
+
+	F32 sun_hour = getSunHour();
+	if (childGetValue("use_global_time_check").asBoolean())
+	{
+		sun_hour = 0.f;	// 0 = global time
+	}
+
+	buffer = llformat("%d", (S32)(sun_hour*1024.0f));
+	msg->nextBlock("ParamList");
+	msg->addString("Parameter", buffer);
+
+	gAgent.sendMessage();
+}
+
+void LLPanelEstateInfo::setEstateFlags(U32 flags)
+{
+	childSetValue("externally_visible_check", LLSD(flags & REGION_FLAGS_EXTERNALLY_VISIBLE ? TRUE : FALSE) );
+	childSetValue("fixed_sun_check", LLSD(flags & REGION_FLAGS_SUN_FIXED ? TRUE : FALSE) );
+	childSetValue(
+		"voice_chat_check",
+		LLSD(flags & REGION_FLAGS_ALLOW_VOICE ? TRUE : FALSE));
+	childSetValue("allow_direct_teleport", LLSD(flags & REGION_FLAGS_ALLOW_DIRECT_TELEPORT ? TRUE : FALSE) );
+	childSetValue("limit_payment", LLSD(flags & REGION_FLAGS_DENY_ANONYMOUS ? TRUE : FALSE) );
+	childSetValue("limit_age_verified", LLSD(flags & REGION_FLAGS_DENY_AGEUNVERIFIED ? TRUE : FALSE) );
+
+	refresh();
+}
+
+U32 LLPanelEstateInfo::computeEstateFlags()
+{
+	U32 flags = 0;
+
+	if (childGetValue("externally_visible_check").asBoolean())
+	{
+		flags |= REGION_FLAGS_EXTERNALLY_VISIBLE;
+	}
+
+	if ( childGetValue("voice_chat_check").asBoolean() )
+	{
+		flags |= REGION_FLAGS_ALLOW_VOICE;
+	}
+	
+	if (childGetValue("allow_direct_teleport").asBoolean())
+	{
+		flags |= REGION_FLAGS_ALLOW_DIRECT_TELEPORT;
+	}
+
+	if (childGetValue("fixed_sun_check").asBoolean())
+	{
+		flags |= REGION_FLAGS_SUN_FIXED;
+	}
+	
+	if (childGetValue("limit_payment").asBoolean())
+	{
+		flags |= REGION_FLAGS_DENY_ANONYMOUS;
+	}
+	
+	if (childGetValue("limit_age_verified").asBoolean())
+	{
+		flags |= REGION_FLAGS_DENY_AGEUNVERIFIED;
+	}
+
+	
+	return flags;
+}
+
+BOOL LLPanelEstateInfo::getGlobalTime()
+{
+	return childGetValue("use_global_time_check").asBoolean();
+}
+
+void LLPanelEstateInfo::setGlobalTime(bool b)
+{
+	childSetValue("use_global_time_check", LLSD(b));
+	childSetEnabled("fixed_sun_check", LLSD(!b));
+	childSetEnabled("sun_hour_slider", LLSD(!b));
+	if (b)
+	{
+		childSetValue("sun_hour_slider", LLSD(0.f));
+	}
+}
+
+
+BOOL LLPanelEstateInfo::getFixedSun()
+{
+	return childGetValue("fixed_sun_check").asBoolean();
+}
+
+void LLPanelEstateInfo::setSunHour(F32 sun_hour)
+{
+	if(sun_hour < 6.0f)
+	{
+		sun_hour = 24.0f + sun_hour;
+	}
+	childSetValue("sun_hour_slider", LLSD(sun_hour));
+}
+
+F32 LLPanelEstateInfo::getSunHour()
+{
+	if (childIsEnabled("sun_hour_slider"))
+	{
+		return (F32)childGetValue("sun_hour_slider").asReal();
+	}
+	return 0.f;
+}
+
+const std::string LLPanelEstateInfo::getEstateName() const
+{
+	return childGetValue("estate_name").asString();
+}
+
+void LLPanelEstateInfo::setEstateName(const std::string& name)
+{
+	childSetValue("estate_name", LLSD(name));
+}
+
+const std::string LLPanelEstateInfo::getOwnerName() const
+{
+	return childGetValue("estate_owner").asString();
+}
+
+void LLPanelEstateInfo::setOwnerName(const std::string& name)
+{
+	childSetValue("estate_owner", LLSD(name));
+}
+
+const std::string LLPanelEstateInfo::getAbuseEmailAddress() const
+{
+	return childGetValue("abuse_email_address").asString();
+}
+
+void LLPanelEstateInfo::setAbuseEmailAddress(const std::string& address)
+{
+	childSetValue("abuse_email_address", LLSD(address));
+}
+
+void LLPanelEstateInfo::setAccessAllowedEnabled(bool enable_agent,
+												bool enable_group,
+												bool enable_ban)
+{
+	childSetEnabled("allow_resident_label", enable_agent);
+	childSetEnabled("allowed_avatar_name_list", enable_agent);
+	childSetVisible("allowed_avatar_name_list", enable_agent);
+	childSetEnabled("add_allowed_avatar_btn", enable_agent);
+	childSetEnabled("remove_allowed_avatar_btn", enable_agent);
+
+	// Groups
+	childSetEnabled("allow_group_label", enable_group);
+	childSetEnabled("allowed_group_name_list", enable_group);
+	childSetVisible("allowed_group_name_list", enable_group);
+	childSetEnabled("add_allowed_group_btn", enable_group);
+	childSetEnabled("remove_allowed_group_btn", enable_group);
+
+	// Ban
+	childSetEnabled("ban_resident_label", enable_ban);
+	childSetEnabled("banned_avatar_name_list", enable_ban);
+	childSetVisible("banned_avatar_name_list", enable_ban);
+	childSetEnabled("add_banned_avatar_btn", enable_ban);
+	childSetEnabled("remove_banned_avatar_btn", enable_ban);
+
+	// Update removal buttons if needed
+	if (enable_agent)
+	{
+		checkRemovalButton("allowed_avatar_name_list");
+	}
+
+	if (enable_group)
+	{
+		checkRemovalButton("allowed_group_name_list");
+	}
+
+	if (enable_ban)
+	{
+		checkRemovalButton("banned_avatar_name_list");
+	}
+}
+
+// static
+void LLPanelEstateInfo::callbackCacheName(
+	const LLUUID& id,
+	const std::string& first,
+	const std::string& last,
+	BOOL is_group,
+	void*)
+{
+	LLPanelEstateInfo* self = LLFloaterRegionInfo::getPanelEstate();
+	if (!self) return;
+
+	std::string name;
+	
+	if (id.isNull())
+	{
+		name = "(none)";
+	}
+	else
+	{
+		name = first + " " + last;
+	}
+
+	self->setOwnerName(name);
+}
+
+void LLPanelEstateInfo::clearAccessLists() 
+{
+	LLNameListCtrl* name_list = getChild<LLNameListCtrl>("allowed_avatar_name_list");
+	if (name_list)
+	{
+		name_list->deleteAllItems();
+	}
+
+	name_list = getChild<LLNameListCtrl>("banned_avatar_name_list");
+	if (name_list)
+	{
+		name_list->deleteAllItems();
+	}
+}
+
+// enables/disables the "remove" button for the various allow/ban lists
+BOOL LLPanelEstateInfo::checkRemovalButton(std::string name)
+{
+	std::string btn_name = "";
+	if (name == "allowed_avatar_name_list")
+	{
+		btn_name = "remove_allowed_avatar_btn";
+	}
+	else if (name == "allowed_group_name_list")
+	{
+		btn_name = "remove_allowed_group_btn";
+	}
+	else if (name == "banned_avatar_name_list")
+	{
+		btn_name = "remove_banned_avatar_btn";
+	}
+	else if (name == "estate_manager_name_list")
+	{
+		//ONLY OWNER CAN ADD /DELET ESTATE MANAGER
+		LLViewerRegion* region = gAgent.getRegion();
+		if (region && (region->getOwner() == gAgent.getID()))
+		{
+			btn_name = "remove_estate_manager_btn";
+		}
+	}
+
+	// enable the remove button if something is selected
+	LLNameListCtrl* name_list = getChild<LLNameListCtrl>(name);
+	childSetEnabled(btn_name, name_list && name_list->getFirstSelected() ? TRUE : FALSE);
+
+	return (btn_name != "");
+}
+
+BOOL LLPanelEstateInfo::checkSunHourSlider(LLUICtrl* child_ctrl)
+{
+	BOOL found_child_ctrl = FALSE;
+	if (child_ctrl->getName() == "sun_hour_slider")
+	{
+		enableButton("apply_btn");
+		found_child_ctrl = TRUE;
+	}
+	return found_child_ctrl;
+}
+
+// static
+void LLPanelEstateInfo::onClickMessageEstate(void* userdata)
+{
+	llinfos << "LLPanelEstateInfo::onClickMessageEstate" << llendl;
+	LLNotifications::instance().add("MessageEstate", LLSD(), LLSD(), boost::bind(&LLPanelEstateInfo::onMessageCommit, (LLPanelEstateInfo*)userdata, _1, _2));
+}
+
+bool LLPanelEstateInfo::onMessageCommit(const LLSD& notification, const LLSD& response)
+{
+	S32 option = LLNotification::getSelectedOption(notification, response);
+	std::string text = response["message"].asString();
+	if(option != 0) return false;
+	if(text.empty()) return false;
+	llinfos << "Message to everyone: " << text << llendl;
+	strings_t strings;
+	//integers_t integers;
+	std::string name;
+	gAgent.buildFullname(name);
+	strings.push_back(strings_t::value_type(name));
+	strings.push_back(strings_t::value_type(text));
+	LLUUID invoice(LLFloaterRegionInfo::getLastInvoice());
+	sendEstateOwnerMessage(gMessageSystem, "instantmessage", invoice, strings);
+	return false;
+}
+
+LLPanelEstateCovenant::LLPanelEstateCovenant()
+: mCovenantID(LLUUID::null)
+{
+}
+
+// virtual 
+bool LLPanelEstateCovenant::refreshFromRegion(LLViewerRegion* region)
+{
+	LLTextBox* region_name = getChild<LLTextBox>("region_name_text");
+	if (region_name)
+	{
+		region_name->setText(region->getName());
+	}
+
+	LLTextBox* resellable_clause = getChild<LLTextBox>("resellable_clause");
+	if (resellable_clause)
+	{
+		if (region->getRegionFlags() & REGION_FLAGS_BLOCK_LAND_RESELL)
+		{
+			resellable_clause->setText(getString("can_not_resell"));
+		}
+		else
+		{
+			resellable_clause->setText(getString("can_resell"));
+		}
+	}
+	
+	LLTextBox* changeable_clause = getChild<LLTextBox>("changeable_clause");
+	if (changeable_clause)
+	{
+		if (region->getRegionFlags() & REGION_FLAGS_ALLOW_PARCEL_CHANGES)
+		{
+			changeable_clause->setText(getString("can_change"));
+		}
+		else
+		{
+			changeable_clause->setText(getString("can_not_change"));
+		}
+	}
+
+	LLTextBox* region_maturity = getChild<LLTextBox>("region_maturity_text");
+	if (region_maturity)
+	{
+		region_maturity->setText(region->getSimAccessString());
+	}
+	
+	LLTextBox* region_landtype = getChild<LLTextBox>("region_landtype_text");
+	if (region_landtype)
+	{
+		region_landtype->setText(region->getSimProductName());
+	}
+	
+	
+	// let the parent class handle the general data collection. 
+	bool rv = LLPanelRegionInfo::refreshFromRegion(region);
+	LLMessageSystem *msg = gMessageSystem;
+	msg->newMessage("EstateCovenantRequest");
+	msg->nextBlockFast(_PREHASH_AgentData);
+	msg->addUUIDFast(_PREHASH_AgentID,	gAgent.getID());
+	msg->addUUIDFast(_PREHASH_SessionID,gAgent.getSessionID());
+	msg->sendReliable(region->getHost());
+	return rv;
+}
+
+// virtual 
+bool LLPanelEstateCovenant::estateUpdate(LLMessageSystem* msg)
+{
+	llinfos << "LLPanelEstateCovenant::estateUpdate()" << llendl;
+	return true;
+}
+	
+// virtual 
+BOOL LLPanelEstateCovenant::postBuild()
+{
+	initHelpBtn("covenant_help",		"HelpEstateCovenant");
+	mEstateNameText = getChild<LLTextBox>("estate_name_text");
+	mEstateOwnerText = getChild<LLTextBox>("estate_owner_text");
+	mLastModifiedText = getChild<LLTextBox>("covenant_timestamp_text");
+	mEditor = getChild<LLViewerTextEditor>("covenant_editor");
+	if (mEditor) mEditor->setHandleEditKeysDirectly(TRUE);
+	LLButton* reset_button = getChild<LLButton>("reset_covenant");
+	reset_button->setEnabled(gAgent.canManageEstate());
+	reset_button->setClickedCallback(LLPanelEstateCovenant::resetCovenantID, NULL);
+
+	return LLPanelRegionInfo::postBuild();
+}
+
+// virtual 
+void LLPanelEstateCovenant::updateChild(LLUICtrl* child_ctrl)
+{
+}
+
+// virtual
+BOOL LLPanelEstateCovenant::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
+								  EDragAndDropType cargo_type,
+								  void* cargo_data,
+								  EAcceptance* accept,
+								  std::string& tooltip_msg)
+{
+	LLInventoryItem* item = (LLInventoryItem*)cargo_data;
+
+	if (!gAgent.canManageEstate())
+	{
+		*accept = ACCEPT_NO;
+		return TRUE;
+	}
+
+	switch(cargo_type)
+	{
+	case DAD_NOTECARD:
+		*accept = ACCEPT_YES_COPY_SINGLE;
+		if (item && drop)
+		{
+			LLSD payload;
+			payload["item_id"] = item->getUUID();
+			LLNotifications::instance().add("EstateChangeCovenant", LLSD(), payload,
+									LLPanelEstateCovenant::confirmChangeCovenantCallback);
+		}
+		break;
+	default:
+		*accept = ACCEPT_NO;
+		break;
+	}
+
+	return TRUE;
+} 
+
+// static 
+bool LLPanelEstateCovenant::confirmChangeCovenantCallback(const LLSD& notification, const LLSD& response)
+{
+	S32 option = LLNotification::getSelectedOption(notification, response);
+	LLInventoryItem* item = gInventory.getItem(notification["payload"]["item_id"].asUUID());
+	LLPanelEstateCovenant* self = LLFloaterRegionInfo::getPanelCovenant();
+
+	if (!item || !self) return false;
+
+	switch(option)
+	{
+	case 0:
+		self->loadInvItem(item);
+		break;
+	default:
+		break;
+	}
+	return false;
+}
+
+// static
+void LLPanelEstateCovenant::resetCovenantID(void* userdata)
+{
+	LLNotifications::instance().add("EstateChangeCovenant", LLSD(), LLSD(), confirmResetCovenantCallback);
+}
+
+// static
+bool LLPanelEstateCovenant::confirmResetCovenantCallback(const LLSD& notification, const LLSD& response)
+{
+	LLPanelEstateCovenant* self = LLFloaterRegionInfo::getPanelCovenant();
+	if (!self) return false;
+
+	S32 option = LLNotification::getSelectedOption(notification, response);
+	switch(option)
+	{
+	case 0:		
+		self->loadInvItem(NULL);
+		break;
+	default:
+		break;
+	}
+	return false;
+}
+
+void LLPanelEstateCovenant::loadInvItem(LLInventoryItem *itemp)
+{
+	const BOOL high_priority = TRUE;	
+	if (itemp)
+	{
+		gAssetStorage->getInvItemAsset(gAgent.getRegionHost(),
+									gAgent.getID(),
+									gAgent.getSessionID(),
+									itemp->getPermissions().getOwner(),
+									LLUUID::null,
+									itemp->getUUID(),
+									itemp->getAssetUUID(),
+									itemp->getType(),
+                                    onLoadComplete,
+									(void*)this,
+									high_priority);
+		mAssetStatus = ASSET_LOADING;
+	}
+	else
+	{
+		mAssetStatus = ASSET_LOADED;
+		setCovenantTextEditor("There is no Covenant provided for this Estate.");
+		sendChangeCovenantID(LLUUID::null);
+	}
+}
+
+// static
+void LLPanelEstateCovenant::onLoadComplete(LLVFS *vfs,
+									   const LLUUID& asset_uuid,
+									   LLAssetType::EType type,
+									   void* user_data, S32 status, LLExtStat ext_status)
+{
+	llinfos << "LLPanelEstateCovenant::onLoadComplete()" << llendl;
+	LLPanelEstateCovenant* panelp = (LLPanelEstateCovenant*)user_data;
+	if( panelp )
+	{
+		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)
+			{
+				llerrs << "Memory Allocation Failed" << llendl;
+				return;
+			}
+
+			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 ) )
+			{
+				if( !panelp->mEditor->importBuffer( buffer, file_length+1 ) )
+				{
+					llwarns << "Problem importing estate covenant." << llendl;
+					LLNotifications::instance().add("ProblemImportingEstateCovenant");
+				}
+				else
+				{
+					panelp->sendChangeCovenantID(asset_uuid);	
+				}
+			}
+			else
+			{
+				// Version 0 (just text, doesn't include version number)
+				panelp->sendChangeCovenantID(asset_uuid);
+			}
+			delete[] buffer;
+		}
+		else
+		{
+			LLViewerStats::getInstance()->incStat( LLViewerStats::ST_DOWNLOAD_FAILED );
+
+			if( LL_ERR_ASSET_REQUEST_NOT_IN_DATABASE == status ||
+				LL_ERR_FILE_EMPTY == status)
+			{
+				LLNotifications::instance().add("MissingNotecardAssetID");
+			}
+			else if (LL_ERR_INSUFFICIENT_PERMISSIONS == status)
+			{
+				LLNotifications::instance().add("NotAllowedToViewNotecard");
+			}
+			else
+			{
+				LLNotifications::instance().add("UnableToLoadNotecardAsset");
+			}
+
+			llwarns << "Problem loading notecard: " << status << llendl;
+		}
+		panelp->mAssetStatus = ASSET_LOADED;
+		panelp->setCovenantID(asset_uuid);
+	}
+}
+
+// key = "estatechangecovenantid"
+// strings[0] = str(estate_id) (added by simulator before relay - not here)
+// strings[1] = str(covenant_id)
+void LLPanelEstateCovenant::sendChangeCovenantID(const LLUUID &asset_id)
+{
+	if (asset_id != getCovenantID())
+	{
+        setCovenantID(asset_id);
+
+		LLMessageSystem* msg = gMessageSystem;
+		msg->newMessage("EstateOwnerMessage");
+		msg->nextBlockFast(_PREHASH_AgentData);
+		msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
+		msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
+		msg->addUUIDFast(_PREHASH_TransactionID, LLUUID::null); //not used
+
+		msg->nextBlock("MethodData");
+		msg->addString("Method", "estatechangecovenantid");
+		msg->addUUID("Invoice", LLFloaterRegionInfo::getLastInvoice());
+
+		msg->nextBlock("ParamList");
+		msg->addString("Parameter", getCovenantID().asString());
+		gAgent.sendReliableMessage();
+	}
+}
+
+// virtual 
+BOOL LLPanelEstateCovenant::sendUpdate()
+{
+	return TRUE;
+}
+
+const std::string& LLPanelEstateCovenant::getEstateName() const
+{
+	return mEstateNameText->getText();
+}
+
+void LLPanelEstateCovenant::setEstateName(const std::string& name)
+{
+	mEstateNameText->setText(name);
+}
+
+// static
+void LLPanelEstateCovenant::updateCovenantText(const std::string& string, const LLUUID& asset_id)
+{
+	LLPanelEstateCovenant* panelp = LLFloaterRegionInfo::getPanelCovenant();
+	if( panelp )
+	{
+		panelp->mEditor->setText(string);
+		panelp->setCovenantID(asset_id);
+	}
+}
+
+// static
+void LLPanelEstateCovenant::updateEstateName(const std::string& name)
+{
+	LLPanelEstateCovenant* panelp = LLFloaterRegionInfo::getPanelCovenant();
+	if( panelp )
+	{
+		panelp->mEstateNameText->setText(name);
+	}
+}
+
+// static
+void LLPanelEstateCovenant::updateLastModified(const std::string& text)
+{
+	LLPanelEstateCovenant* panelp = LLFloaterRegionInfo::getPanelCovenant();
+	if( panelp )
+	{
+		panelp->mLastModifiedText->setText(text);
+	}
+}
+
+// static
+void LLPanelEstateCovenant::updateEstateOwnerName(const std::string& name)
+{
+	LLPanelEstateCovenant* panelp = LLFloaterRegionInfo::getPanelCovenant();
+	if( panelp )
+	{
+		panelp->mEstateOwnerText->setText(name);
+	}
+}
+
+const std::string& LLPanelEstateCovenant::getOwnerName() const
+{
+	return mEstateOwnerText->getText();
+}
+
+void LLPanelEstateCovenant::setOwnerName(const std::string& name)
+{
+	mEstateOwnerText->setText(name);
+}
+
+void LLPanelEstateCovenant::setCovenantTextEditor(const std::string& text)
+{
+	mEditor->setText(text);
+}
+
+// key = "estateupdateinfo"
+// strings[0] = estate name
+// strings[1] = str(owner_id)
+// strings[2] = str(estate_id)
+// strings[3] = str(estate_flags)
+// strings[4] = str((S32)(sun_hour * 1024))
+// strings[5] = str(parent_estate_id)
+// strings[6] = str(covenant_id)
+// strings[7] = str(covenant_timestamp)
+// strings[8] = str(send_to_agent_only)
+// strings[9] = str(abuse_email_addr)
+bool LLDispatchEstateUpdateInfo::operator()(
+		const LLDispatcher* dispatcher,
+		const std::string& key,
+		const LLUUID& invoice,
+		const sparam_t& strings)
+{
+	LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();
+	if (!panel) return true;
+
+	// NOTE: LLDispatcher extracts strings with an extra \0 at the
+	// end.  If we pass the std::string direct to the UI/renderer
+	// it draws with a weird character at the end of the string.
+	std::string estate_name = strings[0].c_str(); // preserve c_str() call!
+	panel->setEstateName(estate_name);
+	
+	if (strings.size() > 3)
+	{
+		std::string abuse_email = strings[9].c_str(); // preserve c_str() call!
+		panel->setAbuseEmailAddress(abuse_email);
+	}
+	else
+	{
+		panel->setAbuseEmailAddress(panel->getString("email_unsupported"));
+	}
+
+	LLViewerRegion* regionp = gAgent.getRegion();
+
+	LLUUID owner_id(strings[1]);
+	regionp->setOwner(owner_id);
+	// Update estate owner name in UI
+	const BOOL is_group = FALSE;
+	gCacheName->get(owner_id, is_group, LLPanelEstateInfo::callbackCacheName);
+
+	U32 estate_id = strtoul(strings[2].c_str(), NULL, 10);
+	panel->setEstateID(estate_id);
+
+	U32 flags = strtoul(strings[3].c_str(), NULL, 10);
+	panel->setEstateFlags(flags);
+
+	F32 sun_hour = ((F32)(strtod(strings[4].c_str(), NULL)))/1024.0f;
+	if(sun_hour == 0 && (flags & REGION_FLAGS_SUN_FIXED ? FALSE : TRUE))
+	{
+		panel->setGlobalTime(TRUE);
+	} 
+	else
+	{
+		panel->setGlobalTime(FALSE);
+		panel->setSunHour(sun_hour);
+	}
+
+	bool visible_from_mainland = (bool)(flags & REGION_FLAGS_EXTERNALLY_VISIBLE);
+	bool god = gAgent.isGodlike();
+	bool linden_estate = (estate_id <= ESTATE_LAST_LINDEN);
+
+	// If visible from mainland, disable the access allowed
+	// UI, as anyone can teleport there.
+	// However, gods need to be able to edit the access list for
+	// linden estates, regardless of visibility, to allow object
+	// and L$ transfers.
+	bool enable_agent = (!visible_from_mainland || (god && linden_estate));
+	bool enable_group = enable_agent;
+	bool enable_ban = !linden_estate;
+	panel->setAccessAllowedEnabled(enable_agent, enable_group, enable_ban);
+
+	return true;
+}
+
+
+// key = "setaccess"
+// strings[0] = str(estate_id)
+// strings[1] = str(packed_access_lists)
+// strings[2] = str(num allowed agent ids)
+// strings[3] = str(num allowed group ids)
+// strings[4] = str(num banned agent ids)
+// strings[5] = str(num estate manager agent ids)
+// strings[6] = bin(uuid)
+// strings[7] = bin(uuid)
+// strings[8] = bin(uuid)
+// ...
+bool LLDispatchSetEstateAccess::operator()(
+		const LLDispatcher* dispatcher,
+		const std::string& key,
+		const LLUUID& invoice,
+		const sparam_t& strings)
+{
+	LLPanelEstateInfo* panel = LLFloaterRegionInfo::getPanelEstate();
+	if (!panel) return true;
+
+	S32 index = 1;	// skip estate_id
+	U32 access_flags = strtoul(strings[index++].c_str(), NULL,10);
+	S32 num_allowed_agents = strtol(strings[index++].c_str(), NULL, 10);
+	S32 num_allowed_groups = strtol(strings[index++].c_str(), NULL, 10);
+	S32 num_banned_agents = strtol(strings[index++].c_str(), NULL, 10);
+	S32 num_estate_managers = strtol(strings[index++].c_str(), NULL, 10);
+
+	// sanity ckecks
+	if (num_allowed_agents > 0
+		&& !(access_flags & ESTATE_ACCESS_ALLOWED_AGENTS))
+	{
+		llwarns << "non-zero count for allowed agents, but no corresponding flag" << llendl;
+	}
+	if (num_allowed_groups > 0
+		&& !(access_flags & ESTATE_ACCESS_ALLOWED_GROUPS))
+	{
+		llwarns << "non-zero count for allowed groups, but no corresponding flag" << llendl;
+	}
+	if (num_banned_agents > 0
+		&& !(access_flags & ESTATE_ACCESS_BANNED_AGENTS))
+	{
+		llwarns << "non-zero count for banned agents, but no corresponding flag" << llendl;
+	}
+	if (num_estate_managers > 0
+		&& !(access_flags & ESTATE_ACCESS_MANAGERS))
+	{
+		llwarns << "non-zero count for managers, but no corresponding flag" << llendl;
+	}
+
+	// grab the UUID's out of the string fields
+	if (access_flags & ESTATE_ACCESS_ALLOWED_AGENTS)
+	{
+		LLNameListCtrl* allowed_agent_name_list;
+		allowed_agent_name_list = panel->getChild<LLNameListCtrl>("allowed_avatar_name_list");
+
+		int totalAllowedAgents = num_allowed_agents;
+		
+		if (allowed_agent_name_list) 
+		{
+			totalAllowedAgents += allowed_agent_name_list->getItemCount();
+		}
+
+		std::string msg = llformat("Allowed residents: (%d, max %d)",
+									totalAllowedAgents,
+									ESTATE_MAX_ACCESS_IDS);
+		panel->childSetValue("allow_resident_label", LLSD(msg));
+
+		if (allowed_agent_name_list)
+		{
+			//allowed_agent_name_list->deleteAllItems();
+			for (S32 i = 0; i < num_allowed_agents && i < ESTATE_MAX_ACCESS_IDS; i++)
+			{
+				LLUUID id;
+				memcpy(id.mData, strings[index++].data(), UUID_BYTES);		/* Flawfinder: ignore */
+				allowed_agent_name_list->addNameItem(id);
+			}
+			panel->childSetEnabled("remove_allowed_avatar_btn", allowed_agent_name_list->getFirstSelected() ? TRUE : FALSE);
+			allowed_agent_name_list->sortByColumnIndex(0, TRUE);
+		}
+	}
+
+	if (access_flags & ESTATE_ACCESS_ALLOWED_GROUPS)
+	{
+		LLNameListCtrl* allowed_group_name_list;
+		allowed_group_name_list = panel->getChild<LLNameListCtrl>("allowed_group_name_list");
+
+		std::string msg = llformat("Allowed groups: (%d, max %d)",
+									num_allowed_groups,
+									(S32) ESTATE_MAX_GROUP_IDS);
+		panel->childSetValue("allow_group_label", LLSD(msg));
+
+		if (allowed_group_name_list)
+		{
+			allowed_group_name_list->deleteAllItems();
+			for (S32 i = 0; i < num_allowed_groups && i < ESTATE_MAX_GROUP_IDS; i++)
+			{
+				LLUUID id;
+				memcpy(id.mData, strings[index++].data(), UUID_BYTES);		/* Flawfinder: ignore */
+				allowed_group_name_list->addGroupNameItem(id);
+			}
+			panel->childSetEnabled("remove_allowed_group_btn", allowed_group_name_list->getFirstSelected() ? TRUE : FALSE);
+			allowed_group_name_list->sortByColumnIndex(0, TRUE);
+		}
+	}
+
+	if (access_flags & ESTATE_ACCESS_BANNED_AGENTS)
+	{
+		LLNameListCtrl* banned_agent_name_list;
+		banned_agent_name_list = panel->getChild<LLNameListCtrl>("banned_avatar_name_list");
+
+		int totalBannedAgents = num_banned_agents;
+		
+		if (banned_agent_name_list) 
+		{
+			totalBannedAgents += banned_agent_name_list->getItemCount();
+		}
+
+
+		std::string msg = llformat("Banned residents: (%d, max %d)",
+									totalBannedAgents,
+									ESTATE_MAX_ACCESS_IDS);
+		panel->childSetValue("ban_resident_label", LLSD(msg));
+
+		if (banned_agent_name_list)
+		{
+			//banned_agent_name_list->deleteAllItems();
+			for (S32 i = 0; i < num_banned_agents && i < ESTATE_MAX_ACCESS_IDS; i++)
+			{
+				LLUUID id;
+				memcpy(id.mData, strings[index++].data(), UUID_BYTES);		/* Flawfinder: ignore */
+				banned_agent_name_list->addNameItem(id);
+			}
+			panel->childSetEnabled("remove_banned_avatar_btn", banned_agent_name_list->getFirstSelected() ? TRUE : FALSE);
+			banned_agent_name_list->sortByColumnIndex(0, TRUE);
+		}
+	}
+
+	if (access_flags & ESTATE_ACCESS_MANAGERS)
+	{
+		std::string msg = llformat("Estate Managers: (%d, max %d)",
+									num_estate_managers,
+									ESTATE_MAX_MANAGERS);
+		panel->childSetValue("estate_manager_label", LLSD(msg));
+
+		LLNameListCtrl* estate_manager_name_list =
+			panel->getChild<LLNameListCtrl>("estate_manager_name_list");
+		if (estate_manager_name_list)
+		{	
+			estate_manager_name_list->deleteAllItems();		// Clear existing entries
+
+			// There should be only ESTATE_MAX_MANAGERS people in the list, but if the database gets more (SL-46107) don't 
+			// truncate the list unless it's really big.  Go ahead and show the extras so the user doesn't get confused, 
+			// and they can still remove them.
+			for (S32 i = 0; i < num_estate_managers && i < (ESTATE_MAX_MANAGERS * 4); i++)
+			{
+				LLUUID id;
+				memcpy(id.mData, strings[index++].data(), UUID_BYTES);		/* Flawfinder: ignore */
+				estate_manager_name_list->addNameItem(id);
+			}
+			panel->childSetEnabled("remove_estate_manager_btn", estate_manager_name_list->getFirstSelected() ? TRUE : FALSE);
+			estate_manager_name_list->sortByColumnIndex(0, TRUE);
+		}
+	}
+
+	return true;
+}
+
+// [RLVa:KB] - Checked: 2009-07-04 (RLVa-1.0.0a)
+void LLFloaterRegionInfo::open()
+{
+	// We'll allow access to the estate tools for estate managers (and for the sim owner)
+	if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC))
+	{
+		LLViewerRegion* pRegion = gAgent.getRegion();
+		if (!pRegion)
+			return;
+
+		// Should be able to call LLRegion::canManageEstate() but then we can fake god like
+		if ( (!pRegion->isEstateManager()) && (pRegion->getOwner() != gAgent.getID()) )
+			return;
+	}
+
+	LLFloater::open();
+}
+// [/RLVa:KB]
diff --git a/linden/indra/newview/llfloatertos.cpp b/linden/indra/newview/llfloatertos.cpp
index ac4a06b..efc8bd6 100644
--- a/linden/indra/newview/llfloatertos.cpp
+++ b/linden/indra/newview/llfloatertos.cpp
@@ -1,305 +1,305 @@
-/** 
- * @file llfloatertos.cpp
- * @brief Terms of Service Agreement dialog
- *
- * $LicenseInfo:firstyear=2003&license=viewergpl$
- * 
- * Copyright (c) 2003-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 "llfloatertos.h"
-
-// viewer includes
-#include "llagent.h"
-#include "llappviewer.h"
-#include "llstartup.h"
-#include "llviewerstats.h"
-#include "llviewertexteditor.h"
-#include "llviewerwindow.h"
-
-// linden library includes
-#include "llbutton.h"
-#include "llhttpclient.h"
-#include "llhttpstatuscodes.h"	// for HTTP_FOUND
-#include "llradiogroup.h"
-#include "lltextbox.h"
-#include "llui.h"
-#include "lluictrlfactory.h"
-#include "llvfile.h"
-#include "message.h"
-#include "hippogridmanager.h"
-
-
-// static 
-LLFloaterTOS* LLFloaterTOS::sInstance = NULL;
-
-// static
-LLFloaterTOS* LLFloaterTOS::show(ETOSType type, const std::string & message)
-{
-	if( !LLFloaterTOS::sInstance )
-	{
-		LLFloaterTOS::sInstance = new LLFloaterTOS(type, message);
-	}
-
-	if (type == TOS_TOS)
-	{
-		LLUICtrlFactory::getInstance()->buildFloater(LLFloaterTOS::sInstance, "floater_tos.xml");
-	}
-	else
-	{
-		LLUICtrlFactory::getInstance()->buildFloater(LLFloaterTOS::sInstance, "floater_critical.xml");
-	}
-
-	return LLFloaterTOS::sInstance;
-}
-
-
-LLFloaterTOS::LLFloaterTOS(ETOSType type, const std::string & message)
-:	LLModalDialog( std::string(" "), 100, 100 ),
-	mType(type),
-	mMessage(message),
-	mWebBrowserWindowId( 0 ),
-	mLoadCompleteCount( 0 )
-{
-}
-
-// helper class that trys to download a URL from a web site and calls a method 
-// on parent class indicating if the web server is working or not
-class LLIamHereTOS : public LLHTTPClient::Responder
-{
-	private:
-		LLIamHereTOS( LLFloaterTOS* parent ) :
-		   mParent( parent )
-		{}
-
-		LLFloaterTOS* mParent;
-
-	public:
-
-		static boost::intrusive_ptr< LLIamHereTOS > build( LLFloaterTOS* parent )
-		{
-			return boost::intrusive_ptr< LLIamHereTOS >( new LLIamHereTOS( parent ) );
-		};
-		
-		virtual void  setParent( LLFloaterTOS* parentIn )
-		{
-			mParent = parentIn;
-		};
-		
-		virtual void result( const LLSD& content )
-		{
-			if ( mParent )
-				mParent->setSiteIsAlive( true );
-		};
-
-		virtual void error( U32 status, const std::string& reason )
-		{
-			if ( mParent )
-			{
-				// *HACK: For purposes of this alive check, 302 Found
-				// (aka Moved Temporarily) is considered alive.  The web site
-				// redirects this link to a "cache busting" temporary URL. JC
-				bool alive = (status == HTTP_FOUND);
-				mParent->setSiteIsAlive( alive );
-			}
-		};
-};
-
-// this is global and not a class member to keep crud out of the header file
-namespace {
-	boost::intrusive_ptr< LLIamHereTOS > gResponsePtr = 0;
-};
-
-BOOL LLFloaterTOS::postBuild()
-{	
-	childSetAction("Continue", onContinue, this);
-	childSetAction("Cancel", onCancel, this);
-	childSetCommitCallback("agree_chk", updateAgree, this);
-
-	LLCheckBoxCtrl* tos_agreement = getChild<LLCheckBoxCtrl>("agree_chk");
-	tos_agreement->setEnabled( true );
-	
-	//Always set this so that the TOS is displayed whether the web browser pops up or not.
-	LLTextEditor *editor = getChild<LLTextEditor>("tos_text");
-	editor->setHandleEditKeysDirectly( TRUE );
-	editor->setEnabled( FALSE );
-	editor->setWordWrap(TRUE);
-	editor->setFocus(TRUE);
-	editor->setValue(LLSD(mMessage));
-	LLMediaCtrl* web_browser = getChild<LLMediaCtrl>("tos_html");
-	if (web_browser)
-	{
-		//Disable for critical messages and text messages, it is reenabled later
-		web_browser->setVisible( FALSE );
-	}
-
-	if ( mType != TOS_TOS )
-	{
-		// this displays the critical message only
-		return TRUE;
-	}
-	bool use_web_browser = false;
-
-	//Check to see if the message is a link to display
-	std::string token = "http://";
-	std::string::size_type iIndex = mMessage.rfind(token);
-	//IF it has http:// in it, we use the web browser
-	if(iIndex != std::string::npos && mMessage.length() >= 2)
-	{
-		// it exists
-		use_web_browser = true;
-	}
-	else if (gHippoGridManager->getConnectedGrid()->isSecondLife())
-	{
-		//Its SL, use the browser for it as thats what it should do
-		use_web_browser = true;
-	}
-
-	if ( web_browser && use_web_browser)
-	{
-		// hide the SL text widget if we're displaying TOS with using a browser widget.
-		LLTextEditor *editor = getChild<LLTextEditor>("tos_text");
-		editor->setVisible( FALSE );
-
-		// disable Agree to TOS radio button until the page has fully loaded
-		tos_agreement->setEnabled( false );
-
-		// Reenable the web browser
-		web_browser->setVisible( TRUE );
-
-		web_browser->addObserver(this);
-		gResponsePtr = LLIamHereTOS::build( this );
-		LLHTTPClient::head( getString( "real_url" ), gResponsePtr );
-	}
-
-	return TRUE;
-}
-
-void LLFloaterTOS::setSiteIsAlive( bool alive )
-{
-	// only do this for TOS pages
-	if ( mType == TOS_TOS )
-	{
-		LLMediaCtrl* web_browser = getChild<LLMediaCtrl>("tos_html");
-		// if the contents of the site was retrieved
-		if ( alive )
-		{
-			if ( web_browser )
-			{
-				// navigate to the "real" page 
-				web_browser->navigateTo( getString( "real_url" ) );
-			};
-		}
-		else
-		{
-			// normally this is set when navigation to TOS page navigation completes (so you can't accept before TOS loads)
-			// but if the page is unavailable, we need to do this now
-			LLCheckBoxCtrl* tos_agreement = getChild<LLCheckBoxCtrl>("agree_chk");
-			tos_agreement->setEnabled( true );
-		};
-	};
-}
-
-LLFloaterTOS::~LLFloaterTOS()
-{
-
-	// tell the responder we're not here anymore
-	if ( gResponsePtr )
-		gResponsePtr->setParent( 0 );
-
-	LLFloaterTOS::sInstance = NULL;
-}
-
-// virtual
-void LLFloaterTOS::draw()
-{
-	// draw children
-	LLModalDialog::draw();
-}
-
-// static
-void LLFloaterTOS::updateAgree(LLUICtrl*, void* userdata )
-{
-	LLFloaterTOS* self = (LLFloaterTOS*) userdata;
-	bool agree = self->childGetValue("agree_chk").asBoolean(); 
-	self->childSetEnabled("Continue", agree);
-}
-
-// static
-void LLFloaterTOS::onContinue( void* userdata )
-{
-	LLFloaterTOS* self = (LLFloaterTOS*) userdata;
-	llinfos << "User agrees with TOS." << llendl;
-	if (self->mType == TOS_TOS)
-	{
-		gAcceptTOS = TRUE;
-	}
-	else
-	{
-		gAcceptCriticalMessage = TRUE;
-	}
-
-	// Testing TOS dialog
-	#if ! LL_RELEASE_FOR_DOWNLOAD		
-	if ( LLStartUp::getStartupState() == STATE_LOGIN_WAIT )
-	{
-		LLStartUp::setStartupState( STATE_LOGIN_SHOW );
-	}
-	else 
-	#endif
-
-	LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT );			// Go back and finish authentication
-	self->close(); // destroys this object
-}
-
-// static
-void LLFloaterTOS::onCancel( void* userdata )
-{
-	LLFloaterTOS* self = (LLFloaterTOS*) userdata;
-	llinfos << "User disagrees with TOS." << llendl;
-	LLNotifications::instance().add("MustAgreeToLogIn", LLSD(), LLSD(), login_alert_done);
-	LLStartUp::setStartupState( STATE_LOGIN_SHOW );
-	self->mLoadCompleteCount = 0;  // reset counter for next time we come to TOS
-	self->close(); // destroys this object
-}
-
-//virtual 
-void LLFloaterTOS::handleMediaEvent(LLPluginClassMedia* /*self*/, EMediaEvent event)
-{
-	if(event == MEDIA_EVENT_NAVIGATE_COMPLETE)
-	{
-	// skip past the loading screen navigate complete
-	if ( ++mLoadCompleteCount == 2 )
-	{
-		llinfos << "NAVIGATE COMPLETE" << llendl;
-		// enable Agree to TOS radio button now that page has loaded
-		LLCheckBoxCtrl * tos_agreement = getChild<LLCheckBoxCtrl>("agree_chk");
-		tos_agreement->setEnabled( true );
-		}
-	}
-}
+/** 
+ * @file llfloatertos.cpp
+ * @brief Terms of Service Agreement dialog
+ *
+ * $LicenseInfo:firstyear=2003&license=viewergpl$
+ * 
+ * Copyright (c) 2003-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 "llfloatertos.h"
+
+// viewer includes
+#include "llagent.h"
+#include "llappviewer.h"
+#include "llstartup.h"
+#include "llviewerstats.h"
+#include "llviewertexteditor.h"
+#include "llviewerwindow.h"
+
+// linden library includes
+#include "llbutton.h"
+#include "llhttpclient.h"
+#include "llhttpstatuscodes.h"	// for HTTP_FOUND
+#include "llradiogroup.h"
+#include "lltextbox.h"
+#include "llui.h"
+#include "lluictrlfactory.h"
+#include "llvfile.h"
+#include "message.h"
+#include "hippogridmanager.h"
+
+
+// static 
+LLFloaterTOS* LLFloaterTOS::sInstance = NULL;
+
+// static
+LLFloaterTOS* LLFloaterTOS::show(ETOSType type, const std::string & message)
+{
+	if( !LLFloaterTOS::sInstance )
+	{
+		LLFloaterTOS::sInstance = new LLFloaterTOS(type, message);
+	}
+
+	if (type == TOS_TOS)
+	{
+		LLUICtrlFactory::getInstance()->buildFloater(LLFloaterTOS::sInstance, "floater_tos.xml");
+	}
+	else
+	{
+		LLUICtrlFactory::getInstance()->buildFloater(LLFloaterTOS::sInstance, "floater_critical.xml");
+	}
+
+	return LLFloaterTOS::sInstance;
+}
+
+
+LLFloaterTOS::LLFloaterTOS(ETOSType type, const std::string & message)
+:	LLModalDialog( std::string(" "), 100, 100 ),
+	mType(type),
+	mMessage(message),
+	mWebBrowserWindowId( 0 ),
+	mLoadCompleteCount( 0 )
+{
+}
+
+// helper class that trys to download a URL from a web site and calls a method 
+// on parent class indicating if the web server is working or not
+class LLIamHereTOS : public LLHTTPClient::Responder
+{
+	private:
+		LLIamHereTOS( LLFloaterTOS* parent ) :
+		   mParent( parent )
+		{}
+
+		LLFloaterTOS* mParent;
+
+	public:
+
+		static boost::intrusive_ptr< LLIamHereTOS > build( LLFloaterTOS* parent )
+		{
+			return boost::intrusive_ptr< LLIamHereTOS >( new LLIamHereTOS( parent ) );
+		};
+		
+		virtual void  setParent( LLFloaterTOS* parentIn )
+		{
+			mParent = parentIn;
+		};
+		
+		virtual void result( const LLSD& content )
+		{
+			if ( mParent )
+				mParent->setSiteIsAlive( true );
+		};
+
+		virtual void error( U32 status, const std::string& reason )
+		{
+			if ( mParent )
+			{
+				// *HACK: For purposes of this alive check, 302 Found
+				// (aka Moved Temporarily) is considered alive.  The web site
+				// redirects this link to a "cache busting" temporary URL. JC
+				bool alive = (status == HTTP_FOUND);
+				mParent->setSiteIsAlive( alive );
+			}
+		};
+};
+
+// this is global and not a class member to keep crud out of the header file
+namespace {
+	boost::intrusive_ptr< LLIamHereTOS > gResponsePtr = 0;
+};
+
+BOOL LLFloaterTOS::postBuild()
+{	
+	childSetAction("Continue", onContinue, this);
+	childSetAction("Cancel", onCancel, this);
+	childSetCommitCallback("agree_chk", updateAgree, this);
+
+	LLCheckBoxCtrl* tos_agreement = getChild<LLCheckBoxCtrl>("agree_chk");
+	tos_agreement->setEnabled( true );
+	
+	//Always set this so that the TOS is displayed whether the web browser pops up or not.
+	LLTextEditor *editor = getChild<LLTextEditor>("tos_text");
+	editor->setHandleEditKeysDirectly( TRUE );
+	editor->setEnabled( FALSE );
+	editor->setWordWrap(TRUE);
+	editor->setFocus(TRUE);
+	editor->setValue(LLSD(mMessage));
+	LLMediaCtrl* web_browser = getChild<LLMediaCtrl>("tos_html");
+	if (web_browser)
+	{
+		//Disable for critical messages and text messages, it is reenabled later
+		web_browser->setVisible( FALSE );
+	}
+
+	if ( mType != TOS_TOS )
+	{
+		// this displays the critical message only
+		return TRUE;
+	}
+	bool use_web_browser = false;
+
+	//Check to see if the message is a link to display
+	std::string token = "http://";
+	std::string::size_type iIndex = mMessage.rfind(token);
+	//IF it has http:// in it, we use the web browser
+	if(iIndex != std::string::npos && mMessage.length() >= 2)
+	{
+		// it exists
+		use_web_browser = true;
+	}
+	else if (gHippoGridManager->getConnectedGrid()->isSecondLife())
+	{
+		//Its SL, use the browser for it as thats what it should do
+		use_web_browser = true;
+	}
+
+	if ( web_browser && use_web_browser)
+	{
+		// hide the SL text widget if we're displaying TOS with using a browser widget.
+		LLTextEditor *editor = getChild<LLTextEditor>("tos_text");
+		editor->setVisible( FALSE );
+
+		// disable Agree to TOS radio button until the page has fully loaded
+		tos_agreement->setEnabled( false );
+
+		// Reenable the web browser
+		web_browser->setVisible( TRUE );
+
+		web_browser->addObserver(this);
+		gResponsePtr = LLIamHereTOS::build( this );
+		LLHTTPClient::head( getString( "real_url" ), gResponsePtr );
+	}
+
+	return TRUE;
+}
+
+void LLFloaterTOS::setSiteIsAlive( bool alive )
+{
+	// only do this for TOS pages
+	if ( mType == TOS_TOS )
+	{
+		LLMediaCtrl* web_browser = getChild<LLMediaCtrl>("tos_html");
+		// if the contents of the site was retrieved
+		if ( alive )
+		{
+			if ( web_browser )
+			{
+				// navigate to the "real" page 
+				web_browser->navigateTo( getString( "real_url" ) );
+			};
+		}
+		else
+		{
+			// normally this is set when navigation to TOS page navigation completes (so you can't accept before TOS loads)
+			// but if the page is unavailable, we need to do this now
+			LLCheckBoxCtrl* tos_agreement = getChild<LLCheckBoxCtrl>("agree_chk");
+			tos_agreement->setEnabled( true );
+		};
+	};
+}
+
+LLFloaterTOS::~LLFloaterTOS()
+{
+
+	// tell the responder we're not here anymore
+	if ( gResponsePtr )
+		gResponsePtr->setParent( 0 );
+
+	LLFloaterTOS::sInstance = NULL;
+}
+
+// virtual
+void LLFloaterTOS::draw()
+{
+	// draw children
+	LLModalDialog::draw();
+}
+
+// static
+void LLFloaterTOS::updateAgree(LLUICtrl*, void* userdata )
+{
+	LLFloaterTOS* self = (LLFloaterTOS*) userdata;
+	bool agree = self->childGetValue("agree_chk").asBoolean(); 
+	self->childSetEnabled("Continue", agree);
+}
+
+// static
+void LLFloaterTOS::onContinue( void* userdata )
+{
+	LLFloaterTOS* self = (LLFloaterTOS*) userdata;
+	llinfos << "User agrees with TOS." << llendl;
+	if (self->mType == TOS_TOS)
+	{
+		gAcceptTOS = TRUE;
+	}
+	else
+	{
+		gAcceptCriticalMessage = TRUE;
+	}
+
+	// Testing TOS dialog
+	#if ! LL_RELEASE_FOR_DOWNLOAD		
+	if ( LLStartUp::getStartupState() == STATE_LOGIN_WAIT )
+	{
+		LLStartUp::setStartupState( STATE_LOGIN_SHOW );
+	}
+	else 
+	#endif
+
+	LLStartUp::setStartupState( STATE_LOGIN_AUTH_INIT );			// Go back and finish authentication
+	self->close(); // destroys this object
+}
+
+// static
+void LLFloaterTOS::onCancel( void* userdata )
+{
+	LLFloaterTOS* self = (LLFloaterTOS*) userdata;
+	llinfos << "User disagrees with TOS." << llendl;
+	LLNotifications::instance().add("MustAgreeToLogIn", LLSD(), LLSD(), login_alert_done);
+	LLStartUp::setStartupState( STATE_LOGIN_SHOW );
+	self->mLoadCompleteCount = 0;  // reset counter for next time we come to TOS
+	self->close(); // destroys this object
+}
+
+//virtual 
+void LLFloaterTOS::handleMediaEvent(LLPluginClassMedia* /*self*/, EMediaEvent event)
+{
+	if(event == MEDIA_EVENT_NAVIGATE_COMPLETE)
+	{
+	// skip past the loading screen navigate complete
+	if ( ++mLoadCompleteCount == 2 )
+	{
+		llinfos << "NAVIGATE COMPLETE" << llendl;
+		// enable Agree to TOS radio button now that page has loaded
+		LLCheckBoxCtrl * tos_agreement = getChild<LLCheckBoxCtrl>("agree_chk");
+		tos_agreement->setEnabled( true );
+		}
+	}
+}
diff --git a/linden/indra/newview/llmaniptranslate.cpp b/linden/indra/newview/llmaniptranslate.cpp
index 8484c4e..3b78553 100644
--- a/linden/indra/newview/llmaniptranslate.cpp
+++ b/linden/indra/newview/llmaniptranslate.cpp
@@ -531,7 +531,7 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
 	// You can't move more than some distance from your original mousedown point.
 	F32 max_drag_distance = gHippoLimits->getMaxDragDistance();
 
-	if (max_drag_distance != FLT_MAX && relative_move.magVecSquared() > max_drag_distance * max_drag_distance)
+	if (max_drag_distance != FLT_MAX && relative_move.magVecSquared() > max_drag_distance * max_drag_distance)
 	{
 		lldebugst(LLERR_USER_INPUT) << "hover handled by LLManipTranslate (too far)" << llendl;
 		gViewerWindow->setCursor(UI_CURSOR_NOLOCKED);
diff --git a/linden/indra/newview/llmapresponders.cpp b/linden/indra/newview/llmapresponders.cpp
index b6b5c8a..31c04a3 100644
--- a/linden/indra/newview/llmapresponders.cpp
+++ b/linden/indra/newview/llmapresponders.cpp
@@ -120,8 +120,8 @@ void LLMapLayerResponder::result(const LLSD& result)
 		
 			S32 x_regions = map_block["X"];
 			S32 y_regions = map_block["Y"];
-			S32 size_x_regions = map_block["SizeX"];
-			S32 size_y_regions = map_block["SizeY"];
+			S32 size_x_regions = map_block["SizeX"];
+			S32 size_y_regions = map_block["SizeY"];
 			std::string name = map_block["Name"];
 			S32 access = map_block["Access"];
 			S32 region_flags = map_block["RegionFlags"];
@@ -170,8 +170,8 @@ void LLMapLayerResponder::result(const LLSD& result)
 				LLWorldMap::getInstance()->mSimInfoMap[handle] = siminfo;
 
 				siminfo->mHandle = handle;
-				siminfo->msizeX = size_x_regions;
-				siminfo->msizeY = size_y_regions;
+				siminfo->msizeX = size_x_regions;
+				siminfo->msizeY = size_y_regions;
 				siminfo->mName.assign( name );
 				siminfo->mAccess = access;		/*Flawfinder: ignore*/
 				siminfo->mRegionFlags = region_flags;
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 0b6d75f..164e038 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -368,7 +368,7 @@ bool idle_startup()
 	static U64 first_sim_handle = 0;
 	static LLHost first_sim;
 	static std::string first_sim_seed_cap;
-	static U32 first_sim_size_x = 256;
+	static U32 first_sim_size_x = 256;
 	static U32 first_sim_size_y = 256;
 
 	static LLVector3 initial_sun_direction(1.f, 0.f, 0.f);
@@ -1622,16 +1622,16 @@ bool idle_startup()
 				first_sim_handle = to_region_handle(region_x, region_y);
 			}
 			
-			text = LLUserAuth::getInstance()->getResponse("region_size_x");
-			if(!text.empty()) {
-				first_sim_size_x = strtoul(text.c_str(), NULL, 10);
-				LLViewerParcelMgr::getInstance()->init(first_sim_size_x);
-			}
-
-			//region Y size is currently unused, major refactoring required. - Patrick Sapinski (2/10/2011)
-			text = LLUserAuth::getInstance()->getResponse("region_size_y");
-			if(!text.empty()) first_sim_size_y = strtoul(text.c_str(), NULL, 10);
-			
+			text = LLUserAuth::getInstance()->getResponse("region_size_x");
+			if(!text.empty()) {
+				first_sim_size_x = strtoul(text.c_str(), NULL, 10);
+				LLViewerParcelMgr::getInstance()->init(first_sim_size_x);
+			}
+
+			//region Y size is currently unused, major refactoring required. - Patrick Sapinski (2/10/2011)
+			text = LLUserAuth::getInstance()->getResponse("region_size_y");
+			if(!text.empty()) first_sim_size_y = strtoul(text.c_str(), NULL, 10);
+			
 			const std::string look_at_str = LLUserAuth::getInstance()->getResponse("look_at");
 			if (!look_at_str.empty())
 			{
diff --git a/linden/indra/newview/llsurface.cpp b/linden/indra/newview/llsurface.cpp
index 66f8076..5a99e66 100644
--- a/linden/indra/newview/llsurface.cpp
+++ b/linden/indra/newview/llsurface.cpp
@@ -713,15 +713,15 @@ void LLSurface::decompressDCTPatch(LLBitPack &bitpack, LLGroupHeader *gopp, BOOL
 			break;
 		}
 
-		if (b_large_patch)
-		{
-			i = ph.patchids >> 16; //x
-			j = ph.patchids & 0xFFFF; //y
-		}
-		else
-		{
-			i = ph.patchids >> 5; //x
-			j = ph.patchids & 0x1F; //y
+		if (b_large_patch)
+		{
+			i = ph.patchids >> 16; //x
+			j = ph.patchids & 0xFFFF; //y
+		}
+		else
+		{
+			i = ph.patchids >> 5; //x
+			j = ph.patchids & 0x1F; //y
 		}
 
 		if ((i >= mPatchesPerEdge) || (j >= mPatchesPerEdge))
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 4de4768..f67f0dc 100755
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -3531,16 +3531,16 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
 	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;
-	msg->getU32Fast(_PREHASH_Info, _PREHASH_RegionSizeY, region_size_y);
-
-	//and a little hack for Second Life compatibility
-	if (region_size_y == 0 || region_size_x == 0)
-	{
-		region_size_x = 256;
-		region_size_y = 256;
+	U32 region_size_x = 256;
+	msg->getU32Fast(_PREHASH_Info, _PREHASH_RegionSizeX, region_size_x);
+	U32 region_size_y = 256;
+	msg->getU32Fast(_PREHASH_Info, _PREHASH_RegionSizeY, region_size_y);
+
+	//and a little hack for Second Life compatibility
+	if (region_size_y == 0 || region_size_x == 0)
+	{
+		region_size_x = 256;
+		region_size_y = 256;
 	}
 	
 	std::string seedCap;
@@ -3877,16 +3877,16 @@ void process_crossed_region(LLMessageSystem* msg, void**)
 	std::string seedCap;
 	msg->getStringFast(_PREHASH_RegionData, _PREHASH_SeedCapability, seedCap);
 
-	U32 region_size_x = 256;
-	msg->getU32(_PREHASH_RegionData, _PREHASH_RegionSizeX, region_size_x);
-	U32 region_size_y = 256;
-	msg->getU32(_PREHASH_RegionData, _PREHASH_RegionSizeY, region_size_y);
-
-	//and a little hack for Second Life compatibility
-	if (region_size_y == 0 || region_size_x == 0)
-	{
-		region_size_x = 256;
-		region_size_y = 256;
+	U32 region_size_x = 256;
+	msg->getU32(_PREHASH_RegionData, _PREHASH_RegionSizeX, region_size_x);
+	U32 region_size_y = 256;
+	msg->getU32(_PREHASH_RegionData, _PREHASH_RegionSizeY, region_size_y);
+
+	//and a little hack for Second Life compatibility
+	if (region_size_y == 0 || region_size_x == 0)
+	{
+		region_size_x = 256;
+		region_size_y = 256;
 	}
 
 	send_complete_agent_movement(sim_host);
diff --git a/linden/indra/newview/llviewerparcelmgr.cpp b/linden/indra/newview/llviewerparcelmgr.cpp
index 7373c3f..b99b0c0 100644
--- a/linden/indra/newview/llviewerparcelmgr.cpp
+++ b/linden/indra/newview/llviewerparcelmgr.cpp
@@ -140,24 +140,24 @@ LLViewerParcelMgr::LLViewerParcelMgr()
 	mBlockedImage = gImageList.getImageFromFile("noentrylines.j2c");
 	mPassImage = gImageList.getImageFromFile("noentrypasslines.j2c");
 
-	init(256);
-}
-
-//moved this stuff out of the constructor and into a function that we can call again after we get the region size.
-//LLViewerParcelMgr needs to be changed so we either get an instance per region, or it handles various region sizes
-//on a single grid properly - Patrick Sapinski (2/10/2011)
-void LLViewerParcelMgr::init(F32 region_size)
-{
-	mParcelsPerEdge = S32(	region_size / PARCEL_GRID_STEP_METERS );
+	init(256);
+}
+
+//moved this stuff out of the constructor and into a function that we can call again after we get the region size.
+//LLViewerParcelMgr needs to be changed so we either get an instance per region, or it handles various region sizes
+//on a single grid properly - Patrick Sapinski (2/10/2011)
+void LLViewerParcelMgr::init(F32 region_size)
+{
+	mParcelsPerEdge = S32(	region_size / PARCEL_GRID_STEP_METERS );
 	mHighlightSegments = new U8[(mParcelsPerEdge+1)*(mParcelsPerEdge+1)];
 	resetSegments(mHighlightSegments);
 
 	mCollisionSegments = new U8[(mParcelsPerEdge+1)*(mParcelsPerEdge+1)];
 	resetSegments(mCollisionSegments);
 
-	S32 mParcelOverLayChunks = region_size * region_size / (128 * 128);
-
-	S32 overlay_size = mParcelsPerEdge * mParcelsPerEdge / mParcelOverLayChunks;
+	S32 mParcelOverLayChunks = region_size * region_size / (128 * 128);
+
+	S32 overlay_size = mParcelsPerEdge * mParcelsPerEdge / mParcelOverLayChunks;
 	sPackedOverlay = new U8[overlay_size];
 
 	mAgentParcelOverlay = new U8[mParcelsPerEdge * mParcelsPerEdge];
@@ -1361,7 +1361,7 @@ void LLViewerParcelMgr::processParcelOverlay(LLMessageSystem *msg, void **user)
 		return;
 	}
 
-	S32 expected_size = 1024; //parcels_per_edge * parcels_per_edge / PARCEL_OVERLAY_CHUNKS;
+	S32 expected_size = 1024; //parcels_per_edge * parcels_per_edge / PARCEL_OVERLAY_CHUNKS;
 	if (packed_overlay_size != expected_size)
 	{
 		llwarns << "Got parcel overlay size " << packed_overlay_size
diff --git a/linden/indra/newview/llviewerparcelmgr.h b/linden/indra/newview/llviewerparcelmgr.h
index dcdea3c..59e6186 100644
--- a/linden/indra/newview/llviewerparcelmgr.h
+++ b/linden/indra/newview/llviewerparcelmgr.h
@@ -82,8 +82,8 @@ public:
 	LLViewerParcelMgr();
 	~LLViewerParcelMgr();
 
-	void init(F32 region_size);
-
+	void init(F32 region_size);
+
 	static void cleanupGlobals();
 
 	BOOL	selectionEmpty() const;
diff --git a/linden/indra/newview/llviewerparceloverlay.cpp b/linden/indra/newview/llviewerparceloverlay.cpp
index a31f153..4ae3253 100644
--- a/linden/indra/newview/llviewerparceloverlay.cpp
+++ b/linden/indra/newview/llviewerparceloverlay.cpp
@@ -58,7 +58,7 @@ const U8  OVERLAY_IMG_COMPONENTS = 4;
 LLViewerParcelOverlay::LLViewerParcelOverlay(LLViewerRegion* region, F32 region_width_meters)
 :	mRegion( region ),
 	mParcelGridsPerEdge( S32( region_width_meters / PARCEL_GRID_STEP_METERS ) ),
-	mRegionSize(S32(region_width_meters)),
+	mRegionSize(S32(region_width_meters)),
 	mDirty( FALSE ),
 	mTimeSinceLastUpdate(),
 	mOverlayTextureIdx(-1),
@@ -300,8 +300,8 @@ void LLViewerParcelOverlay::uncompressLandOverlay(S32 chunk, U8 *packed_overlay)
 {
 	// Unpack the message data into the ownership array
 	S32	size	= mParcelGridsPerEdge * mParcelGridsPerEdge;
-	S32 mParcelOverLayChunks = mRegionSize * mRegionSize / (128 * 128);
-	S32 chunk_size = size / mParcelOverLayChunks;
+	S32 mParcelOverLayChunks = mRegionSize * mRegionSize / (128 * 128);
+	S32 chunk_size = size / mParcelOverLayChunks;
 
 	memcpy(mOwnership + chunk*chunk_size, packed_overlay, chunk_size);		/*Flawfinder: ignore*/
 
diff --git a/linden/indra/newview/llviewerparceloverlay.h b/linden/indra/newview/llviewerparceloverlay.h
index d3b5980..fc0db0a 100644
--- a/linden/indra/newview/llviewerparceloverlay.h
+++ b/linden/indra/newview/llviewerparceloverlay.h
@@ -98,7 +98,7 @@ private:
 	LLViewerRegion*	mRegion;
 
 	S32				mParcelGridsPerEdge;
-	S32				mRegionSize;
+	S32				mRegionSize;
 
 	LLPointer<LLImageGL> mTexture;
 	LLPointer<LLImageRaw> mImageRaw;
diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp
index 4186362..eba0db7 100644
--- a/linden/indra/newview/llviewerregion.cpp
+++ b/linden/indra/newview/llviewerregion.cpp
@@ -200,7 +200,7 @@ LLViewerRegion::LLViewerRegion(const U64 &handle,
 	if (!gNoRender)
 	{
 		mParcelOverlay = new LLViewerParcelOverlay(this, region_width_meters);
-		//Re-init the parcel mgr for this sim
+		//Re-init the parcel mgr for this sim
 		LLViewerParcelMgr::getInstance()->init(region_width_meters);
 	}
 	else
diff --git a/linden/indra/newview/llvlmanager.cpp b/linden/indra/newview/llvlmanager.cpp
index 68b4d7b..7f483ca 100644
--- a/linden/indra/newview/llvlmanager.cpp
+++ b/linden/indra/newview/llvlmanager.cpp
@@ -57,23 +57,23 @@ LLVLManager::~LLVLManager()
 
 void LLVLManager::addLayerData(LLVLData *vl_datap, const S32 mesg_size)
 {
-	if (LAND_LAYER_CODE == vl_datap->mType ||
-		AURORA_LAND_LAYER_CODE == vl_datap->mType)
-	{
-		mLandBits += mesg_size * 8;
-	}
-	else if (WIND_LAYER_CODE == vl_datap->mType ||
-		AURORA_WIND_LAYER_CODE == vl_datap->mType)
-	{
-		mWindBits += mesg_size * 8;
-	}
-	else if (CLOUD_LAYER_CODE == vl_datap->mType)
-	{
-		mCloudBits += mesg_size * 8;
-	}
-	else
-	{
-		llerrs << "Unknown layer type!" << (S32)vl_datap->mType << llendl;
+	if (LAND_LAYER_CODE == vl_datap->mType ||
+		AURORA_LAND_LAYER_CODE == vl_datap->mType)
+	{
+		mLandBits += mesg_size * 8;
+	}
+	else if (WIND_LAYER_CODE == vl_datap->mType ||
+		AURORA_WIND_LAYER_CODE == vl_datap->mType)
+	{
+		mWindBits += mesg_size * 8;
+	}
+	else if (CLOUD_LAYER_CODE == vl_datap->mType)
+	{
+		mCloudBits += mesg_size * 8;
+	}
+	else
+	{
+		llerrs << "Unknown layer type!" << (S32)vl_datap->mType << llendl;
 	}
 
 	mPacketData.put(vl_datap);
@@ -92,23 +92,23 @@ void LLVLManager::unpackData(const S32 num_packets)
 		LLGroupHeader goph;
 
 		decode_patch_group_header(bit_pack, &goph);
-		if (LAND_LAYER_CODE == datap->mType)
-		{
-			datap->mRegionp->getLand().decompressDCTPatch(bit_pack, &goph, FALSE);
-		}
-		else if (AURORA_LAND_LAYER_CODE == datap->mType)
-		{
-			datap->mRegionp->getLand().decompressDCTPatch(bit_pack, &goph, TRUE);
-		}
-		else if (WIND_LAYER_CODE == datap->mType ||
-			AURORA_WIND_LAYER_CODE == datap->mType)
-		{
-			datap->mRegionp->mWind.decompress(bit_pack, &goph);
-		}
-		else if (CLOUD_LAYER_CODE == datap->mType ||
-			AURORA_CLOUD_LAYER_CODE == datap->mType)
-		{
-			datap->mRegionp->mCloudLayer.decompress(bit_pack, &goph);
+		if (LAND_LAYER_CODE == datap->mType)
+		{
+			datap->mRegionp->getLand().decompressDCTPatch(bit_pack, &goph, FALSE);
+		}
+		else if (AURORA_LAND_LAYER_CODE == datap->mType)
+		{
+			datap->mRegionp->getLand().decompressDCTPatch(bit_pack, &goph, TRUE);
+		}
+		else if (WIND_LAYER_CODE == datap->mType ||
+			AURORA_WIND_LAYER_CODE == datap->mType)
+		{
+			datap->mRegionp->mWind.decompress(bit_pack, &goph);
+		}
+		else if (CLOUD_LAYER_CODE == datap->mType ||
+			AURORA_CLOUD_LAYER_CODE == datap->mType)
+		{
+			datap->mRegionp->mCloudLayer.decompress(bit_pack, &goph);
 		}
 	}
 
diff --git a/linden/indra/newview/llvowater.cpp b/linden/indra/newview/llvowater.cpp
index 8af9e4a..eb74520 100644
--- a/linden/indra/newview/llvowater.cpp
+++ b/linden/indra/newview/llvowater.cpp
@@ -74,7 +74,7 @@ LLVOWater::LLVOWater(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regi
 {
 	// Terrain must draw during selection passes so it can block objects behind it.
 	mbCanSelect = FALSE;
-	setScale(LLVector3(mRegionp->getWidth(), mRegionp->getWidth(), 0.f)); // Hack for setting scale for bounding boxes/visibility.
+	setScale(LLVector3(mRegionp->getWidth(), mRegionp->getWidth(), 0.f)); // Hack for setting scale for bounding boxes/visibility.
 
 	mUseTexture = TRUE;
 	mIsEdgePatch = FALSE;
diff --git a/linden/indra/newview/llworld.cpp b/linden/indra/newview/llworld.cpp
index 525195d..13fc91c 100644
--- a/linden/indra/newview/llworld.cpp
+++ b/linden/indra/newview/llworld.cpp
@@ -172,11 +172,11 @@ LLViewerRegion* LLWorld::addRegion(const U64 &region_handle, const LLHost &host,
 
 	U32 iindex = 0;
 	U32 jindex = 0;
-	mWidth = region_size_x;
-	mWidthInMeters = mWidth * mScale;
+	mWidth = region_size_x;
+	mWidthInMeters = mWidth * mScale;
 	from_region_handle(region_handle, &iindex, &jindex);
-	S32 x = (S32)(iindex/256);
-	S32 y = (S32)(jindex/256);
+	S32 x = (S32)(iindex/256);
+	S32 y = (S32)(jindex/256);
 	llinfos << "Adding new region (" << x << ":" << y << ")" << llendl;
 	llinfos << "Host: " << host << llendl;
 
@@ -1258,15 +1258,15 @@ void process_enable_simulator(LLMessageSystem *msg, void **user_data)
 	// which simulator should we modify?
 	LLHost sim(ip_u32, port);
 
-	U32 region_size_x = 256;
-	msg->getU32Fast(_PREHASH_SimulatorInfo, _PREHASH_RegionSizeX, region_size_x);
-	U32 region_size_y = 256;
-	msg->getU32Fast(_PREHASH_SimulatorInfo, _PREHASH_RegionSizeY, region_size_y);
-
-	if (region_size_y == 0 || region_size_x == 0)
-	{
-		region_size_x = 256;
-		region_size_y = 256;
+	U32 region_size_x = 256;
+	msg->getU32Fast(_PREHASH_SimulatorInfo, _PREHASH_RegionSizeX, region_size_x);
+	U32 region_size_y = 256;
+	msg->getU32Fast(_PREHASH_SimulatorInfo, _PREHASH_RegionSizeY, region_size_y);
+
+	if (region_size_y == 0 || region_size_x == 0)
+	{
+		region_size_x = 256;
+		region_size_y = 256;
 	}
 
 	// Viewer trusts the simulator.
diff --git a/linden/indra/newview/llworldmap.cpp b/linden/indra/newview/llworldmap.cpp
index ead72fa..bd3996d 100644
--- a/linden/indra/newview/llworldmap.cpp
+++ b/linden/indra/newview/llworldmap.cpp
@@ -239,25 +239,25 @@ LLSimInfo* LLWorldMap::simInfoFromPosGlobal(const LLVector3d& pos_global)
 
 LLSimInfo* LLWorldMap::simInfoFromHandle(const U64 findhandle)
 {
-	std::map<U64, LLSimInfo*>::const_iterator it;
-	for (it = LLWorldMap::getInstance()->mSimInfoMap.begin(); it != LLWorldMap::getInstance()->mSimInfoMap.end(); ++it)
-	{
-		const U64 handle = (*it).first;
-		LLSimInfo* info = (*it).second;
-		if(handle == findhandle)
-		{
-			return info;
-		}
-		U32 x = 0, y = 0;
-		from_region_handle(findhandle, &x, &y);
-		U32 checkRegionX, checkRegionY;
-		from_region_handle(handle, &checkRegionX, &checkRegionY);
-
-        if(x > checkRegionX && x < (checkRegionX + info->msizeX) &&
-			y > checkRegionY && y < (checkRegionY + info->msizeY))
-		{
-			return info;
-		}
+	std::map<U64, LLSimInfo*>::const_iterator it;
+	for (it = LLWorldMap::getInstance()->mSimInfoMap.begin(); it != LLWorldMap::getInstance()->mSimInfoMap.end(); ++it)
+	{
+		const U64 handle = (*it).first;
+		LLSimInfo* info = (*it).second;
+		if(handle == findhandle)
+		{
+			return info;
+		}
+		U32 x = 0, y = 0;
+		from_region_handle(findhandle, &x, &y);
+		U32 checkRegionX, checkRegionY;
+		from_region_handle(handle, &checkRegionX, &checkRegionY);
+
+        if(x > checkRegionX && x < (checkRegionX + info->msizeX) &&
+			y > checkRegionY && y < (checkRegionY + info->msizeY))
+		{
+			return info;
+		}
 	}
 	return NULL;
 }
diff --git a/linden/indra/newview/llworldmap.h b/linden/indra/newview/llworldmap.h
index 6725f91..56b32a2 100644
--- a/linden/indra/newview/llworldmap.h
+++ b/linden/indra/newview/llworldmap.h
@@ -81,8 +81,8 @@ public:
 
 public:
 	U64 mHandle;
-	S32 msizeX;
-	S32 msizeY;
+	S32 msizeX;
+	S32 msizeY;
 	std::string mName;
 
 	F64 mAgentsUpdateTime;
diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index 51de598..8d9ed1b 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -471,8 +471,8 @@ void LLWorldMapView::draw()
 		// When the view isn't panned, 0,0 = center of rectangle
 		F32 bottom =	sPanY + half_height + relative_y;
 		F32 left =		sPanX + half_width + relative_x;
-		F32 top =		bottom+ (sMapScale * info->msizeY / REGION_WIDTH_METERS);
-		F32 right =		left + (sMapScale * info->msizeY / REGION_WIDTH_METERS);
+		F32 top =		bottom+ (sMapScale * info->msizeY / REGION_WIDTH_METERS);
+		F32 right =		left + (sMapScale * info->msizeY / REGION_WIDTH_METERS);
 
 		// Switch to world map texture (if available for this region) if either:
 		// 1. Tiles are zoomed out small enough, or
@@ -567,11 +567,11 @@ void LLWorldMapView::draw()
 		center_global.mdV[VX] += 128.0;
 		center_global.mdV[VY] += 128.0;
 
-		S32 x_draw_size = llround(sMapScale);
-		S32 y_draw_size = llround(sMapScale);
-		x_draw_size *= info->msizeX / REGION_WIDTH_METERS;
-		y_draw_size *= info->msizeY / REGION_WIDTH_METERS;
-		
+		S32 x_draw_size = llround(sMapScale);
+		S32 y_draw_size = llround(sMapScale);
+		x_draw_size *= info->msizeX / REGION_WIDTH_METERS;
+		y_draw_size *= info->msizeY / REGION_WIDTH_METERS;
+		
 		if (simimage != NULL)
 		{
 			simimage->setBoostLevel(LLViewerImageBoostLevel::BOOST_MAP);
diff --git a/linden/indra/newview/viewertime.cpp b/linden/indra/newview/viewertime.cpp
index 8a65a23..5ed9465 100644
--- a/linden/indra/newview/viewertime.cpp
+++ b/linden/indra/newview/viewertime.cpp
@@ -27,7 +27,7 @@
 * COMPLETENESS OR PERFORMANCE.
 * $/LicenseInfo$
 */
-
+
 #include <sstream> 
 #include "llviewerprecompiledheaders.h"
 
-- 
cgit v1.1


From 901acaf13758b3faec599354f4e8b44ad7f0469b Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Sat, 19 Mar 2011 15:42:25 +0100
Subject: package libz.so instead of libz.so.1 for linux32

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

diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 3651bea..8225b4c 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -1018,7 +1018,7 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libELFIO.so")
             self.path("libopenjpeg.so.2")
             self.path("libxml2.so.2")
-            self.path("libz.so.1")
+            self.path("libz.so.1","libz.so")
 
             # OpenAL
             self.path("libopenal.so.1.12.854", "libopenal.so.1")
-- 
cgit v1.1


From ea974f39baed26a3c2de8ba00ada97e8a49d0468 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Sat, 19 Mar 2011 15:59:42 +0100
Subject: less misleading wording for linux script messages

---
 linden/indra/newview/linux_tools/register_secondlifeprotocol.sh | 4 ++--
 linden/indra/newview/linux_tools/wrapper.sh                     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/linden/indra/newview/linux_tools/register_secondlifeprotocol.sh b/linden/indra/newview/linux_tools/register_secondlifeprotocol.sh
index 4ab96f9..338fc26 100755
--- a/linden/indra/newview/linux_tools/register_secondlifeprotocol.sh
+++ b/linden/indra/newview/linux_tools/register_secondlifeprotocol.sh
@@ -18,7 +18,7 @@ LLGCONFTOOL2=gconftool-2
 if which ${LLGCONFTOOL2} >/dev/null; then
     (${LLGCONFTOOL2} -s -t string /desktop/gnome/url-handlers/secondlife/command "${HANDLER} \"%s\"" && ${LLGCONFTOOL2} -s -t bool /desktop/gnome/url-handlers/secondlife/enabled true) || echo Warning: Did not register secondlife:// handler with GNOME: ${LLGCONFTOOL2} failed.
 else
-    echo Warning: Did not register secondlife:// handler with GNOME: ${LLGCONFTOOL2} not found.
+    echo Info: Did not register secondlife:// handler with GNOME: ${LLGCONFTOOL2} not found. You can safely ignore this if you are not using GNOME.
 fi
 
 # Register handler for KDE-aware apps
@@ -42,5 +42,5 @@ makedir=false
 deleting=false
 EOF
 else
-    echo Warning: Did not register secondlife:// handler with KDE: Directory $LLKDEPROTDIR does not exist.
+    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
diff --git a/linden/indra/newview/linux_tools/wrapper.sh b/linden/indra/newview/linux_tools/wrapper.sh
index a43ebd5..f6ce272 100755
--- a/linden/indra/newview/linux_tools/wrapper.sh
+++ b/linden/indra/newview/linux_tools/wrapper.sh
@@ -126,7 +126,7 @@ if [ -n "$LL_RUN_ERR" ]; then
 	LL_RUN_ERR_MSG=""
 	if [ "$LL_RUN_ERR" = "runerr" ]; then
 		# generic error running the binary
-		echo '*** Bad shutdown. ***'
+		echo 'unexpected shutdown'
 
 
 	fi
-- 
cgit v1.1


From 74d6849a9730941839f00c1ec2b640958fd61cc9 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 19 Mar 2011 13:38:38 -0500
Subject: Package both libz.so.1 and libz.so (symlink) on Linux32. (IMP-790)

The viewer binary links against libz.so, but libvivoxsdk.so and some
other libraries link against libz.so.1.
---
 linden/indra/newview/viewer_manifest.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 8225b4c..86acaea 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -1018,7 +1018,8 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libELFIO.so")
             self.path("libopenjpeg.so.2")
             self.path("libxml2.so.2")
-            self.path("libz.so.1","libz.so")
+            self.path("libz.so")
+            self.path("libz.so.1")
 
             # OpenAL
             self.path("libopenal.so.1.12.854", "libopenal.so.1")
-- 
cgit v1.1