diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-02-21 15:22:06 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-02-21 15:22:06 -0500 |
| commit | eb7e48fc9015266fd2945873f12d925ffc6262ed (patch) | |
| tree | 5e56836fbc98a104b2de4919933f71bfcfed7971 /indra/newview/llagent.cpp | |
| parent | 2ee9e7c159e2546cd81ce52fdffde40389aa7882 (diff) | |
| parent | 065edd19d60737ee330b0f64defb301995fdb5fd (diff) | |
merge changes for storm-1808
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rwxr-xr-x | indra/newview/llagent.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index ab9b5ff436..3870a3be2e 100755 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -169,11 +169,7 @@ bool LLAgent::isActionAllowed(const LLSD& sdname) const std::string& param = sdname.asString(); - if (param == "build") - { - retval = gAgent.canEditParcel(); - } - else if (param == "speak") + if (param == "speak") { if ( gAgent.isVoiceConnected() && LLViewerParcelMgr::getInstance()->allowAgentVoice() && |