diff options
| author | Adam Moss <moss@lindenlab.com> | 2009-04-16 23:45:35 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2009-04-16 23:45:35 +0000 |
| commit | b01c75cb423f07a3d3354f8bd62f265f80062b3b (patch) | |
| tree | dec1b220c24a60cc220d1cb07fd3545610644f0a /indra/newview/llviewerparcelmgr.cpp | |
| parent | 868250bdd74f348557102c0d8408d9bec30331f6 (diff) | |
svn merge -r117314:117337
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/mv13a-merge-1
QAR-1343 maint-viewer-13a+libcurlexploitfix-3-3 combo merge
Diffstat (limited to 'indra/newview/llviewerparcelmgr.cpp')
| -rw-r--r-- | indra/newview/llviewerparcelmgr.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp index 194029398d..07203ce0f4 100644 --- a/indra/newview/llviewerparcelmgr.cpp +++ b/indra/newview/llviewerparcelmgr.cpp @@ -650,10 +650,9 @@ BOOL LLViewerParcelMgr::agentCanBuild() const { if (mAgentParcel) { - return (gAgent.isGodlike() - || (mAgentParcel->allowModifyBy( - gAgent.getID(), - gAgent.getGroupID()))); + return (gAgent.isGodlike() || + (mAgentParcel->allowModifyBy(gAgent.getID(), gAgent.getGroupID())) || + (isParcelOwnedByAgent(mAgentParcel, GP_LAND_ALLOW_CREATE))); } else { |