From fcac8d4b833ba1f526729b5f66daa5d59aa68ab4 Mon Sep 17 00:00:00 2001
From: Kitty Barnett <develop@catznip.com>
Date: Sun, 17 Jun 2018 17:24:09 +0200
Subject: [PATCH] Fixed comments
--HG--
branch : RLVa
---
indra/llrender/llgltexture.cpp | 2 +-
indra/llrender/llgltexture.h | 2 +-
indra/llrender/llimagegl.cpp | 2 +-
indra/llrender/llimagegl.h | 2 +-
indra/newview/llagent.cpp | 2 +-
indra/newview/llgroupmgr.cpp | 2 +-
indra/newview/llinventorybridge.cpp | 2 +-
indra/newview/llviewerdisplay.cpp | 2 +-
indra/newview/llviewerwindow.cpp | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/indra/llrender/llgltexture.cpp b/indra/llrender/llgltexture.cpp
index 7bb67594af..5676001fdf 100644
--- a/indra/llrender/llgltexture.cpp
+++ b/indra/llrender/llgltexture.cpp
@@ -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]
{
diff --git a/indra/llrender/llgltexture.h b/indra/llrender/llgltexture.h
index 5b8ad47765..2baa28f0b4 100644
--- a/indra/llrender/llgltexture.h
+++ b/indra/llrender/llgltexture.h
@@ -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);
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp
index cd2b7f952f..4338852bc5 100644
--- a/indra/llrender/llimagegl.cpp
+++ b/indra/llrender/llimagegl.cpp
@@ -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]
{
diff --git a/indra/llrender/llimagegl.h b/indra/llrender/llimagegl.h
index fc86a68132..740c08aa77 100644
--- a/indra/llrender/llimagegl.h
+++ b/indra/llrender/llimagegl.h
@@ -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);
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 7be7feab4c..0001719147 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -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;
diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp
index 1eed6bc156..44ead3aa3e 100644
--- a/indra/newview/llgroupmgr.cpp
+++ b/indra/newview/llgroupmgr.cpp
@@ -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]
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 1a5b992240..333da8665d 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -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;
diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index da5f89743d..8d8b4ae314 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -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();
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 5919322918..ff7c516fff 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -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))
--
GitLab