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

Adjustments to IMs -

Browse Source 
Got "Announce incoming IMs" working.
Group name can now be shown in the local chat notifications for IMs.
"IM Received" changes to "New IM" for length.

Signed-off-by: Beeks <HgDelirium@gmail.com>
This commit is contained in:
Beeks
2010-09-21 14:53:36 -04:00
parent a820e9adee
commit 72c4c63b95
5 changed files with 52 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,28 @@
<key>Value</key>
<integer>1</integer>
</map>
<key>OptionShowGroupNameInChatIM</key>
<map>
<key>Comment</key>
<string>Show group name in IM notification</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>AscentInstantMessageAnnounceIncoming</key>
<map>
<key>Comment</key>
<string>Start IM window as soon as the person starts typing</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>1</integer>
</map>
<key>AscentShowLookAt</key>
<map>
<key>Comment</key>

12
indra/newview/ascentprefssys.cpp
View File

@@ -257,7 +257,7 @@ void LLPrefsAscentSysImpl::refresh()
combo->setCurrentByIndex(mDateFormat);
}
childSetValue("seconds_in_chat_and_ims_check", mEnableOOCAutoClose);
childSetValue("seconds_in_chat_and_ims_check", mSecondsInChatAndIMs);
LLWString auto_response = utf8str_to_wstring( gSavedPerAccountSettings.getString("AscentInstantMessageResponse") );
@@ -268,10 +268,9 @@ void LLPrefsAscentSysImpl::refresh()
childSetValue("AscentInstantMessageResponseMuted", gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseMuted"));
childSetValue("AscentInstantMessageResponseAnyone", gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseAnyone"));
childSetValue("AscentInstantMessageShowResponded", gSavedPerAccountSettings.getBOOL("AscentInstantMessageShowResponded"));
childSetValue("AscentInstantMessageShowOnTyping", gSavedPerAccountSettings.getBOOL("AscentInstantMessageShowOnTyping"));
childSetValue("AscentInstantMessageShowOnTyping", gSavedPerAccountSettings.getBOOL("AscentInstantMessageAnnounceIncoming"));
childSetValue("AscentInstantMessageResponseRepeat", gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseRepeat" ));
childSetValue("AscentInstantMessageResponseItem", gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseItem"));
childSetValue("AscentInstantMessageAnnounceIncoming", gSavedPerAccountSettings.getBOOL("AscentInstantMessageAnnounceIncoming"));
//Save Performance --------------------------------------------------------------------
@@ -385,8 +384,9 @@ void LLPrefsAscentSysImpl::apply()
//Missing the echo/log option.
gSavedSettings.setBOOL("PlayTypingSound", childGetValue("play_typing_sound_check"));
gSavedSettings.setBOOL("AscentHideTypingNotification", childGetValue("hide_typing_check"));
gSavedSettings.setBOOL("AscentAllowMUpose", childGetValue("allow_mu_pose_check"));
gSavedSettings.setBOOL("AscentAutoCloseOOC", childGetValue("close_ooc_check"));
gSavedSettings.setBOOL("AscentInstantMessageAnnounceIncoming", childGetValue("AscentInstantMessageAnnounceIncoming").asBoolean());
gSavedSettings.setBOOL("AscentAllowMUpose", childGetValue("allow_mu_pose_check").asBoolean());
gSavedSettings.setBOOL("AscentAutoCloseOOC", childGetValue("close_ooc_check").asBoolean());
//gSavedSettings.setU32("LinksForChattingObjects", childGetValue("objects_link"). );
LLComboBox* combo = getChild<LLComboBox>("time_format_combobox");
@@ -437,7 +437,7 @@ void LLPrefsAscentSysImpl::apply()
gSavedSettings.setString("ShortTimeFormat", short_time);
gSavedSettings.setString("LongTimeFormat", long_time);
gSavedSettings.setString("TimestampFormat", timestamp);
gSavedSettings.setBOOL("SecondsInChatAndIMs", childGetValue("seconds_in_chat_and_ims_check"));
gSavedSettings.setBOOL("SecondsInChatAndIMs", childGetValue("seconds_in_chat_and_ims_check").asBoolean());
gSavedPerAccountSettings.setString("AscentInstantMessageResponse", childGetValue("im_response").asString());

16
indra/newview/llimview.cpp
View File

@@ -1540,8 +1540,20 @@ public:
message_params["region_id"].asUUID(),
ll_vector3_from_sd(message_params["position"]),
true);
chat.mText = std::string("IM: ") + name + separator_string + saved + message.substr(message_offset);
LLGroupData group_data;
gAgent.getGroupData(session_id, group_data);
std::string prepend_msg;
if (gAgent.isInGroup(session_id)&& gSavedSettings.getBOOL("OptionShowGroupNameInChatIM"))
{
prepend_msg = "[";
prepend_msg += group_data.mName;
prepend_msg += "] ";
}
else
{
prepend_msg = std::string("IM: ");
}
chat.mText = prepend_msg + name + separator_string + saved + message.substr(message_offset);
LLFloaterChat::addChat(chat, TRUE, is_this_agent);
//K now we want to accept the invitation

6
indra/newview/lloverlaybar.cpp
View File

@@ -155,7 +155,7 @@ bool updateChatVisible(const LLSD &data)
BOOL LLOverlayBar::postBuild()
{
childSetAction("IM Received",onClickIMReceived,this);
childSetAction("New IM",onClickIMReceived,this);
childSetAction("Set Not Busy",onClickSetNotBusy,this);
childSetAction("Mouselook",onClickMouselook,this);
childSetAction("Stand Up",onClickStandUp,this);
@@ -167,7 +167,7 @@ BOOL LLOverlayBar::postBuild()
setFocusRoot(TRUE);
mBuilt = true;
mOriginalIMLabel = getChild<LLButton>("IM Received")->getLabelSelected();
mOriginalIMLabel = getChild<LLButton>("New IM")->getLabelSelected();
layoutButtons();
@@ -242,7 +242,7 @@ void LLOverlayBar::refresh()
BOOL im_received = gIMMgr->getIMReceived();
int unread_count = gIMMgr->getIMUnreadCount();
LLButton* button = getChild<LLButton>("IM Received");
LLButton* button = getChild<LLButton>("New IM");
if ((button && button->getVisible() != im_received) ||
(button && button->getVisible()))

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

@@ -77,7 +77,7 @@
tool_tip="Adds features deemed too dangerous for normal use. These features can wreak havoc or do bad things if misused - Mostly to yourself or your belongings. If you're sure, activate the checkbox below as well."
mouse_opaque="true" name="power_user_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="AscentPowerfulWizardCheck1" enabled="true"
<check_box bottom_delta="-20" control_name="AscentPowerfulWizardCheck2" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Confirm Power User functionality" left="10"
tool_tip="Confirms Power User activation. Turn this on at your own risk, and use any features it enables responsibly. Ascent devs will not replace anything you break if you ruin something important. Unlike most checkboxes, you must apply/ok changes before this will activate."
@@ -100,7 +100,8 @@
width="400" />
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Announce incoming instant messages" left="10" mouse_opaque="true"
name="AscentInstantMessageAnnounceIncoming" radio_style="false" width="270"
control_name="AscentInstantMessageAnnounceIncoming" radio_style="false" width="270"
name="quickstart_im_check"
tool_tip="Opens an IM window when someone starts typing an IM to you. This gives you a heads up that someone is IMing you before they hit enter. "/>
<check_box bottom_delta="-20" control_name="HideTypingNotification" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
@@ -108,11 +109,11 @@
tool_tip="IM partners will not see '______ is typing...' when you're responding."
mouse_opaque="true" name="hide_typing_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="AscentInstantMessageAnnounceIncoming" enabled="true"
<check_box bottom_delta="-20" control_name="OptionShowGroupNameInChatIM" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Open IM as soon as user starts typing" left="10"
tool_tip="IM window will open as soon as the user begins typing."
mouse_opaque="true" name="quickstart_im_check" radio_style="false"
label="Show group name in chat" left="10"
tool_tip="The name of the group will also be displayed if the IM is from group chat."
mouse_opaque="true" name="append_group_name_check" radio_style="false"
width="400" />
<!-- Left/Right Column split -->
<view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="top|left" height="75"