aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra
diff options
context:
space:
mode:
authorDavid Seikel2011-01-18 12:13:33 +1000
committerDavid Seikel2011-01-18 12:13:33 +1000
commit56965e8cb66df9e15303ffbe65f5ead93b90ab97 (patch)
tree0994331b90aedecaf8695450ee3dff86edb583e8 /linden/indra
parentUpdate the README.txt. (diff)
downloadmeta-impy-56965e8cb66df9e15303ffbe65f5ead93b90ab97.zip
meta-impy-56965e8cb66df9e15303ffbe65f5ead93b90ab97.tar.gz
meta-impy-56965e8cb66df9e15303ffbe65f5ead93b90ab97.tar.bz2
meta-impy-56965e8cb66df9e15303ffbe65f5ead93b90ab97.tar.xz
Increase maximum build height and sim size to 16383 meters.
Diffstat (limited to '')
-rw-r--r--linden/indra/llcommon/indra_constants.h3
-rw-r--r--linden/indra/newview/hippolimits.cpp4
2 files changed, 4 insertions, 3 deletions
diff --git a/linden/indra/llcommon/indra_constants.h b/linden/indra/llcommon/indra_constants.h
index 279d280..2fa2cdf 100644
--- a/linden/indra/llcommon/indra_constants.h
+++ b/linden/indra/llcommon/indra_constants.h
@@ -61,7 +61,8 @@ static const F32 REGION_WIDTH_METERS = 256.f;
61static const S32 REGION_WIDTH_UNITS = 256; 61static const S32 REGION_WIDTH_UNITS = 256;
62static const U32 REGION_WIDTH_U32 = 256; 62static const U32 REGION_WIDTH_U32 = 256;
63 63
64const F32 REGION_HEIGHT_METERS = 4096.f; 64// TODO - this is not actually used anywhere, but updating it anyway.
65const F32 REGION_HEIGHT_METERS = 16383.f;
65 66
66// Bits for simulator performance query flags 67// Bits for simulator performance query flags
67enum LAND_STAT_FLAGS 68enum LAND_STAT_FLAGS
diff --git a/linden/indra/newview/hippolimits.cpp b/linden/indra/newview/hippolimits.cpp
index 3368ba4..d899f60 100644
--- a/linden/indra/newview/hippolimits.cpp
+++ b/linden/indra/newview/hippolimits.cpp
@@ -16,7 +16,7 @@ HippoLimits *gHippoLimits = 0;
16HippoLimits::HippoLimits() 16HippoLimits::HippoLimits()
17: 17:
18 mMaxAgentGroups(100), 18 mMaxAgentGroups(100),
19 mMaxHeight(10000.0f), 19 mMaxHeight(16383.0f),
20 mMinHoleSize(0.05f), 20 mMinHoleSize(0.05f),
21 mMaxHollow(0.95f), 21 mMaxHollow(0.95f),
22 mMinPrimScale(0.001f), 22 mMinPrimScale(0.001f),
@@ -56,7 +56,7 @@ void HippoLimits::setOpenSimLimits()
56 mMaxPrimXPos = F32_MAX; 56 mMaxPrimXPos = F32_MAX;
57 mMaxPrimYPos = F32_MAX; 57 mMaxPrimYPos = F32_MAX;
58 mMaxPrimZPos = F32_MAX; 58 mMaxPrimZPos = F32_MAX;
59 mMaxHeight = 10000.0f; 59 mMaxHeight = 16383.0f;
60 mMaxLinkedPrims = -1; 60 mMaxLinkedPrims = -1;
61 mMaxPhysLinkedPrims = -1; 61 mMaxPhysLinkedPrims = -1;
62 mAllowParcelWindLight = TRUE; 62 mAllowParcelWindLight = TRUE;