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

Merge branch 'master' of github.com:Beeks/Ascent

Browse Source
This commit is contained in:
CharleyLevenque
2010-08-26 22:49:45 -04:00
parent 8c23e3bdea 2be05793b1
commit fbcfee20b6
9 changed files with 541 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,203 +114,252 @@
<integer>0</integer> <integer>0</integer>
</map> </map>
<!-- Ascent-Specific Settings --> <!-- Ascent-Specific Settings -->
<key>AscentCmdLine</key> <key>AscentCmdLine</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string>Would you like the chatbar to be able to be used for command line functions?</string> <string>Would you like the chatbar to be able to be used for command line functions?</string>
<key>Persist</key> <key>Persist</key>
<integer>1</integer> <integer>1</integer>
<key>Type</key> <key>Type</key>
<string>Boolean</string> <string>Boolean</string>
<key>Value</key> <key>Value</key>
<integer>1</integer> <integer>1</integer>
</map> </map>
<key>AscentCmdLineClearChat</key> <key>AscentCmdLineClearChat</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string>Clear chat history to stop lag from chat spam</string> <string>Clear chat history to stop lag from chat spam</string>
<key>Persist</key> <key>Persist</key>
<integer>1</integer> <integer>1</integer>
<key>Type</key> <key>Type</key>
<string>String</string> <string>String</string>
<key>Value</key> <key>Value</key>
<string>clrchat</string> <string>clrchat</string>
</map> </map>
<key>AscentCmdLineHeight</key> <key>AscentCmdLineHeight</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string>Teleport to height function command</string> <string>Teleport to height function command</string>
<key>Persist</key> <key>Persist</key>
<integer>1</integer> <integer>1</integer>
<key>Type</key> <key>Type</key>
<string>String</string> <string>String</string>
<key>Value</key> <key>Value</key>
<string>gth</string> <string>gth</string>
</map> </map>
<key>AscentCmdLinePos</key> <key>AscentCmdLinePos</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string>Teleport to position function command</string> <string>Teleport to position function command</string>
<key>Persist</key> <key>Persist</key>
<integer>1</integer> <integer>1</integer>
<key>Type</key> <key>Type</key>
<string>String</string> <string>String</string>
<key>Value</key> <key>Value</key>
<string>gtp</string> <string>gtp</string>
</map> </map>
<key>AscentCmdLineGround</key> <key>AscentCmdLineGround</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string>Teleport to ground function command</string> <string>Teleport to ground function command</string>
<key>Persist</key> <key>Persist</key>
<integer>1</integer> <integer>1</integer>
<key>Type</key> <key>Type</key>
<string>String</string> <string>String</string>
<key>Value</key> <key>Value</key>
<string>flr</string> <string>flr</string>
</map> </map>
<key>AscentCmdLineTeleportHome</key> <key>AscentCmdLineTeleportHome</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string>Teleport to home function command</string> <string>Teleport to home function command</string>
<key>Persist</key> <key>Persist</key>
<integer>1</integer> <integer>1</integer>
<key>Type</key> <key>Type</key>
<string>String</string> <string>String</string>
<key>Value</key> <key>Value</key>
<string>tph</string> <string>tph</string>
</map> </map>
<key>AscentCmdLineRezPlatform</key> <key>AscentCmdLineRezPlatform</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string>Rez a platform underneath you</string> <string>Rez a platform underneath you</string>
<key>Persist</key> <key>Persist</key>
<integer>1</integer> <integer>1</integer>
<key>Type</key> <key>Type</key>
<string>String</string> <string>String</string>
<key>Value</key> <key>Value</key>
<string>rezplat</string> <string>rezplat</string>
</map> </map>
<key>AscentPlatformSize</key> <key>AscentPlatformSize</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string>How wide the rezzed platform will appear to be.</string> <string>How wide the rezzed platform will appear to be.</string>
<key>Persist</key> <key>Persist</key>
<integer>1</integer> <integer>1</integer>
<key>Type</key> <key>Type</key>
<string>F32</string> <string>F32</string>
<key>Value</key> <key>Value</key>
<real>30</real> <real>30</real>
</map> </map>
<key>AscentCmdLineMapTo</key> <key>AscentCmdLineMapTo</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string>Teleport to a region by name rapidly</string> <string>Teleport to a region by name rapidly</string>
<key>Persist</key> <key>Persist</key>
<integer>1</integer> <integer>1</integer>
<key>Type</key> <key>Type</key>
<string>String</string> <string>String</string>
<key>Value</key> <key>Value</key>
<string>mapto</string> <string>mapto</string>
</map> </map>
<key>AscentCmdLineDrawDistance</key> <key>AscentCmdLineMapToKeepPos</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string>Change draw distance quickly</string> <string>Attempt to arrive in the same location you were at.</string>
<key>Persist</key> <key>Persist</key>
<integer>1</integer> <integer>1</integer>
<key>Type</key> <key>Type</key>
<string>String</string> <string>Boolean</string>
<key>Value</key> <key>Value</key>
<string>dd</string> <integer>0</integer>
</map> </map>
<key>AscentCmdTeleportToCam</key> <key>AscentCmdLineDrawDistance</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string>Teleport to your camera</string> <string>Change draw distance quickly</string>
<key>Persist</key> <key>Persist</key>
<integer>1</integer> <integer>1</integer>
<key>Type</key> <key>Type</key>
<string>String</string> <string>String</string>
<key>Value</key> <key>Value</key>
<string>tp2cam</string> <string>dd</string>
</map> </map>
<key>AscentCmdLineKeyToName</key> <key>AscentCmdTeleportToCam</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string>Use a fast key to name querry</string> <string>Teleport to your camera</string>
<key>Persist</key> <key>Persist</key>
<integer>1</integer> <integer>1</integer>
<key>Type</key> <key>Type</key>
<string>String</string> <string>String</string>
<key>Value</key> <key>Value</key>
<string>key2name</string> <string>tp2cam</string>
</map> </map>
<key>AscentCmdLineOfferTp</key> <key>AscentCmdLineKeyToName</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string>Offer a teleport to target avatar</string> <string>Use a fast key to name querry</string>
<key>Persist</key> <key>Persist</key>
<integer>1</integer> <integer>1</integer>
<key>Type</key> <key>Type</key>
<string>String</string> <string>String</string>
<key>Value</key> <key>Value</key>
<string>offertp</string> <string>key2name</string>
</map> </map>
<key>AscentCmdLineCalc</key> <key>AscentCmdLineOfferTp</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string>Calculates an expression</string> <string>Offer a teleport to target avatar</string>
<key>Persist</key> <key>Persist</key>
<integer>1</integer> <integer>1</integer>
<key>Type</key> <key>Type</key>
<string>String</string> <string>String</string>
<key>Value</key> <key>Value</key>
<string>calc</string> <string>offertp</string>
</map> </map>
<key>AscentCmdLineTP2</key> <key>AscentCmdLineCalc</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string>Teleport to a person by name, partials work.</string> <string>Calculates an expression</string>
<key>Persist</key> <key>Persist</key>
<integer>1</integer> <integer>1</integer>
<key>Type</key> <key>Type</key>
<string>String</string> <string>String</string>
<key>Value</key> <key>Value</key>
<string>tp2</string> <string>calc</string>
</map> </map>
<key>AscentAutoCloseOOC</key> <key>AscentCmdLineTP2</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string>Auto-close OOC chat (i.e. add \"))\" if not found and \"((\" was used)</string> <string>Teleport to a person by name, partials work.</string>
<key>Persist</key> <key>Persist</key>
<integer>1</integer> <integer>1</integer>
<key>Type</key> <key>Type</key>
<string>Boolean</string> <string>String</string>
<key>Value</key> <key>Value</key>
<integer>0</integer> <string>tp2</string>
</map> </map>
<key>AscentAllowMUpose</key> <key>AscentUseCustomTag</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string>Allow MU* pose style in chat and IM (with ':' as a synonymous to '/me ')</string> <string>Show a custom local tag.</string>
<key>Persist</key> <key>Persist</key>
<integer>1</integer> <integer>1</integer>
<key>Type</key> <key>Type</key>
<string>Boolean</string> <string>Boolean</string>
<key>Value</key> <key>Value</key>
<integer>0</integer> <integer>0</integer>
</map> </map>
<key>AscentCustomTagColor</key>
<map>
<key>Comment</key>
<string>Color of custom local tag.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>0.5</real>
<real>1.0</real>
<real>0.25</real>
<real>1.0</real>
</array>
</map>
<key>AscentCustomTagLabel</key>
<map>
<key>Comment</key>
<string>Label for the custom local tag</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>Custom</string>
</map>
<key>AscentAutoCloseOOC</key>
<map>
<key>Comment</key>
<string>Auto-close OOC chat (i.e. add \"))\" if not found and \"((\" was used)</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AscentAllowMUpose</key>
<map>
<key>Comment</key>
<string>Allow MU* pose style in chat and IM (with ':' as a synonymous to '/me ')</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AscentStoreSettingsPerAccount</key> <key>AscentStoreSettingsPerAccount</key>
<map> <map>
<key>Comment</key> <key>Comment</key>
<string>Toggles whether to save certain settings per-account, rather than per-install.</string> <string>Toggles whether to save certain settings per-account, rather than per-install.</string>
<key>Persist</key> <key>Persist</key>
<integer>0</integer> <integer>0</integer>
<key>Type</key> <key>Type</key>
<string>Boolean</string> <string>Boolean</string>
<key>Value</key> <key>Value</key>
<integer>0</integer> <integer>0</integer>
</map> </map>
<key>AscentDataSeparator</key> <key>AscentDataSeparator</key>
<map> <map>

38
indra/newview/app_settings/settings_per_account.xml
View File

@@ -14,6 +14,44 @@
</array> </array>
</map> </map>
<!-- Ascent Account-Specific (If active) --> <!-- Ascent Account-Specific (If active) -->
<key>AscentUseCustomTag</key>
<map>
<key>Comment</key>
<string>Show a custom local tag.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>AscentCustomTagColor</key>
<map>
<key>Comment</key>
<string>Color of custom local tag.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Color4</string>
<key>Value</key>
<array>
<real>0.5</real>
<real>1.0</real>
<real>0.25</real>
<real>1.0</real>
</array>
</map>
<key>AscentCustomTagLabel</key>
<map>
<key>Comment</key>
<string>Label for the custom local tag</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string>Custom</string>
</map>
<key>AscentSpoofClientIndex</key> <key>AscentSpoofClientIndex</key>
<map> <map>
<key>Comment</key> <key>Comment</key>

67
indra/newview/ascentprefssys.cpp
View File

@@ -34,7 +34,6 @@
//File include //File include
#include "ascentprefssys.h" #include "ascentprefssys.h"
#include "ascentprefsvan.h"
#include "llcolorswatch.h" #include "llcolorswatch.h"
#include "llvoavatar.h" #include "llvoavatar.h"
#include "llagent.h" #include "llagent.h"
@@ -244,9 +243,20 @@ void LLPrefsAscentSysImpl::apply()
{ {
std::string short_date, long_date, short_time, long_time, timestamp; std::string short_date, long_date, short_time, long_time, timestamp;
gSavedSettings.setU32("LinksForChattingObjects", childGetValue("objects_link").asInteger()); //General ------------------------------------------------------------------------------
gSavedSettings.setBOOL("DoubleClickTeleport", childGetValue("double_click_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"));
//Save User Interface //Chat/IM ------------------------------------------------------------------------------
//Missing the echo/log option.
gSavedSettings.setBOOL("PlayTypingSound", childGetValue("play_typing_sound_check"));
gSavedSettings.setBOOL("AscentHideTypingNotification", childGetValue("hide_typing_check"));
//MU Pose missing.
//Auto-close missing.
gSavedSettings.setU32("LinksForChattingObjects", childGetValue("objects_link").asInteger());
LLComboBox* combo = getChild<LLComboBox>("time_format_combobox"); LLComboBox* combo = getChild<LLComboBox>("time_format_combobox");
if (combo) { if (combo) {
mTimeFormat = combo->getCurrentIndex(); mTimeFormat = combo->getCurrentIndex();
@@ -290,37 +300,46 @@ void LLPrefsAscentSysImpl::apply()
timestamp = "%a %b %d %Y" + timestamp; timestamp = "%a %b %d %Y" + timestamp;
} }
gSavedSettings.setString("ShortDateFormat", short_date); gSavedSettings.setString("ShortDateFormat", short_date);
gSavedSettings.setString("LongDateFormat", long_date); gSavedSettings.setString("LongDateFormat", long_date);
gSavedSettings.setString("ShortTimeFormat", short_time); gSavedSettings.setString("ShortTimeFormat", short_time);
gSavedSettings.setString("LongTimeFormat", long_time); gSavedSettings.setString("LongTimeFormat", long_time);
gSavedSettings.setString("TimestampFormat", timestamp); gSavedSettings.setString("TimestampFormat", timestamp);
gSavedSettings.setBOOL("SecondsInChatAndIMs", childGetValue("seconds_in_chat_and_ims_check")); gSavedSettings.setBOOL("SecondsInChatAndIMs", childGetValue("seconds_in_chat_and_ims_check"));
//Save Chat/IM //Performance ----------------------------------------------------------------------------
gSavedSettings.setBOOL("PlayTypingSound", childGetValue("play_typing_sound_check")); gSavedSettings.setBOOL("FetchInventoryOnLogin", childGetValue("fetch_inventory_on_login_check"));
//Save Performance
gSavedSettings.setBOOL("WindEnabled", childGetValue("enable_wind")); gSavedSettings.setBOOL("WindEnabled", childGetValue("enable_wind"));
//Missing "Enabled Clouds"
//Save Privacy
gSavedSettings.setBOOL("AscentHideTypingNotification", childGetValue("hide_typing_check"));
//Save Misc
gSavedSettings.setBOOL("DoubleClickTeleport", childGetValue("double_click_teleport_check"));
gSavedSettings.setBOOL("SpeedRez", childGetValue("speed_rez_check")); gSavedSettings.setBOOL("SpeedRez", childGetValue("speed_rez_check"));
gSavedSettings.setU32("SpeedRezInterval", childGetValue("speed_rez_interval").asReal()); gSavedSettings.setU32("SpeedRezInterval", childGetValue("speed_rez_interval").asReal());
gSavedSettings.setBOOL("PreviewAnimInWorld", childGetValue("preview_anim_in_world_check"));
//Commandline ----------------------------------------------------------------------------
//Missing "Use Command Line"
gSavedSettings.setString("AscentCmdLinePos", childGetValue("AscentCmdLinePos"));
gSavedSettings.setString("AscentCmdLineGround", childGetValue("AscentCmdLineGround"));
gSavedSettings.setString("AscentCmdLineHeight", childGetValue("AscentCmdLineHeight"));
gSavedSettings.setString("AscentCmdLineTeleportHome", childGetValue("AscentCmdLineTeleportHome"));
gSavedSettings.setString("AscentCmdLineRezPlatform", childGetValue("AscentCmdLineRezPlatform"));
//Platform Size
gSavedSettings.setString("AscentCmdLineCalc", childGetValue("AscentCmdLineCalc"));
gSavedSettings.setString("AscentCmdLineClearChat", childGetValue("AscentCmdLineClearChat"));
//-------------------------------------------------------------------------------------
gSavedSettings.setString("AscentCmdLineDrawDistance", childGetValue("AscentCmdLineDrawDistance"));
gSavedSettings.setString("AscentCmdTeleportToCam", childGetValue("AscentCmdTeleportToCam"));
gSavedSettings.setString("AscentCmdLineKeyToName", childGetValue("AscentCmdLineKeyToName"));
gSavedSettings.setString("AscentCmdLineOfferTp", childGetValue("AscentCmdLineOfferTp"));
gSavedSettings.setString("AscentCmdLineMapTo", childGetValue("AscentCmdLineMapTo"));
gSavedSettings.setBOOL("AscentCmdLineMapToKeepPos", childGetValue("AscentCmdLineMapToKeepPos"));
gSavedSettings.setString("AscentCmdLineTP2", childGetValue("AscentCmdLineTP2"));
//Privacy --------------------------------------------------------------------------------
gSavedSettings.setBOOL("BroadcastViewerEffects", childGetValue("broadcast_viewer_effects")); gSavedSettings.setBOOL("BroadcastViewerEffects", childGetValue("broadcast_viewer_effects"));
gSavedSettings.setBOOL("DisablePointAtAndBeam", childGetValue("disable_point_at_and_beams_check")); gSavedSettings.setBOOL("DisablePointAtAndBeam", childGetValue("disable_point_at_and_beams_check"));
gSavedSettings.setBOOL("PrivateLookAt", childGetValue("private_look_at_check")); gSavedSettings.setBOOL("PrivateLookAt", childGetValue("private_look_at_check"));
gSavedSettings.setBOOL("RevokePermsOnStandUp", childGetValue("revoke_perms_on_stand_up_check")); gSavedSettings.setBOOL("RevokePermsOnStandUp", childGetValue("revoke_perms_on_stand_up_check"));
gSavedSettings.setBOOL("SaveScriptsAsMono", childGetValue("save_scripts_as_mono_check"));
gSavedSettings.setBOOL("FetchInventoryOnLogin", childGetValue("fetch_inventory_on_login_check"));
gSavedSettings.setBOOL("AscentAlwaysRezInGroup", childGetValue("always_rez_in_group_check"));
refreshValues(); refreshValues();
} }

109
indra/newview/ascentprefsvan.cpp
View File

@@ -62,9 +62,14 @@ public:
private: private:
static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data); static void onCommitCheckBox(LLUICtrl* ctrl, void* user_data);
void refreshValues(); void refreshValues();
//General
BOOL mUseAccountSettings;
//Colors
BOOL mShowSelfClientTag; BOOL mShowSelfClientTag;
BOOL mShowSelfClientTagColor; BOOL mShowSelfClientTagColor;
BOOL mUseAccountSettings; BOOL mCustomTagOn;
std::string mCustomTagLabel;
LLColor4 mCustomTagColor;
LLColor4 mEffectColor; LLColor4 mEffectColor;
U32 mSelectedClient; U32 mSelectedClient;
}; };
@@ -75,6 +80,9 @@ LLPrefsAscentVanImpl::LLPrefsAscentVanImpl()
{ {
LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_ascent_vanity.xml"); LLUICtrlFactory::getInstance()->buildPanel(this, "panel_preferences_ascent_vanity.xml");
childSetCommitCallback("use_account_settings_check", onCommitCheckBox, this); childSetCommitCallback("use_account_settings_check", onCommitCheckBox, this);
childSetCommitCallback("customize_own_tag_check", onCommitCheckBox, this);
refresh(); refresh();
} }
@@ -82,8 +90,31 @@ LLPrefsAscentVanImpl::LLPrefsAscentVanImpl()
//static //static
void LLPrefsAscentVanImpl::onCommitCheckBox(LLUICtrl* ctrl, void* user_data) void LLPrefsAscentVanImpl::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
{ {
LLPrefsAscentVanImpl* self = (LLPrefsAscentVanImpl*)user_data; LLPrefsAscentVanImpl* self = (LLPrefsAscentVanImpl*)user_data;
self->refresh();
llinfos << "Control named " << ctrl->getControlName() << llendl;
if (ctrl->getControlName() == "AscentStoreSettingsPerAccount")
{
self->refresh();
}
else
{
if (gSavedSettings.getBOOL("AscentUseCustomTag"))
{
self->childEnable("custom_tag_label_text");
self->childEnable("custom_tag_label_box");
self->childEnable("custom_tag_color_text");
self->childEnable("custom_tag_color_swatch");
}
else
{
self->childDisable("custom_tag_label_text");
self->childDisable("custom_tag_label_box");
self->childDisable("custom_tag_color_text");
self->childDisable("custom_tag_color_swatch");
}
}
} }
void LLPrefsAscentVanImpl::refreshValues() void LLPrefsAscentVanImpl::refreshValues()
@@ -100,21 +131,58 @@ void LLPrefsAscentVanImpl::refreshValues()
{ {
mSelectedClient = gSavedSettings.getU32("AscentSpoofClientIndex"); mSelectedClient = gSavedSettings.getU32("AscentSpoofClientIndex");
mEffectColor = gSavedSettings.getColor4("EffectColor"); mEffectColor = gSavedSettings.getColor4("EffectColor");
if (gSavedSettings.getBOOL("AscentUseCustomTag"))
{
childEnable("custom_tag_label_text");
childEnable("custom_tag_label_box");
childEnable("custom_tag_color_text");
childEnable("custom_tag_color_swatch");
}
else
{
childDisable("custom_tag_label_text");
childDisable("custom_tag_label_box");
childDisable("custom_tag_color_text");
childDisable("custom_tag_color_swatch");
}
mCustomTagLabel = gSavedSettings.getString("AscentCustomTagLabel");
mCustomTagColor = gSavedSettings.getColor4("AscentCustomTagColor");
} }
else else
{ {
mSelectedClient = gSavedPerAccountSettings.getU32("AscentSpoofClientIndex"); mSelectedClient = gSavedPerAccountSettings.getU32("AscentSpoofClientIndex");
mEffectColor = gSavedPerAccountSettings.getColor4("EffectColor"); mEffectColor = gSavedPerAccountSettings.getColor4("EffectColor");
if (gSavedPerAccountSettings.getBOOL("AscentUseCustomTag"))
{
childEnable("custom_tag_label_text");
childEnable("custom_tag_label_box");
childEnable("custom_tag_color_text");
childEnable("custom_tag_color_swatch");
}
else
{
childDisable("custom_tag_label_text");
childDisable("custom_tag_label_box");
childDisable("custom_tag_color_text");
childDisable("custom_tag_color_swatch");
}
mCustomTagLabel = gSavedPerAccountSettings.getString("AscentCustomTagLabel");
mCustomTagColor = gSavedPerAccountSettings.getColor4("AscentCustomTagColor");
} }
} }
void LLPrefsAscentVanImpl::refresh() void LLPrefsAscentVanImpl::refresh()
{ {
refreshValues(); refreshValues();
//General //General --------------------------------------------------------------------------------
childSetValue("use_account_settings_check", mUseAccountSettings); childSetValue("use_account_settings_check", mUseAccountSettings);
//Colors
llinfos << "Refreshing Vanity panel." << llendl; //Colors ---------------------------------------------------------------------------------
LLComboBox* combo = getChild<LLComboBox>("tag_spoofing_combobox");
combo->setCurrentByIndex(mSelectedClient);
childSetValue("show_self_tag_check", mShowSelfClientTag); childSetValue("show_self_tag_check", mShowSelfClientTag);
childSetValue("show_self_tag_color_check", mShowSelfClientTagColor); childSetValue("show_self_tag_color_check", mShowSelfClientTagColor);
@@ -132,12 +200,6 @@ void LLPrefsAscentVanImpl::refresh()
gSavedPerAccountSettings.setColor4("EffectColor", LLColor4::white); gSavedPerAccountSettings.setColor4("EffectColor", LLColor4::white);
gSavedPerAccountSettings.setColor4("EffectColor", mEffectColor); gSavedPerAccountSettings.setColor4("EffectColor", mEffectColor);
} }
// tag spoofing comboxbox
LLComboBox* combo = getChild<LLComboBox>("tag_spoofing_combobox");
combo->setCurrentByIndex(mSelectedClient);
} }
void LLPrefsAscentVanImpl::cancel() void LLPrefsAscentVanImpl::cancel()
@@ -149,8 +211,10 @@ void LLPrefsAscentVanImpl::apply()
{ {
std::string client_uuid; std::string client_uuid;
U32 client_index; U32 client_index;
//General -----------------------------------------------------------------------------
//Colors
//Colors ------------------------------------------------------------------------------
LLComboBox* combo = getChild<LLComboBox>("tag_spoofing_combobox"); LLComboBox* combo = getChild<LLComboBox>("tag_spoofing_combobox");
if (combo) if (combo)
{ {
@@ -158,7 +222,7 @@ void LLPrefsAscentVanImpl::apply()
//Don't rebake if it's not neccesary. //Don't rebake if it's not neccesary.
if (client_index != mSelectedClient) if (client_index != mSelectedClient)
{ {
client_uuid = combo->getSelectedValue(); client_uuid = combo->getSelectedValue().asString();
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount")) if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
{ {
gSavedSettings.setString("AscentSpoofClientUUID", client_uuid); gSavedSettings.setString("AscentSpoofClientUUID", client_uuid);
@@ -177,20 +241,27 @@ void LLPrefsAscentVanImpl::apply()
avatar->forceBakeAllTextures(slam_for_debug); avatar->forceBakeAllTextures(slam_for_debug);
} }
} }
gSavedSettings.setBOOL("AscentShowSelfTag", childGetValue("show_self_tag_check"));
gSavedSettings.setBOOL("AscentShowSelfTagColor", childGetValue("show_self_tag_color_check"));
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount")) if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
{ {
llinfos << "Storing color in client" << llendl; llinfos << "Storing color in client" << llendl;
gSavedSettings.setColor4("EffectColor", childGetValue("effect_color_swatch")); gSavedSettings.setColor4("EffectColor", childGetValue("effect_color_swatch"));
gSavedSettings.setBOOL("AscentUseCustomTag", childGetValue("customize_own_tag_check"));
gSavedSettings.setString("AscentCustomTagLabel", childGetValue("custom_tag_label_box"));
gSavedSettings.setColor4("AscentCustomTagColor", childGetValue("custom_tag_color_swatch"));
} }
else else
{ {
llinfos << "Storing color in account" << llendl; llinfos << "Storing color in account" << llendl;
gSavedPerAccountSettings.setColor4("EffectColor", childGetValue("effect_color_swatch")); gSavedPerAccountSettings.setColor4("EffectColor", childGetValue("effect_color_swatch"));
gSavedPerAccountSettings.setBOOL("AscentUseCustomTag", childGetValue("customize_own_tag_check"));
gSavedPerAccountSettings.setString("AscentCustomTagLabel", childGetValue("custom_tag_label_box"));
gSavedPerAccountSettings.setColor4("AscentCustomTagColor", childGetValue("custom_tag_color_swatch"));
} }
gSavedSettings.setBOOL("AscentShowSelfTag", childGetValue("show_self_tag_check"));
gSavedSettings.setBOOL("AscentShowSelfTagColor", childGetValue("show_self_tag_color_check"));
refreshValues(); refreshValues();
} }

6
indra/newview/llpanelskins.cpp
View File

@@ -91,7 +91,7 @@ void LLPanelSkins::refresh()
while(found) while(found)
{ {
found = gDirUtilp->getNextFileInDir(path_name, "*.xml", name, false); found = gDirUtilp->getNextFileInDir(path_name, "*.xml", name, false);
llinfos << "path name " << path_name << " and name " << name << " and found " << found << llendl; //llinfos << "path name " << path_name << " and name " << name << " and found " << found << llendl;
if(found) if(found)
{ {
LLSD data; LLSD data;
@@ -102,8 +102,8 @@ void LLPanelSkins::refresh()
{ {
datas.push_back(data); datas.push_back(data);
comboBox->add(data["skin_name"].asString()); comboBox->add(data["skin_name"].asString());
llinfos << "data is length " << datas.size() << " foldername field is " /*llinfos << "data is length " << datas.size() << " foldername field is "
<< data["folder_name"].asString() << " and looking for " << gSavedSettings.getString("SkinCurrent") <<llendl; << data["folder_name"].asString() << " and looking for " << gSavedSettings.getString("SkinCurrent") <<llendl;*/
if(data["folder_name"].asString()==mSkin) if(data["folder_name"].asString()==mSkin)
{ {
//llinfos << "found!!!!!!1!1" << llendl; //llinfos << "found!!!!!!1!1" << llendl;

15
indra/newview/llvoavatar.cpp
View File

@@ -3357,6 +3357,12 @@ void LLVOAvatar::getClientInfo(std::string& client, LLColor4& color, BOOL useCom
color = gColors.getColor( "AvatarNameColor" ); color = gColors.getColor( "AvatarNameColor" );
return; return;
} }
else if (gSavedSettings.getBOOL("AscentUseCustomTag"))
{
color = gSavedSettings.getColor4("AscentCustomTagColor");
client = gSavedSettings.getString("AscentCustomTagLabel");
return;
}
else if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount")) else if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
{ {
uuid_str = gSavedSettings.getString("AscentSpoofClientUUID"); uuid_str = gSavedSettings.getString("AscentSpoofClientUUID");
@@ -3405,7 +3411,7 @@ void LLVOAvatar::getClientInfo(std::string& client, LLColor4& color, BOOL useCom
&& getTEImage(TEX_LOWER_BODYPAINT)->getID().asString() == "4934f1bf-3b1f-cf4f-dbdf-a72550d05bc6") && getTEImage(TEX_LOWER_BODYPAINT)->getID().asString() == "4934f1bf-3b1f-cf4f-dbdf-a72550d05bc6")
{ {
color = LLColor4(0.5f, 0.0f, 0.0f); color = LLColor4(0.5f, 0.0f, 0.0f);
client = "Unknown"; client = "??";
} }
return; return;
} }
@@ -3448,7 +3454,7 @@ void LLVOAvatar::getClientInfo(std::string& client, LLColor4& color, BOOL useCom
} }
if (false) if (false)
//Probably should remove this entirely, but it's useful information if we're going to try for the new client tag idea. -HgB //We'll remove this entirely eventually, but it's useful information if we're going to try for the new client tag idea. -HgB
//if(useComment) //if(useComment)
{ {
LLUUID baked_head_id = getTE(9)->getID(); LLUUID baked_head_id = getTE(9)->getID();
@@ -5613,7 +5619,8 @@ void LLVOAvatar::processAnimationStateChanges()
stop_glerror(); stop_glerror();
} }
//Here's that undeform function I was talking about. -HGB /*Here's that undeform function I was talking about. -HGB
// Bug-fixed Linden Labs style. Comment out 4ever.
std::string undeformers[] = std::string undeformers[] =
{ {
"7a8a3dfc-acd1-7ac3-9cdf-71cd9be89969", "7a8a3dfc-acd1-7ac3-9cdf-71cd9be89969",
@@ -5675,7 +5682,7 @@ void LLVOAvatar::undeform()
} }
stop_glerror(); stop_glerror();
} }*/

101
indra/newview/skins/default/xui/en-us/menu_viewer.xml
View File

@@ -69,7 +69,7 @@
</menu_item_call> </menu_item_call>
<menu_item_separator bottom="-194" enabled="true" height="8" label="-----------" left="0" <menu_item_separator bottom="-194" enabled="true" height="8" label="-----------" left="0"
mouse_opaque="true" name="separator4" width="243" /> mouse_opaque="true" name="separator4" width="243" />
<menu_item_call bottom="-259" enabled="true" height="19" label="Quit" left="0" <menu_item_call bottom="-259" enabled="true" height="19" label="Quit" left="0" color="1 0 0 1"
mouse_opaque="true" name="Quit" shortcut="control|Q" width="243"> mouse_opaque="true" name="Quit" shortcut="control|Q" width="243">
<on_click function="File.Quit" userdata="" /> <on_click function="File.Quit" userdata="" />
</menu_item_call> </menu_item_call>
@@ -387,11 +387,100 @@
<on_click function="View.HighlightTransparent" userdata="" /> <on_click function="View.HighlightTransparent" userdata="" />
<on_check function="View.CheckHighlightTransparent" /> <on_check function="View.CheckHighlightTransparent" />
</menu_item_check> </menu_item_check>
<menu_item_check bottom="-384" enabled="true" height="19" label="Beacons" left="0" <menu create_jump_keys="true" drop_shadow="true" enabled="true"
mouse_opaque="true" name="beacons" width="211" shortcut="control|alt|shift|N"> label="Beacons" mouse_opaque="false" name="Beacons"
<on_click function="ShowFloater" userdata="beacons" /> opaque="true" tear_off="true">
<on_check function="FloaterVisible" userdata="beacons" /> <menu_item_check enabled="true" height="18"
</menu_item_check> label="Beacons Always On" mouse_opaque="true"
name="Beacons Always On" shortcut="control|n">
<on_click function="ToggleControl"
userdata="BeaconAlwaysOn" />
<on_check control="BeaconAlwaysOn" />
</menu_item_check>
<menu_item_separator enabled="true" height="8"
label="-----------" mouse_opaque="true" name="separator" />
<menu_item_check enabled="true" height="18"
label="Scripted Objects with Touch Only" left="0" color="1 0 0 1"
mouse_opaque="true" name="Scripted Objects With Touch Only">
<on_click function="View.ToggleBeacon"
userdata="scripttouchbeacon" />
<on_check function="View.CheckBeaconEnabled"
userdata="scripttouchbeacon" />
</menu_item_check>
<menu_item_check enabled="true" height="18"
label="Scripted Objects" mouse_opaque="true" color="1 0 0 1"
name="Scripted Objects">
<on_click function="View.ToggleBeacon"
userdata="scriptsbeacon" />
<on_check function="View.CheckBeaconEnabled"
userdata="scriptsbeacon" />
</menu_item_check>
<menu_item_check enabled="true" height="18"
label="Physical Objects" mouse_opaque="true" color="0 1 0 1"
name="Physical Objects">
<on_click function="View.ToggleBeacon"
userdata="physicalbeacon" />
<on_check function="View.CheckBeaconEnabled"
userdata="physicalbeacon" />
</menu_item_check>
<menu_item_check enabled="true" height="18"
label="Sound Sources" mouse_opaque="true" color="1 1 0 1"
name="Sound Sources">
<on_click function="View.ToggleBeacon"
userdata="soundsbeacon" />
<on_check function="View.CheckBeaconEnabled"
userdata="soundsbeacon" />
</menu_item_check>
<menu_item_check enabled="true" height="18"
label="Particle Sources" mouse_opaque="true" color="0 0 1 1"
name="Particle Sources">
<on_click function="View.ToggleBeacon"
userdata="particlesbeacon" />
<on_check function="View.CheckBeaconEnabled"
userdata="particlesbeacon" />
</menu_item_check>
<menu_item_separator enabled="true" height="8"
label="-----------" mouse_opaque="true" name="separator" />
<menu_item_check enabled="true" height="18"
label="Render Highlights" mouse_opaque="true"
name="Render Highlights">
<on_click function="View.ToggleBeacon"
userdata="renderhighlights" />
<on_check function="View.CheckBeaconEnabled"
userdata="renderhighlights" />
</menu_item_check>
<menu_item_check enabled="true" height="18"
label="Render Beacons" mouse_opaque="true"
name="Render Beacons">
<on_click function="View.ToggleBeacon"
userdata="renderbeacons" />
<on_check function="View.CheckBeaconEnabled"
userdata="renderbeacons" />
</menu_item_check>
<menu_item_separator enabled="true" height="8"
label="-----------" mouse_opaque="true" name="separator3" />
<menu create_jump_keys="true"
drop_shadow="true" enabled="true" height="117"
label="Beacon Width" mouse_opaque="false" name="Beacon Width"
opaque="true" tear_off="true">
<menu_item_call enabled="true" height="18" label="1"
mouse_opaque="true" name="Beacon Width 1">
<on_click function="View.BeaconWidth" userdata="1" />
</menu_item_call>
<menu_item_call enabled="true" height="18" label="4"
mouse_opaque="true" name="Beacon Width 4">
<on_click function="View.BeaconWidth" userdata="4" />
</menu_item_call>
<menu_item_call enabled="true" height="18" label="16"
mouse_opaque="true" name="Beacon Width 16">
<on_click function="View.BeaconWidth" userdata="16" />
</menu_item_call>
<menu_item_call enabled="true" height="18" label="32"
mouse_opaque="true" name="Beacon Width 32">
<on_click function="View.BeaconWidth" userdata="32" />
</menu_item_call>
</menu>
</menu>
<menu_item_check bottom="-384" enabled="true" height="19" label="Hide Particles" left="0" <menu_item_check bottom="-384" enabled="true" height="19" label="Hide Particles" left="0"
mouse_opaque="true" name="Hide Particles" width="129" shortcut="control|alt|shift|="> mouse_opaque="true" name="Hide Particles" width="129" shortcut="control|alt|shift|=">
<on_click function="View.ToggleRenderType" userdata="hideparticles" /> <on_click function="View.ToggleRenderType" userdata="hideparticles" />

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

@@ -17,12 +17,6 @@
tool_tip="The Animation upload window will play animations on your avatar when previewing them." tool_tip="The Animation upload window will play animations on your avatar when previewing them."
mouse_opaque="true" name="preview_anim_in_world_check" radio_style="false" mouse_opaque="true" name="preview_anim_in_world_check" radio_style="false"
width="400" /> width="400" />
<check_box bottom_delta="-20" control_name="RevokePermsOnStandUp" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="On standing up, revoke perms for the object your avatar was sitting on" left="10"
tool_tip="Objects generally retain Take Control and Trigger Animation permissions until reset or given permission by another user. Enabling this will make sure you revoke these permissions immediately."
mouse_opaque="true" name="revoke_perms_on_stand_up_check" radio_style="false"
width="400" />
<check_box bottom_delta="-20" control_name="SaveScriptsAsMono" enabled="true" <check_box bottom_delta="-20" control_name="SaveScriptsAsMono" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Save scripts in inventory as Mono scripts instead of LSL2" left="10" label="Save scripts in inventory as Mono scripts instead of LSL2" left="10"
@@ -271,7 +265,8 @@
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="toggle" radio_style="false" width="270" control_name="AscentCmdLineMapToKeepPos"/> name="AscentCmdLineMapToKeepPos" radio_style="false" width="270"
control_name="AscentCmdLineMapToKeepPos"/>
<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>
@@ -299,6 +294,12 @@
tool_tip="Turns off broadcasting headturns and lookat beacons for yourself." tool_tip="Turns off broadcasting headturns and lookat beacons for yourself."
mouse_opaque="true" name="private_look_at_check" radio_style="false" mouse_opaque="true" name="private_look_at_check" radio_style="false"
width="400" /> width="400" />
<check_box bottom_delta="-20" control_name="RevokePermsOnStandUp" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
label="On standing up, revoke perms for the object your avatar was sitting on" left="10"
tool_tip="Objects generally retain Take Control and Trigger Animation permissions until reset or given permission by another user. Enabling this will make sure you revoke these permissions immediately."
mouse_opaque="true" name="revoke_perms_on_stand_up_check" radio_style="false"
width="400" />
</panel> </panel>
</tab_container> </tab_container>
</panel> </panel>

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

@@ -90,32 +90,32 @@
tool_tip="Enabling this set your avatar name color to your client tag color or custom set color." tool_tip="Enabling this set your avatar name color to your client tag color or custom set color."
mouse_opaque="true" name="show_self_tag_color_check" radio_style="false" mouse_opaque="true" name="show_self_tag_color_check" radio_style="false"
width="400" /> width="400" />
<check_box bottom_delta="65" control_name="AscentCustomizeOwnTag" enabled="false" <check_box bottom_delta="65" control_name="AscentUseCustomTag" enabled="true"
follows="left|top" font="SansSerifSmall" height="16" initial_value="true" follows="left|top" font="SansSerifSmall" height="16" initial_value="true"
label="Use a custom color and label (Local only)" left_delta="230" label="Use a custom color and label (Local only)" left_delta="230"
tool_tip="Enabling this will let you set your own name tag to show up with your custom client and tag color. This only shows up to yourself." tool_tip="Enabling this will let you set your own name tag to show up with your custom client and tag color. This only shows up to yourself."
mouse_opaque="true" name="customize_own_tag_check" radio_style="false" mouse_opaque="true" name="customize_own_tag_check" radio_style="false"
width="400" /> width="400" />
<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="-16" left_delta="0" drop_shadow_visible="true" enabled="false" follows="left|top" bottom_delta="-16" left_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" font="SansSerifSmall" h_pad="0" halign="left" height="10"
mouse_opaque="true" name="tag_color_textbox" v_pad="0" width="394"> mouse_opaque="true" name="custom_tag_label_text" v_pad="0" width="394">
Tag Label: Tag Label:
</text> </text>
<line_editor bottom_delta="-8" enabled="false" follows="left|top" font="SansSerif" <line_editor bottom_delta="-8" enabled="true" follows="left|top" font="SansSerif"
height="20" left_delta="60" name="custom_client_tag_label" height="20" left_delta="60" name="custom_tag_label_box"
tool_tip="The custom string you would like to replace your client tag with (Local only)" tool_tip="The custom string you would like to replace your client tag with (Local only)"
width="170" /> width="170" />
<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="-25" left_delta="-60" drop_shadow_visible="true" enabled="false" follows="left|top" bottom_delta="-25" left_delta="-60" drop_shadow_visible="true" enabled="true" follows="left|top"
font="SansSerifSmall" h_pad="0" halign="left" height="10" font="SansSerifSmall" h_pad="0" halign="left" height="10"
mouse_opaque="true" name="tag_color_textbox" v_pad="0" width="394"> mouse_opaque="true" name="custom_tag_color_text" v_pad="0" width="394">
Tag color: Tag color:
</text> </text>
<color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-29" <color_swatch border_color="0.45098 0.517647 0.607843 1" bottom_delta="-29"
can_apply_immediately="false" color="1 1 1 1" can_apply_immediately="false" color="1 1 1 1"
enabled="false" follows="left|top" height="48" label="" left_delta="73" enabled="true" follows="left|top" height="48" label="" left_delta="60"
mouse_opaque="true" name="tag_color_swatch" mouse_opaque="true" name="custom_tag_color_swatch"
tool_tip="The custom color you would like to replace your client color with (Local only)" width="32" /> tool_tip="The custom color you would like to replace your client color with (Local only)" width="32" />
<!-- End of Client Tag settings --> <!-- End of Client Tag settings -->
<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"