diff --git a/indra/llrender/llgltexture.cpp b/indra/llrender/llgltexture.cpp index 7bb67594afa0bc9a447b7a5a4477eb9adb88e744..5676001fdfdbec698ec8fd77b71abbf80007d5fc 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 5b8ad47765d58377f34f979743eea83ba9b428d2..2baa28f0b43bf57b1e45e01e86ed509d5b38c07d 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 cd2b7f952f7198cef598d0195de023f665c2a6ae..4338852bc5d46b788bcc60da921d3f5c54a31e05 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 fc86a6813263d471026d8b3d12ba326676b377cc..740c08aa776c74b5f8e40cbe2223ac7d78f793ad 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 7be7feab4c82219705df38a3722e6cef80b4ff40..00017191473a694ae8c451943f443c9764986d8a 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 1eed6bc156a19e85834a219b665114c767f19f6e..44ead3aa3e993f3441d9d5264b888b2b95aebe8e 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 1a5b992240eaaa039a606d948db4d3479390009b..333da8665da668c73492dc78ddc6efe5c693466a 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 da5f89743dee86867c3fe4f4e07fe30c9ec28829..8d8b4ae314cc59fe8bd3b4a24f0a0c87e7b48d5b 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 59193229188b041ed7f0404a98644420c8aef0fa..ff7c516fffa35636170cedfd083812f827b4f793 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))