diff options
author | John Hurliman | 2010-04-02 13:32:40 -0700 |
---|---|---|
committer | John Hurliman | 2010-04-02 13:32:40 -0700 |
commit | a895de4414fa3a9439500a2bbbb18d4bc24fa624 (patch) | |
tree | 5adccfbbd91fceb4366c82e71a786270a95c1653 /OpenSim/Framework | |
parent | * Better logging for Authenticate() failures (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC-a895de4414fa3a9439500a2bbbb18d4bc24fa624.zip opensim-SC-a895de4414fa3a9439500a2bbbb18d4bc24fa624.tar.gz opensim-SC-a895de4414fa3a9439500a2bbbb18d4bc24fa624.tar.bz2 opensim-SC-a895de4414fa3a9439500a2bbbb18d4bc24fa624.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Communications/Osp/OspResolver.cs | 5 | ||||
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/RegionInfo.cs | 303 | ||||
-rw-r--r-- | OpenSim/Framework/Serialization/TarArchiveWriter.cs | 4 |
4 files changed, 311 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/Osp/OspResolver.cs b/OpenSim/Framework/Communications/Osp/OspResolver.cs index 2e55f53..24ea64d 100644 --- a/OpenSim/Framework/Communications/Osp/OspResolver.cs +++ b/OpenSim/Framework/Communications/Osp/OspResolver.cs | |||
@@ -139,6 +139,9 @@ namespace OpenSim.Framework.Communications.Osp | |||
139 | /// </returns> | 139 | /// </returns> |
140 | protected static UUID ResolveOspaName(string name, IUserAccountService userService) | 140 | protected static UUID ResolveOspaName(string name, IUserAccountService userService) |
141 | { | 141 | { |
142 | if (userService == null) | ||
143 | return UUID.Zero; | ||
144 | |||
142 | int nameSeparatorIndex = name.IndexOf(OSPA_NAME_VALUE_SEPARATOR); | 145 | int nameSeparatorIndex = name.IndexOf(OSPA_NAME_VALUE_SEPARATOR); |
143 | 146 | ||
144 | if (nameSeparatorIndex < 0) | 147 | if (nameSeparatorIndex < 0) |
@@ -149,7 +152,7 @@ namespace OpenSim.Framework.Communications.Osp | |||
149 | 152 | ||
150 | string firstName = name.Remove(nameSeparatorIndex).TrimEnd(); | 153 | string firstName = name.Remove(nameSeparatorIndex).TrimEnd(); |
151 | string lastName = name.Substring(nameSeparatorIndex + 1).TrimStart(); | 154 | string lastName = name.Substring(nameSeparatorIndex + 1).TrimStart(); |
152 | 155 | ||
153 | UserAccount account = userService.GetUserAccount(UUID.Zero, firstName, lastName); | 156 | UserAccount account = userService.GetUserAccount(UUID.Zero, firstName, lastName); |
154 | if (account != null) | 157 | if (account != null) |
155 | return account.PrincipalID; | 158 | return account.PrincipalID; |
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 4f6f709..4577758 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -1150,7 +1150,7 @@ namespace OpenSim.Framework | |||
1150 | 1150 | ||
1151 | void SendInstantMessage(GridInstantMessage im); | 1151 | void SendInstantMessage(GridInstantMessage im); |
1152 | 1152 | ||
1153 | void SendGenericMessage(string method, List<string> message); | 1153 | void SendGenericMessage(string method, List<byte[]> message); |
1154 | 1154 | ||
1155 | void SendLayerData(float[] map); | 1155 | void SendLayerData(float[] map); |
1156 | void SendLayerData(int px, int py, float[] map); | 1156 | void SendLayerData(int px, int py, float[] map); |
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs index 5d63da7..ad98816 100644 --- a/OpenSim/Framework/RegionInfo.cs +++ b/OpenSim/Framework/RegionInfo.cs | |||
@@ -36,8 +36,295 @@ using OpenMetaverse; | |||
36 | using OpenMetaverse.StructuredData; | 36 | using OpenMetaverse.StructuredData; |
37 | using OpenSim.Framework.Console; | 37 | using OpenSim.Framework.Console; |
38 | 38 | ||
39 | |||
39 | namespace OpenSim.Framework | 40 | namespace OpenSim.Framework |
40 | { | 41 | { |
42 | public class RegionLightShareData : ICloneable | ||
43 | { | ||
44 | public UUID regionID = UUID.Zero; | ||
45 | public Vector3 waterColor = new Vector3(4.0f,38.0f,64.0f); | ||
46 | public float waterFogDensityExponent = 4.0f; | ||
47 | public float underwaterFogModifier = 0.25f; | ||
48 | public Vector3 reflectionWaveletScale = new Vector3(2.0f,2.0f,2.0f); | ||
49 | public float fresnelScale = 0.40f; | ||
50 | public float fresnelOffset = 0.50f; | ||
51 | public float refractScaleAbove = 0.03f; | ||
52 | public float refractScaleBelow = 0.20f; | ||
53 | public float blurMultiplier = 0.040f; | ||
54 | public Vector2 bigWaveDirection = new Vector2(1.05f,-0.42f); | ||
55 | public Vector2 littleWaveDirection = new Vector2(1.11f,-1.16f); | ||
56 | public UUID normalMapTexture = new UUID("822ded49-9a6c-f61c-cb89-6df54f42cdf4"); | ||
57 | public Vector4 horizon = new Vector4(0.25f, 0.25f, 0.32f, 0.32f); | ||
58 | public float hazeHorizon = 0.19f; | ||
59 | public Vector4 blueDensity = new Vector4(0.12f, 0.22f, 0.38f, 0.38f); | ||
60 | public float hazeDensity = 0.70f; | ||
61 | public float densityMultiplier = 0.18f; | ||
62 | public float distanceMultiplier = 0.8f; | ||
63 | public UInt16 maxAltitude = 1605; | ||
64 | public Vector4 sunMoonColor = new Vector4(0.24f, 0.26f, 0.30f, 0.30f); | ||
65 | public float sunMoonPosition = 0.317f; | ||
66 | public Vector4 ambient = new Vector4(0.35f,0.35f,0.35f,0.35f); | ||
67 | public float eastAngle = 0.0f; | ||
68 | public float sunGlowFocus = 0.10f; | ||
69 | public float sunGlowSize = 1.75f; | ||
70 | public float sceneGamma = 1.0f; | ||
71 | public float starBrightness = 0.0f; | ||
72 | public Vector4 cloudColor = new Vector4(0.41f, 0.41f, 0.41f, 0.41f); | ||
73 | public Vector3 cloudXYDensity = new Vector3(1.00f, 0.53f, 1.00f); | ||
74 | public float cloudCoverage = 0.27f; | ||
75 | public float cloudScale = 0.42f; | ||
76 | public Vector3 cloudDetailXYDensity = new Vector3(1.00f, 0.53f, 0.12f); | ||
77 | public float cloudScrollX = 0.20f; | ||
78 | public bool cloudScrollXLock = false; | ||
79 | public float cloudScrollY = 0.01f; | ||
80 | public bool cloudScrollYLock = false; | ||
81 | public bool drawClassicClouds = true; | ||
82 | |||
83 | public delegate void SaveDelegate(RegionLightShareData wl); | ||
84 | public event SaveDelegate OnSave; | ||
85 | public void Save() | ||
86 | { | ||
87 | if (OnSave != null) | ||
88 | OnSave(this); | ||
89 | } | ||
90 | public object Clone() | ||
91 | { | ||
92 | return this.MemberwiseClone(); // call clone method | ||
93 | } | ||
94 | |||
95 | } | ||
96 | |||
97 | [Serializable] | ||
98 | public class SimpleRegionInfo | ||
99 | { | ||
100 | // private static readonly log4net.ILog m_log | ||
101 | // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
102 | |||
103 | /// <summary> | ||
104 | /// The port by which http communication occurs with the region (most noticeably, CAPS communication) | ||
105 | /// </summary> | ||
106 | public uint HttpPort | ||
107 | { | ||
108 | get { return m_httpPort; } | ||
109 | set { m_httpPort = value; } | ||
110 | } | ||
111 | protected uint m_httpPort; | ||
112 | |||
113 | /// <summary> | ||
114 | /// A well-formed URI for the host region server (namely "http://" + ExternalHostName) | ||
115 | /// </summary> | ||
116 | public string ServerURI | ||
117 | { | ||
118 | get { return m_serverURI; } | ||
119 | set { m_serverURI = value; } | ||
120 | } | ||
121 | protected string m_serverURI; | ||
122 | |||
123 | public string RegionName | ||
124 | { | ||
125 | get { return m_regionName; } | ||
126 | set { m_regionName = value; } | ||
127 | } | ||
128 | protected string m_regionName = String.Empty; | ||
129 | |||
130 | protected bool Allow_Alternate_Ports; | ||
131 | public bool m_allow_alternate_ports; | ||
132 | protected string m_externalHostName; | ||
133 | |||
134 | protected IPEndPoint m_internalEndPoint; | ||
135 | protected uint? m_regionLocX; | ||
136 | protected uint? m_regionLocY; | ||
137 | protected uint m_remotingPort; | ||
138 | public UUID RegionID = UUID.Zero; | ||
139 | public string RemotingAddress; | ||
140 | public UUID ScopeID = UUID.Zero; | ||
141 | |||
142 | public SimpleRegionInfo() | ||
143 | { | ||
144 | } | ||
145 | |||
146 | public SimpleRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) | ||
147 | { | ||
148 | m_regionLocX = regionLocX; | ||
149 | m_regionLocY = regionLocY; | ||
150 | |||
151 | m_internalEndPoint = internalEndPoint; | ||
152 | m_externalHostName = externalUri; | ||
153 | } | ||
154 | |||
155 | public SimpleRegionInfo(uint regionLocX, uint regionLocY, string externalUri, uint port) | ||
156 | { | ||
157 | m_regionLocX = regionLocX; | ||
158 | m_regionLocY = regionLocY; | ||
159 | |||
160 | m_externalHostName = externalUri; | ||
161 | |||
162 | m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int) port); | ||
163 | } | ||
164 | |||
165 | public SimpleRegionInfo(RegionInfo ConvertFrom) | ||
166 | { | ||
167 | m_regionName = ConvertFrom.RegionName; | ||
168 | m_regionLocX = ConvertFrom.RegionLocX; | ||
169 | m_regionLocY = ConvertFrom.RegionLocY; | ||
170 | m_internalEndPoint = ConvertFrom.InternalEndPoint; | ||
171 | m_externalHostName = ConvertFrom.ExternalHostName; | ||
172 | m_remotingPort = ConvertFrom.RemotingPort; | ||
173 | m_httpPort = ConvertFrom.HttpPort; | ||
174 | m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports; | ||
175 | RemotingAddress = ConvertFrom.RemotingAddress; | ||
176 | RegionID = UUID.Zero; | ||
177 | ServerURI = ConvertFrom.ServerURI; | ||
178 | } | ||
179 | |||
180 | public uint RemotingPort | ||
181 | { | ||
182 | get { return m_remotingPort; } | ||
183 | set { m_remotingPort = value; } | ||
184 | } | ||
185 | |||
186 | /// <value> | ||
187 | /// This accessor can throw all the exceptions that Dns.GetHostAddresses can throw. | ||
188 | /// | ||
189 | /// XXX Isn't this really doing too much to be a simple getter, rather than an explict method? | ||
190 | /// </value> | ||
191 | public IPEndPoint ExternalEndPoint | ||
192 | { | ||
193 | get | ||
194 | { | ||
195 | // Old one defaults to IPv6 | ||
196 | //return new IPEndPoint(Dns.GetHostAddresses(m_externalHostName)[0], m_internalEndPoint.Port); | ||
197 | |||
198 | IPAddress ia = null; | ||
199 | // If it is already an IP, don't resolve it - just return directly | ||
200 | if (IPAddress.TryParse(m_externalHostName, out ia)) | ||
201 | return new IPEndPoint(ia, m_internalEndPoint.Port); | ||
202 | |||
203 | // Reset for next check | ||
204 | ia = null; | ||
205 | try | ||
206 | { | ||
207 | foreach (IPAddress Adr in Dns.GetHostAddresses(m_externalHostName)) | ||
208 | { | ||
209 | if (ia == null) | ||
210 | ia = Adr; | ||
211 | |||
212 | if (Adr.AddressFamily == AddressFamily.InterNetwork) | ||
213 | { | ||
214 | ia = Adr; | ||
215 | break; | ||
216 | } | ||
217 | } | ||
218 | } | ||
219 | catch (SocketException e) | ||
220 | { | ||
221 | throw new Exception( | ||
222 | "Unable to resolve local hostname " + m_externalHostName + " innerException of type '" + | ||
223 | e + "' attached to this exception", e); | ||
224 | } | ||
225 | |||
226 | return new IPEndPoint(ia, m_internalEndPoint.Port); | ||
227 | } | ||
228 | |||
229 | set { m_externalHostName = value.ToString(); } | ||
230 | } | ||
231 | |||
232 | public string ExternalHostName | ||
233 | { | ||
234 | get { return m_externalHostName; } | ||
235 | set { m_externalHostName = value; } | ||
236 | } | ||
237 | |||
238 | public IPEndPoint InternalEndPoint | ||
239 | { | ||
240 | get { return m_internalEndPoint; } | ||
241 | set { m_internalEndPoint = value; } | ||
242 | } | ||
243 | |||
244 | public uint RegionLocX | ||
245 | { | ||
246 | get { return m_regionLocX.Value; } | ||
247 | set { m_regionLocX = value; } | ||
248 | } | ||
249 | |||
250 | public uint RegionLocY | ||
251 | { | ||
252 | get { return m_regionLocY.Value; } | ||
253 | set { m_regionLocY = value; } | ||
254 | } | ||
255 | |||
256 | public ulong RegionHandle | ||
257 | { | ||
258 | get { return Util.UIntsToLong((RegionLocX * (uint) Constants.RegionSize), (RegionLocY * (uint) Constants.RegionSize)); } | ||
259 | } | ||
260 | |||
261 | public int getInternalEndPointPort() | ||
262 | { | ||
263 | return m_internalEndPoint.Port; | ||
264 | } | ||
265 | |||
266 | public Dictionary<string, object> ToKeyValuePairs() | ||
267 | { | ||
268 | Dictionary<string, object> kvp = new Dictionary<string, object>(); | ||
269 | kvp["uuid"] = RegionID.ToString(); | ||
270 | kvp["locX"] = RegionLocX.ToString(); | ||
271 | kvp["locY"] = RegionLocY.ToString(); | ||
272 | kvp["external_ip_address"] = ExternalEndPoint.Address.ToString(); | ||
273 | kvp["external_port"] = ExternalEndPoint.Port.ToString(); | ||
274 | kvp["external_host_name"] = ExternalHostName; | ||
275 | kvp["http_port"] = HttpPort.ToString(); | ||
276 | kvp["internal_ip_address"] = InternalEndPoint.Address.ToString(); | ||
277 | kvp["internal_port"] = InternalEndPoint.Port.ToString(); | ||
278 | kvp["alternate_ports"] = m_allow_alternate_ports.ToString(); | ||
279 | kvp["server_uri"] = ServerURI; | ||
280 | |||
281 | return kvp; | ||
282 | } | ||
283 | |||
284 | public SimpleRegionInfo(Dictionary<string, object> kvp) | ||
285 | { | ||
286 | if ((kvp["external_ip_address"] != null) && (kvp["external_port"] != null)) | ||
287 | { | ||
288 | int port = 0; | ||
289 | Int32.TryParse((string)kvp["external_port"], out port); | ||
290 | IPEndPoint ep = new IPEndPoint(IPAddress.Parse((string)kvp["external_ip_address"]), port); | ||
291 | ExternalEndPoint = ep; | ||
292 | } | ||
293 | else | ||
294 | ExternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0); | ||
295 | |||
296 | if (kvp["external_host_name"] != null) | ||
297 | ExternalHostName = (string)kvp["external_host_name"]; | ||
298 | |||
299 | if (kvp["http_port"] != null) | ||
300 | { | ||
301 | UInt32 port = 0; | ||
302 | UInt32.TryParse((string)kvp["http_port"], out port); | ||
303 | HttpPort = port; | ||
304 | } | ||
305 | |||
306 | if ((kvp["internal_ip_address"] != null) && (kvp["internal_port"] != null)) | ||
307 | { | ||
308 | int port = 0; | ||
309 | Int32.TryParse((string)kvp["internal_port"], out port); | ||
310 | IPEndPoint ep = new IPEndPoint(IPAddress.Parse((string)kvp["internal_ip_address"]), port); | ||
311 | InternalEndPoint = ep; | ||
312 | } | ||
313 | else | ||
314 | InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0); | ||
315 | |||
316 | if (kvp["alternate_ports"] != null) | ||
317 | { | ||
318 | bool alts = false; | ||
319 | Boolean.TryParse((string)kvp["alternate_ports"], out alts); | ||
320 | m_allow_alternate_ports = alts; | ||
321 | } | ||
322 | |||
323 | if (kvp["server_uri"] != null) | ||
324 | ServerURI = (string)kvp["server_uri"]; | ||
325 | } | ||
326 | } | ||
327 | |||
41 | public class RegionInfo | 328 | public class RegionInfo |
42 | { | 329 | { |
43 | // private static readonly log4net.ILog m_log | 330 | // private static readonly log4net.ILog m_log |
@@ -69,6 +356,7 @@ namespace OpenSim.Framework | |||
69 | private bool m_clampPrimSize = false; | 356 | private bool m_clampPrimSize = false; |
70 | private int m_objectCapacity = 0; | 357 | private int m_objectCapacity = 0; |
71 | private string m_regionType = String.Empty; | 358 | private string m_regionType = String.Empty; |
359 | private RegionLightShareData m_windlight = new RegionLightShareData(); | ||
72 | protected uint m_httpPort; | 360 | protected uint m_httpPort; |
73 | protected string m_serverURI; | 361 | protected string m_serverURI; |
74 | protected string m_regionName = String.Empty; | 362 | protected string m_regionName = String.Empty; |
@@ -207,6 +495,21 @@ namespace OpenSim.Framework | |||
207 | set { m_regionSettings = value; } | 495 | set { m_regionSettings = value; } |
208 | } | 496 | } |
209 | 497 | ||
498 | public RegionLightShareData WindlightSettings | ||
499 | { | ||
500 | get | ||
501 | { | ||
502 | if (m_windlight == null) | ||
503 | { | ||
504 | m_windlight = new RegionLightShareData(); | ||
505 | } | ||
506 | |||
507 | return m_windlight; | ||
508 | } | ||
509 | |||
510 | set { m_windlight = value; } | ||
511 | } | ||
512 | |||
210 | public int NonphysPrimMax | 513 | public int NonphysPrimMax |
211 | { | 514 | { |
212 | get { return m_nonphysPrimMax; } | 515 | get { return m_nonphysPrimMax; } |
diff --git a/OpenSim/Framework/Serialization/TarArchiveWriter.cs b/OpenSim/Framework/Serialization/TarArchiveWriter.cs index 20d0f7e..0bd639f 100644 --- a/OpenSim/Framework/Serialization/TarArchiveWriter.cs +++ b/OpenSim/Framework/Serialization/TarArchiveWriter.cs | |||
@@ -208,7 +208,9 @@ namespace OpenSim.Framework.Serialization | |||
208 | m_bw.Write(header); | 208 | m_bw.Write(header); |
209 | 209 | ||
210 | // Write out data | 210 | // Write out data |
211 | m_bw.Write(data); | 211 | // An IOException occurs if we try to write out an empty array in Mono 2.6 |
212 | if (data.Length > 0) | ||
213 | m_bw.Write(data); | ||
212 | 214 | ||
213 | if (data.Length % 512 != 0) | 215 | if (data.Length % 512 != 0) |
214 | { | 216 | { |