diff options
| author | Jacek Antonelli | 2008-08-15 23:45:23 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-08-15 23:45:23 -0500 |
| commit | 486c4774ab4a707d69c1b48cdc048af1369084db (patch) | |
| tree | 2a206a7e32a9a7efb98d585798a9fa18baeaf171 /linden/indra/newview/llviewerobject.cpp | |
| parent | Second Life viewer sources 1.18.6.1-RC (diff) | |
| download | meta-impy-486c4774ab4a707d69c1b48cdc048af1369084db.zip meta-impy-486c4774ab4a707d69c1b48cdc048af1369084db.tar.gz meta-impy-486c4774ab4a707d69c1b48cdc048af1369084db.tar.bz2 meta-impy-486c4774ab4a707d69c1b48cdc048af1369084db.tar.xz | |
Second Life viewer sources 1.18.6.2-RC
Diffstat (limited to 'linden/indra/newview/llviewerobject.cpp')
| -rw-r--r-- | linden/indra/newview/llviewerobject.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp index 4c6f279..047d36b 100644 --- a/linden/indra/newview/llviewerobject.cpp +++ b/linden/indra/newview/llviewerobject.cpp | |||
| @@ -4511,7 +4511,8 @@ BOOL LLViewerObject::permYouOwner() const | |||
| 4511 | return TRUE; | 4511 | return TRUE; |
| 4512 | #else | 4512 | #else |
| 4513 | # ifdef TOGGLE_HACKED_GODLIKE_VIEWER | 4513 | # ifdef TOGGLE_HACKED_GODLIKE_VIEWER |
| 4514 | if (!gInProductionGrid && (gAgent.getGodLevel() >= GOD_MAINTENANCE)) | 4514 | if (!LLAppViewer::instance()->isInProductionGrid() |
| 4515 | && (gAgent.getGodLevel() >= GOD_MAINTENANCE)) | ||
| 4515 | { | 4516 | { |
| 4516 | return TRUE; | 4517 | return TRUE; |
| 4517 | } | 4518 | } |
| @@ -4547,7 +4548,8 @@ BOOL LLViewerObject::permOwnerModify() const | |||
| 4547 | return TRUE; | 4548 | return TRUE; |
| 4548 | #else | 4549 | #else |
| 4549 | # ifdef TOGGLE_HACKED_GODLIKE_VIEWER | 4550 | # ifdef TOGGLE_HACKED_GODLIKE_VIEWER |
| 4550 | if (!gInProductionGrid && (gAgent.getGodLevel() >= GOD_MAINTENANCE)) | 4551 | if (!LLAppViewer::instance()->isInProductionGrid() |
| 4552 | && (gAgent.getGodLevel() >= GOD_MAINTENANCE)) | ||
| 4551 | { | 4553 | { |
| 4552 | return TRUE; | 4554 | return TRUE; |
| 4553 | } | 4555 | } |
| @@ -4570,7 +4572,8 @@ BOOL LLViewerObject::permModify() const | |||
| 4570 | return TRUE; | 4572 | return TRUE; |
| 4571 | #else | 4573 | #else |
| 4572 | # ifdef TOGGLE_HACKED_GODLIKE_VIEWER | 4574 | # ifdef TOGGLE_HACKED_GODLIKE_VIEWER |
| 4573 | if (!gInProductionGrid && (gAgent.getGodLevel() >= GOD_MAINTENANCE)) | 4575 | if (!LLAppViewer::instance()->isInProductionGrid() |
| 4576 | && (gAgent.getGodLevel() >= GOD_MAINTENANCE)) | ||
| 4574 | { | 4577 | { |
| 4575 | return TRUE; | 4578 | return TRUE; |
| 4576 | } | 4579 | } |
| @@ -4593,7 +4596,8 @@ BOOL LLViewerObject::permCopy() const | |||
| 4593 | return TRUE; | 4596 | return TRUE; |
| 4594 | #else | 4597 | #else |
| 4595 | # ifdef TOGGLE_HACKED_GODLIKE_VIEWER | 4598 | # ifdef TOGGLE_HACKED_GODLIKE_VIEWER |
| 4596 | if (!gInProductionGrid && (gAgent.getGodLevel() >= GOD_MAINTENANCE)) | 4599 | if (!LLAppViewer::instance()->isInProductionGrid() |
| 4600 | && (gAgent.getGodLevel() >= GOD_MAINTENANCE)) | ||
| 4597 | { | 4601 | { |
| 4598 | return TRUE; | 4602 | return TRUE; |
| 4599 | } | 4603 | } |
| @@ -4616,7 +4620,8 @@ BOOL LLViewerObject::permMove() const | |||
| 4616 | return TRUE; | 4620 | return TRUE; |
| 4617 | #else | 4621 | #else |
| 4618 | # ifdef TOGGLE_HACKED_GODLIKE_VIEWER | 4622 | # ifdef TOGGLE_HACKED_GODLIKE_VIEWER |
| 4619 | if (!gInProductionGrid && (gAgent.getGodLevel() >= GOD_MAINTENANCE)) | 4623 | if (!LLAppViewer::instance()->isInProductionGrid() |
| 4624 | && (gAgent.getGodLevel() >= GOD_MAINTENANCE)) | ||
| 4620 | { | 4625 | { |
| 4621 | return TRUE; | 4626 | return TRUE; |
| 4622 | } | 4627 | } |
| @@ -4639,7 +4644,8 @@ BOOL LLViewerObject::permTransfer() const | |||
| 4639 | return TRUE; | 4644 | return TRUE; |
| 4640 | #else | 4645 | #else |
| 4641 | # ifdef TOGGLE_HACKED_GODLIKE_VIEWER | 4646 | # ifdef TOGGLE_HACKED_GODLIKE_VIEWER |
| 4642 | if (!gInProductionGrid && (gAgent.getGodLevel() >= GOD_MAINTENANCE)) | 4647 | if (!LLAppViewer::instance()->isInProductionGrid() |
| 4648 | && (gAgent.getGodLevel() >= GOD_MAINTENANCE)) | ||
| 4643 | { | 4649 | { |
| 4644 | return TRUE; | 4650 | return TRUE; |
| 4645 | } | 4651 | } |