Files
SingularityViewer/indra/newview/llsavedsettingsglue.cpp
unknown 25190a6d8a Merge remote branch 'Ascent/master'
Conflicts:
	indra/llaudio/llaudioengine.cpp
	indra/llcommon/llqueuedthread.cpp
	indra/llimage/llimage.cpp
	indra/llimage/llimagepng.cpp
	indra/llimage/llimagepng.h
	indra/llimagej2coj/llimagej2coj.cpp
	indra/llrender/llimagegl.cpp
	indra/llrender/llrender.cpp
	indra/newview/ascentprefssys.cpp
	indra/newview/ascentprefsvan.cpp
	indra/newview/gpu_table.txt
	indra/newview/llfloaterauction.cpp
	indra/newview/llsavedsettingsglue.cpp
	indra/newview/llsavedsettingsglue.h
	indra/newview/llstartup.cpp
	indra/newview/llviewercontrol.cpp
	indra/newview/llviewercontrol.h
	indra/newview/llvoavatar.cpp
	indra/newview/pipeline.cpp
	indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
2010-10-11 07:01:10 -05:00

186 lines
5.4 KiB
C++

/**
* @file llsavedsettingsglue.cpp
* @author James Cook
* @brief LLSavedSettingsGlue class implementation
*
* $LicenseInfo:firstyear=2006&license=viewergpl$
*
* Copyright (c) 2006-2009, Linden Research, Inc.
*
* 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"
#include "llsavedsettingsglue.h"
#include "lluictrl.h"
#include "llviewercontrol.h"
/*
void LLSavedSettingsGlue::setBOOL(LLUICtrl* ctrl, void* data)
{
const char* name = (const char*)data;
LLSD value = ctrl->getValue();
gSavedSettings.setBOOL(name, value.asBoolean());
}
void LLSavedSettingsGlue::setS32(LLUICtrl* ctrl, void* data)
{
const char* name = (const char*)data;
LLSD value = ctrl->getValue();
gSavedSettings.setS32(name, value.asInteger());
}
void LLSavedSettingsGlue::setF32(LLUICtrl* ctrl, void* data)
{
const char* name = (const char*)data;
LLSD value = ctrl->getValue();
gSavedSettings.setF32(name, (F32)value.asReal());
}
void LLSavedSettingsGlue::setU32(LLUICtrl* ctrl, void* data)
{
const char* name = (const char*)data;
LLSD value = ctrl->getValue();
gSavedSettings.setU32(name, (U32)value.asInteger());
}
void LLSavedSettingsGlue::setString(LLUICtrl* ctrl, void* data)
{
const char* name = (const char*)data;
LLSD value = ctrl->getValue();
gSavedSettings.setString(name, value.asString());
}
*/
/*
//Begin Ascent SavedSettings/PerAccountSettings handling
//Get
LLControlVariable *gCOASavedSettings->getControl(const std::string &name)
{
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
return gSavedSettings.getControl(name);
else
return gSavedPerAccountSettings.getControl(name);
}
BOOL gCOASavedSettings->getBOOL(const std::string &name)
{
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
return gSavedSettings.getBOOL(name);
else
return gSavedPerAccountSettings.getBOOL(name);
}
S32 gCOASavedSettings->getS32(const std::string &name)
{
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
return gSavedSettings.getS32(name);
else
return gSavedPerAccountSettings.getS32(name);
}
F32 gCOASavedSettings->getF32(const std::string &name)
{
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
return gSavedSettings.getF32(name);
else
return gSavedPerAccountSettings.getF32(name);
}
U32 gCOASavedSettings->getU32(const std::string &name)
{
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
return gSavedSettings.getU32(name);
else
return gSavedPerAccountSettings.getU32(name);
}
std::string gCOASavedSettings->getString(const std::string &name)
{
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
return gSavedSettings.getString(name);
else
return gSavedPerAccountSettings.getString(name);
}
LLColor4 gCOASavedSettings->getColor4(const std::string &name)
{
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
return gSavedSettings.getColor4(name);
else
return gSavedPerAccountSettings.getColor4(name);
}
//Set
void gCOASavedSettings->setBOOL(const std::string &name, BOOL value)
{
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
gSavedSettings.setBOOL(name, value);
else
gSavedPerAccountSettings.setBOOL(name, value);
}
void gCOASavedSettings->setS32(const std::string &name, S32 value)
{
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
gSavedSettings.setS32(name, value);
else
gSavedPerAccountSettings.setS32(name, value);
}
void gCOASavedSettings->setF32(const std::string &name, F32 value)
{
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
gSavedSettings.setF32(name, value);
else
gSavedPerAccountSettings.setF32(name, value);
}
void gCOASavedSettings->setU32(const std::string &name, U32 value)
{
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
gSavedSettings.setU32(name, value);
else
gSavedPerAccountSettings.setU32(name, value);
}
void gCOASavedSettings->setString(const std::string &name, std::string value)
{
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
gSavedSettings.setString(name, value);
else
gSavedPerAccountSettings.setString(name, value);
}
void gCOASavedSettings->setColor4(const std::string &name, LLColor4 value)
{
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
gSavedSettings.setColor4(name, value);
else
gSavedPerAccountSettings.setColor4(name, value);
}*/