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

Updated preferences system for bug fixes and user friendliness.

Browse Source
This commit is contained in:
TighMacFanatic
2011-05-17 12:54:30 -04:00
parent 990fe86438
commit 2b412bffec
20 changed files with 1415 additions and 1232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/CMakeLists.txt
View File

@@ -78,6 +78,7 @@ set(viewer_SOURCE_FILES
ascentdaycyclemanager.cpp ascentdaycyclemanager.cpp
ascentfloatercontactgroups.cpp ascentfloatercontactgroups.cpp
ascentkeyword.cpp ascentkeyword.cpp
ascentprefschat.cpp
ascentprefssys.cpp ascentprefssys.cpp
ascentprefsvan.cpp ascentprefsvan.cpp
dhparam.cpp dhparam.cpp
@@ -552,6 +553,7 @@ set(viewer_HEADER_FILES
ascentdaycyclemanager.h ascentdaycyclemanager.h
ascentfloatercontactgroups.h ascentfloatercontactgroups.h
ascentkeyword.h ascentkeyword.h
ascentprefschat.h
ascentprefssys.h ascentprefssys.h
ascentprefsvan.h ascentprefsvan.h
emerald.h emerald.h

462
indra/newview/ascentprefschat.cpp Normal file
View File

@@ -0,0 +1,462 @@
/**
* @file ascentprefssys.cpp
* @Ascent Viewer preferences panel
*
* $LicenseInfo:firstyear=2008&license=viewergpl$
*
* Copyright (c) 2008, Henri Beauchamp.
* Rewritten in its entirety 2010 Hg Beeks.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
* to you under the terms of the GNU General Public License, version 2.0
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
* and agree to abide by those obligations.
*
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
* $/LicenseInfo$
*/
#include "llviewerprecompiledheaders.h"
//File include
#include "ascentprefschat.h"
#include "llagent.h"
#include "llcolorswatch.h"
#include "llcombobox.h"
#include "llradiogroup.h"
#include "lluictrlfactory.h"
#include "llviewercontrol.h"
#include "lgghunspell_wrapper.h"
LLPrefsAscentChat::LLPrefsAscentChat()
{
LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_ascent_chat.xml");
childSetCommitCallback("SpellBase", onSpellBaseComboBoxCommit, this);
childSetAction("EmSpell_EditCustom", onSpellEditCustom, this);
childSetAction("EmSpell_GetMore", onSpellGetMore, this);
childSetAction("EmSpell_Add", onSpellAdd, this);
childSetAction("EmSpell_Remove", onSpellRemove, this);
childSetCommitCallback("Keywords_Alert", onCommitCheckBox, this);
refreshValues();
refresh();
}
LLPrefsAscentChat::~LLPrefsAscentChat()
{
}
//static
void LLPrefsAscentChat::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
{
LLPrefsAscentChat* self = (LLPrefsAscentChat*)user_data;
if (ctrl->getName() == "Keywords_Alert")
{
bool enabled = self->childGetValue("Keywords_Alert").asBoolean();
self->childSetEnabled("Keywords_Entries", enabled);
self->childSetEnabled("Keywords_LocalChat", enabled);
self->childSetEnabled("Keywords_IM", enabled);
self->childSetEnabled("Keywords_Highlight", enabled);
self->childSetEnabled("Keywords_Color", enabled);
self->childSetEnabled("Keywords_PlaySound", enabled);
self->childSetEnabled("Keywords_SoundUUID", enabled);
}
}
void LLPrefsAscentChat::onSpellAdd(void* data)
{
LLPrefsAscentChat* self = (LLPrefsAscentChat*)data;
if(self)
{
glggHunSpell->addButton(self->childGetValue("EmSpell_Avail").asString());
}
self->refresh();
}
void LLPrefsAscentChat::onSpellRemove(void* data)
{
LLPrefsAscentChat* self = (LLPrefsAscentChat*)data;
if(self)
{
glggHunSpell->removeButton(self->childGetValue("EmSpell_Installed").asString());
}
self->refresh();
}
void LLPrefsAscentChat::onSpellGetMore(void* data)
{
glggHunSpell->getMoreButton(data);
}
void LLPrefsAscentChat::onSpellEditCustom(void* data)
{
glggHunSpell->editCustomButton();
}
void LLPrefsAscentChat::onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata)
{
LLComboBox* box = (LLComboBox*)ctrl;
if (box)
{
glggHunSpell->newDictSelection(box->getValue().asString());
}
}
void LLPrefsAscentChat::refreshValues()
{
//Chat/IM -----------------------------------------------------------------------------
mWoLfVerticalIMTabs = gSavedSettings.getBOOL("WoLfVerticalIMTabs");
mIMAnnounceIncoming = gSavedSettings.getBOOL("AscentInstantMessageAnnounceIncoming");
mHideTypingNotification = gSavedSettings.getBOOL("HideTypingNotification");
mShowGroupNameInChatIM = gSavedSettings.getBOOL("OptionShowGroupNameInChatIM");
mPlayTypingSound = gSavedSettings.getBOOL("PlayTypingSound");
mHideNotificationsInChat = gSavedSettings.getBOOL("HideNotificationsInChat");
mEnableMUPose = gSavedSettings.getBOOL("AscentAllowMUpose");
mEnableOOCAutoClose = gSavedSettings.getBOOL("AscentAutoCloseOOC");
mLinksForChattingObjects = gSavedSettings.getU32("LinksForChattingObjects");
mSecondsInChatAndIMs = gSavedSettings.getBOOL("SecondsInChatAndIMs");
std::string format = gSavedSettings.getString("ShortTimeFormat");
if (format.find("%p") == -1)
{
mTimeFormat = 0;
}
else
{
mTimeFormat = 1;
}
format = gSavedSettings.getString("ShortDateFormat");
if (format.find("%m/%d/%") != -1)
{
mDateFormat = 2;
}
else if (format.find("%d/%m/%") != -1)
{
mDateFormat = 1;
}
else
{
mDateFormat = 0;
}
mIMResponseAnyone = gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseAnyone");
mIMResponseFriends = gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseFriends");
mIMResponseMuted = gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseMuted");
mIMShowOnTyping = gSavedPerAccountSettings.getBOOL("AscentInstantMessageShowOnTyping");
mIMShowResponded = gSavedPerAccountSettings.getBOOL("AscentInstantMessageShowResponded");
mIMResponseRepeat = gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseRepeat");
mIMResponseItem = gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseItem");
mIMResponseText = gSavedPerAccountSettings.getString("AscentInstantMessageResponse");
//Spam --------------------------------------------------------------------------------
mBlockChatSpam = gSavedSettings.getBOOL("SGBlockChatSpam");
mChatSpamCount = gSavedSettings.getU32("SGChatSpamCount");
mChatSpamTime = gSavedSettings.getF32("SGChatSpamTime");
mBlockDialogSpam = gSavedSettings.getBOOL("SGBlockDialogSpam");
mBlockCardSpam = gSavedSettings.getBOOL("SGBlockCardSpam");
mSpamCount = gSavedSettings.getU32("SGSpamCount");
mSpamTime = gSavedSettings.getF32("SGSpamTime");
//Text Options ------------------------------------------------------------------------
mSpellDisplay = gSavedSettings.getBOOL("SpellDisplay");
mKeywordsOn = gSavedPerAccountSettings.getBOOL("KeywordsOn");
mKeywordsList = gSavedPerAccountSettings.getString("KeywordsList");
mKeywordsInChat = gSavedPerAccountSettings.getBOOL("KeywordsInChat");
mKeywordsInIM = gSavedPerAccountSettings.getBOOL("KeywordsInIM");
mKeywordsChangeColor = gSavedPerAccountSettings.getBOOL("KeywordsChangeColor");
mKeywordsColor = gSavedPerAccountSettings.getColor4("KeywordsColor");
mKeywordsPlaySound = gSavedPerAccountSettings.getBOOL("KeywordsPlaySound");
mKeywordsSound = static_cast<LLUUID>(gSavedPerAccountSettings.getString("KeywordsSound"));
}
void LLPrefsAscentChat::refresh()
{
//Chat --------------------------------------------------------------------------------
/*
LLRadioGroup* radioLinkOptions = getChild<LLRadioGroup>("objects_link");
radioLinkOptions->selectNthItem(mLinksForChattingObjects);
*/
// time format combobox
LLComboBox* combo = getChild<LLComboBox>("time_format_combobox");
if (combo)
{
combo->setCurrentByIndex(mTimeFormat);
}
// date format combobox
combo = getChild<LLComboBox>("date_format_combobox");
if (combo)
{
combo->setCurrentByIndex(mDateFormat);
}
childSetValue("AscentInstantMessageResponseAnyone", mIMResponseAnyone);
childSetValue("AscentInstantMessageResponseFriends", mIMResponseFriends);
childSetValue("AscentInstantMessageResponseMuted", mIMResponseMuted);
childSetValue("AscentInstantMessageShowOnTyping", mIMShowOnTyping);
childSetValue("AscentInstantMessageShowResponded", mIMShowResponded);
childSetValue("AscentInstantMessageResponseRepeat", mIMResponseRepeat);
childSetValue("AscentInstantMessageResponseItem", mIMResponseItem);
LLWString auto_response = utf8str_to_wstring( gSavedPerAccountSettings.getString("AscentInstantMessageResponse") );
LLWStringUtil::replaceChar(auto_response, '^', '\n');
LLWStringUtil::replaceChar(auto_response, '%', ' ');
childSetText("im_response", wstring_to_utf8str(auto_response));
//Text Options ------------------------------------------------------------------------
combo = getChild<LLComboBox>("SpellBase");
if (combo != NULL)
{
combo->removeall();
std::vector<std::string> names = glggHunSpell->getDicts();
for (int i = 0; i < (int)names.size(); i++)
{
combo->add(names[i]);
}
combo->setSimple(gSavedSettings.getString("SpellBase"));
}
combo = getChild<LLComboBox>("EmSpell_Avail");
if (combo != NULL)
{
combo->removeall();
combo->add("");
std::vector<std::string> names = glggHunSpell->getAvailDicts();
for (int i = 0; i < (int)names.size(); i++)
{
combo->add(names[i]);
}
combo->setSimple(std::string(""));
}
combo = getChild<LLComboBox>("EmSpell_Installed");
if (combo != NULL)
{
combo->removeall();
combo->add("");
std::vector<std::string> names = glggHunSpell->getInstalledDicts();
for (int i = 0; i < (int)names.size(); i++)
{
combo->add(names[i]);
}
combo->setSimple(std::string(""));
}
bool enabled = childGetValue("Keywords_Alert").asBoolean();
childSetEnabled("Keywords_Entries", enabled);
childSetEnabled("Keywords_LocalChat", enabled);
childSetEnabled("Keywords_IM", enabled);
childSetEnabled("Keywords_Highlight", enabled);
childSetEnabled("Keywords_Color", enabled);
childSetEnabled("Keywords_PlaySound", enabled);
childSetEnabled("Keywords_SoundUUID", enabled);
childSetValue("Keywords_Alert", mKeywordsOn);
childSetValue("Keywords_Entries", mKeywordsList);
childSetValue("Keywords_LocalChat", mKeywordsInChat);
childSetValue("Keywords_IM", mKeywordsInIM);
childSetValue("Keywords_Highlight", mKeywordsChangeColor);
LLColorSwatchCtrl* colorctrl = getChild<LLColorSwatchCtrl>("Keywords_Color");
colorctrl->set(LLColor4(mKeywordsColor),TRUE);
childSetValue("Keywords_PlaySound", mKeywordsPlaySound);
childSetValue("Keywords_SoundUUID", mKeywordsSound);
}
void LLPrefsAscentChat::cancel()
{
//Chat/IM -----------------------------------------------------------------------------
gSavedSettings.setBOOL("WoLfVerticalIMTabs", mWoLfVerticalIMTabs);
gSavedSettings.setBOOL("AscentInstantMessageAnnounceIncoming", mIMAnnounceIncoming);
gSavedSettings.setBOOL("HideTypingNotification", mHideTypingNotification);
gSavedSettings.setBOOL("OptionShowGroupNameInChatIM", mShowGroupNameInChatIM);
gSavedSettings.setBOOL("PlayTypingSound", mPlayTypingSound);
gSavedSettings.setBOOL("HideNotificationsInChat", mHideNotificationsInChat);
gSavedSettings.setBOOL("AscentAllowMUpose", mEnableMUPose);
gSavedSettings.setBOOL("AscentAutoCloseOOC", mEnableOOCAutoClose);
gSavedSettings.setU32("LinksForChattingObjects", mLinksForChattingObjects);
gSavedSettings.setBOOL("SecondsInChatAndIMs", mSecondsInChatAndIMs);
std::string short_date, long_date, short_time, long_time, timestamp;
if (mTimeFormat == 0)
{
short_time = "%H:%M";
long_time = "%H:%M:%S";
timestamp = " %H:%M:%S";
}
else
{
short_time = "%I:%M %p";
long_time = "%I:%M:%S %p";
timestamp = " %I:%M %p";
}
if (mDateFormat == 0)
{
short_date = "%Y-%m-%d";
long_date = "%A %d %B %Y";
timestamp = "%a %d %b %Y" + timestamp;
}
else if (mDateFormat == 1)
{
short_date = "%d/%m/%Y";
long_date = "%A %d %B %Y";
timestamp = "%a %d %b %Y" + timestamp;
}
else
{
short_date = "%m/%d/%Y";
long_date = "%A, %B %d %Y";
timestamp = "%a %b %d %Y" + timestamp;
}
gSavedSettings.setString("ShortDateFormat", short_date);
gSavedSettings.setString("LongDateFormat", long_date);
gSavedSettings.setString("ShortTimeFormat", short_time);
gSavedSettings.setString("LongTimeFormat", long_time);
gSavedSettings.setString("TimestampFormat", timestamp);
gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseAnyone", mIMResponseAnyone);
gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseFriends", mIMResponseFriends);
gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseMuted", mIMResponseMuted);
gSavedPerAccountSettings.setBOOL("AscentInstantMessageShowOnTyping", mIMShowOnTyping);
gSavedPerAccountSettings.setBOOL("AscentInstantMessageShowResponded", mIMShowResponded);
gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseRepeat", mIMResponseRepeat);
gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseItem", mIMResponseItem);
gSavedPerAccountSettings.setString("AscentInstantMessageResponse", mIMResponseText);
//Spam --------------------------------------------------------------------------------
gSavedSettings.setBOOL("SGBlockChatSpam", mBlockChatSpam);
gSavedSettings.setU32("SGChatSpamCount", mChatSpamCount);
gSavedSettings.setF32("SGChatSpamTime", mChatSpamTime);
gSavedSettings.setBOOL("SGBlockDialogSpam", mBlockDialogSpam);
gSavedSettings.setBOOL("SGBlockCardSpam", mBlockCardSpam);
gSavedSettings.setU32("SGSpamCount", mSpamCount);
gSavedSettings.setF32("SGSpamTime", mSpamTime);
//Text Options ------------------------------------------------------------------------
gSavedSettings.setBOOL("SpellDisplay", mSpellDisplay);
gSavedPerAccountSettings.setBOOL("KeywordsOn", mKeywordsOn);
gSavedPerAccountSettings.setString("KeywordsList", mKeywordsList);
gSavedPerAccountSettings.setBOOL("KeywordsInChat", mKeywordsInChat);
gSavedPerAccountSettings.setBOOL("KeywordsInIM", mKeywordsInIM);
gSavedPerAccountSettings.setBOOL("KeywordsChangeColor", mKeywordsChangeColor);
gSavedPerAccountSettings.setColor4("KeywordsColor", mKeywordsColor);
gSavedPerAccountSettings.setBOOL("KeywordsPlaySound", mKeywordsPlaySound);
gSavedPerAccountSettings.setString("KeywordsSound", mKeywordsSound.asString());
}
void LLPrefsAscentChat::apply()
{
//Chat/IM -----------------------------------------------------------------------------
LLComboBox* combo = getChild<LLComboBox>("time_format_combobox");
if (combo)
{
mTimeFormat = combo->getCurrentIndex();
}
combo = getChild<LLComboBox>("date_format_combobox");
if (combo)
{
mDateFormat = combo->getCurrentIndex();
}
std::string short_date, long_date, short_time, long_time, timestamp;
if (mTimeFormat == 0)
{
short_time = "%H:%M";
long_time = "%H:%M:%S";
timestamp = " %H:%M:%S";
}
else
{
short_time = "%I:%M %p";
long_time = "%I:%M:%S %p";
timestamp = " %I:%M %p";
}
if (mDateFormat == 0)
{
short_date = "%Y-%m-%d";
long_date = "%A %d %B %Y";
timestamp = "%a %d %b %Y" + timestamp;
}
else if (mDateFormat == 1)
{
short_date = "%d/%m/%Y";
long_date = "%A %d %B %Y";
timestamp = "%a %d %b %Y" + timestamp;
}
else
{
short_date = "%m/%d/%Y";
long_date = "%A, %B %d %Y";
timestamp = "%a %b %d %Y" + timestamp;
}
gSavedSettings.setString("ShortDateFormat", short_date);
gSavedSettings.setString("LongDateFormat", long_date);
gSavedSettings.setString("ShortTimeFormat", short_time);
gSavedSettings.setString("LongTimeFormat", long_time);
gSavedSettings.setString("TimestampFormat", timestamp);
gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseAnyone", mIMResponseAnyone);
gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseFriends", mIMResponseFriends);
gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseMuted", mIMResponseMuted);
gSavedPerAccountSettings.setBOOL("AscentInstantMessageShowOnTyping", mIMShowOnTyping);
gSavedPerAccountSettings.setBOOL("AscentInstantMessageShowResponded", mIMShowResponded);
gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseRepeat", mIMResponseRepeat);
gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseItem", mIMResponseItem);
gSavedPerAccountSettings.setString("AscentInstantMessageResponse", mIMResponseText);
//Text Options ------------------------------------------------------------------------
gSavedPerAccountSettings.setBOOL("KeywordsOn", mKeywordsOn);
gSavedPerAccountSettings.setString("KeywordsList", mKeywordsList);
gSavedPerAccountSettings.setBOOL("KeywordsInChat", mKeywordsInChat);
gSavedPerAccountSettings.setBOOL("KeywordsInIM", mKeywordsInIM);
gSavedPerAccountSettings.setBOOL("KeywordsChangeColor", mKeywordsChangeColor);
gSavedPerAccountSettings.setColor4("KeywordsColor", mKeywordsColor);
gSavedPerAccountSettings.setBOOL("KeywordsPlaySound", mKeywordsPlaySound);
gSavedPerAccountSettings.setString("KeywordsSound", mKeywordsSound.asString());
refreshValues();
refresh();
}

102
indra/newview/ascentprefschat.h Normal file
View File

@@ -0,0 +1,102 @@
/**
* @file hbprefsinert.h
* @brief Ascent Viewer preferences panel
*
* $LicenseInfo:firstyear=2008&license=viewergpl$
*
* Copyright (c) 2008, Henri Beauchamp.
*
* Second Life Viewer Source Code
* The source code in this file ("Source Code") is provided by Linden Lab
* to you under the terms of the GNU General Public License, version 2.0
* ("GPL"), unless you have obtained a separate licensing agreement
* ("Other License"), formally executed by you and Linden Lab. Terms of
* the GPL can be found in doc/GPL-license.txt in this distribution, or
* online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
*
* There are special exceptions to the terms and conditions of the GPL as
* it is applied to this Source Code. View the full text of the exception
* in the file doc/FLOSS-exception.txt in this software distribution, or
* online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
*
* By copying, modifying or distributing this software, you acknowledge
* that you have read and understood your obligations described above,
* and agree to abide by those obligations.
*
* ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
* WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
* COMPLETENESS OR PERFORMANCE.
* $/LicenseInfo$
*/
#ifndef ASCENTPREFSCHAT_H
#define ASCENTPREFSCHAT_H
#include "llpanel.h"
class LLPrefsAscentChat : public LLPanel
{
public:
LLPrefsAscentChat();
~LLPrefsAscentChat();
void apply();
void cancel();
void refresh();
void refreshValues();
protected:
static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data);
static void onSpellAdd(void* data);
static void onSpellRemove(void* data);
static void onSpellGetMore(void* data);
static void onSpellEditCustom(void* data);
static void onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata);
//Chat/IM -----------------------------------------------------------------------------
BOOL mWoLfVerticalIMTabs;
BOOL mIMAnnounceIncoming;
BOOL mHideTypingNotification;
BOOL mShowGroupNameInChatIM;
BOOL mPlayTypingSound;
BOOL mHideNotificationsInChat;
BOOL mEnableMUPose;
BOOL mEnableOOCAutoClose;
U32 mLinksForChattingObjects;
U32 mTimeFormat;
U32 mDateFormat;
BOOL mSecondsInChatAndIMs;
BOOL mIMResponseAnyone;
BOOL mIMResponseFriends;
BOOL mIMResponseMuted;
BOOL mIMShowOnTyping;
BOOL mIMShowResponded;
BOOL mIMResponseRepeat;
BOOL mIMResponseItem;
std::string mIMResponseText;
//Spam --------------------------------------------------------------------------------
BOOL mBlockChatSpam;
U32 mChatSpamCount;
F32 mChatSpamTime;
BOOL mBlockDialogSpam;
BOOL mBlockCardSpam;
U32 mSpamCount;
F32 mSpamTime;
//Text Options ------------------------------------------------------------------------
BOOL mSpellDisplay;
BOOL mKeywordsOn;
std::string mKeywordsList;
BOOL mKeywordsInChat;
BOOL mKeywordsInIM;
BOOL mKeywordsChangeColor;
LLColor4 mKeywordsColor;
BOOL mKeywordsPlaySound;
LLUUID mKeywordsSound;
};
#endif

