diff options
| author | Melanie | 2012-09-09 13:30:24 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-09 13:30:24 +0100 |
| commit | 0d97beefce9eaa675c93504b7cb8230e75e17763 (patch) | |
| tree | 587516c2fdf96179c93a0d37624a8d3a9f7bebdd /OpenSim/Framework/Constants.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | implementing per-region configuration of limits on the number of prims one ca... (diff) | |
| download | opensim-SC-0d97beefce9eaa675c93504b7cb8230e75e17763.zip opensim-SC-0d97beefce9eaa675c93504b7cb8230e75e17763.tar.gz opensim-SC-0d97beefce9eaa675c93504b7cb8230e75e17763.tar.bz2 opensim-SC-0d97beefce9eaa675c93504b7cb8230e75e17763.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Constants.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Framework/Constants.cs b/OpenSim/Framework/Constants.cs index 1b1aaf2..a2eb5ee 100644 --- a/OpenSim/Framework/Constants.cs +++ b/OpenSim/Framework/Constants.cs | |||
| @@ -31,6 +31,7 @@ namespace OpenSim.Framework | |||
| 31 | public class Constants | 31 | public class Constants |
| 32 | { | 32 | { |
| 33 | public const uint RegionSize = 256; | 33 | public const uint RegionSize = 256; |
| 34 | public const uint RegionHeight = 4096; | ||
| 34 | public const byte TerrainPatchSize = 16; | 35 | public const byte TerrainPatchSize = 16; |
| 35 | public const string DefaultTexture = "89556747-24cb-43ed-920b-47caed15465f"; | 36 | public const string DefaultTexture = "89556747-24cb-43ed-920b-47caed15465f"; |
| 36 | 37 | ||