livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge viewer-quickgraphics

master
Ansariel 2016-03-31 18:54:45 +02:00
parent 59956afb12 812d454ecf
commit 14954d999d
7 changed files with 42 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build.sh
View File

@ -146,6 +146,13 @@ build()
local variant="$1"
if $build_viewer
then
if [ "$arch" = "Linux" ]
then
## something about the additional_packages mechanism messes up buildscripts results.py
## since we don't care about those packages on Linux, just zero it out, yes - a HACK
export additional_packages=""
fi
"$autobuild" build --quiet --no-configure -c $variant
build_ok=$?
@ -206,13 +213,6 @@ fi
# load autobuild provided shell functions and variables
eval "$("$autobuild" source_environment)"
if [ "$arch" = "Linux" ]
then
## something about the additional_packages mechanism messes up buildscripts results.py
## since we don't care about those packages on Linux, just zero it out, yes - a HACK
export additional_packages=""
fi
# dump environment variables for debugging
begin_section "Environment"
env|sort

1
doc/contributions.txt
View File

@ -1265,6 +1265,7 @@ Sovereign Engineer
OPEN-295
MAINT-6107
STORM-2107
MAINT-6218
SpacedOut Frye
VWR-34
VWR-45

43
indra/llxml/llcontrol.cpp
View File

@ -405,20 +405,23 @@ LLPointer<LLControlVariable> LLControlGroup::getControl(const std::string& name)
////////////////////////////////////////////////////////////////////////////
// Must match the type definition in llcontrol.h
const std::string LLControlGroup::mTypeString[TYPE_COUNT] = { "U32"
,"S32"
,"F32"
,"Boolean"
,"String"
,"Vector3"
,"Vector3D"
,"Rect"
,"Color4"
,"Color3"
,"LLSD"
};
LLControlGroup::LLControlGroup(const std::string& name)
: LLInstanceTracker<LLControlGroup, std::string>(name)
{
mTypeString[TYPE_U32] = "U32";
mTypeString[TYPE_S32] = "S32";
mTypeString[TYPE_F32] = "F32";
mTypeString[TYPE_BOOLEAN] = "Boolean";
mTypeString[TYPE_STRING] = "String";
mTypeString[TYPE_VEC3] = "Vector3";
mTypeString[TYPE_VEC3D] = "Vector3D";
mTypeString[TYPE_RECT] = "Rect";
mTypeString[TYPE_COL4] = "Color4";
mTypeString[TYPE_COL3] = "Color3";
mTypeString[TYPE_LLSD] = "LLSD";
mSanityTypeString[SANITY_TYPE_NONE] = "None";
mSanityTypeString[SANITY_TYPE_EQUALS] = "Equals";
@ -1285,7 +1288,7 @@ bool convert_from_llsd<bool>(const LLSD& sd, eControlType type, const std::strin
return sd.asBoolean();
else
{
CONTROL_ERRS << "Invalid BOOL value for " << control_name << ": " << sd << LL_ENDL;
CONTROL_ERRS << "Invalid BOOL value for " << control_name << ": " << LLControlGroup::typeEnumToString(type) << " " << sd << LL_ENDL;
return FALSE;
}
}
@ -1297,7 +1300,7 @@ S32 convert_from_llsd<S32>(const LLSD& sd, eControlType type, const std::string&
return sd.asInteger();
else
{
CONTROL_ERRS << "Invalid S32 value for " << control_name << ": " << sd << LL_ENDL;
CONTROL_ERRS << "Invalid S32 value for " << control_name << ": " << LLControlGroup::typeEnumToString(type) << " " << sd << LL_ENDL;
return 0;
}
}
@ -1309,7 +1312,7 @@ U32 convert_from_llsd<U32>(const LLSD& sd, eControlType type, const std::string&
return sd.asInteger();
else
{
CONTROL_ERRS << "Invalid U32 value for " << control_name << ": " << sd << LL_ENDL;
CONTROL_ERRS << "Invalid U32 value for " << control_name << ": " << LLControlGroup::typeEnumToString(type) << " " << sd << LL_ENDL;
return 0;
}
}
@ -1321,7 +1324,7 @@ F32 convert_from_llsd<F32>(const LLSD& sd, eControlType type, const std::string&
return (F32) sd.asReal();
else
{
CONTROL_ERRS << "Invalid F32 value for " << control_name << ": " << sd << LL_ENDL;
CONTROL_ERRS << "Invalid F32 value for " << control_name << ": " << LLControlGroup::typeEnumToString(type) << " " << sd << LL_ENDL;
return 0.0f;
}
}
@ -1333,7 +1336,7 @@ std::string convert_from_llsd<std::string>(const LLSD& sd, eControlType type, co
return sd.asString();
else
{
CONTROL_ERRS << "Invalid string value for " << control_name << ": " << sd << LL_ENDL;
CONTROL_ERRS << "Invalid string value for " << control_name << ": " << LLControlGroup::typeEnumToString(type) << " " << sd << LL_ENDL;
return LLStringUtil::null;
}
}
@ -1351,7 +1354,7 @@ LLVector3 convert_from_llsd<LLVector3>(const LLSD& sd, eControlType type, const
return (LLVector3)sd;
else
{
CONTROL_ERRS << "Invalid LLVector3 value for " << control_name << ": " << sd << LL_ENDL;
CONTROL_ERRS << "Invalid LLVector3 value for " << control_name << ": " << LLControlGroup::typeEnumToString(type) << " " << sd << LL_ENDL;
return LLVector3::zero;
}
}
@ -1363,7 +1366,7 @@ LLVector3d convert_from_llsd<LLVector3d>(const LLSD& sd, eControlType type, cons
return (LLVector3d)sd;
else
{
CONTROL_ERRS << "Invalid LLVector3d value for " << control_name << ": " << sd << LL_ENDL;
CONTROL_ERRS << "Invalid LLVector3d value for " << control_name << ": " << LLControlGroup::typeEnumToString(type) << " " << sd << LL_ENDL;
return LLVector3d::zero;
}
}
@ -1375,7 +1378,7 @@ LLRect convert_from_llsd<LLRect>(const LLSD& sd, eControlType type, const std::s
return LLRect(sd);
else
{
CONTROL_ERRS << "Invalid rect value for " << control_name << ": " << sd << LL_ENDL;
CONTROL_ERRS << "Invalid rect value for " << control_name << ": " << LLControlGroup::typeEnumToString(type) << " " << sd << LL_ENDL;
return LLRect::null;
}
}
@ -1420,7 +1423,7 @@ LLColor3 convert_from_llsd<LLColor3>(const LLSD& sd, eControlType type, const st
return sd;
else
{
CONTROL_ERRS << "Invalid LLColor3 value for " << control_name << ": " << sd << LL_ENDL;
CONTROL_ERRS << "Invalid LLColor3 value for " << control_name << ": " << LLControlGroup::typeEnumToString(type) << " " << sd << LL_ENDL;
return LLColor3::white;
}
}

7
indra/llxml/llcontrol.h
View File

@ -70,6 +70,7 @@ class LLVector3d;
class LLColor4;
class LLColor3;
// if this is changed, also modify mTypeString in llcontrol.h
typedef enum e_control_type
{
TYPE_U32 = 0,
@ -224,13 +225,13 @@ class LLControlGroup : public LLInstanceTracker<LLControlGroup, std::string>
protected:
typedef std::map<std::string, LLControlVariablePtr > ctrl_name_table_t;
ctrl_name_table_t mNameTable;
std::string mTypeString[TYPE_COUNT];
static const std::string mTypeString[TYPE_COUNT];
std::string mSanityTypeString[SANITY_TYPE_COUNT];
public:
eControlType typeStringToEnum(const std::string& typestr);
static eControlType typeStringToEnum(const std::string& typestr);
eSanityType sanityTypeStringToEnum(const std::string& sanitystr);
std::string typeEnumToString(eControlType typeenum);
static std::string typeEnumToString(eControlType typeenum);
std::string sanityTypeEnumToString(eSanityType sanitytypeenum);
LLControlGroup(const std::string& name);

2
indra/newview/llpresetsmanager.cpp
View File

@ -180,7 +180,7 @@ bool LLPresetsManager::savePreset(const std::string& subdirectory, std::string n
std::string ctrl_name = *it;
LLControlVariable* ctrl = gSavedSettings.getControl(ctrl_name).get();
std::string comment = ctrl->getComment();
std::string type = gSavedSettings.typeEnumToString(ctrl->type());
std::string type = LLControlGroup::typeEnumToString(ctrl->type());
LLSD value = ctrl->getValue();
paramsData[ctrl_name]["Comment"] = comment;

6
indra/newview/llviewercontrollistener.cpp
View File

@ -121,7 +121,7 @@ struct Info
if (control)
{
response["name"] = control->getName();
response["type"] = group->typeEnumToString(control->type());
response["type"] = LLControlGroup::typeEnumToString(control->type());
response["value"] = control->get();
response["comment"] = control->getComment();
}
@ -167,7 +167,7 @@ void LLViewerControlListener::toggle(LLSD const & request)
info.response.error(STRINGIZE("toggle of non-boolean '" << info.groupname
<< "' control '" << info.key
<< "', type is "
<< info.group->typeEnumToString(info.control->type())));
<< LLControlGroup::typeEnumToString(info.control->type())));
}
}
@ -199,7 +199,7 @@ struct CollectVars: public LLControlGroup::ApplyFunctor
{
vars.append(LLSDMap
("name", name)
("type", mGroup->typeEnumToString(control->type()))
("type", LLControlGroup::typeEnumToString(control->type()))
("value", control->get())
("comment", control->getComment()));
}

