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

FIRE-9759: Temporarily disable AvatarZOffset while it's broken

Cinders 2013-04-16 15:40:15 -06:00
parent aa0d4f442f
commit aca722b1cc
8 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,7 @@
<key>Value</key>
<integer>1</integer>
</map>
<!-- .:FS:CR:. FIRE-9759 - Temporarily remove setting AvatarZOffset
<key>AvatarZOffset</key>
<map>
<key>Comment</key>
@ -22,6 +23,7 @@
<key>Value</key>
<real>0.0</real>
</map>
-->
<key>BusyResponseChanged</key>
<map>
<key>Comment</key>

3
indra/newview/llviewercontrol.cpp
View File

@ -890,7 +890,8 @@ void settings_setup_listeners()
gSavedSettings.getControl("LoginLocation")->getSignal()->connect(boost::bind(&handleLoginLocationChanged));
// [SL:KB] - Patch: UI-DndButtonCommit | Checked: 2011-06-19 (Catznip-2.6.0c) | Added: Catznip-2.6.0c
gSavedSettings.getControl("DragAndDropCommitDelay")->getSignal()->connect(boost::bind(&handleSettingF32Change, _2, &DELAY_DRAG_HOVER_COMMIT));
gSavedPerAccountSettings.getControl("AvatarZOffset")->getSignal()->connect(boost::bind(&handleAvatarZOffsetChanged, _2)); // ## Zi: Moved Avatar Z offset from RLVa to here
// <FS:CR> FIRE-9759 - Temporarily remove AvatarZOffset since it's broken
//gSavedPerAccountSettings.getControl("AvatarZOffset")->getSignal()->connect(boost::bind(&handleAvatarZOffsetChanged, _2)); // ## Zi: Moved Avatar Z offset from RLVa to here
gSavedSettings.getControl("FSUseV1Menus")->getSignal()->connect(boost::bind(&show_v1_menus)); // V1 menu system -WoLf
// <FS:Zi> Is done inside XUI now, using visibility_control
// gSavedSettings.getControl("ShowNavbarFavoritesPanel")->getSignal()->connect(boost::bind(&toggle_show_favorites_panel, _2));

5
indra/newview/llvoavatarself.cpp
View File

@ -3482,6 +3482,9 @@ void LLVOAvatarSelf::dumpWearableInfo(LLAPRFile& outfile)
// [RLVa:KB] - Checked: 2013-03-03 (RLVa-1.4.8)
F32 LLVOAvatarSelf::getAvatarOffset() /*const*/
{
return (isUsingServerBakes()) ? LLAvatarAppearance::getAvatarOffset() : RlvSettings::getAvatarOffsetZ();
// <FS:CR> FIRE-9759 - Temporarily remove setting AvatarZOffset
//return (isUsingServerBakes()) ? LLAvatarAppearance::getAvatarOffset() : RlvSettings::getAvatarOffsetZ();
return LLAvatarAppearance::getAvatarOffset();
// </FS:CR>
}
// [/RLVa:KB]

3
indra/newview/rlvcommon.h
View File

@ -78,7 +78,8 @@ template<typename T> inline T rlvGetPerUserSetting(const std::string& strSetting
class RlvSettings
{
public:
static F32 getAvatarOffsetZ() { return rlvGetPerUserSetting<F32>(RLV_SETTING_AVATAROFFSET_Z, 0.0); }
// <FS:CR> FIRE-9759 - Temporarily remove setting AvatarZOffset
//static F32 getAvatarOffsetZ() { return rlvGetPerUserSetting<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); }

3
indra/newview/rlvdefines.h
View File

@ -295,7 +295,8 @@ enum ERlvAttachGroupType
#define RLV_SETTING_MAIN "RestrainedLove"
#define RLV_SETTING_DEBUG "RestrainedLoveDebug"
#define RLV_SETTING_AVATAROFFSET_Z "AvatarZOffset"
// <FS:CR> FIRE-9759 - Temporarily remove setting AvatarZOffset
//#define RLV_SETTING_AVATAROFFSET_Z "AvatarZOffset"
#define RLV_SETTING_CANOOC "RestrainedLoveCanOOC"
#define RLV_SETTING_FORBIDGIVETORLV "RestrainedLoveForbidGiveToRLV"
#define RLV_SETTING_NOSETENV "RestrainedLoveNoSetEnv"

3
indra/newview/rlvhandler.cpp
View File

@ -1611,7 +1611,8 @@ ERlvCmdRet RlvHandler::processForceCommand(const RlvCommand& rlvCmd) const
{
F32 nValue = (rlvCmdOption.m_nPelvisToFoot - gAgentAvatarp->getPelvisToFoot()) * rlvCmdOption.m_nPelvisToFootDeltaMult;
nValue += rlvCmdOption.m_nPelvisToFootOffset;
gSavedPerAccountSettings.setF32(RLV_SETTING_AVATAROFFSET_Z, llclamp<F32>(nValue, -1.0f, 1.0f));
// <FS:CR> FIRE-9759 - Temporarily remove setting AvatarZOffset
//gSavedPerAccountSettings.setF32(RLV_SETTING_AVATAROFFSET_Z, llclamp<F32>(nValue, -1.0f, 1.0f));
}
}
break;

3
indra/newview/skins/default/xui/it/floater_quickprefs.xml
View File

@ -27,8 +27,7 @@
<text name="Tag Offset" tool_tip="Consente di modificare l'altezza dell'avatar senza modificare la shape. Default 0">
Altezza Tag:
</text>
<slider name="FSNameTagZOffsetCorrection"/>
<slider name="AvatarZOffset"/>
<slider name="FSNameTagZOffsetCorrection"/>
<text name="name_tags_textbox">
Tag Nome:
</text>

3
indra/newview/skins/default/xui/ru/floater_quickprefs.xml
View File

@ -27,8 +27,7 @@
<slider left_delta="87" name="RenderAvatarMaxVisible"/>
<text name="Height Offset" width="105" tool_tip="Позволяет изменять расстояние по вертикали от аватара, не меняя самой фигуры.">
Выс.вмещения:
</text>
<slider left_delta="87" name="AvatarZOffset"/>
</text>
<text name="name_tags_textbox">
Имена аватаров:
</text>