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

Merged with RLVa tip

Kitty Barnett 2016-06-24 19:32:38 +02:00
parent 17a9b09f25 e4f327e747
commit 5cc4570d10
7 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/fschathistory.cpp
View File

@ -721,10 +721,11 @@ protected:
void showInfoCtrl()
{
const bool isVisible = !mAvatarID.isNull() && !mFrom.empty() && (CHAT_SOURCE_SYSTEM != mSourceType || mType == CHAT_TYPE_RADAR);
// const bool isVisible = !mAvatarID.isNull() && !mFrom.empty() && (CHAT_SOURCE_SYSTEM != mSourceType || mType == CHAT_TYPE_RADAR);;
// [RLVa:KB] - Checked: 2010-04-22 (RLVa-1.2.2a) | Added: RLVa-1.2.0f
if (isVisible && mShowInfoCtrl)
const bool isVisible = mShowInfoCtrl && !mAvatarID.isNull() && !mFrom.empty() && (CHAT_SOURCE_SYSTEM != mSourceType || mType == CHAT_TYPE_RADAR);;
// [/RLVa:KB]
if (isVisible)
{
const LLRect sticky_rect = mUserNameTextBox->getRect();
S32 icon_x = llmin(sticky_rect.mLeft + mUserNameTextBox->getTextBoundingRect().getWidth() + 7, sticky_rect.mRight - 3);

2
indra/newview/rlvcommon.cpp
View File

@ -244,7 +244,7 @@ void RlvStrings::saveToFile(const std::string& strFilePath)
sdStrings[itString->first]["value"] = listValues.back();
}
llofstream fileStream(strFilePath);
llofstream fileStream(strFilePath.c_str());
if (!fileStream.good())
return;

2
indra/newview/rlvdefines.h
View File

@ -73,7 +73,7 @@ const S32 RLVa_VERSION_BUILD = 0;
#define RLV_PUTINV_PREFIX "#RLV/~"
#define RLV_PUTINV_SEPARATOR "/"
#define RLV_PUTINV_MAXDEPTH 4
#define RLV_SETROT_OFFSET F_PI_BY_TWO // @setrot is off by 90° with the rest of SL
#define RLV_SETROT_OFFSET F_PI_BY_TWO // @setrot is off by 90 degrees with the rest of SL
#define RLV_STRINGS_FILE "rlva_strings.xml"
#define RLV_FOLDER_FLAG_NOSTRIP "nostrip"

2
indra/newview/rlvextensions.cpp
View File

@ -281,7 +281,7 @@ bool RlvWindLight::setValue(const std::string& strRlvName, const std::string& st
}
else
{
pEnvMgr->useRegionSettings();
pEnvMgr->setUserPrefs(pEnvMgr->getWaterPresetName(), pEnvMgr->getSkyPresetName(), pEnvMgr->getDayCycleName(), false, true);
}
return true;
}

2
indra/newview/rlvhandler.cpp
View File

@ -2112,7 +2112,7 @@ ERlvCmdRet RlvHandler::processForceCommand(const RlvCommand& rlvCmd) const
nValue += rlvCmdOption.m_nPelvisToFootOffset;
if (gAgentAvatarp->getRegion()->avatarHoverHeightEnabled() || !gAgentAvatarp->isUsingServerBakes())
{
LLVector3 avOffset(0.0, 0.0, llclamp<F32>(nValue, MIN_HOVER_Z, MAX_HOVER_Z));
LLVector3 avOffset(0.0f, 0.0f, llclamp<F32>(nValue, MIN_HOVER_Z, MAX_HOVER_Z));
gSavedPerAccountSettings.setF32("AvatarHoverOffsetZ", avOffset.mV[VZ]);
gAgentAvatarp->setHoverOffset(avOffset, true);
}

2
indra/newview/rlvinventory.cpp
View File

@ -18,8 +18,8 @@
#include "llagent.h"
#include "llappearancemgr.h"
#include "llstartup.h"
#include "llviewermessage.h"
#include "llviewerfoldertype.h"
#include "llviewermessage.h"
#include "rlvinventory.h"

4
indra/newview/rlvinventory.h
View File

@ -24,6 +24,10 @@
#include "rlvhelper.h"
#include "rlvlocks.h"
// ============================================================================
// Forward declarations
//
class LLOfferInfo;
// ============================================================================