diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-03-09 12:56:48 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-03-09 12:56:48 -0500 |
| commit | 0a873715677ef3fb28e8dab161acbe05ed8bd537 (patch) | |
| tree | 1f2e2c804bb7764bddbcb428c71edbcdeeb3da6f /indra/newview/llagent.cpp | |
| parent | 11c6654479a299549dc0035faa894678a60e157e (diff) | |
| parent | eb7e48fc9015266fd2945873f12d925ffc6262ed (diff) | |
merge changes for vmrg-230
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() && |