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

Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer

Browse Source
This commit is contained in:
Siana Gearz
2012-02-06 04:32:44 +01:00
parent 548f9d0a88 8adf2965fd
commit 787a18d3a8
8 changed files with 157 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llcommon/llfasttimer_class.cpp
View File

@@ -27,7 +27,7 @@
// //
// LLFastTimer documentation, written by Aleric (Feb 2012). // LLFastTimer documentation, written by Aleric (Feb 2012).
// //
// Disclaimer: this is horrible code and I distantiate myself from it's design. // Disclaimer: this is horrible code and I distantiate myself from its design.
// It's neither robust nor object oriented. I just document what I find, in // It's neither robust nor object oriented. I just document what I find, in
// order to be able to fix the bugs (that logically result from such a design). // order to be able to fix the bugs (that logically result from such a design).
// //
@@ -63,12 +63,12 @@
// LLFastTimer::getFrameStateList()[named_timer.getFrameStateIndex()], where // LLFastTimer::getFrameStateList()[named_timer.getFrameStateIndex()], where
// getFrameStateList() is a static function returning a global std::vector<FrameState>. // getFrameStateList() is a static function returning a global std::vector<FrameState>.
// This vector is ordered "Depth First" (the FrameState objects (belonging to // This vector is ordered "Depth First" (the FrameState objects (belonging to
// NamedTimer objects) with smallest depth first). The vector is resorted a few // NamedTimer objects) with smallest depth first). The vector is re-sorted a few
// times in the beginning (and indexes in FrameState updated) since timers are added // times in the beginning (and indexes in FrameState updated) since timers are added
// whenever they are first used, not in "Depth First" order, but stabilizes after a // whenever they are first used, not in "Depth First" order, but stabilizes after a
// while. This implies that FrameState pointers can't really be used: FrameState // while. This implies that FrameState pointers can't really be used: FrameState
// objects move around in memory whenever something is inserted or removed from the // objects move around in memory whenever something is inserted or removed from the
// std::vector and/or when the vector is resorted. However, FrameState pointers ARE // std::vector and/or when the vector is re-sorted. However, FrameState pointers ARE
// being used and code exists that tries to update those pointers in the above // being used and code exists that tries to update those pointers in the above
// mentioned cases (this part had bugs, which I now fixed). // mentioned cases (this part had bugs, which I now fixed).
// //

55
indra/newview/llimpanel.cpp
View File

