diff options
author | Justin Clark-Casey (justincc) | 2010-08-24 22:29:32 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-08-24 22:29:32 +0100 |
commit | 78f452050a25e563eb7067854c0c9179d8f62bf8 (patch) | |
tree | 4dae082a6c5dc116dc5356cc0b2066bb9a39d50c /OpenSim/Framework | |
parent | refactor: make RezObject() more readable (diff) | |
parent | Patch by Apelsin that fixes behaviour of llSetPos and llGetLocalPos for attac... (diff) | |
download | opensim-SC-78f452050a25e563eb7067854c0c9179d8f62bf8.zip opensim-SC-78f452050a25e563eb7067854c0c9179d8f62bf8.tar.gz opensim-SC-78f452050a25e563eb7067854c0c9179d8f62bf8.tar.bz2 opensim-SC-78f452050a25e563eb7067854c0c9179d8f62bf8.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/RegionInfoForEstateMenuArgs.cs | 3 |
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 | } |