aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionInfoForEstateMenuArgs.cs
diff options
context:
space:
mode:
authormeta72010-08-30 11:42:17 -0700
committermeta72010-08-30 11:42:17 -0700
commit35d6181b78525df995cf2dc5f8bb4f102f3c0aad (patch)
tree725b6fcda44f24f578cde7851aac869c59c0af82 /OpenSim/Framework/RegionInfoForEstateMenuArgs.cs
parentKick the user from the region in the circumstance that the TP home failed - O... (diff)
parentMerge branch 'master' into careminster-presence-refactor (diff)
downloadopensim-SC_OLD-35d6181b78525df995cf2dc5f8bb4f102f3c0aad.zip
opensim-SC_OLD-35d6181b78525df995cf2dc5f8bb4f102f3c0aad.tar.gz
opensim-SC_OLD-35d6181b78525df995cf2dc5f8bb4f102f3c0aad.tar.bz2
opensim-SC_OLD-35d6181b78525df995cf2dc5f8bb4f102f3c0aad.tar.xz
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster 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}