508
indra/newview/ascentprefssys.cpp
View File

@@ -34,41 +34,27 @@
//File include //File include
#include "ascentprefssys.h" #include "ascentprefssys.h"
#include "llcolorswatch.h"
#include "llvoavatar.h"
#include "llhudeffectlookat.h"
#include "llagent.h" #include "llagent.h"
#include "llaudioengine.h" //For POWER USER affirmation. #include "llaudioengine.h" //For POWER USER affirmation.
#include "llfloaterchat.h" //For POWER USER affirmation. #include "llchat.h"
#include "llstartup.h" #include "llcolorswatch.h"
#include "llviewercontrol.h"
#include "lluictrlfactory.h"
#include "llcombobox.h" #include "llcombobox.h"
#include "llfloaterchat.h" //For POWER USER affirmation.
#include "llradiogroup.h" #include "llradiogroup.h"
#include "llwind.h" #include "lluictrlfactory.h"
#include "llviewernetwork.h" #include "llviewercontrol.h"
#include "pipeline.h"
#include "lgghunspell_wrapper.h"
LLPrefsAscentSys::LLPrefsAscentSys() LLPrefsAscentSys::LLPrefsAscentSys()
{ {
LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_ascent_system.xml"); LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_ascent_system.xml");
childSetCommitCallback("speed_rez_check", onCommitCheckBox, this); childSetCommitCallback("speed_rez_check", onCommitCheckBox, this);
childSetCommitCallback("double_click_teleport_check", onCommitCheckBox, this); childSetCommitCallback("double_click_teleport_check", onCommitCheckBox, this);
childSetCommitCallback("system_folder_check", onCommitCheckBox, this); childSetCommitCallback("system_folder_check", onCommitCheckBox, this);
childSetCommitCallback("show_look_at_check", onCommitCheckBox, this); childSetCommitCallback("show_look_at_check", onCommitCheckBox, this);
childSetCommitCallback("enable_clouds", onCommitCheckBox, this); childSetCommitCallback("enable_clouds", onCommitCheckBox, this);
childSetCommitCallback("SpellBase", onSpellBaseComboBoxCommit, this);
childSetAction("EmSpell_EditCustom", onSpellEditCustom, this);
childSetAction("EmSpell_GetMore", onSpellGetMore, this);
childSetAction("EmSpell_Add", onSpellAdd, this);
childSetAction("EmSpell_Remove", onSpellRemove, this);
childSetCommitCallback("Keywords_Alert", onCommitCheckBox, this);
refreshValues(); refreshValues();
refresh(); refresh();
} }
@@ -90,12 +76,6 @@ void LLPrefsAscentSys::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
self->childSetEnabled("speed_rez_interval", enabled); self->childSetEnabled("speed_rez_interval", enabled);
self->childSetEnabled("speed_rez_seconds", enabled); self->childSetEnabled("speed_rez_seconds", enabled);
} }
else if (ctrl->getName() == "show_look_at_check")
{
BOOL lookAt = self->childGetValue("show_look_at_check").asBoolean();
LLHUDEffectLookAt::sDebugLookAt = lookAt;
gSavedSettings.setBOOL("AscentShowLookAt", lookAt);
}
else if (ctrl->getName() == "double_click_teleport_check") else if (ctrl->getName() == "double_click_teleport_check")
{ {
bool enabled = self->childGetValue("double_click_teleport_check").asBoolean(); bool enabled = self->childGetValue("double_click_teleport_check").asBoolean();
@@ -112,61 +92,6 @@ void LLPrefsAscentSys::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
bool enabled = self->childGetValue("enable_clouds").asBoolean(); bool enabled = self->childGetValue("enable_clouds").asBoolean();
self->childSetEnabled("enable_classic_clouds", enabled); self->childSetEnabled("enable_classic_clouds", enabled);
} }
else if (ctrl->getName() == "Keywords_Alert")
{
bool enabled = self->childGetValue("Keywords_Alert").asBoolean();
self->childSetEnabled("Keywords_Entries", enabled);
self->childSetEnabled("Keywords_LocalChat", enabled);
self->childSetEnabled("Keywords_IM", enabled);
self->childSetEnabled("Keywords_Highlight", enabled);
self->childSetEnabled("Keywords_Color", enabled);
self->childSetEnabled("Keywords_PlaySound", enabled);
self->childSetEnabled("Keywords_SoundUUID", enabled);
}
}
void LLPrefsAscentSys::onSpellAdd(void* data)
{
LLPrefsAscentSys* self = (LLPrefsAscentSys*)data;
if(self)
{
glggHunSpell->addButton(self->childGetValue("EmSpell_Avail").asString());
}
self->refresh();
}
void LLPrefsAscentSys::onSpellRemove(void* data)
{
LLPrefsAscentSys* self = (LLPrefsAscentSys*)data;
if(self)
{
glggHunSpell->removeButton(self->childGetValue("EmSpell_Installed").asString());
}
self->refresh();
}
void LLPrefsAscentSys::onSpellGetMore(void* data)
{
glggHunSpell->getMoreButton(data);
}
void LLPrefsAscentSys::onSpellEditCustom(void* data)
{
glggHunSpell->editCustomButton();
}
void LLPrefsAscentSys::onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata)
{
LLComboBox* box = (LLComboBox*)ctrl;
if (box)
{
glggHunSpell->newDictSelection(box->getValue().asString());
}
} }
void LLPrefsAscentSys::refreshValues() void LLPrefsAscentSys::refreshValues()
@@ -178,433 +103,136 @@ void LLPrefsAscentSys::refreshValues()
mPreviewAnimInWorld = gSavedSettings.getBOOL("PreviewAnimInWorld"); mPreviewAnimInWorld = gSavedSettings.getBOOL("PreviewAnimInWorld");
mSaveScriptsAsMono = gSavedSettings.getBOOL("SaveScriptsAsMono"); mSaveScriptsAsMono = gSavedSettings.getBOOL("SaveScriptsAsMono");
mAlwaysRezInGroup = gSavedSettings.getBOOL("AscentAlwaysRezInGroup"); mAlwaysRezInGroup = gSavedSettings.getBOOL("AscentAlwaysRezInGroup");
//always show Build mBuildAlwaysEnabled = gSavedSettings.getBOOL("AscentBuildAlwaysEnabled");
mAlwaysShowFly = gSavedSettings.getBOOL("AscentFlyAlwaysEnabled"); mAlwaysShowFly = gSavedSettings.getBOOL("AscentFlyAlwaysEnabled");
//Disable camera minimum distance mDisableMinZoom = gSavedSettings.getBOOL("AscentDisableMinZoomDist");
mPowerUser = gSavedSettings.getBOOL("AscentPowerfulWizard"); mPowerUser = gSavedSettings.getBOOL("AscentPowerfulWizard");
mUseSystemFolder = gSavedSettings.getBOOL("AscentUseSystemFolder"); mUseSystemFolder = gSavedSettings.getBOOL("AscentUseSystemFolder");
mUploadToSystem = gSavedSettings.getBOOL("AscentSystemTemporary"); mUploadToSystem = gSavedSettings.getBOOL("AscentSystemTemporary");
//Chat/IMs ----------------------------------------------------------------------------
mHideNotificationsInChat = gSavedSettings.getBOOL("HideNotificationsInChat");
mHideTypingNotification = gSavedSettings.getBOOL("AscentHideTypingNotification");
mPlayTypingSound = gSavedSettings.getBOOL("PlayTypingSound");
mEnableMUPose = gSavedSettings.getBOOL("AscentAllowMUpose");
mEnableOOCAutoClose = gSavedSettings.getBOOL("AscentAutoCloseOOC");
mLinksForChattingObjects = gSavedSettings.getU32("LinksForChattingObjects");
//Time format
//Date Format
mSecondsInChatAndIMs = gSavedSettings.getBOOL("SecondsInChatAndIMs");
//Performance -------------------------------------------------------------------------
mFetchInventoryOnLogin = gSavedSettings.getBOOL("FetchInventoryOnLogin"); mFetchInventoryOnLogin = gSavedSettings.getBOOL("FetchInventoryOnLogin");
mEnableLLWind = gSavedSettings.getBOOL("WindEnabled"); mEnableLLWind = gSavedSettings.getBOOL("WindEnabled");
mEnableClouds = gSavedSettings.getBOOL("CloudsEnabled"); mEnableClouds = gSavedSettings.getBOOL("CloudsEnabled");
mEnableClassicClouds = gSavedSettings.getBOOL("SkyUseClassicClouds"); mEnableClassicClouds = gSavedSettings.getBOOL("SkyUseClassicClouds");
mSpeedRez = gSavedSettings.getBOOL("SpeedRez"); mSpeedRez = gSavedSettings.getBOOL("SpeedRez");
mSpeedRezInterval = gSavedSettings.getU32("SpeedRezInterval"); mSpeedRezInterval = gSavedSettings.getU32("SpeedRezInterval");
//Command Line ------------------------------------------------------------------------ //Command Line ------------------------------------------------------------------------
mCmdLine = gSavedSettings.getBOOL("chat_cmd_toggle");
mCmdLinePos = gSavedSettings.getString("AscentCmdLinePos");
mCmdLineGround = gSavedSettings.getString("AscentCmdLineGround");
mCmdLineHeight = gSavedSettings.getString("AscentCmdLineHeight");
mCmdLineTeleportHome = gSavedSettings.getString("AscentCmdLineTeleportHome");
mCmdLineRezPlatform = gSavedSettings.getString("AscentCmdLineRezPlatform");
mCmdLineCalc = gSavedSettings.getString("AscentCmdLineCalc");
mCmdLineClearChat = gSavedSettings.getString("AscentCmdLineClearChat");
mCmdLineDrawDistance = gSavedSettings.getString("AscentCmdLineDrawDistance");
mCmdTeleportToCam = gSavedSettings.getString("AscentCmdTeleportToCam");
mCmdLineKeyToName = gSavedSettings.getString("AscentCmdLineKeyToName");
mCmdLineOfferTp = gSavedSettings.getString("AscentCmdLineOfferTp");
mCmdLineMapTo = gSavedSettings.getString("AscentCmdLineMapTo");
mCmdLineTP2 = gSavedSettings.getString("AscentCmdLineTP2");
//Privacy ----------------------------------------------------------------------------- //Privacy -----------------------------------------------------------------------------
mBroadcastViewerEffects = gSavedSettings.getBOOL("BroadcastViewerEffects"); mBroadcastViewerEffects = gSavedSettings.getBOOL("BroadcastViewerEffects");
mDisablePointAtAndBeam = gSavedSettings.getBOOL("DisablePointAtAndBeam"); mDisablePointAtAndBeam = gSavedSettings.getBOOL("DisablePointAtAndBeam");
mPrivateLookAt = gSavedSettings.getBOOL("PrivateLookAt"); mPrivateLookAt = gSavedSettings.getBOOL("PrivateLookAt");
mShowLookAt = LLHUDEffectLookAt::sDebugLookAt; mShowLookAt = gSavedSettings.getBOOL("ShowLookAt");
mRevokePermsOnStandUp = gSavedSettings.getBOOL("RevokePermsOnStandUp"); mRevokePermsOnStandUp = gSavedSettings.getBOOL("RevokePermsOnStandUp");
mDisableClickSit = gSavedSettings.getBOOL("DisableClickSit"); mDisableClickSit = gSavedSettings.getBOOL("DisableClickSit");
//Text Options ------------------------------------------------------------------------ mDisplayScriptJumps = gSavedSettings.getBOOL("AscentDisplayTotalScriptJumps");
mSpellDisplay = gSavedSettings.getBOOL("SpellDisplay");
mKeywordsOn = gSavedPerAccountSettings.getBOOL("KeywordsOn");
mKeywordsList = gSavedPerAccountSettings.getString("KeywordsList");
mKeywordsInChat = gSavedPerAccountSettings.getBOOL("KeywordsInChat");
mKeywordsInIM = gSavedPerAccountSettings.getBOOL("KeywordsInIM");
mKeywordsChangeColor = gSavedPerAccountSettings.getBOOL("KeywordsChangeColor");
mKeywordsColor = gSavedPerAccountSettings.getColor4("KeywordsColor");
mKeywordsPlaySound = gSavedPerAccountSettings.getBOOL("KeywordsPlaySound");
mKeywordsSound = static_cast<LLUUID>(gSavedPerAccountSettings.getString("KeywordsSound"));
} }
void LLPrefsAscentSys::refresh() void LLPrefsAscentSys::refresh()
{ {
//General -----------------------------------------------------------------------------
childSetValue("double_click_teleport_check", mDoubleClickTeleport);
childSetValue("center_after_teleport_check", mResetCameraAfterTP);
childSetEnabled("center_after_teleport_check", mDoubleClickTeleport); childSetEnabled("center_after_teleport_check", mDoubleClickTeleport);
childSetValue("offset_teleport_check", mOffsetTPByUserHeight);
childSetEnabled("offset_teleport_check", mDoubleClickTeleport); childSetEnabled("offset_teleport_check", mDoubleClickTeleport);
childSetValue("preview_anim_in_world_check", mPreviewAnimInWorld);
childSetValue("save_scripts_as_mono_check", mSaveScriptsAsMono);
childSetValue("always_rez_in_group_check", mAlwaysRezInGroup);
//Disable Teleport Progress
//Disable Logout progress
//always show Build
childSetValue("always_fly_check", mAlwaysShowFly);
//Disable camera minimum distance
childSetValue("power_user_check", mPowerUser); childSetValue("power_user_check", mPowerUser);
childSetValue("power_user_confirm_check", mPowerUser); childSetValue("power_user_confirm_check", mPowerUser);
childSetValue("system_folder_check", mUseSystemFolder);
childSetValue("temp_in_system_check", mUploadToSystem);
childSetEnabled("temp_in_system_check", mUseSystemFolder); childSetEnabled("temp_in_system_check", mUseSystemFolder);
//Chat --------------------------------------------------------------------------------
childSetValue("hide_notifications_in_chat_check", mHideNotificationsInChat);
childSetValue("play_typing_sound_check", mPlayTypingSound);
childSetValue("hide_typing_check", mHideTypingNotification);
childSetValue("seconds_in_chat_and_ims_check", mSecondsInChatAndIMs);
childSetValue("allow_mu_pose_check", mEnableMUPose);
childSetValue("close_ooc_check", mEnableOOCAutoClose);
LLRadioGroup* radioLinkOptions = getChild<LLRadioGroup>("objects_link");
radioLinkOptions->selectNthItem(mLinksForChattingObjects);
//childSetValue("objects_link", mLinksForChattingObjects);
std::string format = gSavedSettings.getString("ShortTimeFormat");
if (format.find("%p") == -1)
{
mTimeFormat = 0;
}
else
{
mTimeFormat = 1;
}
format = gSavedSettings.getString("ShortDateFormat");
if (format.find("%m/%d/%") != -1)
{
mDateFormat = 2;
}
else if (format.find("%d/%m/%") != -1)
{
mDateFormat = 1;
}
else
{
mDateFormat = 0;
}
// time format combobox
LLComboBox* combo = getChild<LLComboBox>("time_format_combobox");
if (combo)
{
combo->setCurrentByIndex(mTimeFormat);
}
// date format combobox
combo = getChild<LLComboBox>("date_format_combobox");
if (combo)
{
combo->setCurrentByIndex(mDateFormat);
}
childSetValue("seconds_in_chat_and_ims_check", mSecondsInChatAndIMs);
LLWString auto_response = utf8str_to_wstring( gSavedPerAccountSettings.getString("AscentInstantMessageResponse") );
LLWStringUtil::replaceChar(auto_response, '^', '\n');
LLWStringUtil::replaceChar(auto_response, '%', ' ');
childSetText("im_response", wstring_to_utf8str(auto_response));
childSetValue("AscentInstantMessageResponseFriends", gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseFriends"));
childSetValue("AscentInstantMessageResponseMuted", gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseMuted"));
childSetValue("AscentInstantMessageResponseAnyone", gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseAnyone"));
childSetValue("AscentInstantMessageShowResponded", gSavedPerAccountSettings.getBOOL("AscentInstantMessageShowResponded"));
childSetValue("AscentInstantMessageShowOnTyping", gSavedPerAccountSettings.getBOOL("AscentInstantMessageAnnounceIncoming"));
childSetValue("AscentInstantMessageResponseRepeat", gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseRepeat" ));
childSetValue("AscentInstantMessageResponseItem", gSavedPerAccountSettings.getBOOL("AscentInstantMessageResponseItem"));
//Save Performance --------------------------------------------------------------------
childSetValue("fetch_inventory_on_login_check", mFetchInventoryOnLogin);
childSetValue("enable_wind", mEnableLLWind);
childSetValue("enable_clouds", mEnableClouds);
childSetValue("enable_classic_clouds", mEnableClassicClouds);
gLLWindEnabled = mEnableLLWind;
childSetValue("speed_rez_check", mSpeedRez);
childSetEnabled("speed_rez_interval", mSpeedRez); childSetEnabled("speed_rez_interval", mSpeedRez);
childSetEnabled("speed_rez_seconds", mSpeedRez); childSetEnabled("speed_rez_seconds", mSpeedRez);
//Command Line ------------------------------------------------------------------------
//Privacy -----------------------------------------------------------------------------
childSetValue("broadcast_viewer_effects", mBroadcastViewerEffects);
childSetValue("disable_point_at_and_beams_check", mDisablePointAtAndBeam);
childSetValue("private_look_at_check", mPrivateLookAt);
childSetValue("show_look_at_check", mShowLookAt);
childSetValue("revoke_perms_on_stand_up_check", mRevokePermsOnStandUp);
childSetValue("disable_click_sit_check", mDisableClickSit);
//Text Options ------------------------------------------------------------------------
combo = getChild<LLComboBox>("SpellBase");
if (combo != NULL)
{
combo->removeall();
std::vector<std::string> names = glggHunSpell->getDicts();
for (int i = 0; i < (int)names.size(); i++)
{
combo->add(names[i]);
}
combo->setSimple(gSavedSettings.getString("SpellBase"));
}
combo = getChild<LLComboBox>("EmSpell_Avail");
if (combo != NULL)
{
combo->removeall();
combo->add("");
std::vector<std::string> names = glggHunSpell->getAvailDicts();
for (int i = 0; i < (int)names.size(); i++)
{
combo->add(names[i]);
}
combo->setSimple(std::string(""));
}
combo = getChild<LLComboBox>("EmSpell_Installed");
if (combo != NULL)
{
combo->removeall();
combo->add("");
std::vector<std::string> names = glggHunSpell->getInstalledDicts();
for (int i = 0; i < (int)names.size(); i++)
{
combo->add(names[i]);
}
combo->setSimple(std::string(""));
}
childSetValue("Keywords_Alert", mKeywordsOn);
childSetValue("Keywords_Entries", mKeywordsList);
childSetValue("Keywords_LocalChat", mKeywordsInChat);
childSetValue("Keywords_IM", mKeywordsInIM);
childSetValue("Keywords_Highlight", mKeywordsChangeColor);
childSetValue("Keywords_PlaySound", mKeywordsPlaySound);
childSetValue("Keywords_SoundUUID", mKeywordsSound);
LLColorSwatchCtrl* colorctrl = getChild<LLColorSwatchCtrl>("Keywords_Color");
colorctrl->set(LLColor4(mKeywordsColor),TRUE);
} }
void LLPrefsAscentSys::cancel() void LLPrefsAscentSys::cancel()
{/* {
//General ----------------------------------------------------------------------------- //General -----------------------------------------------------------------------------
childSetValue("double_click_teleport_check", mDoubleClickTeleport); gSavedSettings.setBOOL("DoubleClickTeleport", mDoubleClickTeleport);
childSetValue("center_after_teleport_check", mResetCameraAfterTP); gSavedSettings.setBOOL("OptionRotateCamAfterLocalTP", mResetCameraAfterTP);
childSetValue("offset_teleport_check", mOffsetTPByUserHeight); gSavedSettings.setBOOL("OptionOffsetTPByAgentHeight", mOffsetTPByUserHeight);
childSetValue("preview_anim_in_world_check", mPreviewAnimInWorld); gSavedSettings.setBOOL("PreviewAnimInWorld", mPreviewAnimInWorld);
childSetValue("save_scripts_as_mono_check", mSaveScriptsAsMono); gSavedSettings.setBOOL("SaveScriptsAsMono", mSaveScriptsAsMono);
childSetValue("always_rez_in_group_check", mAlwaysRezInGroup); gSavedSettings.setBOOL("AscentAlwaysRezInGroup", mAlwaysRezInGroup);
//Chat -------------------------------------------------------------------------------- gSavedSettings.setBOOL("AscentBuildAlwaysEnabled", mBuildAlwaysEnabled);
childSetValue("hide_notifications_in_chat_check", mHideNotificationsInChat); gSavedSettings.setBOOL("AscentFlyAlwaysEnabled", mAlwaysShowFly);
childSetValue("play_typing_sound_check", mPlayTypingSound); gSavedSettings.setBOOL("AscentDisableMinZoomDist", mDisableMinZoom);
childSetValue("hide_typing_check", mHideTypingNotification); // gSavedSettings.setBOOL("AscentPowerfulWizard", mPowerUser);
childSetValue("seconds_in_chat_and_ims_check", mSecondsInChatAndIMs); gSavedSettings.setBOOL("AscentUseSystemFolder", mUseSystemFolder);
childSetValue("allow_mu_pose_check", mEnableMUPose); gSavedSettings.setBOOL("AscentSystemTemporary", mUploadToSystem);
childSetValue("close_ooc_check", mEnableOOCAutoClose); gSavedSettings.setBOOL("FetchInventoryOnLogin", mFetchInventoryOnLogin);
//Show Links gSavedSettings.setBOOL("WindEnabled", mEnableLLWind);
//Time Format gSavedSettings.setBOOL("CloudsEnabled", mEnableClouds);
//Date Format gSavedSettings.setBOOL("SkyUseClassicClouds", mEnableClassicClouds);
childSetValue("seconds_in_chat_and_ims_check", mEnableOOCAutoClose); gSavedSettings.setBOOL("SpeedRez", mSpeedRez);
//Save Performance -------------------------------------------------------------------- gSavedSettings.setU32("SpeedRezInterval", mSpeedRezInterval);
childSetValue("fetch_inventory_on_login_check", mFetchInventoryOnLogin);
childSetValue("enable_wind", mEnableLLWind);
childSetValue("enable_clouds", mEnableClouds);
childSetValue("enable_classic_clouds", mEnableClassicClouds);
childSetValue("speed_rez_check", mSpeedRez);
if (mSpeedRez)
{
childEnable("speed_rez_interval");
childEnable("speed_rez_seconds");
}
else
{
childDisable("speed_rez_interval");
childDisable("speed_rez_seconds");
}
//Command Line ------------------------------------------------------------------------ //Command Line ------------------------------------------------------------------------
gSavedSettings.setBOOL("chat_cmd_toggle", mCmdLine);
gSavedSettings.setString("AscentCmdLinePos", mCmdLinePos);
gSavedSettings.setString("AscentCmdLineGround", mCmdLineGround);
gSavedSettings.setString("AscentCmdLineHeight", mCmdLineHeight);
gSavedSettings.setString("AscentCmdLineTeleportHome", mCmdLineTeleportHome);
gSavedSettings.setString("AscentCmdLineRezPlatform", mCmdLineRezPlatform);
gSavedSettings.setString("AscentCmdLineCalc", mCmdLineCalc);
gSavedSettings.setString("AscentCmdLineClearChat", mCmdLineClearChat);
gSavedSettings.setString("AscentCmdLineDrawDistance", mCmdLineDrawDistance);
gSavedSettings.setString("AscentCmdTeleportToCam", mCmdTeleportToCam);
gSavedSettings.setString("AscentCmdLineKeyToName", mCmdLineKeyToName);
gSavedSettings.setString("AscentCmdLineOfferTp", mCmdLineOfferTp);
gSavedSettings.setString("AscentCmdLineMapTo", mCmdLineMapTo);
gSavedSettings.setString("AscentCmdLineTP2", mCmdLineTP2);
//Privacy ----------------------------------------------------------------------------- //Privacy -----------------------------------------------------------------------------
childSetValue("broadcast_viewer_effects", mBroadcastViewerEffects); gSavedSettings.setBOOL("BroadcastViewerEffects", mBroadcastViewerEffects);
childSetValue("disable_point_at_and_beams_check", mDisablePointAtAndBeam); gSavedSettings.setBOOL("DisablePointAtAndBeam", mDisablePointAtAndBeam);
childSetValue("private_look_at_check", mPrivateLookAt); gSavedSettings.setBOOL("PrivateLookAt", mPrivateLookAt);
childSetValue("revoke_perms_on_stand_up_check", mRevokePermsOnStandUp); gSavedSettings.setBOOL("ShowLookAt", mShowLookAt);
gSavedSettings.setBOOL("RevokePermsOnStandUp", mRevokePermsOnStandUp);
childSetValue("enable_clouds", mEnableClouds); gSavedSettings.setBOOL("DisableClickSit", mDisableClickSit);
childSetValue("enable_classic_clouds", mEnableClassicClouds); gSavedSettings.setBOOL("AscentDisplayTotalScriptJumps", mDisplayScriptJumps);
}
gLLWindEnabled = mEnableLLWind;
//Text Options ------------------------------------------------------------------------
childSetValue("SpellDisplay", mSpellDisplay);
childSetValue("Keywords_Alert", mKeywordsOn);
childSetValue("Keywords_Entries", mKeywordsList);
childSetValue("Keywords_LocalChat", mKeywordsInChat);
childSetValue("Keywords_IM", mKeywordsInIM);
childSetValue("Keywords_Highlight", mKeywordsChangeColor);
childSetValue("Keywords_PlaySound", mKeywordsPlaySound);
childSetValue("Keywords_SoundUUID", mKeywordsSound);
LLColorSwatchCtrl* colorctrl = getChild<LLColorSwatchCtrl>("Keywords_Color");
colorctrl->set(LLColor4(mKeywordsColor),TRUE);
*/}
void LLPrefsAscentSys::apply() void LLPrefsAscentSys::apply()
{ {
std::string short_date, long_date, short_time, long_time, timestamp; std::string short_date, long_date, short_time, long_time, timestamp;
//General ------------------------------------------------------------------------------ //General ------------------------------------------------------------------------------
gSavedSettings.setBOOL("DoubleClickTeleport", childGetValue("double_click_teleport_check"));
gSavedSettings.setBOOL("OptionRotateCamAfterLocalTP", childGetValue("center_after_teleport_check"));
gSavedSettings.setBOOL("OptionOffsetTPByAgentHeight", childGetValue("offset_teleport_check"));
gSavedSettings.setBOOL("PreviewAnimInWorld", childGetValue("preview_anim_in_world_check"));
gSavedSettings.setBOOL("SaveScriptsAsMono", childGetValue("save_scripts_as_mono_check"));
gSavedSettings.setBOOL("AscentAlwaysRezInGroup", childGetValue("always_rez_in_group_check"));
//Disable Teleport Progress
//Disable Logout progress
//always show Build
gSavedSettings.setBOOL("AscentFlyAlwaysEnabled", childGetValue("always_fly_check"));
//Disable camera minimum distance
gSavedSettings.setBOOL("AscentPowerfulWizard", (childGetValue("power_user_check") && childGetValue("power_user_confirm_check"))); gSavedSettings.setBOOL("AscentPowerfulWizard", (childGetValue("power_user_check") && childGetValue("power_user_confirm_check")));
if (gSavedSettings.getBOOL("AscentPowerfulWizard") && !mPowerUser) if (gSavedSettings.getBOOL("AscentPowerfulWizard") && !mPowerUser)
{ {
LLVector3d lpos_global = gAgent.getPositionGlobal(); LLVector3d lpos_global = gAgent.getPositionGlobal();
gAudiop->triggerSound(LLUUID("58a38e89-44c6-c52b-deb8-9f1ddc527319"), gAgent.getID(), 1.0f, LLAudioEngine::AUDIO_TYPE_UI, lpos_global); gAudiop->triggerSound(LLUUID("58a38e89-44c6-c52b-deb8-9f1ddc527319"), gAgent.getID(), 1.0f, LLAudioEngine::AUDIO_TYPE_UI, lpos_global);
LLChat chat; LLChat chat;
chat.mSourceType = CHAT_SOURCE_SYSTEM; chat.mSourceType = CHAT_SOURCE_SYSTEM;
chat.mText = llformat("You are bestowed with powers beyond mortal comprehension.\nUse your newfound abilities wisely.\nUnlocked:\n- Animation Priority up to 7 - Meant for animations that should override anything and everything at all times. DO NOT USE THIS FOR GENERAL ANIMATIONS.\n- Right click > Destroy objects - Permanently deletes an object immediately, when you don't feel like waiting for the server to respond.\n- Right Click > Explode objects - Turns and object physical, temporary, and delinks it."); chat.mText = llformat("You are bestowed with powers beyond mortal comprehension.\nUse your newfound abilities wisely.\nUnlocked:\n- Animation Priority up to 7 - Meant for animations that should override anything and everything at all times. DO NOT USE THIS FOR GENERAL ANIMATIONS.\n- Right click > Destroy objects - Permanently deletes an object immediately, when you don't feel like waiting for the server to respond.\n- Right Click > Explode objects - Turns an object physical, temporary, and delinks it.");
LLFloaterChat::addChat(chat); LLFloaterChat::addChat(chat);
} }
//
//Chat/IM ------------------------------------------------------------------------------
//Use Vertical IMs
//Script count
//Missing the echo/log option.
gSavedSettings.setBOOL("PlayTypingSound", childGetValue("play_typing_sound_check"));
gSavedSettings.setBOOL("AscentHideTypingNotification", childGetValue("hide_typing_check"));
gSavedPerAccountSettings.setBOOL("AscentInstantMessageAnnounceIncoming", childGetValue("AscentInstantMessageAnnounceIncoming").asBoolean());
gSavedSettings.setBOOL("AscentAllowMUpose", childGetValue("allow_mu_pose_check").asBoolean());
gSavedSettings.setBOOL("AscentAutoCloseOOC", childGetValue("close_ooc_check").asBoolean());
//gSavedSettings.setU32("LinksForChattingObjects", childGetValue("objects_link"). );
LLComboBox* combo = getChild<LLComboBox>("time_format_combobox");
if (combo) {
mTimeFormat = combo->getCurrentIndex();
}
combo = getChild<LLComboBox>("date_format_combobox");
if (combo)
{
mDateFormat = combo->getCurrentIndex();
}
if (mTimeFormat == 0)
{
short_time = "%H:%M";
long_time = "%H:%M:%S";
timestamp = " %H:%M:%S";
}
else
{
short_time = "%I:%M %p";
long_time = "%I:%M:%S %p";
timestamp = " %I:%M %p";
}
if (mDateFormat == 0)
{
short_date = "%Y-%m-%d";
long_date = "%A %d %B %Y";
timestamp = "%a %d %b %Y" + timestamp;
}
else if (mDateFormat == 1)
{
short_date = "%d/%m/%Y";
long_date = "%A %d %B %Y";
timestamp = "%a %d %b %Y" + timestamp;
}
else
{
short_date = "%m/%d/%Y";
long_date = "%A, %B %d %Y";
timestamp = "%a %b %d %Y" + timestamp;
}
gSavedSettings.setString("ShortDateFormat", short_date);
gSavedSettings.setString("LongDateFormat", long_date);
gSavedSettings.setString("ShortTimeFormat", short_time);
gSavedSettings.setString("LongTimeFormat", long_time);
gSavedSettings.setString("TimestampFormat", timestamp);
gSavedSettings.setBOOL("SecondsInChatAndIMs", childGetValue("seconds_in_chat_and_ims_check").asBoolean());
gSavedPerAccountSettings.setString("AscentInstantMessageResponse", childGetValue("im_response").asString());
gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseMuted", childGetValue("AscentInstantMessageResponseMuted").asBoolean());
gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseFriends", childGetValue("AscentInstantMessageResponseFriends").asBoolean());
gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseMuted", childGetValue("AscentInstantMessageResponseMuted").asBoolean());
gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseAnyone", childGetValue("AscentInstantMessageResponseAnyone").asBoolean());
gSavedPerAccountSettings.setBOOL("AscentInstantMessageShowResponded", childGetValue("AscentInstantMessageShowResponded").asBoolean());
gSavedPerAccountSettings.setBOOL("AscentInstantMessageShowOnTyping", childGetValue("AscentInstantMessageShowOnTyping").asBoolean());
gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseRepeat", childGetValue("AscentInstantMessageResponseRepeat").asBoolean());
gSavedPerAccountSettings.setBOOL("AscentInstantMessageResponseItem", childGetValue("AscentInstantMessageResponseItem").asBoolean());
gSavedPerAccountSettings.setBOOL("AscentInstantMessageAnnounceIncoming", childGetValue("AscentInstantMessageAnnounceIncoming").asBoolean());
//Performance ----------------------------------------------------------------------------
gSavedSettings.setBOOL("FetchInventoryOnLogin", childGetValue("fetch_inventory_on_login_check"));
gSavedSettings.setBOOL("WindEnabled", childGetValue("enable_wind"));
gSavedSettings.setBOOL("CloudsEnabled", childGetValue("enable_clouds"));
gSavedSettings.setBOOL("SkyUseClassicClouds", childGetValue("enable_classic_clouds"));
gSavedSettings.setBOOL("SpeedRez", childGetValue("speed_rez_check"));
gSavedSettings.setU32("SpeedRezInterval", childGetValue("speed_rez_interval").asReal());
//Commandline ---------------------------------------------------------------------------- //Commandline ----------------------------------------------------------------------------
//Missing "Use Command Line"
gSavedSettings.setString("AscentCmdLinePos", childGetValue("AscentCmdLinePos")); gSavedSettings.setString("AscentCmdLinePos", childGetValue("AscentCmdLinePos"));
gSavedSettings.setString("AscentCmdLineGround", childGetValue("AscentCmdLineGround")); gSavedSettings.setString("AscentCmdLineGround", childGetValue("AscentCmdLineGround"));
gSavedSettings.setString("AscentCmdLineHeight", childGetValue("AscentCmdLineHeight")); gSavedSettings.setString("AscentCmdLineHeight", childGetValue("AscentCmdLineHeight"));
gSavedSettings.setString("AscentCmdLineTeleportHome", childGetValue("AscentCmdLineTeleportHome")); gSavedSettings.setString("AscentCmdLineTeleportHome", childGetValue("AscentCmdLineTeleportHome"));
gSavedSettings.setString("AscentCmdLineRezPlatform", childGetValue("AscentCmdLineRezPlatform")); gSavedSettings.setString("AscentCmdLineRezPlatform", childGetValue("AscentCmdLineRezPlatform"));
//Platform Size
gSavedSettings.setString("AscentCmdLineCalc", childGetValue("AscentCmdLineCalc")); gSavedSettings.setString("AscentCmdLineCalc", childGetValue("AscentCmdLineCalc"));
gSavedSettings.setString("AscentCmdLineClearChat", childGetValue("AscentCmdLineClearChat")); gSavedSettings.setString("AscentCmdLineClearChat", childGetValue("AscentCmdLineClearChat"));
//-------------------------------------------------------------------------------------
gSavedSettings.setString("AscentCmdLineDrawDistance", childGetValue("AscentCmdLineDrawDistance")); gSavedSettings.setString("AscentCmdLineDrawDistance", childGetValue("AscentCmdLineDrawDistance"));
gSavedSettings.setString("AscentCmdTeleportToCam", childGetValue("AscentCmdTeleportToCam")); gSavedSettings.setString("AscentCmdTeleportToCam", childGetValue("AscentCmdTeleportToCam"));
gSavedSettings.setString("AscentCmdLineKeyToName", childGetValue("AscentCmdLineKeyToName")); gSavedSettings.setString("AscentCmdLineKeyToName", childGetValue("AscentCmdLineKeyToName"));
gSavedSettings.setString("AscentCmdLineOfferTp", childGetValue("AscentCmdLineOfferTp")); gSavedSettings.setString("AscentCmdLineOfferTp", childGetValue("AscentCmdLineOfferTp"));
gSavedSettings.setString("AscentCmdLineMapTo", childGetValue("AscentCmdLineMapTo")); gSavedSettings.setString("AscentCmdLineMapTo", childGetValue("AscentCmdLineMapTo"));
gSavedSettings.setBOOL("AscentMapToKeepPos", childGetValue("AscentMapToKeepPos"));
gSavedSettings.setString("AscentCmdLineTP2", childGetValue("AscentCmdLineTP2")); gSavedSettings.setString("AscentCmdLineTP2", childGetValue("AscentCmdLineTP2"));
//Privacy --------------------------------------------------------------------------------
gSavedSettings.setBOOL("BroadcastViewerEffects", childGetValue("broadcast_viewer_effects"));
gSavedSettings.setBOOL("DisablePointAtAndBeam", childGetValue("disable_point_at_and_beams_check"));
gSavedSettings.setBOOL("PrivateLookAt", childGetValue("private_look_at_check"));
LLHUDEffectLookAt::sDebugLookAt = childGetValue("show_look_at_check");
gSavedSettings.setBOOL("RevokePermsOnStandUp", childGetValue("revoke_perms_on_stand_up_check"));
gSavedSettings.setBOOL("DisableClickSit", childGetValue("disable_click_sit_check"));
//Text Options ---------------------------------------------------------------------------
gSavedPerAccountSettings.setBOOL("KeywordsOn", childGetValue("Keywords_Alert"));
gSavedPerAccountSettings.setString("KeywordsList", childGetValue("Keywords_Entries"));
gSavedPerAccountSettings.setBOOL("KeywordsInChat", childGetValue("Keywords_LocalChat"));
gSavedPerAccountSettings.setBOOL("KeywordsInIM", childGetValue("Keywords_IM"));
gSavedPerAccountSettings.setBOOL("KeywordsChangeColor", childGetValue("Keywords_Highlight"));
gSavedPerAccountSettings.setColor4("KeywordsColor", childGetValue("Keywords_Color"));
gSavedPerAccountSettings.setBOOL("KeywordsPlaySound", childGetValue("Keywords_PlaySound"));
gSavedPerAccountSettings.setString("KeywordsSound", childGetValue("Keywords_SoundUUID"));
refreshValues(); refreshValues();
refresh(); refresh();
} }

54
indra/newview/ascentprefssys.h
View File

@@ -45,17 +45,11 @@ public:
void apply(); void apply();
void cancel(); void cancel();
void refresh(); void refresh();
void refreshValues();
LLPanel* getPanel();
protected: protected:
static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data); static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data);
static void onSpellAdd(void* data);
static void onSpellRemove(void* data);
static void onSpellGetMore(void* data);
static void onSpellEditCustom(void* data);
static void onSpellBaseComboBoxCommit(LLUICtrl* ctrl, void* userdata);
void refreshValues();
//General ----------------------------------------------------------------------------- //General -----------------------------------------------------------------------------
BOOL mDoubleClickTeleport; BOOL mDoubleClickTeleport;
BOOL mResetCameraAfterTP; BOOL mResetCameraAfterTP;
@@ -63,32 +57,35 @@ protected:
BOOL mPreviewAnimInWorld; BOOL mPreviewAnimInWorld;
BOOL mSaveScriptsAsMono; BOOL mSaveScriptsAsMono;
BOOL mAlwaysRezInGroup; BOOL mAlwaysRezInGroup;
//Disable Teleport Progress BOOL mBuildAlwaysEnabled;
//Disable Logout progress
//always show Build
BOOL mAlwaysShowFly; BOOL mAlwaysShowFly;
//Disable camera minimum distance BOOL mDisableMinZoom;
BOOL mPowerUser; BOOL mPowerUser;
BOOL mUseSystemFolder; BOOL mUseSystemFolder;
BOOL mUploadToSystem; BOOL mUploadToSystem;
//Chat/IM -----------------------------------------------------------------------------
BOOL mHideNotificationsInChat;
BOOL mPlayTypingSound;
BOOL mHideTypingNotification;
BOOL mEnableMUPose;
BOOL mEnableOOCAutoClose;
U32 mLinksForChattingObjects;
U32 mTimeFormat;
U32 mDateFormat;
BOOL mSecondsInChatAndIMs;
//Performance -------------------------------------------------------------------------
BOOL mFetchInventoryOnLogin; BOOL mFetchInventoryOnLogin;
BOOL mEnableLLWind; BOOL mEnableLLWind;
BOOL mEnableClouds; BOOL mEnableClouds;
BOOL mEnableClassicClouds; BOOL mEnableClassicClouds;
BOOL mSpeedRez; BOOL mSpeedRez;
U32 mSpeedRezInterval; U32 mSpeedRezInterval;
//Command Line ------------------------------------------------------------------------ //Command Line ------------------------------------------------------------------------
BOOL mCmdLine;
std::string mCmdLinePos;
std::string mCmdLineGround;
std::string mCmdLineHeight;
std::string mCmdLineTeleportHome;
std::string mCmdLineRezPlatform;
std::string mCmdLineCalc;
std::string mCmdLineClearChat;
std::string mCmdLineDrawDistance;
std::string mCmdTeleportToCam;
std::string mCmdLineKeyToName;
std::string mCmdLineOfferTp;
std::string mCmdLineMapTo;
std::string mCmdLineTP2;
//Privacy ----------------------------------------------------------------------------- //Privacy -----------------------------------------------------------------------------
BOOL mBroadcastViewerEffects; BOOL mBroadcastViewerEffects;
BOOL mDisablePointAtAndBeam; BOOL mDisablePointAtAndBeam;
@@ -96,16 +93,7 @@ protected:
BOOL mShowLookAt; BOOL mShowLookAt;
BOOL mRevokePermsOnStandUp; BOOL mRevokePermsOnStandUp;
BOOL mDisableClickSit; BOOL mDisableClickSit;
//Text Options ------------------------------------------------------------------------ BOOL mDisplayScriptJumps;
BOOL mSpellDisplay;
BOOL mKeywordsOn;
std::string mKeywordsList;
BOOL mKeywordsInIM;
BOOL mKeywordsInChat;
BOOL mKeywordsChangeColor;
BOOL mKeywordsPlaySound;
LLUUID mKeywordsSound;
LLColor4 mKeywordsColor;
}; };
#endif #endif

