Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixup for "Feature Request: On login, open Local Chat, Communicate, and/or Contacts"

Browse Source
This commit is contained in:
Inusaito Sayori
2014-04-23 01:35:52 -04:00
parent e473b9bf10
commit 6526c28e47
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/app_settings/settings.xml
View File

@@ -14587,9 +14587,9 @@ This should be as low as possible, but too low may break functionality</string>
<key>ShowChatHistory</key> <key>ShowChatHistory</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string/> <string>Open local chat window on login</string>
<key>Persist</key> <key>Persist</key>
<integer>0</integer> <integer>1</integer>
<key>Type</key> <key>Type</key>
<string>Boolean</string> <string>Boolean</string>
<key>Value</key> <key>Value</key>
@@ -14598,9 +14598,9 @@ This should be as low as possible, but too low may break functionality</string>
<key>ShowCommunicate</key> <key>ShowCommunicate</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string/> <string>Open communicate window on login</string>
<key>Persist</key> <key>Persist</key>
<integer>0</integer> <integer>1</integer>
<key>Type</key> <key>Type</key>
<string>Boolean</string> <string>Boolean</string>
<key>Value</key> <key>Value</key>
@@ -14609,9 +14609,9 @@ This should be as low as possible, but too low may break functionality</string>
<key>ShowContacts</key> <key>ShowContacts</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string/> <string>Open contacts window on login</string>
<key>Persist</key> <key>Persist</key>
<integer>0</integer> <integer>1</integer>
<key>Type</key> <key>Type</key>
<string>Boolean</string> <string>Boolean</string>
<key>Value</key> <key>Value</key>

4
indra/newview/llfloaterchatterbox.cpp
View File

@@ -118,7 +118,6 @@ LLFloaterChatterBox::LLFloaterChatterBox(const LLSD& seed) :
{ {
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_chatterbox_wolf.xml", NULL, FALSE); LLUICtrlFactory::getInstance()->buildFloater(this, "floater_chatterbox_wolf.xml", NULL, FALSE);
} }
if (gSavedSettings.getBOOL("ShowCommunicate")) open();
if (gSavedSettings.getBOOL("ContactsTornOff")) if (gSavedSettings.getBOOL("ContactsTornOff"))
{ {
@@ -149,6 +148,7 @@ LLFloaterChatterBox::LLFloaterChatterBox(const LLSD& seed) :
{ {
addFloater(floater_chat, FALSE); addFloater(floater_chat, FALSE);
} }
if (gSavedSettings.getBOOL("ShowCommunicate")) open(); // After all floaters have been added, so we may not be hidden anyhow.
gSavedSettings.getControl("ShowLocalChatFloaterBar")->getSignal()->connect(boost::bind(handleLocalChatBar, floater_chat, _2)); gSavedSettings.getControl("ShowLocalChatFloaterBar")->getSignal()->connect(boost::bind(handleLocalChatBar, floater_chat, _2));
mTabContainer->lockTabs(); mTabContainer->lockTabs();
} }
@@ -236,7 +236,7 @@ void LLFloaterChatterBox::onOpen()
void LLFloaterChatterBox::onClose(bool app_quitting) void LLFloaterChatterBox::onClose(bool app_quitting)
{ {
setVisible(FALSE); setVisible(FALSE);
gSavedSettings.setBOOL("ShowCommunicate", FALSE); if (!app_quitting) gSavedSettings.setBOOL("ShowCommunicate", false);
} }
void LLFloaterChatterBox::setMinimized(BOOL minimized) void LLFloaterChatterBox::setMinimized(BOOL minimized)