diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-08-28 23:57:41 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-08-28 23:57:41 +0000 |
| commit | 4a6bacea0f8dcff959028f285bc533852da608b5 (patch) | |
| tree | 7f49b429051e550f70917ccbcdd1c27bf86f5bdf /indra/newview/llviewerregion.h | |
| parent | ac4766d4354ee1945f1569a94d755e3e7c0cd566 (diff) | |
merge viewer/viewer_1-21 94170-94770 -> release
merge viewer/viewer_1-21-0 94830-95157 -> release
Includes:
QAR-786 Sandbox buildme for viewer + server Release Notes on the wiki!
QAR-797 teleport failures (DEV-6198 / SVC-972) mergeme
Diffstat (limited to 'indra/newview/llviewerregion.h')
| -rw-r--r-- | indra/newview/llviewerregion.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index e2ba5b1636..ffccc296f1 100644 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -47,6 +47,7 @@ #include "lluuid.h" #include "lldatapacker.h" #include "llvocache.h" +#include "llweb.h" // Surface id's #define LAND 1 @@ -122,6 +123,7 @@ public: inline BOOL isPrelude() const; inline BOOL getAllowTerraform() const; inline BOOL getRestrictPushObject() const; + inline BOOL getReleaseNotesRequested() const; bool isAlive(); // can become false if circuit disconnects @@ -277,7 +279,9 @@ public: return lhs->mCameraDistanceSquared < rhs->mCameraDistanceSquared; } }; - + + void showReleaseNotes(); + protected: void disconnectAllNeighbors(); void initStats(); @@ -381,6 +385,8 @@ private: std::vector<LLSpatialPartition*> mObjectPartition; LLHTTPClient::ResponderPtr mHttpResponderPtr ; + + BOOL mReleaseNotesRequested; }; inline BOOL LLViewerRegion::getAllowDamage() const @@ -433,6 +439,11 @@ inline BOOL LLViewerRegion::getRestrictPushObject() const return ((mRegionFlags & REGION_FLAGS_RESTRICT_PUSHOBJECT) != 0); } +inline BOOL LLViewerRegion::getReleaseNotesRequested() const +{ + return mReleaseNotesRequested; +} + #endif |