Tweaks twEaks tWEaks tweAKs aaaa

Fixes for Linux issues, fixes for menu issues, fixes for content issues, fixes for texture display issues. I think that's everything.

Signed-off-by: Beeks <HgDelirium@gmail.com>

indra/newview/ascentprefssys.cpp

@@ -60,27 +60,33 @@ public:
 private:
 	static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data);
 	void refreshValues();
-	//System
-	BOOL mSaveScriptsAsMono;
+	//General -----------------------------------------------------------------------------
 	BOOL mDoubleClickTeleport;
+	BOOL mPreviewAnimInWorld;
+	BOOL mSaveScriptsAsMono;
+	BOOL mAlwaysRezInGroup;
+	//Chat/IM -----------------------------------------------------------------------------
 	BOOL mHideNotificationsInChat;
 	BOOL mPlayTypingSound;
-	BOOL mDisablePointAtAndBeam;
-	BOOL mPrivateLookAt;
-	BOOL mFetchInventoryOnLogin;
-	BOOL mSecondsInChatAndIMs;
-	BOOL mPreviewAnimInWorld;
-	BOOL mSpeedRez;
-	BOOL mRevokePermsOnStandUp;
-	BOOL mEnableLLWind;
-	BOOL mEnableClouds;
-	BOOL mInitialEnableClouds;
-	BOOL mBroadcastViewerEffects;
-	BOOL mAlwaysRezInGroup;
-	U32 mSpeedRezInterval;
+	BOOL mHideTypingNotification;
+	BOOL mEnableMUPose;
+	BOOL mEnableOOCAutoClose;
 	U32 mLinksForChattingObjects;
 	U32 mTimeFormat;
 	U32 mDateFormat;
+	BOOL mSecondsInChatAndIMs;
+	//Performance -------------------------------------------------------------------------
+	BOOL mFetchInventoryOnLogin;
+	BOOL mEnableLLWind;
+	BOOL mEnableClouds;
+	BOOL mSpeedRez;
+	U32 mSpeedRezInterval;
+	//Command Line ------------------------------------------------------------------------
+	//Privacy -----------------------------------------------------------------------------
+	BOOL mBroadcastViewerEffects;
+	BOOL mDisablePointAtAndBeam;
+	BOOL mPrivateLookAt;
+	BOOL mRevokePermsOnStandUp;
 };
 
 
@@ -91,8 +97,6 @@ LLPrefsAscentSysImpl::LLPrefsAscentSysImpl()
 	childSetCommitCallback("speed_rez_check", onCommitCheckBox, this);
 	
 	refresh();
-	
-	mInitialEnableClouds = mEnableClouds;
 }
 
 //static
@@ -117,65 +121,68 @@ void LLPrefsAscentSysImpl::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
 			self->childDisable("speed_rez_seconds");
 		}
 	}
