diff options
| author | McCabe Maxsted | 2010-04-14 00:20:56 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-04-14 00:20:56 -0700 |
| commit | 834a60163bba95d53c297c791e49a597b87144f3 (patch) | |
| tree | 0dc2c00c07be28940a72011ef9291cd817a2c0d5 /linden/indra/newview/llworld.cpp | |
| parent | Added prim media functions and new script functions from SL server 1.38.0 (diff) | |
| parent | fix bring help-f1 page under control of hippogridmanager (diff) | |
| download | meta-impy-834a60163bba95d53c297c791e49a597b87144f3.zip meta-impy-834a60163bba95d53c297c791e49a597b87144f3.tar.gz meta-impy-834a60163bba95d53c297c791e49a597b87144f3.tar.bz2 meta-impy-834a60163bba95d53c297c791e49a597b87144f3.tar.xz | |
Merge commit 'armin/beta2-bugfixes' into 1.3-beta2bugfixes
Diffstat (limited to 'linden/indra/newview/llworld.cpp')
| -rw-r--r-- | linden/indra/newview/llworld.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/linden/indra/newview/llworld.cpp b/linden/indra/newview/llworld.cpp index 02c7be3..90ab49b 100644 --- a/linden/indra/newview/llworld.cpp +++ b/linden/indra/newview/llworld.cpp | |||
| @@ -60,6 +60,7 @@ | |||
| 60 | #include "pipeline.h" | 60 | #include "pipeline.h" |
| 61 | #include "llappviewer.h" // for do_disconnect() | 61 | #include "llappviewer.h" // for do_disconnect() |
| 62 | 62 | ||
| 63 | #include "hippoLimits.h" | ||
| 63 | // | 64 | // |
| 64 | // Globals | 65 | // Globals |
| 65 | // | 66 | // |
| @@ -128,6 +129,10 @@ void LLWorld::destroyClass() | |||
| 128 | LLViewerPartSim::getInstance()->destroyClass(); | 129 | LLViewerPartSim::getInstance()->destroyClass(); |
| 129 | } | 130 | } |
| 130 | 131 | ||
| 132 | F32 LLWorld::getRegionMaxHeight() const | ||
| 133 | { | ||
| 134 | return gHippoLimits->getMaxHeight(); | ||
| 135 | } | ||
| 131 | 136 | ||
| 132 | LLViewerRegion* LLWorld::addRegion(const U64 ®ion_handle, const LLHost &host) | 137 | LLViewerRegion* LLWorld::addRegion(const U64 ®ion_handle, const LLHost &host) |
| 133 | { | 138 | { |