diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/ConfigSettings.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 21 |
2 files changed, 15 insertions, 10 deletions
diff --git a/OpenSim/Framework/ConfigSettings.cs b/OpenSim/Framework/ConfigSettings.cs index 93efffa..32415e0 100644 --- a/OpenSim/Framework/ConfigSettings.cs +++ b/OpenSim/Framework/ConfigSettings.cs | |||
@@ -168,7 +168,7 @@ namespace OpenSim.Framework | |||
168 | public const bool DefaultUserServerHttpSSL = false; | 168 | public const bool DefaultUserServerHttpSSL = false; |
169 | public const uint DefaultMessageServerHttpPort = 8006; | 169 | public const uint DefaultMessageServerHttpPort = 8006; |
170 | public const bool DefaultMessageServerHttpSSL = false; | 170 | public const bool DefaultMessageServerHttpSSL = false; |
171 | public const uint DefaultGridServerHttpPort = 8001; | 171 | public const uint DefaultGridServerHttpPort = 8003; |
172 | public const uint DefaultInventoryServerHttpPort = 8004; | 172 | public const uint DefaultInventoryServerHttpPort = 8003; |
173 | } | 173 | } |
174 | } | 174 | } |
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 9e00528..1ea08f9 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -38,8 +38,8 @@ using OpenSim.Framework.Console; | |||
38 | 38 | ||
39 | 39 | ||
40 | namespace OpenSim.Framework | 40 | namespace OpenSim.Framework |
41 | { | 41 | { |
42 | public class RegionMeta7WindlightData | 42 | public class RegionMeta7WindlightData : ICloneable |
43 | { | 43 | { |
44 | public UUID regionID = UUID.Zero; | 44 | public UUID regionID = UUID.Zero; |
45 | public Vector3 waterColor = new Vector3(4.0f,38.0f,64.0f); | 45 | public Vector3 waterColor = new Vector3(4.0f,38.0f,64.0f); |
@@ -54,19 +54,19 @@ namespace OpenSim.Framework | |||
54 | public Vector2 bigWaveDirection = new Vector2(1.05f,-0.42f); | 54 | public Vector2 bigWaveDirection = new Vector2(1.05f,-0.42f); |
55 | public Vector2 littleWaveDirection = new Vector2(1.11f,-1.16f); | 55 | public Vector2 littleWaveDirection = new Vector2(1.11f,-1.16f); |
56 | public UUID normalMapTexture = new UUID("822ded49-9a6c-f61c-cb89-6df54f42cdf4"); | 56 | public UUID normalMapTexture = new UUID("822ded49-9a6c-f61c-cb89-6df54f42cdf4"); |
57 | public Vector4 horizon = new Vector4(0.26f, 0.24f, 0.34f, 0.33f); | 57 | public Vector4 horizon = new Vector4(0.25f, 0.25f, 0.32f, 0.32f); |
58 | public float hazeHorizon = 0.19f; | 58 | public float hazeHorizon = 0.19f; |
59 | public Vector4 blueDensity = new Vector4(0.10f, 0.93f, 0.02f, 0.93f); | 59 | public Vector4 blueDensity = new Vector4(0.12f, 0.22f, 0.38f, 0.38f); |
60 | public float hazeDensity = 0.70f; | 60 | public float hazeDensity = 0.70f; |
61 | public float densityMultiplier = 0.18f; | 61 | public float densityMultiplier = 0.18f; |
62 | public float distanceMultiplier = 0.8f; | 62 | public float distanceMultiplier = 0.8f; |
63 | public UInt16 maxAltitude = 1605; | 63 | public UInt16 maxAltitude = 1605; |
64 | public Vector4 sunMoonColor = new Vector4(0.24f, 0.26f, 0.30f, 0.30f); | 64 | public Vector4 sunMoonColor = new Vector4(0.24f, 0.26f, 0.30f, 0.30f); |
65 | public float sunMoonPosition = 0.335f; | 65 | public float sunMoonPosition = 0.317f; |
66 | public Vector4 ambient = new Vector4(0.35f,0.35f,0.35f,0.35f); | 66 | public Vector4 ambient = new Vector4(0.35f,0.35f,0.35f,0.35f); |
67 | public float eastAngle = 0.0f; | 67 | public float eastAngle = 0.0f; |
68 | public float sunGlowFocus = 0.10f; | 68 | public float sunGlowFocus = 0.10f; |
69 | public float sunGlowSize = 0.10f; | 69 | public float sunGlowSize = 1.75f; |
70 | public float sceneGamma = 1.0f; | 70 | public float sceneGamma = 1.0f; |
71 | public float starBrightness = 0.0f; | 71 | public float starBrightness = 0.0f; |
72 | public Vector4 cloudColor = new Vector4(0.41f, 0.41f, 0.41f, 0.41f); | 72 | public Vector4 cloudColor = new Vector4(0.41f, 0.41f, 0.41f, 0.41f); |
@@ -78,7 +78,7 @@ namespace OpenSim.Framework | |||
78 | public bool cloudScrollXLock = false; | 78 | public bool cloudScrollXLock = false; |
79 | public float cloudScrollY = 0.01f; | 79 | public float cloudScrollY = 0.01f; |
80 | public bool cloudScrollYLock = false; | 80 | public bool cloudScrollYLock = false; |
81 | public bool drawClassicClouds = false; | 81 | public bool drawClassicClouds = true; |
82 | 82 | ||
83 | public delegate void SaveDelegate(RegionMeta7WindlightData wl); | 83 | public delegate void SaveDelegate(RegionMeta7WindlightData wl); |
84 | public event SaveDelegate OnSave; | 84 | public event SaveDelegate OnSave; |
@@ -86,7 +86,12 @@ namespace OpenSim.Framework | |||
86 | { | 86 | { |
87 | if (OnSave != null) | 87 | if (OnSave != null) |
88 | OnSave(this); | 88 | OnSave(this); |
89 | } | 89 | } |
90 | public object Clone() | ||
91 | { | ||
92 | return this.MemberwiseClone(); // call clone method | ||
93 | } | ||
94 | |||
90 | } | 95 | } |
91 | 96 | ||
92 | [Serializable] | 97 | [Serializable] |