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

Moved AvatarPosFinalOffset to per-account settings file

meow-7.2.2
Brad Payne (Vir Linden) 2014-12-22 11:14:15 -05:00
parent d33bb1fe67
commit 553b7ede72
6 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcharacter/lljoint.cpp
View File

@ -290,7 +290,7 @@ const LLVector3& LLJoint::getPosition()
bool do_debug_joint(const std::string& name)
{
return true;
return false;
}
//--------------------------------------------------------------------

15
indra/newview/app_settings/settings.xml
View File

@ -654,21 +654,6 @@
<key>Value</key>
<integer>2</integer>
</map>
<key>AvatarPosFinalOffset</key>
<map>
<key>Comment</key>
<string>After-everything-else fixup for avatar position.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Vector3</string>
<key>Value</key>
<array>
<real>0.0</real>
<real>0.0</real>
<real>0.0</real>
</array>
</map>
<key>AvatarPickerURL</key>
<map>
<key>Comment</key>

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

@ -1,5 +1,20 @@
<llsd>
<map>
<key>AvatarPosFinalOffset</key>
<map>
<key>Comment</key>
<string>After-everything-else fixup for avatar position.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Vector3</string>
<key>Value</key>
<array>
<real>0.0</real>
<real>0.0</real>
<real>0.0</real>
</array>
</map>
<key>DoNotDisturbResponseChanged</key>
<map>
<key>Comment</key>

15
indra/newview/llfloaterhoverheight.cpp
View File

@ -42,7 +42,7 @@ LLFloaterHoverHeight::LLFloaterHoverHeight(const LLSD& key) : LLFloater(key)
void LLFloaterHoverHeight::syncFromPreferenceSetting(void *user_data)
{
LLVector3 offset = gSavedSettings.getVector3("AvatarPosFinalOffset");
LLVector3 offset = gSavedPerAccountSettings.getVector3("AvatarPosFinalOffset");
F32 value = offset[2];
LLFloaterHoverHeight *self = static_cast<LLFloaterHoverHeight*>(user_data);
@ -64,7 +64,14 @@ BOOL LLFloaterHoverHeight::postBuild()
// Initialize slider from pref setting.
syncFromPreferenceSetting(this);
// Update slider on future pref changes.
gSavedSettings.getControl("AvatarPosFinalOffset")->getCommitSignal()->connect(boost::bind(&syncFromPreferenceSetting, this));
if (gSavedPerAccountSettings.getControl("AvatarPosFinalOffset"))
{
gSavedPerAccountSettings.getControl("AvatarPosFinalOffset")->getCommitSignal()->connect(boost::bind(&syncFromPreferenceSetting, this));
}
else
{
LL_WARNS() << "Control not found for AvatarPosFinalOffset" << LL_ENDL;
}
return TRUE;
}
@ -85,9 +92,9 @@ void LLFloaterHoverHeight::onFinalCommit()
{
LLSliderCtrl* sldrCtrl = getChild<LLSliderCtrl>("HoverHeightSlider");
F32 value = sldrCtrl->getValueF32();
LLVector3 offset = gSavedSettings.getVector3("AvatarPosFinalOffset");
LLVector3 offset = gSavedPerAccountSettings.getVector3("AvatarPosFinalOffset");
offset[2] = value;
gSavedSettings.setVector3("AvatarPosFinalOffset",offset);
gSavedPerAccountSettings.setVector3("AvatarPosFinalOffset",offset);
}

4
indra/newview/llvoavatar.cpp
View File

@ -7457,7 +7457,7 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
if (isSelf())
{
LL_INFOS("Avatar") << "hover was set: " << contents.mHoverOffsetWasSet << " value_z " << contents.mHoverOffset[2] << LL_ENDL;
LL_INFOS("Avatar") << avString() << "hover was set: " << contents.mHoverOffsetWasSet << " value_z " << contents.mHoverOffset[2] << LL_ENDL;
}
if (contents.mHoverOffsetWasSet && !isSelf())
@ -7471,7 +7471,7 @@ void LLVOAvatar::processAvatarAppearance( LLMessageSystem* mesgsys )
{
// If we don't get a value at all, we are presumably in a
// region that does not support hover height.
// FIXME RESTORE AFTER TESTING
LL_WARNS() << "zeroing hover because not defined in appearance message" << LL_ENDL;
mHoverOffset = LLVector3(0.0, 0.0, 0.0);
}

5
indra/newview/llvoavatarself.cpp
View File

@ -239,7 +239,8 @@ void LLVOAvatarSelf::initInstance()
return;
}
mHoverOffset = gSavedSettings.getVector3("AvatarPosFinalOffset");
mHoverOffset = gSavedPerAccountSettings.getVector3("AvatarPosFinalOffset");
LL_INFOS("Avatar") << avString() << " set hover height from debug setting " << mHoverOffset[2] << LL_ENDL;
//doPeriodically(output_self_av_texture_diagnostics, 30.0);
doPeriodically(update_avatar_rez_metrics, 5.0);
@ -2734,7 +2735,7 @@ void LLVOAvatarSelf::sendHoverHeight() const
LLSD update = LLSD::emptyMap();
update["hover_height"] = mHoverOffset[2];
LL_DEBUGS("Avatar") << "sending hover height value " << mHoverOffset[2] << LL_ENDL;
LL_DEBUGS("Avatar") << avString() << "sending hover height value " << mHoverOffset[2] << LL_ENDL;
LLHTTPClient::post(url, update, new LLHoverHeightResponder);
}
}