aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorDiva Canto2014-05-31 08:22:56 -0700
committerDiva Canto2014-05-31 08:22:56 -0700
commitd6f9f690e56f129c4fcfb2d6fdb85f750ab3dd37 (patch)
treee198838d321f9adbce57e7744c8aebc2609b87e4 /OpenSim/Framework
parentAdded missing reference (diff)
parentminor: rename velocidyDiff -> velocityDiff (diff)
downloadopensim-SC_OLD-d6f9f690e56f129c4fcfb2d6fdb85f750ab3dd37.zip
opensim-SC_OLD-d6f9f690e56f129c4fcfb2d6fdb85f750ab3dd37.tar.gz
opensim-SC_OLD-d6f9f690e56f129c4fcfb2d6fdb85f750ab3dd37.tar.bz2
opensim-SC_OLD-d6f9f690e56f129c4fcfb2d6fdb85f750ab3dd37.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/Communications/RestClient.cs8
-rw-r--r--OpenSim/Framework/RegionInfo.cs21
2 files changed, 29 insertions, 0 deletions
diff --git a/OpenSim/Framework/Communications/RestClient.cs b/OpenSim/Framework/Communications/RestClient.cs
index 89e6aa1..586400f 100644
--- a/OpenSim/Framework/Communications/RestClient.cs
+++ b/OpenSim/Framework/Communications/RestClient.cs
@@ -299,6 +299,14 @@ namespace OpenSim.Framework.Communications
299 /// <summary> 299 /// <summary>
300 /// Perform a synchronous request 300 /// Perform a synchronous request
301 /// </summary> 301 /// </summary>
302 public Stream Request()
303 {
304 return Request(null);
305 }
306
307 /// <summary>
308 /// Perform a synchronous request
309 /// </summary>
302 public Stream Request(IServiceAuth auth) 310 public Stream Request(IServiceAuth auth)
303 { 311 {
304 lock (_lock) 312 lock (_lock)
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index ce14b58..7ac94a0 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -147,8 +147,29 @@ namespace OpenSim.Framework
147 public uint WorldLocX = 0; 147 public uint WorldLocX = 0;
148 public uint WorldLocY = 0; 148 public uint WorldLocY = 0;
149 public uint WorldLocZ = 0; 149 public uint WorldLocZ = 0;
150
151 /// <summary>
152 /// X dimension of the region.
153 /// </summary>
154 /// <remarks>
155 /// If this is a varregion then the default size set here will be replaced when we load the region config.
156 /// </remarks>
150 public uint RegionSizeX = Constants.RegionSize; 157 public uint RegionSizeX = Constants.RegionSize;
158
159 /// <summary>
160 /// X dimension of the region.
161 /// </summary>
162 /// <remarks>
163 /// If this is a varregion then the default size set here will be replaced when we load the region config.
164 /// </remarks>
151 public uint RegionSizeY = Constants.RegionSize; 165 public uint RegionSizeY = Constants.RegionSize;
166
167 /// <summary>
168 /// Z dimension of the region.
169 /// </summary>
170 /// <remarks>
171 /// XXX: Unknown if this accounts for regions with negative Z.
172 /// </remarks>
152 public uint RegionSizeZ = Constants.RegionHeight; 173 public uint RegionSizeZ = Constants.RegionHeight;
153 174
154 private Dictionary<String, String> m_extraSettings = new Dictionary<string, string>(); 175 private Dictionary<String, String> m_extraSettings = new Dictionary<string, string>();