aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorMelanie2010-11-03 02:34:36 +0000
committerMelanie2010-11-03 02:34:36 +0000
commit5f8ab9f018dab8fc8c1f4e88265cbf7599377eb8 (patch)
tree7d9deca98fbb3cf3f38a0938fcd28509bb783228 /OpenSim/Framework
parentChange the default of the new bind_ip_address RemoteAdmin option to 0.0.0.0 (diff)
parentAdd lsClearWindlightScene() to the lightshare module to remove WL settings (diff)
downloadopensim-SC_OLD-5f8ab9f018dab8fc8c1f4e88265cbf7599377eb8.zip
opensim-SC_OLD-5f8ab9f018dab8fc8c1f4e88265cbf7599377eb8.tar.gz
opensim-SC_OLD-5f8ab9f018dab8fc8c1f4e88265cbf7599377eb8.tar.bz2
opensim-SC_OLD-5f8ab9f018dab8fc8c1f4e88265cbf7599377eb8.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/RegionInfo.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index a006f3e..806142f 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -43,6 +43,7 @@ namespace OpenSim.Framework
43 [Serializable] 43 [Serializable]
44 public class RegionLightShareData : ICloneable 44 public class RegionLightShareData : ICloneable
45 { 45 {
46 public bool valid = false;
46 public UUID regionID = UUID.Zero; 47 public UUID regionID = UUID.Zero;
47 public Vector3 waterColor = new Vector3(4.0f,38.0f,64.0f); 48 public Vector3 waterColor = new Vector3(4.0f,38.0f,64.0f);
48 public float waterFogDensityExponent = 4.0f; 49 public float waterFogDensityExponent = 4.0f;