8
indra/newview/llvoavatar.cpp
View File

@ -4573,11 +4573,9 @@ U32 LLVOAvatar::renderSkinned()
BOOL first_pass = TRUE;
if (!LLDrawPoolAvatar::sSkipOpaque)
{
bool visually_muted = isVisuallyMuted();
if (!isSelf() || gAgent.needsRenderHead() || LLPipeline::sShadowRender)
{
if (isTextureVisible(TEX_HEAD_BAKED) || mIsDummy || visually_muted)
if (isTextureVisible(TEX_HEAD_BAKED) || mIsDummy)
{
LLViewerJoint* head_mesh = getViewerJoint(MESH_ID_HEAD);
if (head_mesh)
@ -4587,7 +4585,7 @@ U32 LLVOAvatar::renderSkinned()
first_pass = FALSE;
}
}
if (isTextureVisible(TEX_UPPER_BAKED) || mIsDummy || visually_muted)
if (isTextureVisible(TEX_UPPER_BAKED) || mIsDummy)
{
LLViewerJoint* upper_mesh = getViewerJoint(MESH_ID_UPPER_BODY);
if (upper_mesh)
@ -4597,7 +4595,7 @@ U32 LLVOAvatar::renderSkinned()
first_pass = FALSE;
}
if (isTextureVisible(TEX_LOWER_BAKED) || mIsDummy || visually_muted)
if (isTextureVisible(TEX_LOWER_BAKED) || mIsDummy)
{
LLViewerJoint* lower_mesh = getViewerJoint(MESH_ID_LOWER_BODY);
if (lower_mesh)