Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in RLVa. Viewer broken!

Browse Source
This commit is contained in:
Siana Gearz
2010-11-07 05:05:47 +01:00
parent ae4a9521af
commit 740b570168
94 changed files with 11249 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
indra/newview/lltoolbar.cpp
View File

@@ -68,6 +68,10 @@
#include "llimpanel.h"
#include "llscrolllistctrl.h"
// [RLVa:KB]
#include "rlvhandler.h"
// [/RLVa:KB]
#if LL_DARWIN
#include "llresizehandle.h"
@@ -309,6 +313,20 @@ void LLToolBar::refresh()
if(build_btn_state!=(bool)build_mode)
build_btn_state = build_mode;
// [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-10 (RLVa-1.0.0g)
// Called per-frame so this really can't be slow
if (rlv_handler_t::isEnabled())
{
// If we're rez-restricted, we can still edit => allow build floater
// If we're edit-restricted, we can still rez => allow build floater
childSetEnabled("build_btn", !(gRlvHandler.hasBehaviour(RLV_BHVR_REZ) && gRlvHandler.hasBehaviour(RLV_BHVR_EDIT)) );
childSetEnabled("map_btn", !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWWORLDMAP) );
childSetEnabled("radar_btn", !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWMINIMAP) );
childSetEnabled("inventory_btn", !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWINV) );
}
// [/RLVa:KB]
if (isInVisibleChain())
{
updateCommunicateList();
@@ -488,6 +506,14 @@ void LLToolBar::onClickSit(void*)
}
else
{
// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
// NOTE-RLVa: dead code?
if (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT))
{
return;
}
// [/RLVa:KB]
// stand up
gAgent.setFlying(FALSE);
gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);