aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llworld.cpp
diff options
context:
space:
mode:
authorArmin Weatherwax2010-03-29 15:50:33 +0200
committerArmin Weatherwax2010-04-12 17:11:05 +0200
commit3fbbd9e0b7516d1c170267acc26a767af1fa4b1d (patch)
treeed49e0dcd64f1244fbbfea6bc844ab2788eaaa50 /linden/indra/newview/llworld.cpp
parentUse Hippogridmanager for OpenSim detection. (diff)
downloadmeta-impy-3fbbd9e0b7516d1c170267acc26a767af1fa4b1d.zip
meta-impy-3fbbd9e0b7516d1c170267acc26a767af1fa4b1d.tar.gz
meta-impy-3fbbd9e0b7516d1c170267acc26a767af1fa4b1d.tar.bz2
meta-impy-3fbbd9e0b7516d1c170267acc26a767af1fa4b1d.tar.xz
support more OpenSim limits (number of groups, hollow size)
Diffstat (limited to 'linden/indra/newview/llworld.cpp')
-rw-r--r--linden/indra/newview/llworld.cpp5
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
132F32 LLWorld::getRegionMaxHeight() const
133{
134 return gHippoLimits->getMaxHeight();
135}
131 136
132LLViewerRegion* LLWorld::addRegion(const U64 &region_handle, const LLHost &host) 137LLViewerRegion* LLWorld::addRegion(const U64 &region_handle, const LLHost &host)
133{ 138{