From 206157a1fbf298cb8316ee61f1b4a0820093f697 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sat, 12 Oct 2013 22:04:30 +0200
Subject: [PATCH] - changed : mark @adjustheight as deprecated since it's not
supported by SSA -> a wearable edit workaround would be clumsy, not work
under all circumstances and could potentially cause asset corruption
--HG--
branch : RLVa
---
indra/llappearance/llavatarappearance.cpp | 12 +-----------
indra/llappearance/llavatarappearance.h | 3 ---
indra/newview/app_settings/settings.xml | 11 -----------
indra/newview/llvoavatarself.cpp | 7 -------
indra/newview/llvoavatarself.h | 5 -----
indra/newview/rlvcommon.cpp | 5 ++---
indra/newview/rlvcommon.h | 1 -
indra/newview/rlvdefines.h | 2 +-
indra/newview/rlvhandler.cpp | 16 ++--------------
indra/newview/rlvhelper.cpp | 19 -------------------
indra/newview/rlvhelper.h | 9 ---------
11 files changed, 6 insertions(+), 84 deletions(-)
diff --git a/indra/llappearance/llavatarappearance.cpp b/indra/llappearance/llavatarappearance.cpp
index 184560c80f4..3bb759d4587 100644
--- a/indra/llappearance/llavatarappearance.cpp
+++ b/indra/llappearance/llavatarappearance.cpp
@@ -464,10 +464,7 @@ void LLAvatarAppearance::computeBodySize()
F32 old_offset = mAvatarOffset.mV[VZ];
-// [RLVa:KB] - Checked: 2013-03-03 (RLVa-1.4.8)
- mAvatarOffset.mV[VZ] = getAvatarOffset();
-// [/RLVa:KB]
-// mAvatarOffset.mV[VZ] = getVisualParamWeight(AVATAR_HOVER);
+ mAvatarOffset.mV[VZ] = getVisualParamWeight(AVATAR_HOVER);
mPelvisToFoot = hip.mV[VZ] * pelvis_scale.mV[VZ] -
knee.mV[VZ] * hip_scale.mV[VZ] -
@@ -517,13 +514,6 @@ void LLAvatarAppearance::computeBodySize()
}
}
-// [RLVa:KB] - Checked: 2013-03-03 (RLVa-1.4.8)
-F32 LLAvatarAppearance::getAvatarOffset() /*const*/
-{
- return getVisualParamWeight(11001);
-}
-// [/RLVa:KB]
-
//-----------------------------------------------------------------------------
// parseSkeletonFile()
//-----------------------------------------------------------------------------
diff --git a/indra/llappearance/llavatarappearance.h b/indra/llappearance/llavatarappearance.h
index f554468184a..bce25402581 100644
--- a/indra/llappearance/llavatarappearance.h
+++ b/indra/llappearance/llavatarappearance.h
@@ -145,9 +145,6 @@ class LLAvatarAppearance : public LLCharacter
virtual void buildCharacter();
virtual BOOL loadAvatar();
virtual void bodySizeChanged() = 0;
-// [RLVa:KB] - Checked: 2013-03-03 (RLVa-1.4.8)
- virtual F32 getAvatarOffset() /*const*/;
-// [/RLVa:KB]
BOOL setupBone(const LLAvatarBoneInfo* info, LLJoint* parent, S32 ¤t_volume_num, S32 ¤t_joint_num);
BOOL allocateCharacterJoints(U32 num);
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 627ac19a22d..1dc191f5016 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -57,17 +57,6 @@
<key>Value</key>
<integer>0</integer>
</map>
- <key>RestrainedLoveOffsetAvatarZ</key>
- <map>
- <key>Comment</key>
- <string>Offset the avatar.</string>
- <key>Persist</key>
- <integer>0</integer>
- <key>Type</key>
- <string>F32</string>
- <key>Value</key>
- <real>0.0</real>
- </map>
<key>RestrainedLoveReplaceWhenFolderBeginsWith</key>
<map>
<key>Comment</key>
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp
index c3b61db3d7f..29f6d40ad12 100644
--- a/indra/newview/llvoavatarself.cpp
+++ b/indra/newview/llvoavatarself.cpp
@@ -3205,10 +3205,3 @@ void LLVOAvatarSelf::dumpWearableInfo(LLAPRFile& outfile)
}
apr_file_printf( file, "\n</wearable_info>\n" );
}
-
-// [RLVa:KB] - Checked: 2013-03-03 (RLVa-1.4.8)
-F32 LLVOAvatarSelf::getAvatarOffset() /*const*/
-{
- return ( (isUsingServerBakes()) || (0.0f == RlvSettings::getAvatarOffsetZ()) ) ? LLAvatarAppearance::getAvatarOffset() : RlvSettings::getAvatarOffsetZ();
-}
-// [/RLVa:KB]
diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h
index f33a579ea47..0d8e8104e0f 100755
--- a/indra/newview/llvoavatarself.h
+++ b/indra/newview/llvoavatarself.h
@@ -359,11 +359,6 @@ class LLVOAvatarSelf :
public:
bool sendAppearanceMessage(LLMessageSystem *mesgsys) const;
-// [RLVa:KB] - Checked: 2013-03-03 (RLVa-1.4.8)
-protected:
- /*virtual*/ F32 getAvatarOffset() /*const*/;
-// [/RLVa:KB]
-
/** Appearance
** **
*******************************************************************************/
diff --git a/indra/newview/rlvcommon.cpp b/indra/newview/rlvcommon.cpp
index 355af5fd677..ede9df1de0a 100644
--- a/indra/newview/rlvcommon.cpp
+++ b/indra/newview/rlvcommon.cpp
@@ -101,9 +101,6 @@ void RlvSettings::initClass()
gSavedPerAccountSettings.getControl(RLV_SETTING_LOGINLASTLOCATION)->setHiddenFromSettingsEditor(true);
#endif // RLV_EXTENSION_STARTLOCATION
- if (gSavedSettings.controlExists(RLV_SETTING_AVATAROFFSET_Z))
- gSavedSettings.getControl(RLV_SETTING_AVATAROFFSET_Z)->getSignal()->connect(boost::bind(&onChangedAvatarOffset, _2));
-
if (gSavedSettings.controlExists(RLV_SETTING_TOPLEVELMENU))
gSavedSettings.getControl(RLV_SETTING_TOPLEVELMENU)->getSignal()->connect(boost::bind(&onChangedMenuLevel));
@@ -296,6 +293,8 @@ const char* RlvStrings::getStringFromReturnCode(ERlvCmdRet eRet)
return "unknown command";
case RLV_RET_FAILED_NOSHAREDROOT:
return "missing #RLV";
+ case RLV_RET_DEPRECATED:
+ return "deprecated";
// The following are identified by the chat verb
case RLV_RET_RETAINED:
case RLV_RET_SUCCESS:
diff --git a/indra/newview/rlvcommon.h b/indra/newview/rlvcommon.h
index 0f84fdb1e9a..00afc2254ec 100644
--- a/indra/newview/rlvcommon.h
+++ b/indra/newview/rlvcommon.h
@@ -77,7 +77,6 @@ template<typename T> inline T rlvGetPerUserSetting(const std::string& strSetting
class RlvSettings
{
public:
- static F32 getAvatarOffsetZ() { return rlvGetSetting<F32>(RLV_SETTING_AVATAROFFSET_Z, 0.0); }
static bool getDebug() { return rlvGetSetting<bool>(RLV_SETTING_DEBUG, false); }
static bool getCanOOC() { return fCanOOC; }
static bool getForbidGiveToRLV() { return rlvGetSetting<bool>(RLV_SETTING_FORBIDGIVETORLV, true); }
diff --git a/indra/newview/rlvdefines.h b/indra/newview/rlvdefines.h
index c1e9893fccc..cc20f8924f2 100644
--- a/indra/newview/rlvdefines.h
+++ b/indra/newview/rlvdefines.h
@@ -253,6 +253,7 @@ enum ERlvCmdRet {
RLV_RET_FAILED_DISABLED, // Command failed (command disabled by user)
RLV_RET_FAILED_UNKNOWN, // Command failed (unknown command)
RLV_RET_FAILED_NOSHAREDROOT, // Command failed (missing #RLV)
+ RLV_RET_DEPRECATED // Command has been deprecated
};
enum ERlvExceptionCheck
@@ -294,7 +295,6 @@ enum ERlvAttachGroupType
#define RLV_SETTING_MAIN "RestrainedLove"
#define RLV_SETTING_DEBUG "RestrainedLoveDebug"
-#define RLV_SETTING_AVATAROFFSET_Z "RestrainedLoveOffsetAvatarZ"
#define RLV_SETTING_CANOOC "RestrainedLoveCanOOC"
#define RLV_SETTING_FORBIDGIVETORLV "RestrainedLoveForbidGiveToRLV"
#define RLV_SETTING_NOSETENV "RestrainedLoveNoSetEnv"
diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index 176a5345f66..22dadacf5f2 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -1604,20 +1604,8 @@ ERlvCmdRet RlvHandler::processForceCommand(const RlvCommand& rlvCmd) const
case RLV_BHVR_SIT: // @sit:<option>=force
eRet = onForceSit(rlvCmd);
break;
- case RLV_BHVR_ADJUSTHEIGHT: // @adjustheight:<options>=force - Checked: 2011-03-28 (RLVa-1.3.0f) | Added: RLVa-1.3.0f
- {
- RlvCommandOptionAdjustHeight rlvCmdOption(rlvCmd);
- VERIFY_OPTION(rlvCmdOption.isValid());
- if (isAgentAvatarValid())
- {
- F32 nValue = (rlvCmdOption.m_nPelvisToFoot - gAgentAvatarp->getPelvisToFoot()) * rlvCmdOption.m_nPelvisToFootDeltaMult;
- nValue += rlvCmdOption.m_nPelvisToFootOffset;
- if (!gAgentAvatarp->isUsingServerBakes())
- gSavedSettings.setF32(RLV_SETTING_AVATAROFFSET_Z, llclamp<F32>(nValue, -1.0f, 1.0f));
- else
- eRet = RLV_RET_FAILED_DISABLED;
- }
- }
+ case RLV_BHVR_ADJUSTHEIGHT: // @adjustheight:<options>=force
+ eRet = RLV_RET_DEPRECATED;
break;
case RLV_BHVR_TPTO: // @tpto:<option>=force - Checked: 2011-03-28 (RLVa-1.3.0f) | Modified: RLVa-1.3.0f
{
diff --git a/indra/newview/rlvhelper.cpp b/indra/newview/rlvhelper.cpp
index b42d6db63eb..4c198d43987 100644
--- a/indra/newview/rlvhelper.cpp
+++ b/indra/newview/rlvhelper.cpp
@@ -326,25 +326,6 @@ bool RlvCommandOptionGetPath::getItemIDs(LLWearableType::EType wtType, uuid_vec_
return (cntItemsPrev != idItems.size());
}
-// Checked: 2011-03-28 (RLVa-1.3.0f) | Added: RLVa-1.3.0f
-RlvCommandOptionAdjustHeight::RlvCommandOptionAdjustHeight(const RlvCommand& rlvCmd)
- : m_nPelvisToFoot(0.0f), m_nPelvisToFootDeltaMult(0.0f), m_nPelvisToFootOffset(0.0f)
-{
- std::vector<std::string> cmdTokens;
- boost::split(cmdTokens, rlvCmd.getOption(), boost::is_any_of(std::string(";")));
- if (1 == cmdTokens.size())
- {
- m_fValid = (LLStringUtil::convertToF32(cmdTokens[0], m_nPelvisToFootOffset));
- m_nPelvisToFootOffset = llclamp<F32>(m_nPelvisToFootOffset / 100, -1.0f, 1.0f);
- }
- else if ( (2 <= cmdTokens.size()) && (cmdTokens.size() <= 3) )
- {
- m_fValid = (LLStringUtil::convertToF32(cmdTokens[0], m_nPelvisToFoot)) &&
- (LLStringUtil::convertToF32(cmdTokens[1], m_nPelvisToFootDeltaMult)) &&
- ( (2 == cmdTokens.size()) || (LLStringUtil::convertToF32(cmdTokens[2], m_nPelvisToFootOffset)) );
- }
-}
-
// Checked: 2011-03-28 (RLVa-1.3.0f) | Added: RLVa-1.3.0f
RlvCommandOptionTpTo::RlvCommandOptionTpTo(const RlvCommand &rlvCmd)
{
diff --git a/indra/newview/rlvhelper.h b/indra/newview/rlvhelper.h
index 603bd54a6d8..b5bdc824f8f 100644
--- a/indra/newview/rlvhelper.h
+++ b/indra/newview/rlvhelper.h
@@ -152,15 +152,6 @@ struct RlvCommandOptionGetPath : public RlvCommandOption
uuid_vec_t m_idItems;
};
-struct RlvCommandOptionAdjustHeight : public RlvCommandOption
-{
- RlvCommandOptionAdjustHeight(const RlvCommand& rlvCmd);
-
- F32 m_nPelvisToFoot;
- F32 m_nPelvisToFootDeltaMult;
- F32 m_nPelvisToFootOffset;
-};
-
struct RlvCommandOptionTpTo : public RlvCommandOption
{
RlvCommandOptionTpTo(const RlvCommand& rlvCmd);
--
GitLab