diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/app_settings/settings.xml | 11 | ||||
| -rw-r--r-- | indra/newview/llimfloater.cpp | 4 | 
2 files changed, 15 insertions, 0 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 6bc95b9cdb..5fc0cb6ff8 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -3631,6 +3631,17 @@        <key>Value</key>        <integer>1</integer>      </map> +    <key>IMShowControlPanel</key> +    <map> +      <key>Comment</key> +      <string>Show IM Control Panel</string> +      <key>Persist</key> +      <integer>1</integer> +      <key>Type</key> +      <string>Boolean</string> +      <key>Value</key> +      <integer>1</integer> +    </map>      <key>IgnoreAllNotifications</key>      <map>        <key>Comment</key> diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index f3fec70ac9..b9c068b583 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -302,6 +302,8 @@ void LLIMFloater::onSlide()  	LLPanel* im_control_panel = getChild<LLPanel>("panel_im_control_panel");  	im_control_panel->setVisible(!im_control_panel->getVisible()); +	gSavedSettings.setBOOL("IMShowControlPanel", im_control_panel->getVisible()); +  	getChild<LLButton>("slide_left_btn")->setVisible(im_control_panel->getVisible());  	getChild<LLButton>("slide_right_btn")->setVisible(!im_control_panel->getVisible());  } @@ -344,6 +346,8 @@ LLIMFloater* LLIMFloater::show(const LLUUID& session_id)  				LLDockControl::TOP,  boost::bind(&LLIMFloater::getAllowedRect, floater, _1)));  	} +	floater->childSetVisible("panel_im_control_panel", gSavedSettings.getBOOL("IMShowControlPanel")); +  	return floater;  }  | 
