Merge remote-tracking branch 'lirusato/master' into 1.7.3-dev
This commit is contained in:
Latif Khalifa
@@ -316,7 +316,8 @@ void LLRadioGroup::setValue( const LLSD& value )
|
||||
}
|
||||
else
|
||||
{
|
||||
llwarns << "LLRadioGroup::setValue: value not found: " << value_name << llendl;
|
||||
llwarns << "LLRadioGroup::setValue: radio_item with name=\"" << value_name << "\" not found, radio_group values are set by radio_item name not value. Falling back on LLUICtrl::setValue." << llendl;
|
||||
LLUICtrl::setValue(value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -760,6 +760,50 @@ Found in Advanced->Rendering->Info Displays</string>
|
||||
<key>Value</key>
|
||||
<integer>1</integer>
|
||||
</map>
|
||||
<key>ContactsUseHorizontalButtons</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Whether or not groups and friends lists use horizontal buttons at the bottom of the panel or vertical ones on the right, requires a restart.</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>UseConciseIMButtons</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Whether or not IMs use buttons concisely on the same line as the name of the receiver, changes apply to new IMs only.</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>UseConciseGroupChatButtons</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Whether or not group chats use buttons concisely on the same line as the group name, changes apply to new group chats only.</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>UseConciseConferenceButtons</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Whether or not conferences use buttons concisely on the same line as the name of the conference, changes apply to new conferences only.</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Boolean</string>
|
||||
<key>Value</key>
|
||||
<integer>0</integer>
|
||||
</map>
|
||||
<key>ShowLocalChatFloaterBar</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
@@ -6182,7 +6226,23 @@ This should be as low as possible, but too low may break functionality</string>
|
||||
<key>FloaterContactsRect</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Rectangle for chat history</string>
|
||||
<string>Rectangle for contacts floater</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
<string>Rect</string>
|
||||
<key>Value</key>
|
||||
<array>
|
||||
<integer>0</integer>
|
||||
<integer>390</integer>
|
||||
<integer>395</integer>
|
||||
<integer>0</integer>
|
||||
</array>
|
||||
</map>
|
||||
<key>FloaterContactsHorizRect</key>
|
||||
<map>
|
||||
<key>Comment</key>
|
||||
<string>Rectangle for contacts floater in horizontal mode</string>
|
||||
<key>Persist</key>
|
||||
<integer>1</integer>
|
||||
<key>Type</key>
|
||||
|
||||
@@ -325,11 +325,9 @@ void LLPrefsAscentChat::onCommitKeywords(LLUICtrl* ctrl, void* user_data)
|
||||
void LLPrefsAscentChat::refreshValues()
|
||||
{
|
||||
//Chat/IM -----------------------------------------------------------------------------
|
||||
mWoLfVerticalIMTabs = gSavedSettings.getBOOL("WoLfVerticalIMTabs");
|
||||
mIMAnnounceIncoming = gSavedSettings.getBOOL("AscentInstantMessageAnnounceIncoming");
|
||||
mHideTypingNotification = gSavedSettings.getBOOL("AscentHideTypingNotification");
|
||||
mShowGroupNameInChatIM = gSavedSettings.getBOOL("OptionShowGroupNameInChatIM");
|
||||
mShowLocalChatFloaterBar = gSavedSettings.getBOOL("ShowLocalChatFloaterBar");
|
||||
mPlayTypingSound = gSavedSettings.getBOOL("PlayTypingSound");
|
||||
mHideNotificationsInChat = gSavedSettings.getBOOL("HideNotificationsInChat");
|
||||
mEnableMUPose = gSavedSettings.getBOOL("AscentAllowMUpose");
|
||||
@@ -337,7 +335,6 @@ void LLPrefsAscentChat::refreshValues()
|
||||
mLinksForChattingObjects = gSavedSettings.getU32("LinksForChattingObjects");
|
||||
mSecondsInChatAndIMs = gSavedSettings.getBOOL("SecondsInChatAndIMs");
|
||||
mSecondsInLog = gSavedSettings.getBOOL("SecondsInLog");
|
||||
mOtherChatsTornOff = gSavedSettings.getBOOL("OtherChatsTornOff");
|
||||
|
||||
std::string format = gSavedSettings.getString("ShortTimeFormat");
|
||||
if (format.find("%p") == -1)
|
||||
@@ -375,6 +372,16 @@ void LLPrefsAscentChat::refreshValues()
|
||||
mIMResponseItem = gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseItem");
|
||||
mIMResponseText = gSavedPerAccountSettings.getString("AscentInstantMessageResponse");
|
||||
|
||||
//Chat UI -----------------------------------------------------------------------------
|
||||
mWoLfVerticalIMTabs = gSavedSettings.getBOOL("WoLfVerticalIMTabs");
|
||||
mOtherChatsTornOff = gSavedSettings.getBOOL("OtherChatsTornOff");
|
||||
mShowLocalChatFloaterBar = gSavedSettings.getBOOL("ShowLocalChatFloaterBar");
|
||||
mHorizButt = gSavedSettings.getBOOL("ContactsUseHorizontalButtons");
|
||||
mOneLineIMButt = gSavedSettings.getBOOL("UseConciseIMButtons");
|
||||
mOneLineGroupButt = gSavedSettings.getBOOL("UseConciseGroupChatButtons");
|
||||
mOneLineConfButt = gSavedSettings.getBOOL("UseConciseConferenceButtons");
|
||||
mOnlyComm = gSavedSettings.getBOOL("CommunicateSpecificShortcut");
|
||||
|
||||
//Spam --------------------------------------------------------------------------------
|
||||
mEnableAS = gSavedSettings.getBOOL("AntiSpamEnabled");
|
||||
mGlobalQueue = gSavedSettings.getBOOL("_NACL_AntiSpamGlobalQueue");
|
||||
@@ -533,11 +540,9 @@ void LLPrefsAscentChat::refresh()
|
||||
void LLPrefsAscentChat::cancel()
|
||||
{
|
||||
//Chat/IM -----------------------------------------------------------------------------
|
||||
gSavedSettings.setBOOL("WoLfVerticalIMTabs", mWoLfVerticalIMTabs);
|
||||
gSavedSettings.setBOOL("AscentInstantMessageAnnounceIncoming", mIMAnnounceIncoming);
|
||||
gSavedSettings.setBOOL("AscentHideTypingNotification", mHideTypingNotification);
|
||||
gSavedSettings.setBOOL("OptionShowGroupNameInChatIM", mShowGroupNameInChatIM);
|
||||
gSavedSettings.setBOOL("ShowLocalChatFloaterBar", mShowLocalChatFloaterBar);
|
||||
gSavedSettings.setBOOL("PlayTypingSound", mPlayTypingSound);
|
||||
gSavedSettings.setBOOL("HideNotificationsInChat", mHideNotificationsInChat);
|
||||
gSavedSettings.setBOOL("AscentAllowMUpose", mEnableMUPose);
|
||||
@@ -545,7 +550,6 @@ void LLPrefsAscentChat::cancel()
|
||||
gSavedSettings.setU32("LinksForChattingObjects", mLinksForChattingObjects);
|
||||
gSavedSettings.setBOOL("SecondsInChatAndIMs", mSecondsInChatAndIMs);
|
||||
gSavedSettings.setBOOL("SecondsInLog", mSecondsInLog);
|
||||
gSavedSettings.setBOOL("OtherChatsTornOff", mOtherChatsTornOff);
|
||||
|
||||
std::string short_date, long_date, short_time, long_time, timestamp;
|
||||
|
||||
@@ -596,6 +600,16 @@ void LLPrefsAscentChat::cancel()
|
||||
gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseItem", mIMResponseItem);
|
||||
gSavedPerAccountSettings.setString("AscentInstantMessageResponse", mIMResponseText);
|
||||
|
||||
//Chat UI -----------------------------------------------------------------------------
|
||||
gSavedSettings.setBOOL("WoLfVerticalIMTabs", mWoLfVerticalIMTabs);
|
||||
gSavedSettings.setBOOL("OtherChatsTornOff", mOtherChatsTornOff);
|
||||
gSavedSettings.setBOOL("ShowLocalChatFloaterBar", mShowLocalChatFloaterBar);
|
||||
gSavedSettings.setBOOL("ContactsUseHorizontalButtons", mHorizButt);
|
||||
gSavedSettings.setBOOL("UseConciseIMButtons", mOneLineIMButt);
|
||||
gSavedSettings.setBOOL("UseConciseGroupChatButtons", mOneLineGroupButt);
|
||||
gSavedSettings.setBOOL("UseConciseConferenceButtons", mOneLineConfButt);
|
||||
gSavedSettings.setBOOL("CommunicateSpecificShortcut", mOnlyComm);
|
||||
|
||||
//Spam --------------------------------------------------------------------------------
|
||||
gSavedSettings.setBOOL("AntiSpamEnabled", mEnableAS);
|
||||
gSavedSettings.setBOOL("_NACL_AntiSpamGlobalQueue", mGlobalQueue);
|
||||
|
||||
@@ -62,11 +62,9 @@ protected:
|
||||
static void onCommitKeywords(LLUICtrl* ctrl, void* user_data);
|
||||
|
||||
//Chat/IM -----------------------------------------------------------------------------
|
||||
BOOL mWoLfVerticalIMTabs;
|
||||
BOOL mIMAnnounceIncoming;
|
||||
BOOL mHideTypingNotification;
|
||||
BOOL mShowGroupNameInChatIM;
|
||||
bool mShowLocalChatFloaterBar;
|
||||
BOOL mPlayTypingSound;
|
||||
BOOL mHideNotificationsInChat;
|
||||
BOOL mEnableMUPose;
|
||||
@@ -78,7 +76,6 @@ protected:
|
||||
U32 tempDateFormat;
|
||||
BOOL mSecondsInChatAndIMs;
|
||||
BOOL mSecondsInLog;
|
||||
BOOL mOtherChatsTornOff;
|
||||
|
||||
BOOL mIMResponseAnyone;
|
||||
BOOL mIMResponseFriends;
|
||||
@@ -89,6 +86,16 @@ protected:
|
||||
BOOL mIMResponseItem;
|
||||
std::string mIMResponseText;
|
||||
|
||||
//Chat UI -----------------------------------------------------------------------------
|
||||
bool mWoLfVerticalIMTabs;
|
||||
bool mOtherChatsTornOff;
|
||||
bool mShowLocalChatFloaterBar;
|
||||
bool mHorizButt;
|
||||
bool mOneLineIMButt;
|
||||
bool mOneLineGroupButt;
|
||||
bool mOneLineConfButt;
|
||||
bool mOnlyComm;
|
||||
|
||||
//Spam --------------------------------------------------------------------------------
|
||||
BOOL mEnableAS;
|
||||
BOOL mGlobalQueue;
|
||||
|
||||
@@ -476,6 +476,15 @@ void LLFloaterAvatarList::assessColumns()
|
||||
mAvatarList->getColumn(LIST_AVATAR_NAME)->mDynamicWidth = TRUE;
|
||||
mAvatarList->getColumn(LIST_AVATAR_NAME)->mRelWidth = -1;
|
||||
}
|
||||
else if (!hide_client)
|
||||
{
|
||||
mAvatarList->getColumn(LIST_CLIENT)->setWidth(0);
|
||||
mAvatarList->getColumn(LIST_AVATAR_NAME)->setWidth(0);
|
||||
mAvatarList->getColumn(LIST_AVATAR_NAME)->mDynamicWidth = FALSE;
|
||||
mAvatarList->getColumn(LIST_AVATAR_NAME)->mRelWidth = 0;
|
||||
mAvatarList->getColumn(LIST_CLIENT)->mDynamicWidth = TRUE;
|
||||
mAvatarList->getColumn(LIST_CLIENT)->mRelWidth = -1;
|
||||
}
|
||||
|
||||
mAvatarList->updateLayout();
|
||||
}
|
||||
|
||||
@@ -54,7 +54,8 @@ LLFloaterMyFriends::LLFloaterMyFriends(const LLSD& seed)
|
||||
mFactoryMap["groups_panel"] = LLCallbackMap(LLFloaterMyFriends::createGroupsPanel, NULL);
|
||||
// do not automatically open singleton floaters (as result of getInstance())
|
||||
BOOL no_open = FALSE;
|
||||
LLUICtrlFactory::getInstance()->buildFloater(this, "floater_my_friends.xml", &getFactoryMap(), no_open);
|
||||
static LLCachedControl<bool> horiz("ContactsUseHorizontalButtons");
|
||||
LLUICtrlFactory::getInstance()->buildFloater(this, (horiz ? "floater_my_friends_horiz.xml" : "floater_my_friends.xml"), &getFactoryMap(), no_open);
|
||||
}
|
||||
|
||||
LLFloaterMyFriends::~LLFloaterMyFriends()
|
||||
|
||||
@@ -352,7 +352,14 @@ void LLFloaterSettingsDebug::updateControl()
|
||||
bool_ctrl->setVisible(true);
|
||||
if (!bool_ctrl->hasFocus())
|
||||
{
|
||||
bool_ctrl->setValue(sd.asInteger());
|
||||
if (sd.asBoolean())
|
||||
{
|
||||
bool_ctrl->setValue(LLSD("TRUE"));
|
||||
}
|
||||
else
|
||||
{
|
||||
bool_ctrl->setValue(LLSD("FALSE"));
|
||||
}
|
||||
}
|
||||
break;
|
||||
case TYPE_STRING:
|
||||
|
||||
@@ -1186,40 +1186,43 @@ void LLFloaterIMPanel::init(const std::string& session_label)
|
||||
// [Ansariel: Display name support]
|
||||
mProfileButtonEnabled = FALSE;
|
||||
// [/Ansariel: Display name support]
|
||||
|
||||
|
||||
static LLCachedControl<bool> concise_im("UseConciseIMButtons");
|
||||
static LLCachedControl<bool> concise_group("UseConciseGroupChatButtons");
|
||||
static LLCachedControl<bool> concise_conf("UseConciseConferenceButtons");
|
||||
std::string xml_filename;
|
||||
switch(mDialog)
|
||||
{
|
||||
case IM_SESSION_GROUP_START:
|
||||
mFactoryMap["active_speakers_panel"] = LLCallbackMap(createSpeakersPanel, this);
|
||||
xml_filename = "floater_instant_message_group.xml";
|
||||
xml_filename = concise_group ? "floater_instant_message_group_concisebuttons.xml" : "floater_instant_message_group.xml";
|
||||
mVoiceChannel = new LLVoiceChannelGroup(mSessionUUID, mSessionLabel);
|
||||
break;
|
||||
case IM_SESSION_INVITE:
|
||||
mFactoryMap["active_speakers_panel"] = LLCallbackMap(createSpeakersPanel, this);
|
||||
if (gAgent.isInGroup(mSessionUUID))
|
||||
{
|
||||
xml_filename = "floater_instant_message_group.xml";
|
||||
xml_filename = concise_group ? "floater_instant_message_group_concisebuttons.xml" : "floater_instant_message_group.xml";
|
||||
}
|
||||
else // must be invite to ad hoc IM
|
||||
{
|
||||
xml_filename = "floater_instant_message_ad_hoc.xml";
|
||||
xml_filename = concise_conf ? "floater_instant_message_ad_hoc_concisebuttons.xml" : "floater_instant_message_ad_hoc.xml";
|
||||
}
|
||||
mVoiceChannel = new LLVoiceChannelGroup(mSessionUUID, mSessionLabel);
|
||||
break;
|
||||
case IM_SESSION_P2P_INVITE:
|
||||
xml_filename = "floater_instant_message.xml";
|
||||
xml_filename = concise_im ? "floater_instant_message_concisebuttons.xml" : "floater_instant_message.xml";
|
||||
mVoiceChannel = new LLVoiceChannelP2P(mSessionUUID, mSessionLabel, mOtherParticipantUUID);
|
||||
break;
|
||||
case IM_SESSION_CONFERENCE_START:
|
||||
mFactoryMap["active_speakers_panel"] = LLCallbackMap(createSpeakersPanel, this);
|
||||
xml_filename = "floater_instant_message_ad_hoc.xml";
|
||||
xml_filename = concise_conf ? "floater_instant_message_ad_hoc_concisebuttons.xml" : "floater_instant_message_ad_hoc.xml";
|
||||
mVoiceChannel = new LLVoiceChannelGroup(mSessionUUID, mSessionLabel);
|
||||
break;
|
||||
// just received text from another user
|
||||
case IM_NOTHING_SPECIAL:
|
||||
|
||||
xml_filename = "floater_instant_message.xml";
|
||||
xml_filename = concise_im ? "floater_instant_message_concisebuttons.xml" : "floater_instant_message.xml";
|
||||
|
||||
mTextIMPossible = LLVoiceClient::getInstance()->isSessionTextIMPossible(mSessionUUID);
|
||||
mProfileButtonEnabled = LLVoiceClient::getInstance()->isParticipantAvatar(mSessionUUID);
|
||||
@@ -1229,7 +1232,7 @@ void LLFloaterIMPanel::init(const std::string& session_label)
|
||||
break;
|
||||
default:
|
||||
llwarns << "Unknown session type" << llendl;
|
||||
xml_filename = "floater_instant_message.xml";
|
||||
xml_filename = concise_im ? "floater_instant_message_concisebuttons.xml" : "floater_instant_message.xml";
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
@@ -66,7 +66,6 @@ private:
|
||||
LLColor4 mHTMLLinkColor;
|
||||
BOOL mChatFullWidth;
|
||||
BOOL mCloseChatOnReturn;
|
||||
bool mOnlyComm;
|
||||
BOOL mArrowKeysMoveAvatar;
|
||||
BOOL mShowTimestamps;
|
||||
BOOL mPlayTypingAnim;
|
||||
@@ -112,7 +111,6 @@ LLPrefsChatImpl::LLPrefsChatImpl()
|
||||
childSetValue("bubble_chat_opacity", gSavedSettings.getF32("ChatBubbleOpacity"));
|
||||
childSetValue("translate_language_combobox", gSavedSettings.getString("TranslateLanguage"));
|
||||
childSetValue("translate_chat", gSavedSettings.getBOOL("TranslateChat"));
|
||||
mOnlyComm = gSavedSettings.getBOOL("CommunicateSpecificShortcut");
|
||||
}
|
||||
|
||||
void LLPrefsChatImpl::refreshValues()
|
||||
@@ -141,7 +139,6 @@ void LLPrefsChatImpl::refreshValues()
|
||||
mBubbleOpacity = gSavedSettings.getF32("ChatBubbleOpacity");
|
||||
mTranslateLanguage = gSavedSettings.getString("TranslateLanguage");
|
||||
mTranslateChat = gSavedSettings.getBOOL("TranslateChat");
|
||||
mOnlyComm = gSavedSettings.getBOOL("CommunicateSpecificShortcut");
|
||||
}
|
||||
|
||||
void LLPrefsChatImpl::cancel()
|
||||
@@ -169,7 +166,6 @@ void LLPrefsChatImpl::cancel()
|
||||
gSavedSettings.setF32("ChatBubbleOpacity", mBubbleOpacity);
|
||||
gSavedSettings.setString("TranslateLanguage", mTranslateLanguage);
|
||||
gSavedSettings.setBOOL("TranslateChat", mTranslateChat);
|
||||
gSavedSettings.setBOOL("CommunicateSpecificShortcut", mOnlyComm);
|
||||
}
|
||||
|
||||
void LLPrefsChatImpl::apply()
|
||||
|
||||
@@ -2011,7 +2011,9 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
|
||||
// </edit>
|
||||
|
||||
BOOL is_busy = gAgent.getBusy();
|
||||
BOOL is_muted = LLMuteList::getInstance()->isMuted(from_id, name, LLMute::flagTextChat);
|
||||
BOOL is_muted = LLMuteList::getInstance()->isMuted(from_id, name, LLMute::flagTextChat)
|
||||
// object IMs contain sender object id in session_id (STORM-1209)
|
||||
|| dialog == IM_FROM_TASK && LLMuteList::getInstance()->isMuted(session_id);
|
||||
BOOL is_linden = LLMuteList::getInstance()->isLinden(name);
|
||||
BOOL is_owned_by_me = FALSE;
|
||||
|
||||
@@ -2509,7 +2511,7 @@ void process_improved_im(LLMessageSystem *msg, void **user_data)
|
||||
info->mFolderID = gInventory.findCategoryUUIDForType(LLFolderType::assetTypeToFolderType(info->mType));
|
||||
std::string from_name;
|
||||
|
||||
from_name += "A group member named ";
|
||||
from_name += LLTrans::getString("AGroupMemberNamed") + " ";
|
||||
from_name += name;
|
||||
|
||||
info->mFromName = from_name;
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
||||
<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="100" min_width="300" name="im_floater" rect_control="" title="(unknown)" width="501">
|
||||
<string name="ringing">Joining Voice Chat...</string>
|
||||
<string name="connected">Connected, click End Call to hang up</string>
|
||||
<string name="hang_up">Left Voice Chat</string>
|
||||
<string name="voice_icon">icn_voice-groupfocus.tga</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="default_text_label">Click here to instant message.</string>
|
||||
<button bottom="-20" follows="right|top" height="20" label="History" right="-165" name="history_btn" width="80"/>
|
||||
<button bottom_delta="0" enabled="false" follows="right|top" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Call" left_delta="80" name="start_call_btn" width="80"/>
|
||||
<button bottom_delta="0" follows="right|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"/>
|
||||
<button bottom_delta="0" follows="right|top" height="20" label="< <" label_selected="> >" left="420" name="toggle_active_speakers_btn" right="450" tool_tip="Click here to toggle a list of active participants in this IM session." visible="true" width="80"/>
|
||||
<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="280" 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="295" left="0" min_width="115" name="im_contents_panel" width="495">
|
||||
<text_editor bottom="28" type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="260" left="5" max_length="2147483647" 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="5" 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="425" spell_check="true"/>
|
||||
<button bottom_delta="0" enabled="true" follows="right|bottom" height="20" label="Send" left="435" name="send_btn" scale_image="true" width="60"/>
|
||||
</layout_panel>
|
||||
<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"/>
|
||||
</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>
|
||||
@@ -0,0 +1,31 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
||||
<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="105" min_width="425" name="im_floater" rect_control="" title="(unknown)" width="501">
|
||||
<string name="answering">Connecting...</string>
|
||||
<string name="ringing">Calling...</string>
|
||||
<string name="connected">Connected, click End Call to hang up</string>
|
||||
<string name="hang_up">Call ended</string>
|
||||
<string name="voice_icon">icn_voice-pvtfocus.tga</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="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="inventory_item_offered">Inventory item offered</string>
|
||||
<button bottom="-20" follows="right|top" height="20" label="Profile" left="135" name="profile_callee_btn" width="60"/>
|
||||
<button bottom="-20" follows="right|top" halign="center" height="20" label="History" left_delta="60" name="history_btn" visible="true" width="60"/>
|
||||
<button bottom="-20" follows="right|top" height="20" label="Teleport" left_delta="60" name="profile_tele_btn" width="70"/>
|
||||
<check_box bottom="-20" follows="right|top" height="20" left_delta="70" name="rp_mode">RP Mode</check_box>
|
||||
<button bottom="-20" follows="right|top" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Call" left_delta="67" name="start_call_btn" width="60"/>
|
||||
<button bottom="-20" follows="right|top" height="20" image_overlay="icn_voice-call-end.tga" image_overlay_alignment="left" scale_image="true" label="End" name="end_call_btn" width="24"/>
|
||||
<panel mouse_opaque="false" border="false" bottom="-20" follows="right|top" height="20" left_delta="16" name="speaker_controls" width="60">
|
||||
<volume_slider bottom="0" follows="bottom" height="20" increment="0.05" initial_val="0.5" max_val="1.0" min_val="0.0" name="speaker_volume" width="48"/>
|
||||
<button bottom="0" height="16" image_selected="icn_speaker-muted_dark.tga" image_unselected="icn_speaker_dark.tga" scale_image="true" label="" left_delta="42" name="mute_btn" tool_tip="Mute voice" width="25"/>
|
||||
</panel>
|
||||
<text_editor bottom="28" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" height="245" left="5" max_length="2147483647" name="im_history" text_color="ChatHistoryTextColor" track_bottom="true" text_readonly_color="ChatHistoryTextColor" width="488" word_wrap="true"/>
|
||||
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="5" follows="left|right" font="SansSerif" height="20" label="Click here to instant message" max_length="2147483647" name="chat_editor" select_all_on_focus_received="false" select_on_focus="false" tab_group="1" width="423" spell_check="true"/>
|
||||
<button bottom="5" follows="right|bottom" height="20" label="Send" left="433" name="send_btn" scale_image="true" width="60"/>
|
||||
<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>
|
||||
@@ -0,0 +1,30 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
||||
<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="100" min_width="330" name="im_floater" rect_control="" title="(unknown)" width="501">
|
||||
<string name="ringing">Joining Voice Chat...</string>
|
||||
<string name="connected">Connected, click End Call to hang up</string>
|
||||
<string name="hang_up">Left Voice Chat</string>
|
||||
<string name="voice_icon">icn_voice-groupfocus.tga</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="default_text_label">Click here to instant message.</string>
|
||||
<string name="moderated_chat_label">(Moderated: Voices off by default)</string>
|
||||
<string name="muted_text_label">Your text chat has been disabled by a Group Moderator.</string>
|
||||
<button bottom="-20" follows="right|top" height="20" label="Group Info" right="-245" name="group_info_btn" tab_group="0" width="80"/>
|
||||
<button bottom_delta="0" follows="right|top" height="20" label="History" left_delta="80" name="history_btn" width="80"/>
|
||||
<button bottom_delta="0" enabled="false" follows="right|top" halign="right" height="20" image_overlay="icn_voice-call-start.tga" image_overlay_alignment="left" label="Join Call" left_delta="80" name="start_call_btn" width="80"/>
|
||||
<button bottom_delta="0" follows="right|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="< <" label_selected="> >" left="420" name="toggle_active_speakers_btn" right="450" tool_tip="Click here to toggle a list of active participants in this IM session." visible="true" width="80"/>
|
||||
<layout_stack border="false" bottom="0" follows="left|top|right|bottom" height="280" 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="295" left="0" min_width="115" name="im_contents_panel" width="495">
|
||||
<text_editor bottom="28" type="string" length="1" bg_readonly_color="ChatHistoryBgColor" bg_writeable_color="ChatHistoryBgColor" enabled="false" follows="left|top|right|bottom" font="SansSerif" height="260" left="5" max_length="2147483647" 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="5" 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="425" spell_check="true"/>
|
||||
<button bottom="5" enabled="true" follows="right|bottom" height="20" label="Send" left="435" name="send_btn" scale_image="true" width="60"/>
|
||||
</layout_panel>
|
||||
<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"/>
|
||||
</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>
|
||||
@@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
||||
<floater can_close="false" can_drag_on_left="false" can_minimize="true"
|
||||
can_resize="true" can_tear_off="true" height="390" min_height="205"
|
||||
min_width="275" name="floater_my_friends"
|
||||
rect_control="FloaterContactsHorizRect" title="Contacts" width="395">
|
||||
<tab_container bottom="6" follows="left|right|top|bottom" height="364" left="4"
|
||||
name="friends_and_groups" tab_position="top" tab_min_width="0" width="383">
|
||||
<panel bottom="0" filename="panel_friends_horiz.xml" label="Friends" left="0" name="friends_panel" width="370" />
|
||||
<panel bottom="0" filename="panel_groups_horiz.xml" label="Groups" left="0" name="groups_panel" width="370" />
|
||||
</tab_container>
|
||||
</floater>
|
||||
@@ -8,10 +8,10 @@
|
||||
name="comment_text" word_wrap="true" />
|
||||
<radio_group bottom_delta="-48" draw_border="false" follows="bottom|left|right" height="36"
|
||||
left="15" name="boolean_combo" visible="false">
|
||||
<radio_item bottom="-18" height="15" name="TRUE" value="1">
|
||||
<radio_item bottom="-18" height="15" name="TRUE" value="true">
|
||||
True
|
||||
</radio_item>
|
||||
<radio_item bottom="-36" height="15" name="FALSE" value="0">
|
||||
<radio_item bottom="-36" height="15" name="FALSE" value="">
|
||||
False
|
||||
</radio_item>
|
||||
</radio_group>
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
||||
<panel border="true" name="friends">
|
||||
<string name="Multiple">Multiple friends...</string>
|
||||
<scroll_list bottom="70" can_resize="true" column_padding="0" draw_heading="true" follows="left|top|bottom|right" left="5" multi_select="true"
|
||||
name="friend_list" right="-5" search_column="1" tool_tip="Hold shift or control while clicking to select multiple friends" top="-40">
|
||||
<column image="ff_online_status_button.tga" name="icon_online_status" tool_tip="Online status" width="20"/>
|
||||
<column dynamicwidth="true" label="Name" name="friend_name" tool_tip="Name"/>
|
||||
<column image="ff_visible_online_button.tga" name="icon_visible_online" tool_tip="Friend can see when you're online" width="20"/>
|
||||
<column image="ff_visible_map_button.tga" name="icon_visible_map" tool_tip="Friend can locate you on the map" width="20"/>
|
||||
<column image="ff_edit_mine_button.tga" name="icon_edit_mine" tool_tip="Friend can edit, delete or take objects" width="20"/>
|
||||
<column image="ff_visible_online_button.tga" name="icon_visible_online_theirs" tool_tip="You can see when they are online (only updates on login)" width="20"/>
|
||||
<column image="ff_visible_map_button.tga" name="icon_visible_map_theirs" tool_tip="You can locate them on the map" width="20"/>
|
||||
<column image="ff_edit_theirs_button.tga" name="icon_edit_theirs" tool_tip="You can edit this friend's objects" width="20"/>
|
||||
<column name="friend_last_update_generation" width="0"/>
|
||||
</scroll_list>
|
||||
<!--text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16" name="friends" width="110">Contact Group:</text-->
|
||||
<!--combo_box allow_text_entry="false" enabled="true" follows="right|top" bottom_delta="20" height="18" hidden="false" left="-255" max_chars="20" tool_tip="Buddy group" name="buddy_group_combobox" width="130">
|
||||
<combo_item type="string" length="20" enabled="true" name="All" value="All">All</combo_item>
|
||||
</combo_box-->
|
||||
<!--text bottom_delta="-40" follows="left|top" font="SansSerifSmall" height="16" name="Contact Search:" width="110">Contact Search:</text-->
|
||||
<search_editor bottom_delta="-100" enabled="true" follows="left|top" font="SansSerif" height="18" name="buddy_search_lineedit" label="Contact Search" tool_tip="The friend name you want to search for" width="160"/>
|
||||
<button bottom_delta="0" follows="top|right" height="22" label="0" left="-25" name="expand_collapse_btn" tool_tip="Expand/Collapse extra info" width="22"/>
|
||||
<!--button bottom_delta="-25" follows="top|right" height="22" label="Set Contact" name="assign_btn" tool_tip="Assign a friend to a Contact Group" width="80"/-->
|
||||
<text bottom="38" left="12" follows="left|bottom" height="32" name="friends" width="95">Online:</text>
|
||||
<text bottom_delta="0" left_delta="60" follows="left|bottom" height="32" name="f_num" width="95">0000</text>
|
||||
<text bottom_delta="0" left_delta="44" follows="left|bottom" height="32" name="sel" width="95">| Selected:</text>
|
||||
<text bottom_delta="0" left_delta="100" follows="left|bottom" height="32" name="s_num" width="95">0000</text>
|
||||
<button bottom_delta="-8" left="5" follows="left|bottom" height="22" label="IM/Call" name="im_btn" tool_tip="Open Instant Message session" width="80"/>
|
||||
<button bottom_delta="0" left_delta="82" follows="left|bottom" height="22" label="Profile" name="profile_btn" tool_tip="Show picture, groups, and other information" width="80"/>
|
||||
<button bottom_delta="0" left_delta="82" follows="left|bottom" height="22" label="Teleport..." name="offer_teleport_btn" tool_tip="Offer this friend a teleport to your current location" width="80" />
|
||||
<button bottom_delta="-24" left="5" follows="left|bottom" height="22" label="Pay..." name="pay_btn" tool_tip="Give in-world money ([CURRENCY]) to this friend" width="80"/>
|
||||
<button bottom_delta="0" left_delta="82" follows="left|bottom" height="22" label="Remove..." name="remove_btn" tool_tip="Remove this person from your friends list" width="80"/>
|
||||
<button bottom_delta="0" left_delta="82" follows="left|bottom" height="22" label="Add..." name="add_btn" tool_tip="Offer friendship to a resident" width="80"/>
|
||||
</panel>
|
||||
51
indra/newview/skins/default/xui/en-us/panel_groups_horiz.xml
Normal file
51
indra/newview/skins/default/xui/en-us/panel_groups_horiz.xml
Normal file
@@ -0,0 +1,51 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
|
||||
<panel border="true" bottom="-371" height="300" left="280" mouse_opaque="true"
|
||||
name="groups" width="350">
|
||||
<scroll_list background_visible="true" bottom="109" column_padding="0" draw_border="true"
|
||||
draw_heading="true" draw_stripes="true" enabled="true"
|
||||
follows="left|top|right|bottom" left="5" mouse_opaque="true"
|
||||
multi_select="false" name="group list" tab_stop="true" top="-10"
|
||||
width="340">
|
||||
<column dynamicwidth="true" label="Name" name="name" tool_tip="Name" />
|
||||
<!--<column label="Active" name="is_active_group"
|
||||
tool_tip="Group is set as active" width="40" />-->
|
||||
<column image_overlay="ff_visible_online.tga" name="is_listed_group"
|
||||
tool_tip="Group is visible in profile." width="20" />
|
||||
<column image_overlay="icn_chat_overlay.tga" name="is_chattable_group"
|
||||
tool_tip="Receive group chat" width="20" />
|
||||
<column image_overlay="smicon_warn.tga" name="is_notice_group"
|
||||
tool_tip="Receive group notices" width="20" />
|
||||
</scroll_list>
|
||||
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
|
||||
bottom_delta="-18" drop_shadow_visible="true" enabled="true" follows="left|bottom"
|
||||
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
|
||||
mouse_opaque="false" name="groupdesc" v_pad="0" width="280">
|
||||
Your currently active group is displayed in italics.
|
||||
</text>
|
||||
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
|
||||
bottom_delta="-13" drop_shadow_visible="true" enabled="true" follows="left|bottom"
|
||||
font="SansSerifSmall" h_pad="0" halign="left" height="16" left="12"
|
||||
mouse_opaque="false" name="groupcount" v_pad="0" width="280">
|
||||
You belong to [COUNT] groups (of [MAX] maximum).
|
||||
</text>
|
||||
<button bottom_delta="-24" follows="left|bottom" font="SansSerif" height="22"
|
||||
label="IM/Call" left="5" name="IM"
|
||||
tool_tip="Open Instant Message session" width="80" />
|
||||
<button bottom_delta="0" left_delta="82" follows="left|bottom" font="SansSerif" height="22"
|
||||
label="Info" name="Info" width="80" />
|
||||
<button bottom_delta="0" left_delta="82" follows="left|bottom" font="SansSerif" height="22"
|
||||
label="Activate" name="Activate" width="80" />
|
||||
<button bottom_delta="-24" left="5" follows="left|bottom" font="SansSerif" height="22"
|
||||
label="Leave" name="Leave" width="80" />
|
||||
<button bottom_delta="0" left_delta="82" follows="left|bottom" font="SansSerif" height="22"
|
||||
label="Create..." name="Create" width="80" />
|
||||
<button bottom_delta="0" left_delta="82" follows="left|bottom" font="SansSerif" height="22"
|
||||
label="Search..." name="Search..." width="80" />
|
||||
<button bottom_delta="-24" left="5" follows="left|bottom" font="SansSerif" height="22"
|
||||
label="Invite..." name="Invite..." width="80" />
|
||||
<button bottom_delta="0" left_delta="82" follows="left|bottom" font="SansSerif" height="22"
|
||||
label="Titles..." name="Titles..." width="80" />
|
||||
<string name="none">
|
||||
none
|
||||
</string>
|
||||
</panel>
|
||||
@@ -4,13 +4,14 @@
|
||||
|
||||
<panel border="true" left="1" bottom="-408" height="408" width="500" label="Chat/IM" name="Chat/IM">
|
||||
<text bottom="-15" left="15" name="objects_link_text_box">IMs:</text>
|
||||
<check_box bottom_delta="-25" left="10" follows="top" initial_value="false" control_name="WoLfVerticalIMTabs"
|
||||
label="Use Vertical IMs (Requires a restart)" name="use_vertical_ims_check"/>
|
||||
<check_box bottom_delta="-20" follows="top" control_name="OtherChatsTornOff" label="Open new IMs in separate floaters" name="chats_torn_off"/>
|
||||
<check_box bottom_delta="-20" follows="left|top" initial_value="false" control_name="AscentInstantMessageAnnounceIncoming"
|
||||
<check_box bottom_delta="-25" left="10" follows="left|top" initial_value="false" control_name="AscentInstantMessageAnnounceIncoming"
|
||||
label="Announce incoming instant messages" 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." name="quickstart_im_check"/>
|
||||
<check_box bottom_delta="-20" follows="left|top" control_name="AscentHideTypingNotification" initial_value="false"
|
||||
label="Don't send '[name] is typing...' in IMs" tool_tip="IM partners will not see '______ is typing...' when you're responding." name="hide_typing_check"/>
|
||||
<check_box bottom_delta="-20" follows="left|top" control_name="AscentAllowMUpose" initial_value="false"
|
||||
label="Allow MU pose method." tool_tip="Allows the use of both /me and : to perform emotes." name="allow_mu_pose_check"/>
|
||||
<check_box bottom_delta="-20" follows="left|top" control_name="AscentAutoCloseOOC"
|
||||
label="Auto-close OOC comments." tool_tip="Will automatically append '))' to any message starting with '((', or visa versa." name="close_ooc_check"/>
|
||||
<!-- Left/Right Column split
|
||||
<view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="top|left" height="75"
|
||||
left="235" name="CmdDivisor" width="0"/>
|
||||
@@ -22,12 +23,7 @@
|
||||
label="Do not echo/log notifications in chat" name="hide_notifications_in_chat_check"/>
|
||||
<check_box bottom_delta="-20" follows="left|top" control_name="OptionShowGroupNameInChatIM" initial_value="false"
|
||||
label="Show group name in chat" tool_tip="The name of the group will also be displayed if the IM is from group chat." name="append_group_name_check"/>
|
||||
<check_box bottom_delta="-20" follows="left|top" control_name="ShowLocalChatFloaterBar" label="Show local chat bar in floater (Needs restart)" tool_tip="Whether or not to display the input bar at the bottom of the local chat floater." name="show_local_chat_floater_bar"/>
|
||||
<check_box bottom="-120" left="10" control_name="AscentAllowMUpose" initial_value="false"
|
||||
label="Allow MU pose method." tool_tip="Allows the use of both /me and : to perform emotes." name="allow_mu_pose_check"/>
|
||||
<check_box bottom_delta="-20" follows="left|top" control_name="AscentAutoCloseOOC"
|
||||
label="Auto-close OOC comments." tool_tip="Will automatically append '))' to any message starting with '((', or visa versa." name="close_ooc_check"/>
|
||||
<text bottom_delta="-15" follows="left|top" name="objects_link_text_box3">Show links on chatting object names in chat history for:</text>
|
||||
<text bottom="-150" left="10" follows="left|top" name="objects_link_text_box3">Show links on chatting object names in chat history for:</text>
|
||||
<radio_group bottom_delta="-26" control_name="LinksForChattingObjects" tool_tip="Enables a link to show you the owner of the speaking object."
|
||||
follows="top" height="20" left="20" name="objects_link" width="350">
|
||||
<radio_item bottom_delta="0" left_delta="5" name="no_object" width="48">No object</radio_item>
|
||||
@@ -70,6 +66,18 @@
|
||||
</text>
|
||||
</panel>
|
||||
|
||||
<panel border="true" bottom="-580" height="525" label="Chat UI" left="1" name="ChatUI" width="418">
|
||||
<check_box bottom_delta="-25" left="10" follows="top" initial_value="false" control_name="WoLfVerticalIMTabs"
|
||||
label="Use Vertical IMs (Requires a restart)" name="use_vertical_ims_check"/>
|
||||
<check_box bottom_delta="-20" follows="top" control_name="OtherChatsTornOff" label="Open new IMs in separate floaters" name="chats_torn_off"/>
|
||||
<check_box bottom_delta="-20" follows="left|top" control_name="ShowLocalChatFloaterBar" label="Show local chat bar in floater (Needs restart)" tool_tip="Whether or not to display the input bar at the bottom of the local chat floater." name="show_local_chat_floater_bar"/>
|
||||
<check_box bottom_delta="-20" control_name="ContactsUseHorizontalButtons" follows="top" height="16" label="Use horizontal buttons for contacts floater (Needs restart)" tool_tip="When enabled, the buttons on the Friends and Groups panels will be at the bottom, horizontally arranged, instead of vertically arranged on the right." name="horiz_butt"/>
|
||||
<check_box bottom_delta="-20" control_name="UseConciseIMButtons" follows="top" height="16" label="Buttons on the same line as name for IMs (Affects new IMs)" name="im_concise_butt"/>
|
||||
<check_box bottom_delta="-20" control_name="UseConciseGroupChatButtons" follows="top" height="16" label="Buttons on group chat name line (Affects new group chats)" name="group_concise_butt"/>
|
||||
<check_box bottom_delta="-20" control_name="UseConciseConferenceButtons" follows="top" height="16" label="Buttons on conference title line (Affects new conferences)" name="conf_concise_butt"/>
|
||||
<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Disallow communicate shortcut opening detached friends list" control_name="CommunicateSpecificShortcut" name="only_comm"/>
|
||||
</panel>
|
||||
|
||||
<panel border="true" left="1" bottom="-408" height="408" width="500" label="Spam" name="Spam">
|
||||
<check_box control_name="AntiSpamEnabled" label="Enable Antispam" name="enable_as" width="256" left="3"/>
|
||||
<button height="23" label="Reset antispam queues" label_selected="Reset antispam queues" name="reset_antispam" width="230" bottom_delta="0" left="260"/>
|
||||
|
||||
@@ -26,7 +26,6 @@
|
||||
<check_box bottom_delta="-25" control_name="ChatFullWidth" follows="top" height="16" initial_value="false" label="Use full screen width (Requires restart)" name="chat_full_width_check"/>
|
||||
<text bottom_delta="-12" height="10" left="12" mouse_opaque="false" name="text_box6" v_pad="0" width="135">Chat Options:</text>
|
||||
<check_box bottom_delta="-8" follows="top" height="16" initial_value="false" label="Close chat bar after hitting return" left="148" name="close_chat_on_return_check"/>
|
||||
<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Disallow communicate shortcut opening detached friends list" left="148" control_name="CommunicateSpecificShortcut" name="only_comm"/>
|
||||
<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Arrow keys always move avatar when chatting" name="arrow_keys_move_avatar_check"/>
|
||||
<check_box bottom_delta="-20" follows="top" height="16" initial_value="false" label="Show timestamps in Local Chat" name="show_timestamps_check"/>
|
||||
<check_box bottom_delta="-20" control_name="ScriptErrorsAsChat" follows="top" height="16" initial_value="false" label="Show script errors and warnings as regular chat" name="script_errors_as_chat"/>
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
</combo_box>
|
||||
</layout_panel>
|
||||
<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">
|
||||
<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">
|
||||
<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="113">
|
||||
<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"/>
|
||||
|
||||
@@ -291,6 +291,7 @@
|
||||
<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="AGroupMemberNamed">A group member named</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>
|
||||
|
||||
Reference in New Issue
Block a user