aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionInfoForEstateMenuArgs.cs
diff options
context:
space:
mode:
authorMelanie2010-08-24 17:37:11 +0100
committerMelanie2010-08-24 17:37:11 +0100
commit483fc88b07b2f7d4f89c021fbb5883e0494b3244 (patch)
tree34bf6f8c94b225990a4bee035984f02e0cea7055 /OpenSim/Framework/RegionInfoForEstateMenuArgs.cs
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentPlumb the region type through to the ProductName field in estate messages (diff)
downloadopensim-SC-483fc88b07b2f7d4f89c021fbb5883e0494b3244.zip
opensim-SC-483fc88b07b2f7d4f89c021fbb5883e0494b3244.tar.gz
opensim-SC-483fc88b07b2f7d4f89c021fbb5883e0494b3244.tar.bz2
opensim-SC-483fc88b07b2f7d4f89c021fbb5883e0494b3244.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/RegionInfoForEstateMenuArgs.cs')
-rw-r--r--OpenSim/Framework/RegionInfoForEstateMenuArgs.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Framework/RegionInfoForEstateMenuArgs.cs b/OpenSim/Framework/RegionInfoForEstateMenuArgs.cs
index fee3126..f274da2 100644
--- a/OpenSim/Framework/RegionInfoForEstateMenuArgs.cs
+++ b/OpenSim/Framework/RegionInfoForEstateMenuArgs.cs
@@ -47,5 +47,6 @@ namespace OpenSim.Framework
47 public bool useEstateSun; 47 public bool useEstateSun;
48 public float waterHeight; 48 public float waterHeight;
49 public string simName; 49 public string simName;
50 public string regionType;
50 } 51 }
51} \ No newline at end of file 52}