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

Fixed comments 

--HG--
branch : RLVa
master
Kitty Barnett 2018-06-17 17:24:09 +02:00
parent e5131a5a2d
commit fcac8d4b83
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llrender/llgltexture.cpp
View File

@ -317,7 +317,7 @@ BOOL LLGLTexture::getIsAlphaMask() const
}
//BOOL LLGLTexture::getMask(const LLVector2 &tc)
// [RLVa:KB] - Checked: RLVa-2.3 (@setoverlay)
// [RLVa:KB] - Checked: RLVa-2.2 (@setoverlay)
bool LLGLTexture::getMask(const LLVector2 &tc) const
// [/RLVa:KB]
{

2
indra/llrender/llgltexture.h
View File

@ -142,7 +142,7 @@ public:
LLGLenum getPrimaryFormat() const;
BOOL getIsAlphaMask() const ;
LLTexUnit::eTextureType getTarget(void) const ;
// [RLVa:KB] - Checked: RLVa-2.3 (@setoverlay)
// [RLVa:KB] - Checked: RLVa-2.2 (@setoverlay)
bool getMask(const LLVector2 &tc) const;
// [/RLVa:KB]
// BOOL getMask(const LLVector2 &tc);

2
indra/llrender/llimagegl.cpp
View File

@ -1994,7 +1994,7 @@ void LLImageGL::updatePickMask(S32 width, S32 height, const U8* data_in)
}
//BOOL LLImageGL::getMask(const LLVector2 &tc)
// [RLVa:KB] - Checked: RLVa-2.3 (@setoverlay)
// [RLVa:KB] - Checked: RLVa-2.2 (@setoverlay)
BOOL LLImageGL::getMask(const LLVector2 &tc) const
// [/RLVa:KB]
{

2
indra/llrender/llimagegl.h
View File

@ -150,7 +150,7 @@ public:
void setUseMipMaps(BOOL usemips) { mUseMipMaps = usemips; }
void updatePickMask(S32 width, S32 height, const U8* data_in);
// [RLVa:KB] - Checked: RLVa-2.3 (@setoverlay)
// [RLVa:KB] - Checked: RLVa-2.2 (@setoverlay)
BOOL getMask(const LLVector2 &tc) const;
// [/RLVa:KB]
// BOOL getMask(const LLVector2 &tc);

2
indra/newview/llagent.cpp
View File

@ -672,7 +672,7 @@ void LLAgent::moveLeftNudge(S32 direction)
//-----------------------------------------------------------------------------
void LLAgent::moveUp(S32 direction)
{
// [RLVa:KB] - Checked: RLVa-2.2
// [RLVa:KB] - Checked: RLVa-2.2 (@jump)
if ( (!RlvActions::canJump()) && (direction > 0) && (!getFlying()) )
{
return;

2
indra/newview/llgroupmgr.cpp
View File

@ -1516,7 +1516,7 @@ void LLGroupMgr::notifyObservers(LLGroupChange gc)
return;
// observer_set_t& obs = obs_it->second;
// [RLVa:KB] - Checked: RLVa-2.3 (General bugfix)
// [RLVa:KB] - Checked: RLVa-2.2 (General bugfix)
// Iterate over a *copy* of the observer list
observer_set_t obs = obs_it->second;
// [/RLVa:KB]

2
indra/newview/llinventorybridge.cpp
View File

@ -5332,7 +5332,7 @@ bool LLTextureBridge::canSaveTexture(void)
return false;
}
// [RLVa:KB] - Checked: RLVa-2.2
// [RLVa:KB] - Checked: RLVa-2.2 (@viewtexture)
if (!RlvActions::canPreviewTextures())
{
return false;

2
indra/newview/llviewerdisplay.cpp
View File

@ -1306,7 +1306,7 @@ void render_ui(F32 zoom_factor, int subfield)
}
render_hud_elements();
// [RLVa:KB] - Checked: RLVa-2.3 (@setoverlay)
// [RLVa:KB] - Checked: RLVa-2.2 (@setoverlay)
if (gRlvHandler.isEnabled())
{
gRlvHandler.renderOverlay();

2
indra/newview/llviewerwindow.cpp
View File

@ -5543,7 +5543,7 @@ void LLPickInfo::fetchResults()
mPickPt = mMousePt;
// [RLVa:KB] - Checked: RLVa-2.3 (@setoverlay)
// [RLVa:KB] - Checked: RLVa-2.2 (@setoverlay)
if ( (gRlvHandler.isEnabled()) && (hit_object) && (!hit_object->isHUDAttachment()) )
{
if (gRlvHandler.hitTestOverlay(mMousePt))