Merge

Wed, 07 Mar 2012 19:52:29 +0100

author
Kitty Barnett <develop@catznip.com>
date
Wed, 07 Mar 2012 19:52:29 +0100
changeset 1670
e54b4e270bcb
parent 1669
3baef9e5526b
parent 1667
09d9a428c141
child 1671
488ae17c07dc

Merge

     1.1 --- a/indra/llui/lllineeditor.cpp	Mon Feb 27 20:14:49 2012 +0100
     1.2 +++ b/indra/llui/lllineeditor.cpp	Wed Mar 07 19:52:29 2012 +0100
     1.3 @@ -109,7 +109,7 @@
     1.4  protected:
     1.5  	void handleResponse(const std::string &translation, const std::string &detectedLanguage)
     1.6  	{
     1.7 -		static LLCachedControl<bool> rep(gSavedSettings, "PhoenixTranslateReplace2");
     1.8 +		static LLCachedControl<bool> rep(gSavedSettings, "PhoenixTranslateReplace_Deprecated");
     1.9  		if(rep)
    1.10  			m_line->deleteSelection();
    1.11  		m_line->insert((rep?"":" (") + translation + (rep?"":")"),m_line->getCursor());
     2.1 --- a/indra/llui/lltexteditor.cpp	Mon Feb 27 20:14:49 2012 +0100
     2.2 +++ b/indra/llui/lltexteditor.cpp	Wed Mar 07 19:52:29 2012 +0100
     2.3 @@ -118,7 +118,7 @@
     2.4  protected:
     2.5  	void handleResponse(const std::string &translation, const std::string &detectedLanguage)
     2.6  	{
     2.7 -		BOOL rep = gSavedSettings.getBOOL("PhoenixTranslateReplace2");
     2.8 +		BOOL rep = gSavedSettings.getBOOL("PhoenixTranslateReplace_Deprecated");
     2.9  		m_line->insertText((rep?"":" (") + translation +(rep?"":")"),rep);
    2.10  	}
    2.11  	void handleFailure()
    2.12 @@ -953,7 +953,9 @@
    2.13  	S32 segoffset = mLineStartList[line].mOffset;
    2.14  	LLTextSegment* seg = mSegments[segidx];
    2.15  	S32 res = seg->getStart() + segoffset;
    2.16 -	if (res > seg->getEnd()) llerrs << "wtf" << llendl;
    2.17 +    //KC- instead of crashing, just clamp the value. (Might not be the right solution)
    2.18 +	//if (res > seg->getEnd()) llerrs << "wtf" << llendl;
    2.19 +    res = llclamp(res, 0, seg->getEnd());
    2.20  	return res;
    2.21  }
    2.22  
     3.1 --- a/indra/newview/app_settings/settings.xml	Mon Feb 27 20:14:49 2012 +0100
     3.2 +++ b/indra/newview/app_settings/settings.xml	Wed Mar 07 19:52:29 2012 +0100
     3.3 @@ -9994,6 +9994,17 @@
     3.4  				<integer>51</integer>
     3.5  			</array>
     3.6  		</map>
     3.7 +		<key>PhoenixScriptTimeMicroseconds</key>
     3.8 +		<map>
     3.9 +			<key>Comment</key>
    3.10 +			<string>Show get obejct/avatar script time in microseconds.</string>
    3.11 +			<key>Persist</key>
    3.12 +			<integer>1</integer>
    3.13 +			<key>Type</key>
    3.14 +			<string>Boolean</string>
    3.15 +			<key>Value</key>
    3.16 +			<integer>0</integer>
    3.17 +		</map>
    3.18  		<key>PhoenixShowChatChannel</key>
    3.19  		<map>
    3.20  			<key>Comment</key>
    3.21 @@ -10254,10 +10265,10 @@
    3.22  			<key>Value</key>
    3.23  			<integer>1</integer>
    3.24  		</map>
    3.25 -		<key>PhoenixTranslateReplace2</key>
    3.26 -		<map>
    3.27 -			<key>Comment</key>
    3.28 -			<string>Whether or not right click tranlate replaces the selected text or adds to it.</string>
    3.29 +		<key>PhoenixTranslateReplace_Deprecated</key>
    3.30 +		<map>
    3.31 +			<key>Comment</key>
    3.32 +			<string>(Deprecated) Whether or not right click tranlate replaces the selected text or adds to it.</string>
    3.33  			<key>Persist</key>
    3.34  			<integer>1</integer>
    3.35  			<key>Type</key>
    3.36 @@ -14692,10 +14703,10 @@
    3.37  			<key>Value</key>
    3.38  			<integer>1</integer>
    3.39  		</map>
    3.40 -		<key>TranslateChat</key>
    3.41 -		<map>
    3.42 -			<key>Comment</key>
    3.43 -			<string>Translate incoming chat messages</string>
    3.44 +		<key>TranslateChat_Deprecated</key>
    3.45 +		<map>
    3.46 +			<key>Comment</key>
    3.47 +			<string>(Deprecated) Translate incoming chat messages</string>
    3.48  			<key>Persist</key>
    3.49  			<integer>1</integer>
    3.50  			<key>Type</key>
     4.1 --- a/indra/newview/llfloaterchat.cpp	Mon Feb 27 20:14:49 2012 +0100
     4.2 +++ b/indra/newview/llfloaterchat.cpp	Wed Mar 07 19:52:29 2012 +0100
     4.3 @@ -115,7 +115,7 @@
     4.4  	childSetCommitCallback("show mutes",onClickToggleShowMute,this); //show mutes
     4.5  	// Disable translate chat permanently since Google killed it -- TS
     4.6  	//childSetCommitCallback("translate chat",onClickToggleTranslateChat,this);
     4.7 -	//childSetValue("translate chat", gSavedSettings.getBOOL("TranslateChat"));
     4.8 +	//childSetValue("translate chat", gSavedSettings.getBOOL("TranslateChat_Deprecated"));
     4.9  	childSetVisible("Chat History Editor with mute",FALSE);
    4.10  	childSetEnabled("ChatChannel", gSavedSettings.getBOOL("PhoenixShowChatChannel"));
    4.11  	childSetAction("toggle_active_speakers_btn", onClickToggleActiveSpeakers, this);
    4.12 @@ -398,7 +398,7 @@
    4.13  
    4.14  // Disable translate chat permanently since Google killed it -- TS
    4.15  #if 0
    4.16 -// Update the "TranslateChat" pref after "translate chat" checkbox is toggled in
    4.17 +// Update the "TranslateChat_Deprecated" pref after "translate chat" checkbox is toggled in
    4.18  // the "Local Chat" floater.
    4.19  //static
    4.20  void LLFloaterChat::onClickToggleTranslateChat(LLUICtrl* caller, void *data)
    4.21 @@ -406,15 +406,15 @@
    4.22  	LLFloaterChat* floater = (LLFloaterChat*)data;
    4.23  
    4.24  	BOOL translate_chat = floater->getChild<LLCheckBoxCtrl>("translate chat")->get();
    4.25 -	gSavedSettings.setBOOL("TranslateChat", translate_chat);
    4.26 +	gSavedSettings.setBOOL("TranslateChat_Deprecated", translate_chat);
    4.27  }
    4.28  
    4.29 -// Update the "translate chat" checkbox after the "TranslateChat" pref is set in
    4.30 +// Update the "translate chat" checkbox after the "TranslateChat_Deprecated" pref is set in
    4.31  // some other place (e.g. prefs dialog).
    4.32  //static
    4.33  void LLFloaterChat::updateSettings()
    4.34  {
    4.35 -	BOOL translate_chat = gSavedSettings.getBOOL("TranslateChat");
    4.36 +	BOOL translate_chat = gSavedSettings.getBOOL("TranslateChat_Deprecated");
    4.37  	LLFloaterChat::getInstance(LLSD())->getChild<LLCheckBoxCtrl>("translate chat")->set(translate_chat);
    4.38  }
    4.39  #endif // disable translate chat
     5.1 --- a/indra/newview/llimpanel.cpp	Mon Feb 27 20:14:49 2012 +0100
     5.2 +++ b/indra/newview/llimpanel.cpp	Wed Mar 07 19:52:29 2012 +0100
     5.3 @@ -3096,7 +3096,7 @@
     5.4  				      << LL_VERSION_PATCH;
     5.5  				version = stream.str();
     5.6  
     5.7 -				if (utf8_text.find("/me ") == 0)
     5.8 +                if (utf8_text.find("/me ") == 0 || utf8_text.find("/me'") == 0)
     5.9  				{
    5.10  					utf8_text.insert(4,("(PH " + version + ") "));
    5.11  				}
     6.1 --- a/indra/newview/llprefschat.cpp	Mon Feb 27 20:14:49 2012 +0100
     6.2 +++ b/indra/newview/llprefschat.cpp	Wed Mar 07 19:52:29 2012 +0100
     6.3 @@ -114,7 +114,7 @@
     6.4  	childSetValue("console_opacity", gSavedSettings.getF32("ConsoleBackgroundOpacity"));
     6.5  	childSetValue("bubble_chat_opacity", gSavedSettings.getF32("ChatBubbleOpacity"));
     6.6  	childSetValue("translate_language_combobox", 	gSavedSettings.getString("TranslateLanguage"));
     6.7 -	childSetValue("translate_chat", 	gSavedSettings.getBOOL("TranslateChat"));
     6.8 +	childSetValue("translate_chat", 	gSavedSettings.getBOOL("TranslateChat_Deprecated"));
     6.9  }
    6.10  
    6.11  void LLPrefsChatImpl::refreshValues()
    6.12 @@ -145,7 +145,7 @@
    6.13  	static LLCachedControl<F32> sChatBubbleOpacity(gSavedSettings, "ChatBubbleOpacity");
    6.14  	mBubbleOpacity = sChatBubbleOpacity;
    6.15  	mTranslateLanguage = gSavedSettings.getString("TranslateLanguage");
    6.16 -	mTranslateChat = gSavedSettings.getBOOL("TranslateChat");
    6.17 +	mTranslateChat = gSavedSettings.getBOOL("TranslateChat_Deprecated");
    6.18  	mIMEncryptedChatColor = gSavedSettings.getColor4("PhoenixIMEncryptedChatColor");
    6.19  }
    6.20  
    6.21 @@ -174,7 +174,7 @@
    6.22  	gSavedSettings.setF32("ConsoleBackgroundOpacity", mConsoleOpacity);
    6.23  	gSavedSettings.setF32("ChatBubbleOpacity", mBubbleOpacity);	
    6.24  	gSavedSettings.setString("TranslateLanguage", mTranslateLanguage);	
    6.25 -	gSavedSettings.setBOOL("TranslateChat", mTranslateChat);
    6.26 +	gSavedSettings.setBOOL("TranslateChat_Deprecated", mTranslateChat);
    6.27  	gSavedSettings.setColor4("PhoenixIMEncryptedChatColor", mIMEncryptedChatColor);
    6.28  }
    6.29  
    6.30 @@ -210,7 +210,7 @@
    6.31  	gSavedSettings.setF32("ChatBubbleOpacity", childGetValue("bubble_chat_opacity").asReal());
    6.32  
    6.33  	gSavedSettings.setString("TranslateLanguage", childGetValue("translate_language_combobox"));
    6.34 -	gSavedSettings.setBOOL("TranslateChat", childGetValue("translate_chat"));
    6.35 +	gSavedSettings.setBOOL("TranslateChat_Deprecated", childGetValue("translate_chat"));
    6.36  
    6.37  	refreshValues(); // member values become the official values and cancel becomes a no-op.
    6.38  }
     7.1 --- a/indra/newview/llprefsvoice.cpp	Mon Feb 27 20:14:49 2012 +0100
     7.2 +++ b/indra/newview/llprefsvoice.cpp	Wed Mar 07 19:52:29 2012 +0100
     7.3 @@ -42,6 +42,7 @@
     7.4  #include "llmodaldialog.h"
     7.5  #include "llviewercontrol.h"
     7.6  #include "lluictrlfactory.h"
     7.7 +#include "llstartup.h"
     7.8  
     7.9  
    7.10  class LLVoiceSetKeyDialog : public LLModalDialog
    7.11 @@ -185,7 +186,13 @@
    7.12  	self->childSetEnabled("enable_lip_sync_check", enable);
    7.13  	self->childSetEnabled("set_voice_hotkey_button", enable);
    7.14  	self->childSetEnabled("set_voice_middlemouse_button", enable);
    7.15 -	self->childSetEnabled("device_settings_btn", enable);
    7.16 +
    7.17 +    // PHOE-3836: Don't allow device settings unless voice is actually enabled, otherwise may cause crash (KC)
    7.18 +    // PHOE-3494: Don't allow device settings before login, causes crash (KC)
    7.19 +	bool voice_enable = !gSavedSettings.getBOOL("CmdLineDisableVoice")
    7.20 +                        && gSavedSettings.getBOOL("EnableVoiceChat")
    7.21 +                        && LLStartUp::getStartupState() == STATE_STARTED;
    7.22 +	self->childSetEnabled("device_settings_btn", voice_enable);
    7.23  }
    7.24  
    7.25  //static
     8.1 --- a/indra/newview/llviewercontrol.cpp	Mon Feb 27 20:14:49 2012 +0100
     8.2 +++ b/indra/newview/llviewercontrol.cpp	Wed Mar 07 19:52:29 2012 +0100
     8.3 @@ -657,7 +657,7 @@
     8.4  	gSavedSettings.getControl("AudioLevelMic")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _2));
     8.5  	gSavedSettings.getControl("LipSyncEnabled")->getSignal()->connect(boost::bind(&handleVoiceClientPrefsChanged, _2));	
     8.6  	// Disable translate chat permanently since Google killed it -- TS
     8.7 -	//gSavedSettings.getControl("TranslateChat")->getSignal()->connect(boost::bind(&handleTranslateChatPrefsChanged, _2));	
     8.8 +	//gSavedSettings.getControl("TranslateChat_Deprecated")->getSignal()->connect(boost::bind(&handleTranslateChatPrefsChanged, _2));	
     8.9  	gSavedSettings.getControl("PhoenixBlockSpam")->getSignal()->connect(boost::bind(&handlePhoenixBlockSpam, _2));
    8.10  	gSavedSettings.getControl("CheesyBeacon")->getSignal()->connect(boost::bind(&handleCheesyBeaconChanged, _2));	
    8.11  	gSavedSettings.getControl("NonBlockingFilePicker")->getSignal()->connect(boost::bind(&handleNonBlockingFilePickerChanged, _2));	
     9.1 --- a/indra/newview/llviewermessage.cpp	Mon Feb 27 20:14:49 2012 +0100
     9.2 +++ b/indra/newview/llviewermessage.cpp	Wed Mar 07 19:52:29 2012 +0100
     9.3 @@ -3173,7 +3173,7 @@
     9.4  
     9.5  void check_translate_chat(const std::string &mesg, LLChat &chat, const BOOL history)
     9.6  {
     9.7 -	const bool translate = LLUI::sConfigGroup->getBOOL("TranslateChat");
     9.8 +	const bool translate = LLUI::sConfigGroup->getBOOL("TranslateChat_Deprecated");
     9.9  
    9.10  	if (translate && chat.mSourceType != CHAT_SOURCE_SYSTEM)
    9.11  	{
    10.1 --- a/indra/newview/scriptcounter.cpp	Mon Feb 27 20:14:49 2012 +0100
    10.2 +++ b/indra/newview/scriptcounter.cpp	Wed Mar 07 19:52:29 2012 +0100
    10.3 @@ -116,7 +116,11 @@
    10.4      resultStr+=" [";
    10.5      resultStr+=sstr.str();
    10.6      resultStr+="K]";
    10.7 -    resultStr+=llformat(" [%.2f µSeconds]", scriptTime);
    10.8 +    resultStr+=llformat(" [%.3f ms]", scriptTime/1000);
    10.9 +    if (gSavedSettings.getBOOL("PhoenixScriptTimeMicroseconds"))
   10.10 +    {
   10.11 +        resultStr+=llformat(" [%.2f µSeconds]", scriptTime);
   10.12 +    }
   10.13      cmdline_printchat(resultStr);
   10.14      init();
   10.15    }
    11.1 Binary file indra/newview/skins/default/textures/inv_folder_inbox.tga has changed
    12.1 --- a/indra/newview/skins/default/xui/en-us/notifications.xml	Mon Feb 27 20:14:49 2012 +0100
    12.2 +++ b/indra/newview/skins/default/xui/en-us/notifications.xml	Wed Mar 07 19:52:29 2012 +0100
    12.3 @@ -1838,6 +1838,34 @@
    12.4    </notification>
    12.5  
    12.6    <notification
    12.7 +   icon="notifytip.tga"
    12.8 +   name="ReleaseLandThrottled"
    12.9 +   type="notifytip">
   12.10 +The parcel [PARCEL_NAME] can not be abandoned at this time.
   12.11 +   <tag>fail</tag>
   12.12 +  </notification>
   12.13 +	
   12.14 +  <notification
   12.15 +   icon="notifytip.tga"
   12.16 +   name="ReleasedLandWithReclaim"
   12.17 +   type="notifytip">
   12.18 +The [AREA] m² parcel &apos;[PARCEL_NAME]&apos; has been released.
   12.19 +
   12.20 +You will have [RECLAIM_PERIOD] hours to reclaim for L$0 before it is set for sale to anyone.
   12.21 +   <tag>fail</tag>
   12.22 +  </notification>
   12.23 +	
   12.24 +  <notification
   12.25 +   icon="notifytip.tga"
   12.26 +   name="ReleasedLandNoReclaim"
   12.27 +   type="notifytip">
   12.28 +The [AREA] m² parcel &apos;[PARCEL_NAME]&apos; has been released.
   12.29 +
   12.30 +It is now available for purchase by anyone.
   12.31 +   <tag>fail</tag>
   12.32 +  </notification>
   12.33 +
   12.34 +  <notification
   12.35     icon="alertmodal.tga"
   12.36     name="CannotReleaseLandWatingForServer"
   12.37     type="alertmodal">

mercurial