@@ -2156,59 +2156,58 @@ void LLFloaterIMPanel::sendMsg()
if (mInputEditor) mInputEditor->updateHistory(); if (mInputEditor) mInputEditor->updateHistory();
// Truncate and convert to UTF8 for transport // Truncate and convert to UTF8 for transport
std::string utf8text = wstring_to_utf8str(text); std::string utf8text = wstring_to_utf8str(text);
// Convert MU*s style poses into IRC emotes here.
if (gSavedSettings.getBOOL("AscentAllowMUpose") && utf8text.length() > 3 && utf8text[0] == ':')
{
if (utf8text[1] == '\'')
{
utf8text.replace(0, 1, "/me");
}
else if (isalpha(utf8text[1])) // Do not prevent smileys and such.
{
utf8text.replace(0, 1, "/me ");
}
}
if (utf8text.find("/ME'") == 0 || utf8text.find("/ME ") == 0) //Allow CAPSlock /me
utf8text.replace(1, 2, "me");
std::string prefix = utf8text.substr(0, 4);
if (gSavedSettings.getBOOL("AscentAutoCloseOOC") && (utf8text.length() > 1) && !mRPMode) if (gSavedSettings.getBOOL("AscentAutoCloseOOC") && (utf8text.length() > 1) && !mRPMode)
{ {
// Chalice - OOC autoclosing patch based on code by Henri Beauchamp // Chalice - OOC autoclosing patch based on code by Henri Beauchamp
int needsClosingType=0; int needsClosingType=0;
//Check if it needs the end-of-chat brackets -HgB //Check if it needs the end-of-chat brackets -HgB
if (utf8text.find("((") == 0 && utf8text.find("))") == -1) if (utf8text.find("((") == 0 && utf8text.find("))") == std::string::npos)
{ {
if(utf8text.at(utf8text.length() - 1) == ')') if(*utf8text.rbegin() == ')')
utf8text+=" "; utf8text+=" ";
utf8text+="))"; utf8text+="))";
} }
else if(utf8text.find("[[") == 0 && utf8text.find("]]") == -1) else if(utf8text.find("[[") == 0 && utf8text.find("]]") == std::string::npos)
{ {
if(utf8text.at(utf8text.length() - 1) == ']') if(*utf8text.rbegin() == ']')
utf8text+=" "; utf8text+=" ";
utf8text+="]]"; utf8text+="]]";
} }
//Check if it needs the start-of-chat brackets -HgB //Check if it needs the start-of-chat brackets -HgB
needsClosingType=0; needsClosingType=0;
if (utf8text.find("((") == -1 && utf8text.find("))") == (utf8text.length() - 2)) if (prefix != "/me " && prefix != "/me'") //Allow /me to end with )) or ]]
{ {
if(utf8text.at(0) == '(') if (utf8text.find("((") == std::string::npos && utf8text.find("))") == (utf8text.length() - 2))
{
if(utf8text[0] == '(')
utf8text.insert(0," "); utf8text.insert(0," ");
utf8text.insert(0,"(("); utf8text.insert(0,"((");
} }
else if (utf8text.find("[[") == -1 && utf8text.find("]]") == (utf8text.length() - 2)) else if (utf8text.find("[[") == std::string::npos && utf8text.find("]]") == (utf8text.length() - 2))
{ {
if(utf8text.at(0) == '[') if(utf8text[0] == '[')
utf8text.insert(0," "); utf8text.insert(0," ");
utf8text.insert(0,"[["); utf8text.insert(0,"[[");
} }
} }
// Convert MU*s style poses into IRC emotes here.
if (gSavedSettings.getBOOL("AscentAllowMUpose") && utf8text.find(":") == 0 && utf8text.length() > 3)
{
if (utf8text.find(":'") == 0)
{
utf8text.replace(0, 1, "/me");
} }
else if (isalpha(utf8text.at(1))) // Do not prevent smileys and such. if (mRPMode && prefix != "/me " && prefix != "/me'")
{ utf8text = "[[" + utf8text + "]]";
utf8text.replace(0, 1, "/me ");
}
}
if (utf8text.find("/ME'") == 0 || utf8text.find("/ME ") == 0) //Allow CAPSlock /me
{
utf8text.replace(1, 2, "me");
}
std::string prefix = utf8text.substr(0, 4);
if (prefix != "/me " && prefix != "/me'")
if (mRPMode) utf8text = "[[" + utf8text + "]]";
// [RLVa:KB] - Checked: 2011-09-17 (RLVa-1.1.4b) | Modified: RLVa-1.1.4b // [RLVa:KB] - Checked: 2011-09-17 (RLVa-1.1.4b) | Modified: RLVa-1.1.4b
if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SENDIM)) || (gRlvHandler.hasBehaviour(RLV_BHVR_SENDIMTO)) ) if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SENDIM)) || (gRlvHandler.hasBehaviour(RLV_BHVR_SENDIMTO)) )
{ {

168
indra/newview/skins/default/xui/en-us/floater_chat_history.xml
View File

@@ -1,136 +1,48 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater bottom="27" can_close="true" can_drag_on_left="false" can_minimize="false" <floater bottom="27" can_close="true" can_drag_on_left="false" can_minimize="false" can_resize="true" can_tear_off="true" enabled="true" height="275" left="15"
can_resize="true" can_tear_off="true" enabled="true" height="275" left="15" min_height="150" min_width="425" name="chat floater" rect_control="FloaterChatRect" title="Local Chat" width="435">
min_height="150" min_width="425" mouse_opaque="true" name="chat floater" <string name="ringing">Connecting to in-world Voice Chat...</string>
rect_control="FloaterChatRect" title="Local Chat" width="435"> <string name="connected">Connected</string>
<string name="ringing"> <string name="unavailable">Voice not available at your current location</string>
Connecting to in-world Voice Chat... <string name="hang_up">Disconnected from in-world Voice Chat</string>
</string> <string name="voice_icon">icn_voice-localchat.tga</string>
<string name="connected"> <string name="IM_logging_string">-- Instant message logging enabled --</string>
Connected <string name="IM_end_log_string">-- End of Log --</string>
</string> <string name="ScriptQuestionCautionChatGranted">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been granted permission to: [PERMISSIONS].</string>
<string name="unavailable"> <string name="ScriptQuestionCautionChatDenied">'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been denied permission to: [PERMISSIONS].</string>
Voice not available at your current location <string name="ScriptTakeMoney">Take in-world money ([CURRENCY]) from you</string>
</string> <string name="ActOnControlInputs">Act on your control inputs</string>
<string name="hang_up"> <string name="RemapControlInputs">Remap your control inputs</string>
Disconnected from in-world Voice Chat <string name="AnimateYourAvatar">Animate your avatar</string>
</string> <string name="AttachToYourAvatar">Attach to your avatar</string>
<string name="voice_icon"> <string name="ReleaseOwnership">Release ownership and become public</string>
icn_voice-localchat.tga <string name="LinkAndDelink">Link and delink from other objects</string>
</string> <string name="AddAndRemoveJoints">Add and remove joints with other objects</string>
<string name="IM_logging_string"> <string name="ChangePermissions">Change its permissions</string>
-- Instant message logging enabled -- <string name="TrackYourCamera">Track your camera</string>
</string> <string name="ControlYourCamera">Control your camera</string>
<string name="IM_end_log_string"> <layout_stack border="false" bottom="2" follows="left|top|right|bottom" height="255" left="2" orientation="horizontal" width="430" name="panels">
-- End of Log -- <layout_panel border="false" bottom="0" default_tab_group="1" height="135" left="0" min_width="275" name="im_contents_panel" width="305">
</string> <combo_box follows="left|top" height="18" label="Gestures" left="5" name="Gesture" width="120">
<combo_item name="Gestures">Gestures</combo_item>
<string name="ScriptQuestionCautionChatGranted">
'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been granted permission to: [PERMISSIONS].
</string>
<string name="ScriptQuestionCautionChatDenied">
'[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been denied permission to: [PERMISSIONS].
</string>
<string name="ScriptTakeMoney">
Take in-world money ([CURRENCY]) from you
</string>
<string name="ActOnControlInputs">
Act on your control inputs
</string>
<string name="RemapControlInputs">
Remap your control inputs
</string>
<string name="AnimateYourAvatar">
Animate your avatar
</string>
<string name="AttachToYourAvatar">
Attach to your avatar
</string>
<string name="ReleaseOwnership">
Release ownership and become public
</string>
<string name="LinkAndDelink">
Link and delink from other objects
</string>
<string name="AddAndRemoveJoints">
Add and remove joints with other objects
</string>
<string name="ChangePermissions">
Change its permissions
</string>
<string name="TrackYourCamera">
Track your camera
</string>
<string name="ControlYourCamera">
Control your camera
</string>
<layout_stack border="false" bottom="2" follows="left|top|right|bottom" height="255" left="2"
orientation="horizontal" width="430" name="panels">
<layout_panel border="false" bottom="0" default_tab_group="1" height="135" left="0"
min_width="275" name="im_contents_panel" width="305">
<combo_box follows="left|top" height="18" label="Gestures" left="5" name="Gesture"
width="120">
<combo_item name="Gestures">
Gestures
</combo_item>
</combo_box> </combo_box>
<check_box bottom_delta="0" enabled="true" follows="left|top" font="SansSerifSmall" <check_box bottom_delta="-2" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" label="Show Muted Text" left_delta="125" name="show mutes" width="116"/>
height="20" initial_value="false" label="Show Muted Text" left_delta="125" <!--check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall" height="20" initial_value="false" label="Translate Chat (powered by Google)" name="translate chat" width="100"/-->
name="show mutes" radio_style="false" width="116" /> <button bottom_delta="2" left_delta="120" follows="left|top" font="SansSerifSmall" height="20" width="100" label="Open History" name="chat_history_open" tool_top="Click here to open chat history in external editor."/>
<!--check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall" <button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" label_selected="&gt; &gt;" left="272" name="toggle_active_speakers_btn" right="305"
height="20" initial_value="false" label="Translate Chat (powered by Google)" left_delta="0" tool_tip="Click here to show list of active participants in this IM session." width="70"/>
name="translate chat" radio_style="false" width="100" /--> <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" bottom="28" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="82" left="5" max_length="2147483647" name="Chat History Editor" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true"/>
<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" bottom="28" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="82" max_length="2147483647" name="Chat History Editor with mute" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true"/>
<button bottom_delta="0" left_delta="150" follows="left|top" font="SansSerifSmall" <panel bottom="5" follows="left|right|bottom" left="5" name="chat_panel" right="-5" tab_group="1" top="25">
height="20" width="100" label="Open History" name="chat_history_open"
tool_top="Click here to open chat history in external editor." />
<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
label_selected="&gt; &gt;" left="272" name="toggle_active_speakers_btn"
right="305"
tool_tip="Click here to show list of active participants in this IM session."
width="70" />
<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
bottom="28" embedded_items="false" enabled="false"
follows="left|top|right|bottom" font="SansSerif" height="79" left="5"
max_length="2147483647" mouse_opaque="true" name="Chat History Editor"
track_bottom="true"
text_color="ChatHistoryTextColor"
text_readonly_color="ChatHistoryTextColor" width="299" word_wrap="true" spell_check="true" />
<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
bottom="28" embedded_items="false" enabled="false"
follows="left|top|right|bottom" font="SansSerif" height="79" left="5"
max_length="2147483647" mouse_opaque="true"
name="Chat History Editor with mute" text_color="ChatHistoryTextColor"
track_bottom="true"
text_readonly_color="ChatHistoryTextColor" width="300" word_wrap="true" spell_check="true"/>
<panel bottom="5" follows="left|right|bottom" left="5" name="chat_panel" right="-5"
tab_group="1" top="25">
<string name="gesture_label">Gestures</string> <string name="gesture_label">Gestures</string>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="0" <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="0" follows="left|right|bottom" font="SansSerif" handle_edit_keys_directly="false" height="20" label="Click here to chat." left="0" max_length="2147483647" name="Chat Editor" right="-70" select_all_on_focus_received="false" select_on_focus="false" tab_group="1" spell_check="true"/>
enabled="true" follows="left|right|bottom" font="SansSerif" <flyout_button bottom="0" follows="right|bottom" height="20" label="Say" left="-65" list_position="above" name="Say" tool_tip="(Enter)" width="70">
handle_edit_keys_directly="false" height="20" label="Click here to chat." <flyout_button_item value="shout" name="shout_item">Shout</flyout_button_item>
left="0" max_length="2147483647" mouse_opaque="true" name="Chat Editor" <flyout_button_item value="say" name="say_item">Say</flyout_button_item>
right="-70" select_all_on_focus_received="false" select_on_focus="false" <flyout_button_item value="whisper" name="whisper_item">Whisper</flyout_button_item>
tab_group="1" spell_check="true" />
<flyout_button bottom="0" follows="right|bottom" height="20" label="Say" left="-65"
list_position="above" mouse_opaque="true" name="Say" tool_tip="(Enter)"
width="70">
<flyout_button_item value="shout" name="shout_item">
Shout
</flyout_button_item>
<flyout_button_item value="say" name="say_item">
Say
</flyout_button_item>
<flyout_button_item value="whisper" name="whisper_item">
Whisper
</flyout_button_item>
</flyout_button> </flyout_button>
</panel> </panel>
</layout_panel> </layout_panel>
<layout_panel auto_resize="false" bottom="0" can_resize="true" <layout_panel auto_resize="false" bottom="0" can_resize="true" filename="panel_speaker_controls.xml" height="120" left="0" min_width="140" name="active_speakers_panel" top_delta="0" visible="false" width="140"/>
filename="panel_speaker_controls.xml" height="120" left="0" min_width="140"
name="active_speakers_panel" top_delta="0" visible="false" width="140" />
</layout_stack> </layout_stack>
</floater> </floater>

16
indra/newview/skins/default/xui/en-us/floater_instant_message.xml
View File

@@ -1,30 +1,28 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater border="true" bottom="-298" can_close="true" can_resize="true" default_tab_group="1" <floater border="true" bottom="-298" can_close="true" can_resize="true" default_tab_group="1" follows="left|top|right|bottom" height="297" label="(unknown)" left="1" min_height="155" min_width="345" name="im_floater" rect_control="" title="(unknown)" width="501">
follows="left|top|right|bottom" height="296" label="(unknown)" left="1"
min_height="155" min_width="345" name="im_floater" rect_control="" title="(unknown)" width="501">
<string name="ringing">Calling...</string>
<string name="answering">Connecting...</string> <string name="answering">Connecting...</string>
<string name="ringing">Calling...</string>
<string name="connected">Connected, click End Call to hang up</string> <string name="connected">Connected, click End Call to hang up</string>
<string name="hang_up">Call ended</string> <string name="hang_up">Call ended</string>
<string name="inventory_item_offered">Inventory item offered</string>
<string name="voice_icon">icn_voice-pvtfocus.tga</string> <string name="voice_icon">icn_voice-pvtfocus.tga</string>
<string name="title_string">Instant Message with [NAME]</string> <string name="title_string">Instant Message with [NAME]</string>
<string name="typing_start_string">[NAME] is typing...</string> <string name="typing_start_string">[NAME] is typing...</string>
<string name="session_start_string">Starting session with [NAME] please wait.</string> <string name="session_start_string">Starting session with [NAME], please wait.</string>
<string name="default_text_label">Click here to instant message.</string> <string name="default_text_label">Click here to instant message.</string>
<string name="unavailable_text_label">Text chat is not available for this call.</string> <string name="unavailable_text_label">Text chat is not available for this call.</string>
<string name="inventory_item_offered">Inventory item offered</string>
<button bottom="-40" height="20" label="Profile" left="5" name="profile_callee_btn" width="80"/> <button bottom="-40" height="20" label="Profile" left="5" name="profile_callee_btn" width="80"/>
<button bottom="-40" height="20" label="Teleport" left_delta="80" name="profile_tele_btn" width="80"/> <button bottom="-40" height="20" label="Teleport" left_delta="80" name="profile_tele_btn" width="80"/>
<button bottom="-40" follows="left|top" halign="center" height="20" label="History" left_delta="80" name="history_btn" visible="true" width="80"/> <button bottom="-40" follows="left|top" halign="center" height="20" label="History" left_delta="80" name="history_btn" visible="true" width="80"/>
<check_box bottom="-40" follows="top" halign="center" height="20" left_delta="80" name="rp_mode">RP Mode</check_box> <check_box bottom="-40" follows="top" height="20" left_delta="80" name="rp_mode">RP Mode</check_box>
<button bottom="-40" follows="left|top" halign="right" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Call" left_delta="80" name="start_call_btn" width="53"/> <button bottom="-40" follows="left|top" halign="right" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Call" left_delta="80" name="start_call_btn" width="53"/>
<button bottom="-40" follows="top" height="20" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" label="End" name="end_call_btn" visible="false" width="53"/> <button bottom="-40" follows="top" height="20" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" label="End" name="end_call_btn" visible="false" width="53"/>
<panel border="false" bottom="-37" follows="left|top" height="20" left_delta="50" name="speaker_controls" width="100"> <panel border="false" bottom="-37" follows="left|top" height="20" left_delta="50" name="speaker_controls" width="100">
<volume_slider bottom="0" follows="bottom" height="15" increment="0.05" initial_val="0.5" max_val="1.0" min_val="0.0" name="speaker_volume" width="56"/> <volume_slider bottom="0" follows="bottom" height="15" increment="0.05" initial_val="0.5" max_val="1.0" min_val="0.0" name="speaker_volume" width="56"/>
<button bottom="0" height="20" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" left_delta="56" name="mute_btn" tool_tip="Mute voice" width="25"/> <button bottom="0" height="20" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" label="" left_delta="56" name="mute_btn" tool_tip="Mute voice" width="25"/>
</panel> </panel>
<text_editor bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" height="221" left="7" max_length="2147483647" name="im_history" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="487"/> <text_editor bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" height="221" left="5" max_length="2147483647" name="im_history" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true"/>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7" follows="left|right" height="20" label="Click here to instant message" max_length="2147483647" name="chat_editor" tab_group="1" width="433" spell_check="true"/> <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7" follows="left|right" font="SansSerif" height="20" label="Click here to instant message" max_length="2147483647" name="chat_editor" tab_group="1" width="436" spell_check="true"/>
<button bottom="7" height="20" label="Send" left="-56" name="send_btn" scale_image="true" width="50"/> <button bottom="7" height="20" label="Send" left="-56" name="send_btn" scale_image="true" width="50"/>
<string name="live_help_dialog">*** Welcome to Help Request *** <string name="live_help_dialog">*** Welcome to Help Request ***
Please first check our SL Help Pages by pressing F1, or by accessing the Knowledge Base http://secondlife.com/knowledgebase/ Please first check our SL Help Pages by pressing F1, or by accessing the Knowledge Base http://secondlife.com/knowledgebase/

88
indra/newview/skins/default/xui/en-us/floater_instant_message_ad_hoc.xml
View File

@@ -1,74 +1,26 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater border="true" bottom="-298" can_close="true" can_drag_on_left="false" <floater border="true" bottom="-298" can_close="true" can_minimize="false" can_resize="true" default_tab_group="1" enabled="true" follows="left|top|right|bottom" height="297" label="(unknown)" left="1" min_height="225" min_width="265" name="im_floater" rect_control="" title="(unknown)" width="501">
can_minimize="false" can_resize="true" default_tab_group="1" enabled="true" <string name="ringing">Joining Voice Chat...</string>
follows="left|top|right|bottom" height="297" label="(unknown)" left="1" <string name="connected">Connected, click End Call to hang up</string>
min_height="225" min_width="265" mouse_opaque="true" name="im_floater" <string name="hang_up">Left Voice Chat</string>
rect_control="" title="(unknown)" width="501"> <string name="voice_icon">icn_voice-groupfocus.tga</string>
<string name="ringing"> <string name="title_string">Instant Message with [NAME]</string>
Joining Voice Chat... <string name="typing_start_string">[NAME] is typing...</string>
</string> <string name="session_start_string">Starting session with [NAME], please wait.</string>
<string name="connected"> <string name="default_text_label">Click here to instant message.</string>
Connected, click End Call to hang up <layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="277" left="0" orientation="horizontal" tab_group="1" width="496" name="panels">
</string> <layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right" height="295" left="0" min_width="115" name="im_contents_panel" width="495">
<string name="hang_up"> <button bottom="-20" enabled="false" follows="left|top" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Call" left="5" name="start_call_btn" width="80"/>
Left Voice Chat <button bottom_delta="0" follows="left|top" height="20" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" label="End Call" left_delta="0" name="end_call_btn" visible="false" width="80" />
</string> <button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" label_selected="&gt; &gt;" left="463" name="toggle_active_speakers_btn" right="496" tool_tip="Click here to toggle a list of active participants in this IM session." visible="true" width="80"/>
<string name="voice_icon"> <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" bottom="-265" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="239" left="5" max_length="2147483647" name="im_history" track_bottom="true" text_color="ChatHistoryTextColor" text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true"/>
icn_voice-groupfocus.tga <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7" follows="left|right|bottom" font="SansSerif" handle_edit_keys_directly="false" height="20" label="Click here to instant message" left="5" max_length="1022" name="chat_editor" select_all_on_focus_received="false" select_on_focus="false" tab_group="1" width="426" spell_check="true"/>
</string> <button bottom_delta="0" enabled="true" follows="right|bottom" halign="center" height="20" label="Send" left="438" name="send_btn" scale_image="true" width="60"/>
<string name="title_string">
Instant Message with [NAME]
</string>
<string name="typing_start_string">
[NAME] is typing...
</string>
<string name="session_start_string">
Starting session with [NAME] please wait.
</string>
<string name="default_text_label">
Click here to instant message.
</string>
<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="277" left="2"
orientation="horizontal" tab_group="1" width="495" name="panels">
<layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right"
height="295" left="0" min_width="115" name="im_contents_panel" width="495">
<button bottom="-20" enabled="false" follows="left|top" halign="center" height="20"
image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
label="Call" left="5" name="start_call_btn" width="80" />
<button bottom_delta="0" follows="left|top" halign="center" height="20"
image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
label="End Call" left_delta="0" name="end_call_btn" visible="false"
width="80" />
<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
label_selected="&gt; &gt;" left="463" name="toggle_active_speakers_btn"
right="496"
tool_tip="Click here to toggle a list of active participants in this IM session."
visible="true" width="80" />
<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
bottom="-265" embedded_items="false" enabled="false"
follows="left|top|right|bottom" font="SansSerif" height="239" left="7"
max_length="2147483647" mouse_opaque="true" name="im_history"
track_bottom="true"
text_color="ChatHistoryTextColor"
text_readonly_color="ChatHistoryTextColor" width="490" word_wrap="true" />
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7"
enabled="true" follows="left|right|bottom" font="SansSerif"
handle_edit_keys_directly="false" height="20"
label="Click here to instant message" left="7" max_length="1022"
mouse_opaque="true" name="chat_editor" select_all_on_focus_received="false"
select_on_focus="false" tab_group="1" width="426" spell_check="true" />
<button bottom_delta="0" enabled="true" follows="right|bottom" font="SansSerif"
halign="center" height="20" label="Send" left="438" mouse_opaque="true"
name="send_btn" scale_image="true" width="60" />
</layout_panel> </layout_panel>
<layout_panel auto_resize="false" bottom="0" can_resize="true" <layout_panel auto_resize="false" bottom="0" can_resize="true" filename="panel_speaker_controls.xml" height="120" left="0" min_width="140" name="active_speakers_panel" top_delta="0" visible="false" width="140"/>
filename="panel_speaker_controls.xml" height="120" left="0" min_width="140"
name="active_speakers_panel" top_delta="0" visible="false" width="140" />
</layout_stack> </layout_stack>
<string name="live_help_dialog"> <string name="live_help_dialog">*** Welcome to Help Request ***
*** Welcome to Help Request ***
Please first check our SL Help Pages by pressing F1, or by accessing the Knowledge Base http://secondlife.com/knowledgebase/ Please first check our SL Help Pages by pressing F1, or by accessing the Knowledge Base http://secondlife.com/knowledgebase/
If your answer is not there, please enter your question to begin, then allow a few moments for available helpers to respond. If your answer is not there, please enter your question to begin, then allow a few moments for available helpers to respond.
-=-=- Response times will vary, especially during peak times -=-=- -=-=- Response times will vary, especially during peak times -=-=-</string>
</string>
</floater> </floater>

103
indra/newview/skins/default/xui/en-us/floater_instant_message_group.xml
View File

@@ -1,82 +1,29 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<floater border="true" bottom="-297" can_close="true" can_drag_on_left="false" <floater border="true" bottom="-298" can_close="true" can_minimize="true" can_resize="true" default_tab_group="1" enabled="true" follows="left|top|right|bottom" height="297" label="(unknown)" left="1" min_height="200" min_width="360" name="im_floater" rect_control="" title="(unknown)" width="501">
can_minimize="true" can_resize="true" default_tab_group="1" enabled="true" <string name="ringing">Joining Voice Chat...</string>
follows="left|top|right|bottom" height="296" label="(unknown)" left="1" <string name="connected">Connected, click End Call to hang up</string>
min_height="200" min_width="360" mouse_opaque="true" name="im_floater" <string name="hang_up">Left Voice Chat</string>
rect_control="" title="(unknown)" width="501"> <string name="voice_icon">icn_voice-groupfocus.tga</string>
<string name="ringing"> <string name="title_string">Instant Message with [NAME]</string>
Joining Voice Chat... <string name="typing_start_string">[NAME] is typing...</string>
</string> <string name="session_start_string">Starting session with [NAME], please wait.</string>
<string name="connected"> <string name="default_text_label">Click here to instant message.</string>
Connected, click End Call to hang up <string name="moderated_chat_label">(Moderated: Voices off by default)</string>
</string> <string name="muted_text_label">Your text chat has been disabled by a Group Moderator.</string>
<string name="hang_up"> <layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="277" left="0" orientation="horizontal" tab_group="1" width="496" name="panels">
Left Voice Chat <layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right" height="130" left="0" min_width="210" name="im_contents_panel" width="175">
</string> <button bottom="-20" follows="left|top" height="20" label="Group Info" left="5" name="group_info_btn" tab_group="0" width="80"/>
<string name="voice_icon"> <button bottom_delta="0" enabled="false" follows="left|top" halign="right" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Join Call" left_delta="85" name="start_call_btn" pad_right="12" width="80"/>
icn_voice-groupfocus.tga <button bottom_delta="0" follows="left|top" halign="right" height="20" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" label="End Call" left_delta="0" name="end_call_btn" pad_right="12" visible="false" width="80"/>
</string> <button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;" label_selected="&gt; &gt;" left="145" name="toggle_active_speakers_btn" tool_tip="Click here to toggle a list of active participants in this IM session." visible="true" width="33"/>
<string name="live_help_dialog" wordwrap="false"> <text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" bottom="30" enabled="false" follows="left|top|right|bottom" font="SansSerif" left="5" max_length="2147483647" name="im_history" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" top="104" width="170" word_wrap="true"/>
*** Welcome to Help Request *** <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7" follows="left|right|bottom" font="SansSerif" height="20" left="5" max_length="1022" name="chat_editor" select_all_on_focus_received="false" select_on_focus="false" tab_group="1" width="106" spell_check="true"/>
Please first check our SL Help Pages by pressing F1, or by accessing the Knowledge Base http://secondlife.com/knowledgebase/ <button bottom="7" enabled="true" follows="right|bottom" height="20" label="Send" left="118" name="send_btn" scale_image="true" width="60"/>
If your answer is not there, please enter your question to begin, then allow a few moments for available helpers to respond.
-=-=- Response times will vary, especially during peak times -=-=-
</string>
<string name="title_string">
Instant Message with [NAME]
</string>
<string name="typing_start_string">
[NAME] is typing...
</string>
<string name="session_start_string">
Starting session with [NAME], please wait.
</string>
<string name="moderated_chat_label">
(Moderated: Voices off by default)
</string>
<string name="default_text_label">
Click here to instant message.
</string>
<string name="muted_text_label">
Your text chat has been disabled by a Group Moderator.
</string>
<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="276" left="0"
orientation="horizontal" tab_group="1" width="496" name="panels">
<layout_panel border="false" bottom="0" default_tab_group="1" follows="left|top|bottom|right"
height="130" left="0" min_width="210" name="im_contents_panel" width="175">
<button bottom="-20" follows="left|top" height="20" label="Group Info" left="5"
name="group_info_btn" tab_group="0" width="80" />
<button bottom_delta="0" enabled="false" follows="left|top" halign="right" height="20"
image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left"
label="Join Call" left_delta="85" name="start_call_btn" pad_right="12"
width="80" />
<button bottom_delta="0" follows="left|top" halign="right" height="20"
image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left"
label="End Call" left_delta="0" name="end_call_btn" pad_right="12"
visible="false" width="80" />
<button bottom_delta="0" follows="right|top" height="20" label="&lt; &lt;"
label_selected="&gt; &gt;" left="145" name="toggle_active_speakers_btn"
tool_tip="Click here to toggle a list of active participants in this IM session."
visible="true" width="33" />
<text_editor type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor"
bottom="30" embedded_items="false" enabled="false"
follows="left|top|right|bottom" font="SansSerif" left="7"
max_length="2147483647" mouse_opaque="true" name="im_history"
text_color="ChatHistoryTextColor"
track_bottom="true"
text_readonly_color="ChatHistoryTextColor" top="104" width="170"
word_wrap="true" />
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="7"
enabled="true" follows="left|right|bottom" font="SansSerif" height="20"
left="7" max_length="1022" mouse_opaque="true" name="chat_editor"
select_all_on_focus_received="false" select_on_focus="false" tab_group="1"
width="106" spell_check="true" />
<button bottom="7" enabled="true" follows="right|bottom" font="SansSerif"
halign="center" height="20" label="Send" left="118" mouse_opaque="true"
name="send_btn" scale_image="true" width="60" />
</layout_panel> </layout_panel>
<layout_panel auto_resize="false" bottom="0" can_resize="true" <layout_panel auto_resize="false" bottom="0" can_resize="true" filename="panel_speaker_controls.xml" height="120" left="0" min_width="140" name="active_speakers_panel" top_delta="0" visible="false" width="140"/>
filename="panel_speaker_controls.xml" height="120" left="0" min_width="140"
name="active_speakers_panel" top_delta="0" visible="false" width="140" />
</layout_stack> </layout_stack>
<string name="live_help_dialog">*** Welcome to Help Request ***
Please first check our SL Help Pages by pressing F1, or by accessing the Knowledge Base http://secondlife.com/knowledgebase/
If your answer is not there, please enter your question to begin, then allow a few moments for available helpers to respond.
-=-=- Response times will vary, especially during peak times -=-=-</string>
</floater> </floater>

8
indra/newview/skins/default/xui/en-us/panel_friends.xml
View File

@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel border="true" name="friends"> <panel border="true" name="friends">
<string name="Multiple"> <string name="Multiple">Multiple friends...</string>
Multiple friends...
</string>
<scroll_list bottom="10" can_resize="true" column_padding="0" draw_heading="true" <scroll_list bottom="10" can_resize="true" column_padding="0" draw_heading="true"
follows="left|top|bottom|right" left="10" multi_select="true" follows="left|top|bottom|right" left="10" multi_select="true"
name="friend_list" right="-100" search_column="1" name="friend_list" right="-100" search_column="1"
@@ -12,7 +10,7 @@
tool_tip="Online status" width="20" /> tool_tip="Online status" width="20" />
<column dynamicwidth="true" label="Name" name="friend_name" tool_tip="Name" /> <column dynamicwidth="true" label="Name" name="friend_name" tool_tip="Name" />
<column image="ff_visible_online_button.tga" name="icon_visible_online" <column image="ff_visible_online_button.tga" name="icon_visible_online"
tool_tip="Friend can see when you&apos;re online" width="20" /> tool_tip="Friend can see when you're online" width="20" />
<column image="ff_visible_map_button.tga" name="icon_visible_map" <column image="ff_visible_map_button.tga" name="icon_visible_map"
tool_tip="Friend can locate you on the map" width="20" /> tool_tip="Friend can locate you on the map" width="20" />
<column image="ff_edit_mine_button.tga" name="icon_edit_mine" <column image="ff_edit_mine_button.tga" name="icon_edit_mine"
@@ -22,7 +20,7 @@
<column image="ff_visible_map_button.tga" name="icon_visible_map_theirs" <column image="ff_visible_map_button.tga" name="icon_visible_map_theirs"
tool_tip="You can locate them on the map" width="20" /> tool_tip="You can locate them on the map" width="20" />
<column image="ff_edit_theirs_button.tga" name="icon_edit_theirs" <column image="ff_edit_theirs_button.tga" name="icon_edit_theirs"
tool_tip="You can edit this friend&apos;s objects" width="20" /> tool_tip="You can edit this friend's objects" width="20" />
<column name="friend_last_update_generation" width="0" /> <column name="friend_last_update_generation" width="0" />
</scroll_list> </scroll_list>
<!--text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" <!--text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"

83
indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml
View File

@@ -1,70 +1,31 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel bevel_style="in" border="true" bottom="0" follows="left|bottom|right" <panel bevel_style="in" border="false" bottom="0" follows="left|bottom|right" height="120" left="0" name="active_speakers_panel" width="140">
height="120" left="0" name="active_speakers_panel" width="140"> <string name="moderator_label">(Moderator)</string>
<string name="moderator_label"> <layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="123" left="0" orientation="vertical" tab_group="1" width="140" name="panels">
(Moderator) <layout_panel auto_resize="false" bottom="0" can_resize="false" height="25" left="0" min_height="25" name="moderation_mode_panel" top_delta="0" user_resize="false" visible="false" width="140">
</string> <combo_box bottom="0" follows="left|top|right|bottom" height="20" left="5" name="moderation_mode" width="130">
<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="123" left="0" <combo_item name="OpenVoice" value="unmoderated">Voices on by default</combo_item>
orientation="vertical" tab_group="1" width="140" name="panels"> <combo_item name="ModeratedVoice" value="moderated">Voices off by default</combo_item>
<layout_panel auto_resize="false" bottom="0" can_resize="false" height="25" left="0"
min_height="25" name="moderation_mode_panel" top_delta="0"
user_resize="false" visible="false" width="140">
<combo_box bottom="0" follows="left|top|right|bottom" height="20" left="5"
name="moderation_mode" width="130">
<combo_item name="OpenVoice" value="unmoderated">
Voices on by default
</combo_item>
<combo_item name="ModeratedVoice" value="moderated">
Voices off by default
</combo_item>
</combo_box> </combo_box>
</layout_panel> </layout_panel>
<layout_panel auto_resize="true" bottom="0" can_resize="false" height="120" left="0" <layout_panel auto_resize="true" bottom="0" can_resize="false" height="120" min_height="100" name="moderate_chat_panel" top_delta="0" user_resize="false" visible="true" width="140">
min_height="100" name="moderate_chat_panel" top_delta="0" <scroll_list bottom="78" can_resize="false" column_padding="0" draw_heading="true" draw_stripes="false" follows="left|top|bottom|right" left="0" multi_select="false" name="speakers_list" right="140" search_column="1" sort_column="2" top="120">
user_resize="false" visible="true" width="140"> <column name="icon_speaking_status" sort="speaking_status" width="20"/>
<scroll_list bottom="78" can_resize="false" column_padding="0" draw_heading="true" <column dynamicwidth="true" label="Name" name="speaker_name"/>
draw_stripes="false" follows="left|top|bottom|right" left="0" <column label="" name="speaking_status" width="0"/>
multi_select="false" name="speakers_list" right="140" search_column="1"
sort_column="2" top="120">
<column name="icon_speaking_status" sort="speaking_status" width="20" />
<column dynamicwidth="true" label="Name" name="speaker_name" />
<column label="" name="speaking_status" width="0" />
</scroll_list> </scroll_list>
<panel border="false" bottom="0" can_resize="false" follows="left|bottom|right" <panel border="false" bottom="0" can_resize="false" follows="left|bottom|right" height="77" left="0" name="speaker_controls" width="140">
height="77" left="0" mouse_opaque="true" name="speaker_controls" <button bottom="-28" enabled="false" follows="left|top" height="20" image_overlay="icon_avatar_offline.tga" label="" left="4" name="profile_btn" right="34" scale_image="true"/>
width="140"> <text bottom_delta="9" follows="left|top|right" left_delta="34" name="resident_name" valign="center" width="140">Rumplstiltskin Califragilistic</text>
<button bottom="-28" enabled="false" follows="left|top" height="20" <volume_slider bottom_delta="-29" follows="left|top" height="15" increment="0.05" initial_val="0.5" left="0" max_val="1.0" min_val="0.0" name="speaker_volume" width="110"/>
image_overlay="icon_avatar_offline.tga" label="" left="4" <button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga" unselected="icn_speaker_dark.tga" label="" left_delta="110" name="mute_btn" tool_tip="Mute voice for this resident" width="25"/>
name="profile_btn" right="34" scale_image="true"/> <check_box bottom_delta="-25" enabled="false" follows="left|top" height="25" label="Mute Text" left="3" name="mute_text_btn"/>
<text bottom_delta="9" follows="left|top|right" font="SansSerif" left_delta="34"
name="resident_name" valign="center" width="140">
Rumplstiltskin Califragilistic
</text>
<volume_slider bottom_delta="-29" follows="left|top" height="15" increment="0.05"
initial_val="0.5" left="0" max_val="1.0" min_val="0.0"
name="speaker_volume" width="110" />
<button bottom_delta="0" height="20" image_selected="icn_speaker-muted_dark.tga"
image_unselected="icn_speaker_dark.tga" label="" left_delta="110"
name="mute_btn" tool_tip="Mute voice for this resident" width="25" />
<check_box bottom_delta="-25" enabled="false" follows="left|top" height="25"
label="Mute Text" left="3" name="mute_text_btn" width="50" />
</panel> </panel>
</layout_panel> </layout_panel>
<layout_panel auto_resize="false" bottom="0" can_resize="false" height="60" left="0" <layout_panel auto_resize="false" bottom="0" can_resize="false" height="60" left="0" name="moderator_controls" top_delta="0" user_resize="false" visible="false" width="140">
name="moderator_controls" top_delta="0" user_resize="false" visible="false" <text bottom="-20" follows="left|right|top|bottom" height="20" left="5" name="moderator_controls_label" right="-5">Moderator Controls:</text>
width="140"> <check_box bottom_delta="-16" follows="left|right|top|bottom" height="20" name="moderator_allow_voice">Allow voice chat</check_box>
<text bottom="-20" follows="left|right|top|bottom" height="20" left="5" <check_box bottom_delta="-20" follows="left|right|top|bottom" height="20" name="moderator_allow_text">Allow text chat</check_box>
name="moderator_controls_label" right="-5">
Moderator Controls:
</text>
<check_box bottom_delta="-16" follows="left|right|top|bottom" height="20" left_delta="0"
name="moderator_allow_voice" right="-5">
Allow voice chat
</check_box>
<check_box bottom_delta="-20" follows="left|right|top|bottom" height="20" left_delta="0"
name="moderator_allow_text" right="-5">
Allow text chat
</check_box>
</layout_panel> </layout_panel>
</layout_stack> </layout_stack>
</panel> </panel>