diff options
author | elektrahesse | 2010-10-03 10:06:37 +0200 |
---|---|---|
committer | McCabe Maxsted | 2010-10-03 18:02:27 -0700 |
commit | 88b6bc3b8591c7fca155dcd95fdb45a4f38decbb (patch) | |
tree | 2827aa50dbe21a6ce39deeacaeb23ad85d2f7459 /linden/indra/newview/llviewerparcelmgr.cpp | |
parent | Reduced the minimum size of the minimap (diff) | |
download | meta-impy-88b6bc3b8591c7fca155dcd95fdb45a4f38decbb.zip meta-impy-88b6bc3b8591c7fca155dcd95fdb45a4f38decbb.tar.gz meta-impy-88b6bc3b8591c7fca155dcd95fdb45a4f38decbb.tar.bz2 meta-impy-88b6bc3b8591c7fca155dcd95fdb45a4f38decbb.tar.xz |
Patch to enable building on any parcel if the agent has create powers in the land group. If the land is deeded the object is created with the agent active group, else it's set to the land group by default. Also enables the build button when it should.
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llviewerparcelmgr.cpp | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/linden/indra/newview/llviewerparcelmgr.cpp b/linden/indra/newview/llviewerparcelmgr.cpp index 61b91fe..257ce0d 100644 --- a/linden/indra/newview/llviewerparcelmgr.cpp +++ b/linden/indra/newview/llviewerparcelmgr.cpp | |||
@@ -651,15 +651,21 @@ BOOL LLViewerParcelMgr::agentCanBuild() const | |||
651 | { | 651 | { |
652 | if (mAgentParcel) | 652 | if (mAgentParcel) |
653 | { | 653 | { |
654 | return (gAgent.isGodlike() | 654 | const LLUUID parcel_group = mAgentParcel->getGroupID(); |
655 | || (mAgentParcel->allowModifyBy( | 655 | const LLUUID active_group = gAgent.getGroupID(); |
656 | gAgent.getID(), | 656 | |
657 | gAgent.getGroupID()))); | 657 | if (gAgent.isGodlike()) |
658 | } | 658 | return true; |
659 | else | 659 | |
660 | { | 660 | if (mAgentParcel->allowModifyBy(gAgent.getID(), active_group)) |
661 | return gAgent.isGodlike(); | 661 | return true; |
662 | |||
663 | // Ele: enable build option if we are in the land group and we have create powers, even if the group tag is not active | ||
664 | if (gAgent.isInGroup(parcel_group) && gAgent.hasPowerInGroup(parcel_group, GP_LAND_ALLOW_CREATE)) | ||
665 | return true; | ||
662 | } | 666 | } |
667 | |||
668 | return gAgent.isGodlike(); | ||
663 | } | 669 | } |
664 | 670 | ||
665 | BOOL LLViewerParcelMgr::agentCanTakeDamage() const | 671 | BOOL LLViewerParcelMgr::agentCanTakeDamage() const |