-
 }
 
 void LLPrefsAscentSysImpl::refreshValues()
 {
-	mSecondsInChatAndIMs		= gSavedSettings.getBOOL("SecondsInChatAndIMs");
-
+	//General -----------------------------------------------------------------------------
+	mDoubleClickTeleport		= gSavedSettings.getBOOL("DoubleClickTeleport");
+	mPreviewAnimInWorld			= gSavedSettings.getBOOL("PreviewAnimInWorld");
+	mSaveScriptsAsMono			= gSavedSettings.getBOOL("SaveScriptsAsMono");
+	mAlwaysRezInGroup			= gSavedSettings.getBOOL("AscentAlwaysRezInGroup");
+	//Chat/IMs ----------------------------------------------------------------------------
+	mHideNotificationsInChat	= gSavedSettings.getBOOL("HideNotificationsInChat");
+	mHideTypingNotification		= gSavedSettings.getBOOL("AscentHideTypingNotification");
 	mPlayTypingSound			= gSavedSettings.getBOOL("PlayTypingSound");
+	mEnableMUPose				= gSavedSettings.getBOOL("AscentAllowMUpose");
+	mEnableOOCAutoClose			= gSavedSettings.getBOOL("AscentAutoCloseOOC");
+	mLinksForChattingObjects	= gSavedSettings.getU32("LinksForChattingObjects");
+	//Time format
+	//Date Format
+	mSecondsInChatAndIMs		= gSavedSettings.getBOOL("SecondsInChatAndIMs");
 	
+	//Performance -------------------------------------------------------------------------
+	mFetchInventoryOnLogin		= gSavedSettings.getBOOL("FetchInventoryOnLogin");
 	mEnableLLWind				= gSavedSettings.getBOOL("WindEnabled");
 	mEnableClouds				= gSavedSettings.getBOOL("CloudsEnabled");
-
-	mHideNotificationsInChat	= gSavedSettings.getBOOL("AscentHideTypingNotification");
-	mLinksForChattingObjects	= gSavedSettings.getU32("LinksForChattingObjects");
-	
-	mDoubleClickTeleport		= gSavedSettings.getBOOL("DoubleClickTeleport");
 	mSpeedRez					= gSavedSettings.getBOOL("SpeedRez");
 	mSpeedRezInterval			= gSavedSettings.getU32("SpeedRezInterval");
-	mPreviewAnimInWorld			= gSavedSettings.getBOOL("PreviewAnimInWorld");
+
+	//Command Line ------------------------------------------------------------------------
+
+
+	//Privacy -----------------------------------------------------------------------------
 	mBroadcastViewerEffects		= gSavedSettings.getBOOL("BroadcastViewerEffects");
 	mDisablePointAtAndBeam		= gSavedSettings.getBOOL("DisablePointAtAndBeam");
 	mPrivateLookAt				= gSavedSettings.getBOOL("PrivateLookAt");
 	mRevokePermsOnStandUp		= gSavedSettings.getBOOL("RevokePermsOnStandUp");
-	mSaveScriptsAsMono			= gSavedSettings.getBOOL("SaveScriptsAsMono");
-	mFetchInventoryOnLogin		= gSavedSettings.getBOOL("FetchInventoryOnLogin");
-	mAlwaysRezInGroup			= gSavedSettings.getBOOL("AscentAlwaysRezInGroup");
 }
 
 void LLPrefsAscentSysImpl::refresh()
 {
 	refreshValues();
 	
-	childSetValue("seconds_in_chat_and_ims_check", mSecondsInChatAndIMs);
-
-	//Save Chat/IM
-	childSetValue("play_typing_sound_check", mPlayTypingSound);
-	
-	//Save Performance
+	//General -----------------------------------------------------------------------------
+	childSetValue("double_click_teleport_check",	mDoubleClickTeleport);
+	childSetValue("preview_anim_in_world_check",	mPreviewAnimInWorld);
+	childSetValue("save_scripts_as_mono_check",		mSaveScriptsAsMono);
+	childSetValue("always_rez_in_group_check",		mAlwaysRezInGroup);
+	//Chat --------------------------------------------------------------------------------
+	childSetValue("hide_notifications_in_chat_check", mHideNotificationsInChat);
+	childSetValue("play_typing_sound_check",		mPlayTypingSound);
+	childSetValue("hide_typing_check",				mHideTypingNotification);
+	childSetValue("seconds_in_chat_and_ims_check",	mSecondsInChatAndIMs);
+	childSetValue("allow_mu_pose_check",			mEnableMUPose);
+	childSetValue("close_ooc_check",				mEnableOOCAutoClose);
+	//Show Links
+	//Time Format
+	//Date Format
+	childSetValue("seconds_in_chat_and_ims_check",	mEnableOOCAutoClose);
+	//Save Performance --------------------------------------------------------------------
+	childSetValue("fetch_inventory_on_login_check", mFetchInventoryOnLogin);
 	childSetValue("enable_wind", mEnableLLWind);
 	childSetValue("enable_clouds", mEnableClouds);
-	
-	//Privacy
-	childSetValue("hide_typing_check", mHideNotificationsInChat);
-
-	//Misc
-	childSetValue("double_click_teleport_check", mDoubleClickTeleport);
 	childSetValue("speed_rez_check", mSpeedRez);
-	
-	childSetValue("preview_anim_in_world_check", mPreviewAnimInWorld);
-	childSetValue("broadcast_viewer_effects", mBroadcastViewerEffects);
-	childSetValue("disable_point_at_and_beams_check", mDisablePointAtAndBeam);
-	childSetValue("private_look_at_check", mPrivateLookAt);
-	childSetValue("revoke_perms_on_stand_up_check", mRevokePermsOnStandUp);
-	childSetValue("save_scripts_as_mono_check", mSaveScriptsAsMono);
-	childSetValue("fetch_inventory_on_login_check", mFetchInventoryOnLogin);
-	childSetValue("always_rez_in_group_check", mAlwaysRezInGroup);
-
-	childEnable("fetch_inventory_on_login_check");
-
 	if (mSpeedRez)
 	{
 		childEnable("speed_rez_interval");
@@ -186,6 +193,13 @@ void LLPrefsAscentSysImpl::refresh()
 		childDisable("speed_rez_interval");
 		childDisable("speed_rez_seconds");
 	}
+	//Command Line ------------------------------------------------------------------------
+
+	//Privacy -----------------------------------------------------------------------------
+	childSetValue("broadcast_viewer_effects", mBroadcastViewerEffects);
+	childSetValue("disable_point_at_and_beams_check", mDisablePointAtAndBeam);
+	childSetValue("private_look_at_check", mPrivateLookAt);
+	childSetValue("revoke_perms_on_stand_up_check", mRevokePermsOnStandUp);
 
 	std::string format = gSavedSettings.getString("ShortTimeFormat");
 	if (format.find("%p") == -1)
@@ -228,11 +242,46 @@ void LLPrefsAscentSysImpl::refresh()
 
 void LLPrefsAscentSysImpl::cancel()
 {
-	gSavedSettings.setU32("SpeedRezInterval",			mSpeedRezInterval);
-	gSavedSettings.setU32("LinksForChattingObjects",	mLinksForChattingObjects);
-	gLLWindEnabled = mEnableLLWind;
+	//General -----------------------------------------------------------------------------
+	childSetValue("double_click_teleport_check",	mDoubleClickTeleport);
+	childSetValue("preview_anim_in_world_check",	mPreviewAnimInWorld);
+	childSetValue("save_scripts_as_mono_check",		mSaveScriptsAsMono);
+	childSetValue("always_rez_in_group_check",		mAlwaysRezInGroup);
+	//Chat --------------------------------------------------------------------------------
+	childSetValue("hide_notifications_in_chat_check", mHideNotificationsInChat);
+	childSetValue("play_typing_sound_check",		mPlayTypingSound);
+	childSetValue("hide_typing_check",				mHideTypingNotification);
+	childSetValue("seconds_in_chat_and_ims_check",	mSecondsInChatAndIMs);
+	childSetValue("allow_mu_pose_check",			mEnableMUPose);
+	childSetValue("close_ooc_check",				mEnableOOCAutoClose);
+	//Show Links
+	//Time Format
+	//Date Format
+	childSetValue("seconds_in_chat_and_ims_check",	mEnableOOCAutoClose);
+	//Save Performance --------------------------------------------------------------------
+	childSetValue("fetch_inventory_on_login_check", mFetchInventoryOnLogin);
+	childSetValue("enable_wind", mEnableLLWind);
+	childSetValue("enable_clouds", mEnableClouds);
+	childSetValue("speed_rez_check", mSpeedRez);
+	if (mSpeedRez)
+	{
+		childEnable("speed_rez_interval");
+		childEnable("speed_rez_seconds");
+	}
+	else
+	{
+		childDisable("speed_rez_interval");
+		childDisable("speed_rez_seconds");
+	}
+	//Command Line ------------------------------------------------------------------------
+
+	//Privacy -----------------------------------------------------------------------------
+	childSetValue("broadcast_viewer_effects", mBroadcastViewerEffects);
+	childSetValue("disable_point_at_and_beams_check", mDisablePointAtAndBeam);
+	childSetValue("private_look_at_check", mPrivateLookAt);
+	childSetValue("revoke_perms_on_stand_up_check", mRevokePermsOnStandUp);
 	
-	if(mInitialEnableClouds != gSavedSettings.getBOOL("CloudsEnabled"))
+	if(mEnableClouds != gSavedSettings.getBOOL("CloudsEnabled"))
 	{
 		gSavedSettings.setBOOL("CloudsEnabled", mEnableClouds);
 		LLPipeline::toggleRenderTypeControl((void*)LLPipeline::RENDER_TYPE_CLOUDS);
@@ -253,8 +302,8 @@ void LLPrefsAscentSysImpl::apply()
 	//Missing the echo/log option.
 	gSavedSettings.setBOOL("PlayTypingSound",			childGetValue("play_typing_sound_check"));
 	gSavedSettings.setBOOL("AscentHideTypingNotification",	childGetValue("hide_typing_check"));
-	//MU Pose missing.
-	//Auto-close missing.
+	gSavedSettings.setBOOL("AscentAllowMUpose",			childGetValue("allow_mu_pose_check"));
+	gSavedSettings.setBOOL("AscentAutoCloseOOC",		childGetValue("close_ooc_check"));
 	gSavedSettings.setU32("LinksForChattingObjects",	childGetValue("objects_link").asInteger());
 	
 	LLComboBox* combo = getChild<LLComboBox>("time_format_combobox");

indra/newview/ascentprefsvan.cpp

@@ -125,7 +125,7 @@ void LLPrefsAscentVanImpl::refreshValues()
 	//Colors
 	mShowSelfClientTag			= gSavedSettings.getBOOL("AscentShowSelfTag");
 	mShowSelfClientTagColor		= gSavedSettings.getBOOL("AscentShowSelfTagColor");	
-	
+	mCustomTagOn				= gSavedSettings.getBOOL("AscentUseCustomTag");
 	
 	if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
 	{
@@ -185,18 +185,22 @@ void LLPrefsAscentVanImpl::refresh()
 
 	childSetValue("show_self_tag_check", mShowSelfClientTag);
 	childSetValue("show_self_tag_color_check", mShowSelfClientTagColor);
+	childSetValue("customize_own_tag_check", mCustomTagOn);
+	childSetValue("custom_tag_label_box", mCustomTagLabel);
 	
 	if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
 	{
 		llinfos << "Retrieving color from client" << llendl;
-		getChild<LLColorSwatchCtrl>("effect_color_swatch")->set(gSavedSettings.getColor4("EffectColor"));
+		getChild<LLColorSwatchCtrl>("effect_color_swatch")->set(mEffectColor);
+		getChild<LLColorSwatchCtrl>("custom_tag_color_swatch")->set(mCustomTagColor);
 		gSavedSettings.setColor4("EffectColor", LLColor4::white);
 		gSavedSettings.setColor4("EffectColor", mEffectColor);
 	}
 	else
 	{
 		llinfos << "Retrieving color from account" << llendl;
-		getChild<LLColorSwatchCtrl>("effect_color_swatch")->set(gSavedPerAccountSettings.getColor4("EffectColor"));
+		getChild<LLColorSwatchCtrl>("effect_color_swatch")->set(mEffectColor);
+		getChild<LLColorSwatchCtrl>("custom_tag_color_swatch")->set(mCustomTagColor);
 		gSavedPerAccountSettings.setColor4("EffectColor", LLColor4::white);
 		gSavedPerAccountSettings.setColor4("EffectColor", mEffectColor);
 	}
@@ -204,7 +208,34 @@ void LLPrefsAscentVanImpl::refresh()
 
 void LLPrefsAscentVanImpl::cancel()
 {
+	//General --------------------------------------------------------------------------------
+	childSetValue("use_account_settings_check", mUseAccountSettings);
+
+	//Colors ---------------------------------------------------------------------------------
+	LLComboBox* combo = getChild<LLComboBox>("tag_spoofing_combobox");
+	combo->setCurrentByIndex(mSelectedClient);
+
+	childSetValue("show_self_tag_check", mShowSelfClientTag);
+	childSetValue("show_self_tag_color_check", mShowSelfClientTagColor);
+	childSetValue("customize_own_tag_check", mCustomTagOn);
+	childSetValue("custom_tag_label_box", mCustomTagLabel);
 	
+	if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
+	{
+		llinfos << "Retrieving color from client" << llendl;
+		getChild<LLColorSwatchCtrl>("effect_color_swatch")->set(mEffectColor);
+		getChild<LLColorSwatchCtrl>("custom_tag_color_swatch")->set(mCustomTagColor);
+		gSavedSettings.setColor4("EffectColor", LLColor4::white);
+		gSavedSettings.setColor4("EffectColor", mEffectColor);
+	}
+	else
+	{
+		llinfos << "Retrieving color from account" << llendl;
+		getChild<LLColorSwatchCtrl>("effect_color_swatch")->set(mEffectColor);
+		getChild<LLColorSwatchCtrl>("custom_tag_color_swatch")->set(mCustomTagColor);
+		gSavedPerAccountSettings.setColor4("EffectColor", LLColor4::white);
+		gSavedPerAccountSettings.setColor4("EffectColor", mEffectColor);
+	}
 }
 
 void LLPrefsAscentVanImpl::apply()

indra/newview/llpreviewtexture.cpp

@@ -73,7 +73,8 @@ LLPreviewTexture::LLPreviewTexture(const std::string& name,
 	mCopyToInv(FALSE),
 	mIsCopyable(FALSE),
 	mLastHeight(0),
-	mLastWidth(0)
+	mLastWidth(0),
+	mAspectRatio(0.f)
 {
 	const LLInventoryItem *item = getItem();
 	if(item)
@@ -133,7 +134,8 @@ LLPreviewTexture::LLPreviewTexture(
 	mCopyToInv(copy_to_inv),
 	mIsCopyable(copy_to_inv),
 	mLastHeight(0),
-	mLastWidth(0)
+	mLastWidth(0),
+	mAspectRatio(0.f)
 {
 
 	init();

indra/newview/llviewermenu.cpp

@@ -6980,11 +6980,6 @@ void handle_selected_texture_info(void*)
 		map_t::iterator it;
 		for (it = faces_per_texture.begin(); it != faces_per_texture.end(); ++it)
 		{
-			LLUUID image_id = it->first;
-			// <edit>
-			std::string uuid_str;
-			image_id.toString(uuid_str);
-			// </edit>
 			U8 te = it->second[0];
 			LLViewerImage* img = node->getObject()->getTEImage(te);
 			S32 height = img->getHeight();
@@ -6992,9 +6987,7 @@ void handle_selected_texture_info(void*)
 			S32 components = img->getComponents();
 			// <edit>
 			//msg = llformat("%dx%d %s on face ",
-			msg = llformat("%s, %dx%d %s on face ",
-								uuid_str.c_str(),
-			// </edit>
+			msg = llformat("%dx%d %s on face ",
 								width,
 								height,
 								(components == 4 ? "alpha" : "opaque"));
@@ -7005,38 +6998,12 @@ void handle_selected_texture_info(void*)
 			LLChat chat(msg);
 			LLFloaterChat::addChat(chat);
 		}
-		// <edit>
-		if(node->getObject()->isSculpted())
-		{
-			LLSculptParams *sculpt_params = (LLSculptParams *)(node->getObject()->getParameterEntry(LLNetworkData::PARAMS_SCULPT));
-			LLUUID sculpt_id = sculpt_params->getSculptTexture();
-			std::string uuid_str;
-			sculpt_id.toString(uuid_str);
-			msg.assign("Sculpt texture: ");
-			msg.append(uuid_str.c_str());
-			LLChat chat(msg);
-			LLFloaterChat::addChat(chat);
-
-			unique_textures[sculpt_id] = true;
-		}
-		if(node->getObject()->isParticleSource())
-		{
-			//LLUUID particle_id = node->getObject()->mPartSourcep->getImage()->getID();
-		}
-		// </edit>
-	}
-	// <edit>
-	typedef std::map<LLUUID, bool>::iterator map_iter;
-	for(map_iter i = unique_textures.begin(); i != unique_textures.end(); ++i)
-	{
-		LLUUID asset_id = (*i).first;
-		LLLocalInventory::addItem(asset_id.asString(), (int)LLAssetType::AT_TEXTURE, asset_id, true);
 	}
 
 	// Show total widthxheight
-	F32 memoriez = (F32)total_memory;
-	memoriez = memoriez / 1000000;
-	std::string msg = llformat("Total uncompressed: %f MB", memoriez);
+	F32 memory = (F32)total_memory;
+	memory = memory / 1000000;
+	std::string msg = llformat("Total uncompressed: %f MB", memory);
 	LLChat chat(msg);
 	LLFloaterChat::addChat(chat);
 	// </edit>

indra/newview/scriptcounter.cpp

@@ -104,7 +104,7 @@ void ScriptCounter::processObjectPropertiesFamily(LLMessageSystem* msg, void** u
 	{
 		if(doDelete)
 		{
-			user_msg = llformat("Deleted %u scripts from object %s.", scriptcount  , name.c_str());
+			user_msg = llformat("Deleted %u scripts from object %s.", scriptcount, name.c_str());
 		}
 		else
 		{

indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml

@@ -53,34 +53,34 @@
 				follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
 				label="Allow MU pose method." left="10"
 				tool_tip="Allows the use of both /me and : to perform emotes."
-				mouse_opaque="true" name="hide_typing_check" radio_style="false"
+				mouse_opaque="true" name="allow_mu_pose_check" radio_style="false"
 				width="400" />
 			<check_box bottom_delta="-20" control_name="AscentAutoCloseOOC" enabled="true"
 				follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
 				label="Auto-close OOC comments." left="10"
 				tool_tip="Will automatically append '))' to any message starting with '((', or visa versa."
-				mouse_opaque="true" name="hide_typing_check" radio_style="false"
+				mouse_opaque="true" name="close_ooc_check" radio_style="false"
 				width="400" />
 			<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
 			    bottom_delta="-20" drop_shadow_visible="true" enabled="true" follows="left|top"
 	    		font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
 		    	left="10" mouse_opaque="true" name="objects_link_text_box" v_pad="0"
 			    width="300">
-					Show links on chatting object names in chat history for:
+				Show links on chatting object names in chat history for:
 			</text>
 			<radio_group bottom_delta="-26" control_name="LinksForChattingObjects" draw_border="true" enabled="true"
 				tool_tip="Enables a link to show you the owner of the speaking object."
 			    follows="left|top" height="20" left="20" mouse_opaque="true" name="objects_link" width="350">
-				<radio_item type="string" length="1" bottom_delta="0" enabled="true" height="18" left_delta="5" mouse_opaque="true"
-				 name="no_object" width="48">
+				<radio_item type="string" length="1" bottom_delta="0" enabled="true" height="18"
+					left_delta="5" mouse_opaque="true" name="no_object" width="48">
 					No object
 				</radio_item>
-				<radio_item type="string" length="1" bottom_delta="0" enabled="true" height="18" left_delta="45" mouse_opaque="true"
-				 name="others_objects" width="48">
+				<radio_item type="string" length="1" bottom_delta="0" enabled="true" height="18" 
+					left_delta="45" mouse_opaque="true" name="others_objects" width="48">
 					Others' objects
 				</radio_item>
-				<radio_item type="string" length="1" bottom_delta="0" enabled="true" height="18" left_delta="60" mouse_opaque="true"
-				 name="anyones_objects" width="48">
+				<radio_item type="string" length="1" bottom_delta="0" enabled="true" height="18" 
+					left_delta="60" mouse_opaque="true" name="anyones_objects" width="48">
 					Anyone's objects
 				</radio_item>
 			</radio_group>