6
indra/newview/lggdicdownload.cpp
View File

@@ -43,7 +43,7 @@
#include "llcolorswatch.h" #include "llcolorswatch.h"
#include "llcombobox.h" #include "llcombobox.h"
#include "llview.h" #include "llview.h"
#include "ascentprefssys.h" #include "ascentprefschat.h"
#include "llviewercontrol.h" #include "llviewercontrol.h"
#include "llhttpclient.h" #include "llhttpclient.h"
#include "llbufferstream.h" #include "llbufferstream.h"
@@ -76,7 +76,7 @@ public:
static void onClickDownload(void* data); static void onClickDownload(void* data);
std::vector<std::string> sNames; std::vector<std::string> sNames;
std::vector<std::string> lNames; std::vector<std::string> lNames;
LLPrefsAscentSys * empanel; LLPrefsAscentChat * empanel;
}; };
lggDicDownloadFloater::~lggDicDownloadFloater() lggDicDownloadFloater::~lggDicDownloadFloater()
@@ -104,7 +104,7 @@ void lggDicDownloadFloater::setData(std::vector<std::string> shortNames, std::ve
{ {
sNames = shortNames; sNames = shortNames;
lNames = longNames; lNames = longNames;
empanel = (LLPrefsAscentSys*)data; empanel = (LLPrefsAscentChat*)data;
LLComboBox* comboBox = getChild<LLComboBox>("Emerald_combo_dics"); LLComboBox* comboBox = getChild<LLComboBox>("Emerald_combo_dics");
if (comboBox != NULL) if (comboBox != NULL)

1
indra/newview/llappviewer.cpp
View File

@@ -630,7 +630,6 @@ bool LLAppViewer::init()
gSavedSettings.setS32("NumSessions", mNumSessions); gSavedSettings.setS32("NumSessions", mNumSessions);
gSavedSettings.setString("HelpLastVisitedURL",gSavedSettings.getString("HelpHomeURL")); gSavedSettings.setString("HelpLastVisitedURL",gSavedSettings.getString("HelpHomeURL"));
LLHUDEffectLookAt::sDebugLookAt = gSavedSettings.getBOOL("AscentShowLookAt");
if (gSavedSettings.getBOOL("VerboseLogs")) if (gSavedSettings.getBOOL("VerboseLogs"))
{ {

13
indra/newview/llfloaterpreference.cpp
View File

@@ -66,6 +66,7 @@
#include "llprefschat.h" #include "llprefschat.h"
#include "llprefsvoice.h" #include "llprefsvoice.h"
#include "llprefsim.h" #include "llprefsim.h"
#include "ascentprefschat.h"
#include "ascentprefssys.h" #include "ascentprefssys.h"
#include "ascentprefsvan.h" #include "ascentprefsvan.h"
#include "llresizehandle.h" #include "llresizehandle.h"
@@ -138,6 +139,7 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
mSkinsPanel(NULL), mSkinsPanel(NULL),
mGridsPanel(NULL), mGridsPanel(NULL),
mLCDPanel(NULL), mLCDPanel(NULL),
mPrefsAscentChat(NULL),
mPrefsAscentSys(NULL), mPrefsAscentSys(NULL),
mPrefsAscentVan(NULL) mPrefsAscentVan(NULL)
{ {
@@ -203,6 +205,10 @@ LLPreferenceCore::LLPreferenceCore(LLTabContainer* tab_container, LLButton * def
mTabContainer->addTabPanel(mGridsPanel, mGridsPanel->getLabel(), FALSE, onTabChanged, mTabContainer); mTabContainer->addTabPanel(mGridsPanel, mGridsPanel->getLabel(), FALSE, onTabChanged, mTabContainer);
mGridsPanel->setDefaultBtn(default_btn); mGridsPanel->setDefaultBtn(default_btn);
mPrefsAscentChat = new LLPrefsAscentChat();
mTabContainer->addTabPanel(mPrefsAscentChat, mPrefsAscentChat->getLabel(), FALSE, onTabChanged, mTabContainer);
mPrefsAscentChat->setDefaultBtn(default_btn);
mPrefsAscentSys = new LLPrefsAscentSys(); mPrefsAscentSys = new LLPrefsAscentSys();
mTabContainer->addTabPanel(mPrefsAscentSys, mPrefsAscentSys->getLabel(), FALSE, onTabChanged, mTabContainer); mTabContainer->addTabPanel(mPrefsAscentSys, mPrefsAscentSys->getLabel(), FALSE, onTabChanged, mTabContainer);
mPrefsAscentSys->setDefaultBtn(default_btn); mPrefsAscentSys->setDefaultBtn(default_btn);
@@ -275,6 +281,11 @@ LLPreferenceCore::~LLPreferenceCore()
delete mGridsPanel; delete mGridsPanel;
mGridsPanel = NULL; mGridsPanel = NULL;
} }
if (mPrefsAscentChat)
{
delete mPrefsAscentChat;
mPrefsAscentChat = NULL;
}
if (mPrefsAscentSys) if (mPrefsAscentSys)
{ {
delete mPrefsAscentSys; delete mPrefsAscentSys;
@@ -301,6 +312,7 @@ void LLPreferenceCore::apply()
mMsgPanel->apply(); mMsgPanel->apply();
mSkinsPanel->apply(); mSkinsPanel->apply();
mGridsPanel->apply(); mGridsPanel->apply();
mPrefsAscentChat->apply();
mPrefsAscentSys->apply(); mPrefsAscentSys->apply();
mPrefsAscentVan->apply(); mPrefsAscentVan->apply();
@@ -332,6 +344,7 @@ void LLPreferenceCore::cancel()
mMsgPanel->cancel(); mMsgPanel->cancel();
mSkinsPanel->cancel(); mSkinsPanel->cancel();
mGridsPanel->cancel(); mGridsPanel->cancel();
mPrefsAscentChat->cancel();
mPrefsAscentSys->cancel(); mPrefsAscentSys->cancel();
mPrefsAscentVan->cancel(); mPrefsAscentVan->cancel();

2
indra/newview/llfloaterpreference.h
View File

@@ -58,6 +58,7 @@ class LLPrefsIM;
class LLPanelMsgs; class LLPanelMsgs;
class LLPanelSkins; class LLPanelSkins;
class LLScrollListCtrl; class LLScrollListCtrl;
class LLPrefsAscentChat;
class LLPrefsAscentSys; class LLPrefsAscentSys;
class LLPrefsAscentVan; class LLPrefsAscentVan;
@@ -98,6 +99,7 @@ private:
LLPanelWeb *mWebPanel; LLPanelWeb *mWebPanel;
LLPanelMsgs *mMsgPanel; LLPanelMsgs *mMsgPanel;
LLPanelLCD *mLCDPanel; LLPanelLCD *mLCDPanel;
LLPrefsAscentChat *mPrefsAscentChat;
LLPrefsAscentSys *mPrefsAscentSys; LLPrefsAscentSys *mPrefsAscentSys;
LLPrefsAscentVan *mPrefsAscentVan; LLPrefsAscentVan *mPrefsAscentVan;
}; };

15
indra/newview/llhudeffectlookat.cpp
View File

@@ -55,8 +55,6 @@
// </edit> // </edit>
BOOL LLHUDEffectLookAt::sDebugLookAt = FALSE;
// packet layout // packet layout
const S32 SOURCE_AVATAR = 0; const S32 SOURCE_AVATAR = 0;
const S32 TARGET_OBJECT = 16; const S32 TARGET_OBJECT = 16;
@@ -505,9 +503,12 @@ void LLHUDEffectLookAt::setSourceObject(LLViewerObject* objectp)
void LLHUDEffectLookAt::render() void LLHUDEffectLookAt::render()
{ {
static const LLCachedControl<bool> private_look_at("PrivateLookAt",false); static const LLCachedControl<bool> private_look_at("PrivateLookAt",false);
if (private_look_at && static const LLCachedControl<bool> show_look_at("ShowLookAt",false);
(gAgent.getAvatarObject() == ((LLVOAvatar*)(LLViewerObject*)mSourceObject))) return;
if (sDebugLookAt && mSourceObject.notNull()) if (private_look_at && (gAgent.getAvatarObject() == ((LLVOAvatar*)(LLViewerObject*)mSourceObject)))
return;
if (show_look_at && mSourceObject.notNull())
{ {
LLGLDepthTest gls_depth(GL_TRUE,GL_FALSE); LLGLDepthTest gls_depth(GL_TRUE,GL_FALSE);
@@ -568,6 +569,8 @@ void LLHUDEffectLookAt::render()
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void LLHUDEffectLookAt::update() void LLHUDEffectLookAt::update()
{ {
static const LLCachedControl<bool> show_look_at("ShowLookAt",false);
// If the target object is dead, set the target object to NULL // If the target object is dead, set the target object to NULL
if (!mTargetObject.isNull() && mTargetObject->isDead()) if (!mTargetObject.isNull() && mTargetObject->isDead())
{ {
@@ -613,7 +616,7 @@ void LLHUDEffectLookAt::update()
} }
} }
if (sDebugLookAt) if (show_look_at)
{ {
((LLVOAvatar*)(LLViewerObject*)mSourceObject)->addDebugText((*mAttentions)[mTargetType].mName); ((LLVOAvatar*)(LLViewerObject*)mSourceObject)->addDebugText((*mAttentions)[mTargetType].mName);
} }

1
indra/newview/llhudeffectlookat.h
View File

@@ -85,7 +85,6 @@ protected:
void setTargetPosGlobal(const LLVector3d &target_pos_global); void setTargetPosGlobal(const LLVector3d &target_pos_global);
public: public:
static BOOL sDebugLookAt;
private: private:
ELookAtType mTargetType; ELookAtType mTargetType;

2
indra/newview/llimpanel.cpp
View File

@@ -2388,7 +2388,7 @@ void LLFloaterIMPanel::setTyping(BOOL typing)
void LLFloaterIMPanel::sendTypingState(BOOL typing) void LLFloaterIMPanel::sendTypingState(BOOL typing)
{ {
if(gSavedSettings.getBOOL("AscentHideTypingNotification")) if(gSavedSettings.getBOOL("HideTypingNotification"))
return; return;
// Don't want to send typing indicators to multiple people, potentially too // Don't want to send typing indicators to multiple people, potentially too
// much network traffic. Only send in person-to-person IMs. // much network traffic. Only send in person-to-person IMs.

4
indra/newview/llstartup.cpp
View File

@@ -236,7 +236,6 @@ std::string SCREEN_LAST_FILENAME = "screen_last.bmp";
// //
extern S32 gStartImageWidth; extern S32 gStartImageWidth;
extern S32 gStartImageHeight; extern S32 gStartImageHeight;
extern bool gLLWindEnabled;
// //
// local globals // local globals
@@ -1886,9 +1885,6 @@ bool idle_startup()
//--------------------------------------------------------------------- //---------------------------------------------------------------------
if (STATE_WORLD_INIT == LLStartUp::getStartupState()) if (STATE_WORLD_INIT == LLStartUp::getStartupState())
{ {
//first of all, let's check if wind should be used
gLLWindEnabled = gSavedSettings.getBOOL("WindEnabled");
set_startup_status(0.40f, LLTrans::getString("LoginInitializingWorld"), gAgent.mMOTD); set_startup_status(0.40f, LLTrans::getString("LoginInitializingWorld"), gAgent.mMOTD);
// Initialize the rest of the world. // Initialize the rest of the world.

6
indra/newview/llviewermenu.cpp
View File

@@ -1596,7 +1596,11 @@ void init_debug_avatar_menu(LLMenuGL* menu)
menu->append(new LLMenuItemCallGL("Reload Vertex Shader", &reload_vertex_shader, NULL)); menu->append(new LLMenuItemCallGL("Reload Vertex Shader", &reload_vertex_shader, NULL));
menu->append(new LLMenuItemToggleGL("Animation Info", &LLVOAvatar::sShowAnimationDebug)); menu->append(new LLMenuItemToggleGL("Animation Info", &LLVOAvatar::sShowAnimationDebug));
menu->append(new LLMenuItemCallGL("Slow Motion Animations", &slow_mo_animations, NULL)); menu->append(new LLMenuItemCallGL("Slow Motion Animations", &slow_mo_animations, NULL));
menu->append(new LLMenuItemToggleGL("Show Look At", &LLHUDEffectLookAt::sDebugLookAt));
LLMenuItemCheckGL* item;
item = new LLMenuItemCheckGL("Show Look At", menu_toggle_control, NULL, menu_check_control, (void*)"ShowLookAt");
menu->append(item);
menu->append(new LLMenuItemToggleGL("Show Point At", &LLHUDEffectPointAt::sDebugPointAt)); menu->append(new LLMenuItemToggleGL("Show Point At", &LLHUDEffectPointAt::sDebugPointAt));
menu->append(new LLMenuItemToggleGL("Debug Joint Updates", &LLVOAvatar::sJointDebug)); menu->append(new LLMenuItemToggleGL("Debug Joint Updates", &LLVOAvatar::sJointDebug));
menu->append(new LLMenuItemToggleGL("Disable LOD", &LLViewerJoint::sDisableLOD)); menu->append(new LLMenuItemToggleGL("Disable LOD", &LLViewerJoint::sDisableLOD));

5
indra/newview/llvotree.cpp
View File

@@ -357,8 +357,9 @@ BOOL LLVOTree::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
} }
//it's cheaper to check if wind is enabled first //it's cheaper to check if wind is enabled first
static const LLCachedControl<bool> enable_wind("WindEnabled",false);
static const LLCachedControl<bool> render_animate_trees("RenderAnimateTrees",false); static const LLCachedControl<bool> render_animate_trees("RenderAnimateTrees",false);
if (gLLWindEnabled && render_animate_trees) if (enable_wind && render_animate_trees)
{ {
F32 mass_inv; F32 mass_inv;
@@ -401,7 +402,7 @@ BOOL LLVOTree::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time)
} }
} }
if (!gLLWindEnabled || !render_animate_trees) if (!enable_wind || !render_animate_trees)
{ {
if (mReferenceBuffer.isNull()) if (mReferenceBuffer.isNull())
{ {

16
indra/newview/llwind.cpp
View File

@@ -52,7 +52,6 @@
#include "llagent.h" #include "llagent.h"
#include "llworld.h" #include "llworld.h"
bool gLLWindEnabled = true;
const F32 CLOUD_DIVERGENCE_COEF = 0.5f; const F32 CLOUD_DIVERGENCE_COEF = 0.5f;
@@ -105,7 +104,8 @@ void LLWind::init()
void LLWind::decompress(LLBitPack &bitpack, LLGroupHeader *group_headerp) void LLWind::decompress(LLBitPack &bitpack, LLGroupHeader *group_headerp)
{ {
if (!mCloudDensityp || !gLLWindEnabled) static const LLCachedControl<bool> wind_enabled("WindEnabled",false);
if (!mCloudDensityp || !wind_enabled)
{ {
return; return;
} }
@@ -182,7 +182,8 @@ void LLWind::decompress(LLBitPack &bitpack, LLGroupHeader *group_headerp)
LLVector3 LLWind::getAverage() LLVector3 LLWind::getAverage()
{ {
if(!gLLWindEnabled) static const LLCachedControl<bool> wind_enabled("WindEnabled",false);
if(!wind_enabled)
{ {
return LLVector3(0.f, 0.f, 0.f); return LLVector3(0.f, 0.f, 0.f);
} }
@@ -203,7 +204,8 @@ LLVector3 LLWind::getAverage()
LLVector3 LLWind::getVelocityNoisy(const LLVector3 &pos_region, const F32 dim) LLVector3 LLWind::getVelocityNoisy(const LLVector3 &pos_region, const F32 dim)
{ {
if(!gLLWindEnabled) static const LLCachedControl<bool> wind_enabled("WindEnabled",false);
if(!wind_enabled)
{ {
return LLVector3(0.f, 0.f, 0.f); return LLVector3(0.f, 0.f, 0.f);
} }
@@ -237,7 +239,8 @@ LLVector3 LLWind::getVelocityNoisy(const LLVector3 &pos_region, const F32 dim)
LLVector3 LLWind::getVelocity(const LLVector3 &pos_region) LLVector3 LLWind::getVelocity(const LLVector3 &pos_region)
{ {
if(!gLLWindEnabled) static const LLCachedControl<bool> wind_enabled("WindEnabled",false);
if(!wind_enabled)
{ {
return LLVector3(0.f, 0.f, 0.f); return LLVector3(0.f, 0.f, 0.f);
} }
@@ -303,7 +306,8 @@ LLVector3 LLWind::getVelocity(const LLVector3 &pos_region)
LLVector3 LLWind::getCloudVelocity(const LLVector3 &pos_region) LLVector3 LLWind::getCloudVelocity(const LLVector3 &pos_region)
{ {
if(!gLLWindEnabled) static const LLCachedControl<bool> wind_enabled("WindEnabled",false);
if(!wind_enabled)
{ {
return LLVector3(0.f, 0.f, 0.f); return LLVector3(0.f, 0.f, 0.f);
} }

2
indra/newview/llwind.h
View File

@@ -42,8 +42,6 @@ class LLVector3;
class LLBitPack; class LLBitPack;
class LLGroupHeader; class LLGroupHeader;
extern bool gLLWindEnabled;
class LLWind class LLWind
{ {

303
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_chat.xml Normal file
View File

@@ -0,0 +1,303 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel top="20" left="10" height="400" width="517" follows="left|top|right|bottom"
border="true" label="SG Chat" name="ascsys" enabled="true" mouse_opaque="true">
<tab_container label="SG Chat" bottom="0" height="440" width="497" left="0"
name="Ascent Chat" tab_min_width="70" tab_position="top">
<panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
follows="left|top|right|bottom" label="Chat/IM" name="Chat/IM">
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-15" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
left="15" mouse_opaque="true" name="objects_link_text_box" v_pad="0"
width="300">
IMs:
</text>
<check_box bottom_delta="-25" control_name="WoLfVerticalIMTabs" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Use Vertical IMs (Requires a restart)" left="10"
mouse_opaque="true" name="use_vertical_ims_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Announce incoming instant messages" left="10" mouse_opaque="true"
control_name="AscentInstantMessageAnnounceIncoming" radio_style="false" width="270"
name="quickstart_im_check"
tool_tip="Opens an IM window when someone starts typing an IM to you. This gives you a heads up that someone is IMing you before they hit enter. "/>
<check_box bottom_delta="-20" control_name="HideTypingNotification" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Don't send '[name] is typing...' in IMs" left="10"
tool_tip="IM partners will not see '______ is typing...' when you're responding."
mouse_opaque="true" name="hide_typing_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="OptionShowGroupNameInChatIM" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Show group name in chat" left="10"
tool_tip="The name of the group will also be displayed if the IM is from group chat."
mouse_opaque="true" name="append_group_name_check" radio_style="false"
width="400" />
<!-- Left/Right Column split -->
<view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="top|left" height="75"
left="235" name="CmdDivisor" width="0"/>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-15" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
left="250" mouse_opaque="true" name="objects_link_text_box" v_pad="0"
width="300">
Chat:
</text>
<check_box bottom_delta="-25" control_name="PlayTypingSound" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Play the typing sound for local chat" left_delta="-5"
tool_tip="Silences the chatting type sound, making it quieter for things like performances."
mouse_opaque="true" name="play_typing_sound_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="HideNotificationsInChat" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Do not echo/log notifications in chat" left_delta="00"
mouse_opaque="true" name="hide_notifications_in_chat_check" radio_style="false"
width="400" />
<check_box bottom="-120" control_name="AscentAllowMUpose" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Allow MU pose method." left="10"
tool_tip="Allows the use of both /me and : to perform emotes."
mouse_opaque="true" name="allow_mu_pose_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="AscentAutoCloseOOC" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Auto-close OOC comments." left="10"
tool_tip="Will automatically append '))' to any message starting with '((', or visa versa."
mouse_opaque="true" name="close_ooc_check" radio_style="false"
width="400" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-15" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
left_delta="0" mouse_opaque="true" name="objects_link_text_box" v_pad="0"
width="300">
Show links on chatting object names in chat history for:
</text>
<radio_group bottom_delta="-26" control_name="LinksForChattingObjects" draw_border="true" enabled="true"
tool_tip="Enables a link to show you the owner of the speaking object."
follows="left|top" height="20" left="20" mouse_opaque="true" name="objects_link" width="350">
<radio_item type="string" length="1" bottom_delta="0" enabled="true" height="18"
left_delta="5" mouse_opaque="true" name="no_object" width="48">
No object
</radio_item>
<radio_item type="string" length="1" bottom_delta="0" enabled="true" height="18"
left_delta="45" mouse_opaque="true" name="others_objects" width="48">
Others' objects
</radio_item>
<radio_item type="string" length="1" bottom_delta="0" enabled="true" height="18"
left_delta="60" mouse_opaque="true" name="anyones_objects" width="48">
Anyone's objects
</radio_item>
</radio_group>
<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|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
left="10" mouse_opaque="true" name="time_format_text_box" v_pad="0"
width="80">
Time format:
</text>
<combo_box allow_text_entry="false" bottom_delta="-5" enabled="true" follows="left|top"
height="18" hidden="false" left="90" max_chars="20" mouse_opaque="true"
tool_tip="Show hours in either 12-23 or 12PM-11PM format."
name="time_format_combobox" width="130">
<combo_item type="string" length="1" enabled="true" name="24hours" value="default">
24-hour clock
</combo_item>
<combo_item type="string" length="1" enabled="true" name="12hours" value="default">
12-hour clock
</combo_item>
</combo_box>
<check_box bottom_delta="0" control_name="SecondsInChatAndIMs" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Seconds in chat/IMs timestamps" left="240"
mouse_opaque="true" name="seconds_in_chat_and_ims_check" radio_style="false"
width="260" />
<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|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
left="10" mouse_opaque="true" name="date_format_text_box" v_pad="0"
width="80">
Date format:
</text>
<combo_box allow_text_entry="false" bottom_delta="-5" enabled="true" follows="left|top"
height="18" hidden="false" left="90" max_chars="20" mouse_opaque="true"
name="date_format_combobox" width="130">
<combo_item type="string" length="1" enabled="true" name="year_first" value="default">
YYYY-MM-DD
</combo_item>
<combo_item type="string" length="1" enabled="true" name="day_first" value="default">
DD/MM/YYYY
</combo_item>
<combo_item type="string" length="1" enabled="true" name="month_first" value="default">
MM/DD/YYYY
</combo_item>
</combo_box>
<!-- Auto-responder -->
<view_border bevel_style="none" border_thickness="1" bottom="-420" follows="top|left"
height="190" left="5" name="GraphicsBorder" width="485" />
<check_box bottom_delta="168" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Enable Autoresponse" left="10" mouse_opaque="true"
name="AscentInstantMessageResponseAnyone" radio_style="false" width="270"
tool_tip="Sends a pre made message of your choosing, when people start IMing you. (Enter your message in the Response Text. Text area), located below."/>
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Autorespond to non-friends" left_delta="0" mouse_opaque="true"
name="AscentInstantMessageResponseFriends" radio_style="false" width="270"
tool_tip="Sends a pre made message of your choosing, when people start IMing you. (Enter your message in the Response Text. Text area), located below."/>
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Autorespond to people you have muted" left_delta="0"
mouse_opaque="true" name="AscentInstantMessageResponseMuted" radio_style="false"
width="270" tool_tip="Sends a pre made message of your choosing, when people start IMing you. (Enter your message in the Response Text. Text area), located below."/>
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Send as soon as they start typing" left_delta="0" mouse_opaque="true"
name="AscentInstantMessageShowOnTyping" radio_style="false" width="270"/>
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="26"
initial_value="false" label="Don't show IMs you auto-responsed to" left_delta="0"
mouse_opaque="true" name="AscentInstantMessageShowResponded" radio_style="false"
width="170"/>
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Autorespond to every message" left_delta="0" mouse_opaque="true"
name="AscentInstantMessageResponseRepeat" radio_style="false" width="270"/>
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Send an item along with the response" left_delta="0"
mouse_opaque="true" name="AscentInstantMessageResponseItem" radio_style="false"
width="270" tool_tip="You can include an inventory item to send along with your auto response by dragging it from your inventory to the location below"/>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="120" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
h_pad="0" halign="left" height="18" left_delta="245" mouse_opaque="false"
name="text_box1" v_pad="0" width="430">
Response Text:
</text>
<text_editor type="string" length="1" bottom_delta="-110" embedded_items="false" enabled="true"
follows="left|top" font="SansSerifSmall" height="110" left_delta="0" max_length="1100"
mouse_opaque="true" name="im_response" width="230" word_wrap="true" spell_check="true"/>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
h_pad="0" halign="left" height="18" left_delta="0" mouse_opaque="false"
name="text_box1" v_pad="0" width="430">
Use #f for user's first name, #l for last name,
#t for timestamp, #r for SLURL to you,
#i for your idle time. (e.g. "5 mins")
</text>
</panel>
<panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
follows="left|top|right|bottom" label="Spam" name="Spam">
<check_box left="10" bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall"
label="Enable chat spam blocking" tool_tip="Enable automatic chat spam blocking"
height="18" width="100" radio_style="false" mouse_opaque="true"
name="AscChatSpamBlock" control_name="SGBlockChatSpam"/>
<spinner left_delta="20" height="18" width="120" enabled="true" follows="left|top"
decimal_digits="0" increment="1" initial_val="10" min_val="2" max_val="100"
label="Chat count" label_width="70" name="AscChatSpamCount" control_name="SGChatSpamCount"
tool_tip="Number of items spammed per time set. (Default: 10)"/>
<spinner left_delta="0" height="18" width="120" enabled="true" follows="left|top"
decimal_digits="1" increment="1" initial_val="1.0" min_val="1" max_val="60"
label="Chat time" label_width="70" name="AscChatSpamTime" control_name="SGChatSpamTime"
tool_tip="Time of evalulating spam in seconds. (Default: 1.0)"/>
<text type="string" length="1" bottom_delta="0" left_delta="130" bg_visible="false"
border_visible="false" border_drop_shadow_visible="false"
drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16"
mouse_opaque="true" name="" v_pad="0" width="100">
seconds
</text>
<check_box left_delta="-150" enabled="true" follows="left|top" font="SansSerifSmall"
label="Enable dialog spam blocking" tool_tip="Enable automatic dialog spam blocking"
height="16" width="100" radio_style="false" mouse_opaque="true"
name="AscDialogSpamBlock" control_name="SGBlockDialogSpam"/>
<check_box left_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
label="Enable calling card spam blocking" tool_tip="Enable automatic calling card spam blocking"
height="16" width="100" radio_style="false" mouse_opaque="true"
name="AscCardSpamBlock" control_name="SGBlockCardSpam"/>
<spinner left_delta="20" height="18" width="120" enabled="true" follows="left|top"
decimal_digits="0" increment="1" initial_val="4" min_val="2" max_val="100"
label="Spam count" label_width="70" name="AscSpamCount" control_name="SGSpamCount"
tool_tip="This setting applies to both Dialog and Card spam (Default: 4)"/>
<spinner left_delta="0" height="18" width="120" enabled="true" follows="left|top"
decimal_digits="1" increment="1" initial_val="1.0" min_val="1" max_val="60"
label="Spam time" label_width="70" name="AscSpamTime" control_name="SGSpamTime"
tool_tip="This setting applies to both Dialog and Card spam (Default: 1.0)"/>
<text type="string" length="1" bottom_delta="0" left_delta="130" bg_visible="false"
border_visible="false" border_drop_shadow_visible="false"
drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16"
mouse_opaque="true" name="" v_pad="0" width="100">
seconds
</text>
</panel>
<panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Text Options"
left="1" mouse_opaque="true" name="TextOptions" width="418">
<check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
label="Show misspelled words in red" left="12" mouse_opaque="true" name="SpellDisplay"
control_name="SpellDisplay" width="126"/>
<text bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="16" left="12"
name="EmSpell_txt1" width="512">
Current language (dictionary):
</text>
<combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="20"
max_chars="200" mouse_opaque="true" name="SpellBase" width="250"
control_name="SpellBase" tool_tip=""/>
<text bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="20" left="12"
name="EmSpell_txt3" width="512">
Downloaded languages (dictionaries):
</text>
<combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="20"
max_chars="200" mouse_opaque="true" name="EmSpell_Avail" width="250"
control_name="EmSpell_Avail" tool_tip=""/>
<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Install"
name="EmSpell_Add" tool_tip="" left_delta="255" width="80"/>
<button bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20" label="Download More..."
name="EmSpell_GetMore" tool_tip="Get more dictionaries availabe online" left="12" width="250"/>
<text bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="20" left="12"
name="EmSpell_txt2" width="512">
Additional custom languages (dictionaries):
</text>
<combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="20"
max_chars="200" mouse_opaque="true" name="EmSpell_Installed" width="250"
control_name="EmSpell_Installed" tool_tip=""/>
<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Remove"
name="EmSpell_Remove" tool_tip="" left_delta="255" width="80"/>
<button bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" label="Edit Custom dictionary"
name="EmSpell_EditCustom" tool_tip="" left="12" width="250"/>
<text bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="20" left="12"
name="EmSpell_txt4" width="512">
To use spellcheck, right-click a misspelled word
(red or otherwise) and select its replacement
</text>
<view_border bevel_style="none" border_thickness="1" bottom_delta="-16" follows="top|left" height="0"
left="5" name="CmdDivisor" width="356"/>
<check_box bottom_delta="-24" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
label="Highlight messages if any of they contain the terms" left="5" mouse_opaque="true"
name="Keywords_Alert" radio_style="false" width="270"/>
<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left="12"
name="keyword_txt1" width="512">
(separated by commas)
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
font="SansSerifSmall" height="20" left_delta="5" max_length="500" mouse_opaque="true" name="Keywords_Entries" width="300" />
<text bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="20" left_delta="15" name="EmKeyw"
width="100">Is found within:</text>
<check_box bottom_delta="3" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
label="Local Chat Floater" left_delta="100" mouse_opaque="true" name="Keywords_LocalChat" radio_style="false" width="270"/>
<check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
label="Instant Message Floater" left_delta="0" mouse_opaque="true" name="Keywords_IM" radio_style="false" width="270"/>
<check_box bottom_delta="-24" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
label="Highlight the message in this color:" left_delta="-110" mouse_opaque="true" name="Keywords_Highlight"
radio_style="false" width="270"/>
<color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom_delta="-16" can_apply_immediately="true"
color="1, 1, 1, 1" follows="left|top" height="35" label="" left_delta="210"
mouse_opaque="true" name="Keywords_Color" tool_tip="Click to open Color Picker" width="50"/>
<check_box bottom_delta="-10" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
label="Play this sound alert: (UUID)" left_delta="-210" mouse_opaque="true" name="Keywords_PlaySound"
radio_style="false" width="270"/>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
font="SansSerifSmall" height="20" left_delta="-5" max_length="36" mouse_opaque="true" name="Keywords_SoundUUID" width="300" />
</panel>
</tab_container>
</panel>

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

@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel top="20" left="10" height="400" width="517" follows="left|top|right|bottom" <panel top="20" left="10" height="400" width="517" follows="left|top|right|bottom"
border="true" label="Singularity" name="ascsys" enabled="true" mouse_opaque="true"> border="true" label="SG System" name="ascsys" enabled="true" mouse_opaque="true">
<tab_container label="Singularity System" bottom="0" height="440" width="497" left="0" <tab_container label="SG System" bottom="0" height="440" width="497" left="0"
name="Ascent System" tab_min_width="70" tab_position="top"> name="Ascent System" tab_min_width="70" tab_position="top">
<panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true" <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
follows="left|top|right|bottom" label="General" name="User Interface"> follows="left|top|right|bottom" label="General" name="User Interface">
<check_box bottom_delta="-25" control_name="DoubleClickTeleport" enabled="true" <check_box bottom_delta="-25" control_name="DoubleClickTeleport" enabled="true"
@@ -83,266 +84,7 @@
tool_tip="Puts temporary uploads in the Asset folder which separates them from actual uploads, making them easier to find." tool_tip="Puts temporary uploads in the Asset folder which separates them from actual uploads, making them easier to find."
mouse_opaque="true" name="temp_in_system_check" radio_style="false" mouse_opaque="true" name="temp_in_system_check" radio_style="false"
width="400" /> width="400" />
</panel> <check_box bottom_delta="-20" control_name="FetchInventoryOnLogin" enabled="true"
<panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
follows="left|top|right|bottom" label="Chat/IM" name="Chat/IM">
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-15" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
left="15" mouse_opaque="true" name="objects_link_text_box" v_pad="0"
width="300">
IMs:
</text>
<check_box bottom_delta="-25" control_name="WoLfVerticalIMTabs" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Use Vertical IMs (Requires a restart)" left="10"
mouse_opaque="true" name="use_vertical_ims_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Announce incoming instant messages" left="10" mouse_opaque="true"
control_name="AscentInstantMessageAnnounceIncoming" radio_style="false" width="270"
name="quickstart_im_check"
tool_tip="Opens an IM window when someone starts typing an IM to you. This gives you a heads up that someone is IMing you before they hit enter. "/>
<check_box bottom_delta="-20" control_name="HideTypingNotification" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Don't send '[name] is typing...' in IMs" left="10"
tool_tip="IM partners will not see '______ is typing...' when you're responding."
mouse_opaque="true" name="hide_typing_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="OptionShowGroupNameInChatIM" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Show group name in chat" left="10"
tool_tip="The name of the group will also be displayed if the IM is from group chat."
mouse_opaque="true" name="append_group_name_check" radio_style="false"
width="400" />
<!-- Left/Right Column split -->
<view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="top|left" height="75"
left="235" name="CmdDivisor" width="0"/>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom="-15" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
left="250" mouse_opaque="true" name="objects_link_text_box" v_pad="0"
width="300">
Chat:
</text>
<check_box bottom_delta="-25" control_name="PlayTypingSound" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Play the typing sound for local chat" left_delta="-5"
tool_tip="Silences the chatting type sound, making it quieter for things like performances."
mouse_opaque="true" name="play_typing_sound_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="HideNotificationsInChat" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Do not echo/log notifications in chat" left_delta="00"
mouse_opaque="true" name="hide_notifications_in_chat_check" radio_style="false"
width="400" />
<check_box bottom="-120" control_name="AscentAllowMUpose" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Allow MU pose method." left="10"
tool_tip="Allows the use of both /me and : to perform emotes."
mouse_opaque="true" name="allow_mu_pose_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="AscentAutoCloseOOC" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Auto-close OOC comments." left="10"
tool_tip="Will automatically append '))' to any message starting with '((', or visa versa."
mouse_opaque="true" name="close_ooc_check" radio_style="false"
width="400" />
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-15" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
left_delta="0" mouse_opaque="true" name="objects_link_text_box" v_pad="0"
width="300">
Show links on chatting object names in chat history for:
</text>
<radio_group bottom_delta="-26" control_name="LinksForChattingObjects" draw_border="true" enabled="true"
tool_tip="Enables a link to show you the owner of the speaking object."
follows="left|top" height="20" left="20" mouse_opaque="true" name="objects_link" width="350">
<radio_item type="string" length="1" bottom_delta="0" enabled="true" height="18"
left_delta="5" mouse_opaque="true" name="no_object" width="48">
No object
</radio_item>
<radio_item type="string" length="1" bottom_delta="0" enabled="true" height="18"
left_delta="45" mouse_opaque="true" name="others_objects" width="48">
Others' objects
</radio_item>
<radio_item type="string" length="1" bottom_delta="0" enabled="true" height="18"
left_delta="60" mouse_opaque="true" name="anyones_objects" width="48">
Anyone's objects
</radio_item>
</radio_group>
<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|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
left="10" mouse_opaque="true" name="time_format_text_box" v_pad="0"
width="80">
Time format:
</text>
<combo_box allow_text_entry="false" bottom_delta="-5" enabled="true" follows="left|top"
height="18" hidden="false" left="90" max_chars="20" mouse_opaque="true"
tool_tip="Show hours in either 12-23 or 12PM-11PM format."
name="time_format_combobox" width="130">
<combo_item type="string" length="1" enabled="true" name="24hours" value="default">
24-hour clock
</combo_item>
<combo_item type="string" length="1" enabled="true" name="12hours" value="default">
12-hour clock
</combo_item>
</combo_box>
<check_box bottom_delta="0" control_name="SecondsInChatAndIMs" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="Seconds in chat/IMs timestamps" left="240"
mouse_opaque="true" name="seconds_in_chat_and_ims_check" radio_style="false"
width="260" />
<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|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" hidden="false"
left="10" mouse_opaque="true" name="date_format_text_box" v_pad="0"
width="80">
Date format:
</text>
<combo_box allow_text_entry="false" bottom_delta="-5" enabled="true" follows="left|top"
height="18" hidden="false" left="90" max_chars="20" mouse_opaque="true"
name="date_format_combobox" width="130">
<combo_item type="string" length="1" enabled="true" name="year_first" value="default">
YYYY-MM-DD
</combo_item>
<combo_item type="string" length="1" enabled="true" name="day_first" value="default">
DD/MM/YYYY
</combo_item>
<combo_item type="string" length="1" enabled="true" name="month_first" value="default">
MM/DD/YYYY
</combo_item>
</combo_box>
<!-- Auto-responder -->
<view_border bevel_style="none" border_thickness="1" bottom="-420" follows="top|left"
height="190" left="5" name="GraphicsBorder" width="485" />
<check_box bottom_delta="168" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Enable Autoresponse" left="10" mouse_opaque="true"
name="AscentInstantMessageResponseAnyone" radio_style="false" width="270"
tool_tip="Sends a pre made message of your choosing, when people start IMing you. (Enter your message in the Response Text. Text area), located below."/>
<!--<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-22" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
h_pad="0" halign="left" height="18" left_delta="10" mouse_opaque="false"
name="text_box1" v_pad="0" width="430">
Response:
</text>
<combo_box allow_text_entry="false" bottom_delta="2" enabled="true" follows="left|top"
height="18" hidden="false" left_delta="67" max_chars="20" mouse_opaque="true"
tool_tip="Saved response to use."
name="autoresponse_combobox" width="90">
<combo_item type="string" length="1" enabled="true" name="default" value="default">
Default
</combo_item>
</combo_box>
<button bottom_delta="0" control_name="addResponse" name="add_current" follows="left|top"
label="+" height="18" left_delta="90" width="20"/>
<button bottom_delta="0" control_name="removeResponse" name="remove_current" follows="left|top"
label="-" height="18" left_delta="20" width="20"/>
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Autorespond to non-friends" left_delta="-187" mouse_opaque="true"-->
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Autorespond to non-friends" left_delta="0" mouse_opaque="true"
name="AscentInstantMessageResponseFriends" radio_style="false" width="270"
tool_tip="Sends a pre made message of your choosing, when people start IMing you. (Enter your message in the Response Text. Text area), located below."/>
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Autorespond to people you have muted" left_delta="0"
mouse_opaque="true" name="AscentInstantMessageResponseMuted" radio_style="false"
width="270" tool_tip="Sends a pre made message of your choosing, when people start IMing you. (Enter your message in the Response Text. Text area), located below."/>
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Send as soon as they start typing" left_delta="0" mouse_opaque="true"
name="AscentInstantMessageShowOnTyping" radio_style="false" width="270"/>
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="26"
initial_value="false" label="Don't show IMs you auto-responsed to" left_delta="0"
mouse_opaque="true" name="AscentInstantMessageShowResponded" radio_style="false"
width="170"/>
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Autorespond to every message" left_delta="0" mouse_opaque="true"
name="AscentInstantMessageResponseRepeat" radio_style="false" width="270"/>
<check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Send an item along with the response" left_delta="0"
mouse_opaque="true" name="AscentInstantMessageResponseItem" radio_style="false"
width="270" tool_tip="You can include an inventory item to send along with your auto response by dragging it from your inventory to the location below"/>
<!--<view_border blevel_style="in" bottom_delta="-20" follows="left|top" height="18" left_delta="5"
mouse_opaque="false" name="im_give_drop_target_rect" width="220"/>
<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bottom_delta="0"
drop_shadow_visible="true" follows="left|top" font="SansSerifSmall" h_pad="0" halign="center"
height="16" left_delta="0" mouse_opaque="true" name="Give inventory" tool_tip="Drop an inventory item here to have it given along with the auto-response."
v_pad="2" width="230">
Drop item here (Currently: NONE)
</text>-->
<!-- Right Column -->
<!--<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="160" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
h_pad="0" halign="left" height="18" left_delta="245" mouse_opaque="false"-->
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="120" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
h_pad="0" halign="left" height="18" left_delta="245" mouse_opaque="false"
name="text_box1" v_pad="0" width="430">
Response Text:
</text>
<text_editor type="string" length="1" bottom_delta="-110" embedded_items="false" enabled="true"
follows="left|top" font="SansSerifSmall" height="110" left_delta="0" max_length="1100"
mouse_opaque="true" name="im_response" width="230" word_wrap="true" spell_check="true"/>
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-25" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
h_pad="0" halign="left" height="18" left_delta="0" mouse_opaque="false"
name="text_box1" v_pad="0" width="430">
Use #f for user's first name, #l for last name,
#t for timestamp, #r for SLURL to you,
#i for your idle time. (e.g. "5 mins")
</text>
</panel>
<panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
follows="left|top|right|bottom" label="Spam" name="Spam">
<check_box left="10" bottom_delta="-25" enabled="true" follows="left|top" font="SansSerifSmall"
label="Enable chat spam blocking" tool_tip="Enable automatic chat spam blocking"
height="18" width="100" radio_style="false" mouse_opaque="true"
name="AscChatSpamBlock" control_name="SGBlockChatSpam"/>
<spinner left_delta="20" height="18" width="120" enabled="true" follows="left|top"
decimal_digits="0" increment="1" initial_val="10" min_val="2" max_val="100"
label="Chat count" label_width="70" name="AscChatSpamCount" control_name="SGChatSpamCount"
tool_tip="Number of items spammed per time set. (Default: 10)"/>
<spinner left_delta="0" height="18" width="120" enabled="true" follows="left|top"
decimal_digits="1" increment="1" initial_val="1.0" min_val="1" max_val="60"
label="Chat time" label_width="70" name="AscChatSpamTime" control_name="SGChatSpamTime"
tool_tip="Time of evalulating spam in seconds. (Default: 1.0)"/>
<text type="string" length="1" bottom_delta="0" left_delta="130" bg_visible="false"
border_visible="false" border_drop_shadow_visible="false"
drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16"
mouse_opaque="true" name="" v_pad="0" width="100">
seconds
</text>
<check_box left_delta="-150" enabled="true" follows="left|top" font="SansSerifSmall"
label="Enable dialog spam blocking" tool_tip="Enable automatic dialog spam blocking"
height="16" width="100" radio_style="false" mouse_opaque="true"
name="AscDialogSpamBlock" control_name="SGBlockDialogSpam"/>
<check_box left_delta="0" enabled="true" follows="left|top" font="SansSerifSmall"
label="Enable calling card spam blocking" tool_tip="Enable automatic calling card spam blocking"
height="16" width="100" radio_style="false" mouse_opaque="true"
name="AscCardSpamBlock" control_name="SGBlockCardSpam"/>
<spinner left_delta="20" height="18" width="120" enabled="true" follows="left|top"
decimal_digits="0" increment="1" initial_val="4" min_val="2" max_val="100"
label="Spam count" label_width="70" name="AscSpamCount" control_name="SGSpamCount"
tool_tip="This setting applies to both Dialog and Card spam (Default: 4)"/>
<spinner left_delta="0" height="18" width="120" enabled="true" follows="left|top"
decimal_digits="1" increment="1" initial_val="1.0" min_val="1" max_val="60"
label="Spam time" label_width="70" name="AscSpamTime" control_name="SGSpamTime"
tool_tip="This setting applies to both Dialog and Card spam (Default: 1.0)"/>
<text type="string" length="1" bottom_delta="0" left_delta="130" bg_visible="false"
border_visible="false" border_drop_shadow_visible="false"
drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16"
mouse_opaque="true" name="" v_pad="0" width="100">
seconds
</text>
</panel>
<panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
follows="left|top|right|bottom" label="Performance" name="Performance">
<check_box bottom_delta="-25" control_name="FetchInventoryOnLogin" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Automatically fetch the inventory in the background after login" left="10" label="Automatically fetch the inventory in the background after login" left="10"
tool_tip="Inventory will preload when you log in, so you don't have to wait for it to load when doing an initial search." tool_tip="Inventory will preload when you log in, so you don't have to wait for it to load when doing an initial search."
@@ -379,9 +121,10 @@ Use #f for user's first name, #l for last name,
drop_shadow_visible="true" enabled="true" follows="left|top" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="16" font="SansSerifSmall" h_pad="0" halign="left" height="16"
mouse_opaque="true" name="speed_rez_seconds" v_pad="0" width="100"> mouse_opaque="true" name="speed_rez_seconds" v_pad="0" width="100">
seconds seconds
</text> </text>
</panel> </panel>
<panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Command Line" <panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Command Line"
left="1" mouse_opaque="true" name="Command Line" width="418"> left="1" mouse_opaque="true" name="Command Line" width="418">
<check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16" <check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
@@ -390,28 +133,28 @@ Use #f for user's first name, #l for last name,
control_name="AscentCmdLine"/> control_name="AscentCmdLine"/>
<text bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="16" left_delta="10" <text bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="16" left_delta="10"
name="cmd_line_text_2" width="512"> name="cmd_line_text_2" width="512">
Teleport within sim (usage: cmd x y z) Teleport within sim (usage: cmd x y z)
</text> </text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
tool_tip="" name="AscentCmdLinePos" control_name="AscentCmdLinePos" width="200"/> tool_tip="" name="AscentCmdLinePos" control_name="AscentCmdLinePos" width="200"/>
<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
name="cmd_line_text_3" width="512"> name="cmd_line_text_3" width="512">
Teleport to ground (usage: cmd) Teleport to ground (usage: cmd)
</text> </text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
tool_tip="" name="AscentCmdLineGround" control_name="AscentCmdLineGround" width="200"/> tool_tip="" name="AscentCmdLineGround" control_name="AscentCmdLineGround" width="200"/>
<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
name="cmd_line_text_4" width="512"> name="cmd_line_text_4" width="512">
Teleport to altitude (usage: cmd z) Teleport to altitude (usage: cmd z)
</text> </text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
tool_tip="" name="AscentCmdLineHeight" control_name="AscentCmdLineHeight" width="200"/> tool_tip="" name="AscentCmdLineHeight" control_name="AscentCmdLineHeight" width="200"/>
<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
name="cmd_line_text_5" width="512"> name="cmd_line_text_5" width="512">
Teleport home (usage: cmd) Teleport home (usage: cmd)
</text> </text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
@@ -419,7 +162,7 @@ Use #f for user's first name, #l for last name,
width="200"/> width="200"/>
<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
name="cmd_line_text_6" width="512"> name="cmd_line_text_6" width="512">
Rez a platform (usage: cmd 0 - 30) Rez a platform (usage: cmd 0 - 30)
</text> </text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
@@ -431,14 +174,15 @@ Use #f for user's first name, #l for last name,
mouse_opaque="true" show_text="true" width="205" auto_resize="false" tool_tip="How big do you want the platform to appear to be?"/> mouse_opaque="true" show_text="true" width="205" auto_resize="false" tool_tip="How big do you want the platform to appear to be?"/>
<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" <text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
name="cmd_line_text_8" width="512"> name="cmd_line_text_8" width="512">
Calc. expressions (usage: cmd 2 + 2) Calc. expressions (usage: cmd 2 + 2)
</text> </text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
tool_tip="" name="AscentCmdLineCalc" control_name="AscentCmdLineCalc" width="200"/> tool_tip="" name="AscentCmdLineCalc" control_name="AscentCmdLineCalc" width="200"/>
<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
name="cmd_line_text_15" width="512"> name="cmd_line_text_15" width="512">
Clear the chat history (usage: cmd)</text> Clear the chat history (usage: cmd)
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
tool_tip="Clears the Chat History to prevent lag effects from chat spammers." tool_tip="Clears the Chat History to prevent lag effects from chat spammers."
@@ -448,7 +192,7 @@ Use #f for user's first name, #l for last name,
left="230" name="CmdDivisor" width="0"/> left="230" name="CmdDivisor" width="0"/>
<text bottom_delta="277" follows="left|top" font="SansSerifSmall" height="16" left_delta="10" <text bottom_delta="277" follows="left|top" font="SansSerifSmall" height="16" left_delta="10"
name="cmd_line_text_9" width="512"> name="cmd_line_text_9" width="512">
Change Draw Distance (usage: cmd meters) Change Draw Distance (usage: cmd meters)
</text> </text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
@@ -456,43 +200,48 @@ Use #f for user's first name, #l for last name,
width="200"/> width="200"/>
<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
name="cmd_line_text_10" width="512"> name="cmd_line_text_10" width="512">
Teleport to cam position (usage: cmd)</text> Teleport to cam position (usage: cmd)
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
tool_tip="" name="AscentCmdTeleportToCam" control_name="AscentCmdTeleportToCam" tool_tip="" name="AscentCmdTeleportToCam" control_name="AscentCmdTeleportToCam"
width="200"/> width="200"/>
<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
name="cmd_line_text_11" width="512"> name="cmd_line_text_11" width="512">
Get avatar name from key (usage: cmd key)</text> Get avatar name from key (usage: cmd key)
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
tool_tip="" name="AscentCmdLineKeyToName" control_name="AscentCmdLineKeyToName" tool_tip="" name="AscentCmdLineKeyToName" control_name="AscentCmdLineKeyToName"
width="200"/> width="200"/>
<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
name="cmd_line_text_12" width="512"> name="cmd_line_text_12" width="512">
Offer teleport to avatar (usage: cmd key)</text> Offer teleport to avatar (usage: cmd key)
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
tool_tip="" name="AscentCmdLineOfferTp" control_name="AscentCmdLineOfferTp" width="200"/> tool_tip="" name="AscentCmdLineOfferTp" control_name="AscentCmdLineOfferTp" width="200"/>
<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
name="cmd_line_text_7" width="512"> name="cmd_line_text_7" width="512">
Teleport to sim x (usage: cmd simname) Teleport to sim x (usage: cmd simname)
</text> </text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
tool_tip="" name="AscentCmdLineMapTo" control_name="AscentCmdLineMapTo" width="200"/> tool_tip="" name="AscentCmdLineMapTo" control_name="AscentCmdLineMapTo" width="200"/>
<check_box bottom_delta="-24" enabled="true" follows="left|top" font="SansSerifSmall" height="16" <check_box bottom_delta="-24" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
initial_value="false" label="Use same position between sims" left_delta="0" mouse_opaque="true" initial_value="false" label="Use same position between sims" left_delta="0" mouse_opaque="true"
name="AscentMapToKeepPos" radio_style="false" width="270" name="map_to_keep_pos" radio_style="false" width="270"
control_name="AscentMapToKeepPos"/> control_name="AscentMapToKeepPos"/>
<text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0" <text bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16" left_delta="0"
name="cmd_line_text_13" width="512"> name="cmd_line_text_13" width="512">
Teleport to avatar (usage: cmd name)</text> Teleport to avatar (usage: cmd name)
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top" <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true" font="SansSerifSmall" height="20" left_delta="0" max_length="256" mouse_opaque="true"
tool_tip="The syntax of this command allows partial names and is not case sensitive. Better results if used while the Radar is open." tool_tip="The syntax of this command allows partial names and is not case sensitive. Better results if used while the Radar is open."
name="AscentCmdLineTP2" control_name="AscentCmdLineTP2" width="200"/> name="AscentCmdLineTP2" control_name="AscentCmdLineTP2" width="200"/>
</panel> </panel>
<panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true" <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
follows="left|top|right|bottom" label="Security" name="Security"> follows="left|top|right|bottom" label="Security" name="Security">
<check_box bottom_delta="-25" control_name="BroadcastViewerEffects" enabled="true" <check_box bottom_delta="-25" control_name="BroadcastViewerEffects" enabled="true"
@@ -540,13 +289,14 @@ Use #f for user's first name, #l for last name,
min_val="1" mouse_opaque="true" name="ScriptJumpCount" width="50" control_name="Ascentnumscriptdiff" min_val="1" mouse_opaque="true" name="ScriptJumpCount" width="50" control_name="Ascentnumscriptdiff"
tool_tip="Threshold for the script jump message [Default: 100]"/> tool_tip="Threshold for the script jump message [Default: 100]"/>
</panel> </panel>
<panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true" <panel border="true" left="1" bottom="-408" height="408" width="500" mouse_opaque="true"
follows="left|top|right|bottom" label="Building" name="Building"> follows="left|top|right|bottom" label="Building" name="Building">
<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false" <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
bottom_delta="-19" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall" bottom_delta="-19" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
h_pad="0" halign="left" height="10" left_delta="30" mouse_opaque="false" h_pad="0" halign="left" height="10" left_delta="30" mouse_opaque="false"
name="text_box6" v_pad="0" width="150"> name="text_box6" v_pad="0" width="150">
Pivot Point Pivot Point
</text> </text>
<spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05" <spinner bottom_delta="-20" decimal_digits="5" follows="left|top" height="16" increment="0.05"
label="X pos" label_width="40" left="10" mouse_opaque="true" max_val="256" label="X pos" label_width="40" left="10" mouse_opaque="true" max_val="256"
@@ -572,76 +322,5 @@ Use #f for user's first name, #l for last name,
radio_style="false" width="270"/> radio_style="false" width="270"/>
</panel> </panel>
<panel border="true" bottom="-580" follows="left|top|right|bottom" height="525" label="Text Options"
left="1" mouse_opaque="true" name="TextOptions" width="418">
<check_box bottom="-25" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
label="Show misspelled words in red" left="12" mouse_opaque="true" name="SpellDisplay"
control_name="SpellDisplay" width="126"/>
<text bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="16" left="12"
name="EmSpell_txt1" width="512">
Current language (dictionary):
</text>
<combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="20"
max_chars="200" mouse_opaque="true" name="SpellBase" width="250"
control_name="SpellBase" tool_tip=""/>
<text bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="20" left="12"
name="EmSpell_txt3" width="512">
Downloaded languages (dictionaries):
</text>
<combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="20"
max_chars="200" mouse_opaque="true" name="EmSpell_Avail" width="250"
control_name="EmSpell_Avail" tool_tip=""/>
<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Install"
name="EmSpell_Add" tool_tip="" left_delta="255" width="80"/>
<button bottom_delta="-22" follows="left|top" font="SansSerifSmall" height="20" label="Download More..."
name="EmSpell_GetMore" tool_tip="Get more dictionaries availabe online" left="12" width="250"/>
<text bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="20" left="12"
name="EmSpell_txt2" width="512">
Additional custom languages (dictionaries):
</text>
<combo_box allow_text_entry="false" bottom_delta="-20" left_delta="0" follows="left|top" height="20"
max_chars="200" mouse_opaque="true" name="EmSpell_Installed" width="250"
control_name="EmSpell_Installed" tool_tip=""/>
<button bottom_delta="0" follows="left|top" font="SansSerifSmall" height="20" label="Remove"
name="EmSpell_Remove" tool_tip="" left_delta="255" width="80"/>
<button bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" label="Edit Custom dictionary"
name="EmSpell_EditCustom" tool_tip="" left="12" width="250"/>
<text bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="20" left="12"
name="EmSpell_txt4" width="512">
To use spellcheck, right-click a misspelled word
(red or otherwise) and select its replacement
</text>
<view_border bevel_style="none" border_thickness="1" bottom_delta="-16" follows="top|left" height="0"
left="5" name="CmdDivisor" width="356"/>
<check_box bottom_delta="-24" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
label="Highlight messages if any of they contain the terms" left="5" mouse_opaque="true"
name="Keywords_Alert" radio_style="false" width="270"/>
<text bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="20" left="12"
name="keyword_txt1" width="512">
(separated by commas)
</text>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
font="SansSerifSmall" height="20" left_delta="5" max_length="500" mouse_opaque="true" name="Keywords_Entries" width="300" />
<text bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="20" left_delta="15" name="EmKeyw"
width="100">Is found within:</text>
<check_box bottom_delta="3" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
label="Local Chat Floater" left_delta="100" mouse_opaque="true" name="Keywords_LocalChat" radio_style="false" width="270"/>
<check_box bottom_delta="-15" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
label="Instant Message Floater" left_delta="0" mouse_opaque="true" name="Keywords_IM" radio_style="false" width="270"/>
<check_box bottom_delta="-24" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
label="Highlight the message in this color:" left_delta="-110" mouse_opaque="true" name="Keywords_Highlight"
radio_style="false" width="270"/>
<color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom_delta="-16" can_apply_immediately="true"
color="1, 1, 1, 1" follows="left|top" height="35" label="" left_delta="210"
mouse_opaque="true" name="Keywords_Color" tool_tip="Click to open Color Picker" width="50"/>
<check_box bottom_delta="-10" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
label="Play this sound alert: (UUID)" left_delta="-210" mouse_opaque="true" name="Keywords_PlaySound"
radio_style="false" width="270"/>
<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-20" follows="left|top"
font="SansSerifSmall" height="20" left_delta="-5" max_length="36" mouse_opaque="true" name="Keywords_SoundUUID" width="300" />
</panel>
</tab_container> </tab_container>
</panel> </panel>

4
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" standalone="yes" ?> <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<panel top="20" left="10" height="400" width="512" follows="left|top|right|bottom" <panel top="20" left="10" height="400" width="512" follows="left|top|right|bottom"
border="true" label="Vanity Settings" name="ascvan" enabled="true" mouse_opaque="true"> border="true" label="SG Vanity" name="ascvan" enabled="true" mouse_opaque="true">
<tab_container label="Singularity" bottom="0" height="440" width="497" left="0" <tab_container label="SG Vanity" bottom="0" height="440" width="497" left="0"
name="Ascent Vanity" tab_min_width="90" tab_position="top"> name="Ascent Vanity" tab_min_width="90" tab_position="top">
<panel border="true" left="1" bottom="-190" height="180" width="500" mouse_opaque="true" <panel border="true" left="1" bottom="-190" height="180" width="500" mouse_opaque="true"
follows="left|top|right|bottom" label="General" name="General"> follows="left|top|right|bottom" label="General" name="General">