From 1f5c2c056ff2b660b053cf3a7344fdf1c5c15b0e Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Wed, 8 Feb 2012 18:25:35 -0500
Subject: [PATCH] STORM-1808 Indicate ability to build
---
doc/contributions.txt | 1 +
indra/newview/app_settings/commands.xml | 2 ++
indra/newview/llagent.cpp | 2 +-
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index c5db396c972..bbaee68d02d 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -610,6 +610,7 @@ Jonathan Yap
STORM-1788
STORM-1799
STORM-1796
+ STORM-1808
Kadah Coba
STORM-1060
Jondan Lundquist
diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 1d1d39c786b..16a7e0b3149 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -37,6 +37,8 @@
tooltip_ref="Command_Build_Tooltip"
execute_function="Build.Toggle"
execute_parameters="build"
+ is_enabled_function="Agent.IsActionAllowed"
+ is_enabled_parameters="build"
is_running_function="Floater.IsOpen"
is_running_parameters="build"
/>
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index ab9b5ff4368..f0add8ddc44 100755
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -171,7 +171,7 @@ bool LLAgent::isActionAllowed(const LLSD& sdname)
if (param == "build")
{
- retval = gAgent.canEditParcel();
+ retval = LLViewerParcelMgr::getInstance()->allowAgentBuild();
}
else if (param == "speak")
{
--
GitLab