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

-Sanity checks from snowglobe. ...

Browse Source 
-Null terminated a string buffer.
-Mutex locks are expensive.
-Realloc is my friend.
-But leaks are not.
-Nor are unused variables.
-And buffer overruns should get lost.
-bindManual shouldnt return failure if texture's already bound.
-Pulled windlight and classic clouds apart into unique rendertypes.
-'Client or Account' savedsettings stuff is now moar bettar. (and efficient)
-Replaced LLSavedSettingsGlue with something that supports gSavedSettings, gSavedPerAccountSettings, and gCOASavedSettings

-Added 'Enable Classic Clouds' checkbox to ascet performance settings panel
-New cards added to gpu table.
-General cleaning...
-How2spell 'dimensions'?
This commit is contained in:
unknown
2010-10-01 00:35:39 -05:00
parent 7b409eb7ab
commit 3e8a7172db
36 changed files with 361 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
indra/newview/ascentprefsvan.cpp
View File

@@ -45,7 +45,6 @@
#include "v4color.h"
#include "lluictrlfactory.h"
#include "llcombobox.h"
#include "llsavedsettingsglue.h"
#include "llwind.h"
#include "llviewernetwork.h"
#include "pipeline.h"
@@ -124,8 +123,8 @@ void LLPrefsAscentVanImpl::onCommitColor(LLUICtrl* ctrl, void* user_data)
{
llinfos << "Recreating color message for tag update." << llendl;
LLSavedSettingsGlue::setCOAString("AscentCustomTagLabel", self->childGetValue("custom_tag_label_box"));
LLSavedSettingsGlue::setCOAColor4("AscentCustomTagColor", self->childGetValue("custom_tag_color_swatch"));
gCOASavedSettings->setString("AscentCustomTagLabel", self->childGetValue("custom_tag_label_box"));
gCOASavedSettings->setColor4("AscentCustomTagColor", self->childGetValue("custom_tag_color_swatch"));
gAgent.sendAgentSetAppearance();
gAgent.resetClientTag();
}
@@ -182,7 +181,7 @@ void LLPrefsAscentVanImpl::onCommitCheckBox(LLUICtrl* ctrl, void* user_data)
}
BOOL showCustomOptions;
showCustomOptions = LLSavedSettingsGlue::getCOABOOL("AscentUseCustomTag");
showCustomOptions = gCOASavedSettings->getBOOL("AscentUseCustomTag");
self->childSetValue("customize_own_tag_check", showCustomOptions);
self->childSetEnabled("custom_tag_label_text", showCustomOptions);
self->childSetEnabled("custom_tag_label_box", showCustomOptions);
@@ -203,27 +202,23 @@ void LLPrefsAscentVanImpl::refreshValues()
//Colors
mShowSelfClientTag = gSavedSettings.getBOOL("AscentShowSelfTag");
mShowSelfClientTagColor = gSavedSettings.getBOOL("AscentShowSelfTagColor");
mCustomTagOn = gSavedSettings.getBOOL("AscentUseCustomTag");
mSelectedClient = LLSavedSettingsGlue::getCOAU32("AscentReportClientIndex");
mEffectColor = LLSavedSettingsGlue::getCOAColor4("EffectColor");
BOOL use_custom = LLSavedSettingsGlue::getCOABOOL("AscentUseCustomTag");
mCustomTagOn = gCOASavedSettings->getBOOL("AscentUseCustomTag");
mSelectedClient = gCOASavedSettings->getU32("AscentReportClientIndex");
mEffectColor = gCOASavedSettings->getColor4("EffectColor");
childSetEnabled("custom_tag_label_text", mCustomTagOn);
childSetEnabled("custom_tag_label_box", mCustomTagOn);
childSetEnabled("custom_tag_color_text", mCustomTagOn);
childSetEnabled("custom_tag_color_swatch", mCustomTagOn);
childSetEnabled("custom_tag_label_text", use_custom);
childSetEnabled("custom_tag_label_box", use_custom);
childSetEnabled("custom_tag_color_text", use_custom);
childSetEnabled("custom_tag_color_swatch", use_custom);
mCustomTagLabel = LLSavedSettingsGlue::getCOAString("AscentCustomTagLabel");
mCustomTagColor = LLSavedSettingsGlue::getCOAColor4("AscentCustomTagColor");
mFriendColor = LLSavedSettingsGlue::getCOAColor4("AscentFriendColor");
mLindenColor = LLSavedSettingsGlue::getCOAColor4("AscentLindenColor");
mMutedColor = LLSavedSettingsGlue::getCOAColor4("AscentMutedColor");
mEMColor = LLSavedSettingsGlue::getCOAColor4("AscentEstateOwnerColor");
mCustomColor = LLSavedSettingsGlue::getCOAColor4("MoyMiniMapCustomColor");
mCustomTagLabel = gCOASavedSettings->getString("AscentCustomTagLabel");
mCustomTagColor = gCOASavedSettings->getColor4("AscentCustomTagColor");
mFriendColor = gCOASavedSettings->getColor4("AscentFriendColor");
mLindenColor = gCOASavedSettings->getColor4("AscentLindenColor");
mMutedColor = gCOASavedSettings->getColor4("AscentMutedColor");
mEMColor = gCOASavedSettings->getColor4("AscentEstateOwnerColor");
mCustomColor = gCOASavedSettings->getColor4("MoyMiniMapCustomColor");
}
void LLPrefsAscentVanImpl::refresh()
@@ -251,23 +246,23 @@ void LLPrefsAscentVanImpl::refresh()
getChild<LLColorSwatchCtrl>("muted_color_swatch")->set(mMutedColor);
getChild<LLColorSwatchCtrl>("em_color_swatch")->set(mEMColor);
getChild<LLColorSwatchCtrl>("custom_color_swatch")->set(mCustomColor);
LLSavedSettingsGlue::setCOAColor4("EffectColor", LLColor4::white);
LLSavedSettingsGlue::setCOAColor4("EffectColor", mEffectColor);
gCOASavedSettings->setColor4("EffectColor", LLColor4::white);
gCOASavedSettings->setColor4("EffectColor", mEffectColor);
LLSavedSettingsGlue::setCOAColor4("AscentFriendColor", LLColor4::white);
LLSavedSettingsGlue::setCOAColor4("AscentFriendColor", mFriendColor);
gCOASavedSettings->setColor4("AscentFriendColor", LLColor4::white);
gCOASavedSettings->setColor4("AscentFriendColor", mFriendColor);
LLSavedSettingsGlue::setCOAColor4("AscentLindenColor", LLColor4::white);
LLSavedSettingsGlue::setCOAColor4("AscentLindenColor", mLindenColor);
gCOASavedSettings->setColor4("AscentLindenColor", LLColor4::white);
gCOASavedSettings->setColor4("AscentLindenColor", mLindenColor);
LLSavedSettingsGlue::setCOAColor4("AscentMutedColor", LLColor4::white);
LLSavedSettingsGlue::setCOAColor4("AscentMutedColor", mMutedColor);
gCOASavedSettings->setColor4("AscentMutedColor", LLColor4::white);
gCOASavedSettings->setColor4("AscentMutedColor", mMutedColor);
LLSavedSettingsGlue::setCOAColor4("AscentEstateOwnerColor", LLColor4::white);
LLSavedSettingsGlue::setCOAColor4("AscentEstateOwnerColor", mEMColor);
gCOASavedSettings->setColor4("AscentEstateOwnerColor", LLColor4::white);
gCOASavedSettings->setColor4("AscentEstateOwnerColor", mEMColor);
LLSavedSettingsGlue::setCOAColor4("MoyMiniMapCustomColor", LLColor4::white);
LLSavedSettingsGlue::setCOAColor4("MoyMiniMapCustomColor", mCustomColor);
gCOASavedSettings->setColor4("MoyMiniMapCustomColor", LLColor4::white);
gCOASavedSettings->setColor4("MoyMiniMapCustomColor", mCustomColor);
gAgent.resetClientTag();
}
@@ -279,18 +274,18 @@ void LLPrefsAscentVanImpl::cancel()
childSetValue("tp_sound_check", mPlayTPSound);
childSetValue("disable_logout_screen_check", mShowLogScreens);
LLSavedSettingsGlue::setCOAColor4("EffectColor", LLColor4::white);
LLSavedSettingsGlue::setCOAColor4("EffectColor", mEffectColor);
LLSavedSettingsGlue::setCOAColor4("AscentFriendColor", LLColor4::yellow);
LLSavedSettingsGlue::setCOAColor4("AscentFriendColor", mFriendColor);
LLSavedSettingsGlue::setCOAColor4("AscentLindenColor", LLColor4::yellow);
LLSavedSettingsGlue::setCOAColor4("AscentLindenColor", mLindenColor);
LLSavedSettingsGlue::setCOAColor4("AscentMutedColor", LLColor4::yellow);
LLSavedSettingsGlue::setCOAColor4("AscentMutedColor", mMutedColor);
LLSavedSettingsGlue::setCOAColor4("AscentEstateOwnerColor", LLColor4::yellow);
LLSavedSettingsGlue::setCOAColor4("AscentEstateOwnerColor", mEMColor);
LLSavedSettingsGlue::setCOAColor4("MoyMiniMapCustomColor", LLColor4::yellow);
LLSavedSettingsGlue::setCOAColor4("MoyMiniMapCustomColor", mCustomColor);
gCOASavedSettings->setColor4("EffectColor", LLColor4::white);
gCOASavedSettings->setColor4("EffectColor", mEffectColor);
gCOASavedSettings->setColor4("AscentFriendColor", LLColor4::yellow);
gCOASavedSettings->setColor4("AscentFriendColor", mFriendColor);
gCOASavedSettings->setColor4("AscentLindenColor", LLColor4::yellow);
gCOASavedSettings->setColor4("AscentLindenColor", mLindenColor);
gCOASavedSettings->setColor4("AscentMutedColor", LLColor4::yellow);
gCOASavedSettings->setColor4("AscentMutedColor", mMutedColor);
gCOASavedSettings->setColor4("AscentEstateOwnerColor", LLColor4::yellow);
gCOASavedSettings->setColor4("AscentEstateOwnerColor", mEMColor);
gCOASavedSettings->setColor4("MoyMiniMapCustomColor", LLColor4::yellow);
gCOASavedSettings->setColor4("MoyMiniMapCustomColor", mCustomColor);
}
void LLPrefsAscentVanImpl::apply()
@@ -311,8 +306,8 @@ void LLPrefsAscentVanImpl::apply()
if (client_index != mSelectedClient)
{
client_uuid = combo->getSelectedValue().asString();
LLSavedSettingsGlue::setCOAString("AscentReportClientUUID", client_uuid);
LLSavedSettingsGlue::setCOAU32("AscentReportClientIndex", client_index);
gCOASavedSettings->setString("AscentReportClientUUID", client_uuid);
gCOASavedSettings->setU32("AscentReportClientIndex", client_index);
LLVOAvatar* avatar = gAgent.getAvatarObject();
if (!avatar) return;
@@ -324,15 +319,15 @@ void LLPrefsAscentVanImpl::apply()
gSavedSettings.setBOOL("AscentShowSelfTag", childGetValue("show_self_tag_check"));
gSavedSettings.setBOOL("AscentShowSelfTagColor", childGetValue("show_self_tag_color_check"));
LLSavedSettingsGlue::setCOAColor4("EffectColor", childGetValue("effect_color_swatch"));
LLSavedSettingsGlue::setCOAColor4("AscentFriendColor", childGetValue("friend_color_swatch"));
LLSavedSettingsGlue::setCOAColor4("AscentLindenColor", childGetValue("linden_color_swatch"));
LLSavedSettingsGlue::setCOAColor4("AscentMutedColor", childGetValue("muted_color_swatch"));
LLSavedSettingsGlue::setCOAColor4("AscentEstateOwnerColor", childGetValue("em_color_swatch"));
LLSavedSettingsGlue::setCOAColor4("MoyMiniMapCustomColor", childGetValue("custom_color_swatch"));
LLSavedSettingsGlue::setCOABOOL("AscentUseCustomTag", childGetValue("customize_own_tag_check"));
LLSavedSettingsGlue::setCOAString("AscentCustomTagLabel", childGetValue("custom_tag_label_box"));
LLSavedSettingsGlue::setCOAColor4("AscentCustomTagColor", childGetValue("custom_tag_color_swatch"));
gCOASavedSettings->setColor4("EffectColor", childGetValue("effect_color_swatch"));
gCOASavedSettings->setColor4("AscentFriendColor", childGetValue("friend_color_swatch"));
gCOASavedSettings->setColor4("AscentLindenColor", childGetValue("linden_color_swatch"));
gCOASavedSettings->setColor4("AscentMutedColor", childGetValue("muted_color_swatch"));
gCOASavedSettings->setColor4("AscentEstateOwnerColor", childGetValue("em_color_swatch"));
gCOASavedSettings->setColor4("MoyMiniMapCustomColor", childGetValue("custom_color_swatch"));
gCOASavedSettings->setBOOL("AscentUseCustomTag", childGetValue("customize_own_tag_check"));
gCOASavedSettings->setString("AscentCustomTagLabel", childGetValue("custom_tag_label_box"));
gCOASavedSettings->setColor4("AscentCustomTagColor", childGetValue("custom_tag_color_swatch"));
refreshValues();
}