aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Base/ServiceBase.cs7
-rw-r--r--OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs60
-rw-r--r--OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs4
-rw-r--r--OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs6
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs77
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs5
-rw-r--r--OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs24
-rw-r--r--OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs5
-rw-r--r--OpenSim/Services/GridService/GridService.cs37
-rw-r--r--OpenSim/Services/GridService/HypergridLinker.cs33
-rw-r--r--OpenSim/Services/Interfaces/IBakedTextureService.cs9
-rw-r--r--OpenSim/Services/Interfaces/IGridService.cs128
-rw-r--r--OpenSim/Services/Interfaces/IMapImageService.cs6
-rw-r--r--OpenSim/Services/Interfaces/ISimulationService.cs9
-rw-r--r--OpenSim/Services/Interfaces/IUserProfilesService.cs5
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginResponse.cs8
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginService.cs20
-rw-r--r--OpenSim/Services/MapImageService/MapImageService.cs74
-rw-r--r--OpenSim/Services/UserProfilesService/UserProfilesService.cs4
19 files changed, 48 insertions, 473 deletions
diff --git a/OpenSim/Services/Base/ServiceBase.cs b/OpenSim/Services/Base/ServiceBase.cs
index 09dcbef..c18226b 100644
--- a/OpenSim/Services/Base/ServiceBase.cs
+++ b/OpenSim/Services/Base/ServiceBase.cs
@@ -47,7 +47,6 @@ namespace OpenSim.Services.Base
47 47
48 public T LoadPlugin<T>(string dllName, Object[] args) where T:class 48 public T LoadPlugin<T>(string dllName, Object[] args) where T:class
49 { 49 {
50<<<<<<< HEAD
51 // The path:type separator : is unfortunate because it collides 50 // The path:type separator : is unfortunate because it collides
52 // with Windows paths like C:\... 51 // with Windows paths like C:\...
53 // When the path provided includes the drive, this fails. 52 // When the path provided includes the drive, this fails.
@@ -55,11 +54,7 @@ namespace OpenSim.Services.Base
55 string pathRoot = Path.GetPathRoot(dllName); 54 string pathRoot = Path.GetPathRoot(dllName);
56 string noRoot = dllName.Substring(pathRoot.Length); 55 string noRoot = dllName.Substring(pathRoot.Length);
57 string[] parts = noRoot.Split(new char[] {':'}); 56 string[] parts = noRoot.Split(new char[] {':'});
58======= 57
59 string pathRoot = Path.GetPathRoot(dllName);
60 string noRoot = dllName.Substring(pathRoot.Length);
61 string[] parts = noRoot.Split(new char[] { ':' });
62>>>>>>> avn/ubitvar
63 58
64 dllName = pathRoot + parts[0]; 59 dllName = pathRoot + parts[0];
65 60
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index 795ca2e..24f802e 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -275,18 +275,11 @@ namespace OpenSim.Services.Connectors
275 return fullAsset.Data; 275 return fullAsset.Data;
276 } 276 }
277 277
278<<<<<<< HEAD 278 using (RestClient rc = new RestClient(MapServer(id)))
279 using (RestClient rc = new RestClient(m_ServerURI))
280 { 279 {
281 rc.AddResourcePath("assets"); 280 rc.AddResourcePath("assets");
282 rc.AddResourcePath(id); 281 rc.AddResourcePath(id);
283 rc.AddResourcePath("data"); 282 rc.AddResourcePath("data");
284=======
285 RestClient rc = new RestClient(MapServer(id));
286 rc.AddResourcePath("assets");
287 rc.AddResourcePath(id);
288 rc.AddResourcePath("data");
289>>>>>>> avn/ubitvar
290 283
291 rc.RequestMethod = "GET"; 284 rc.RequestMethod = "GET";
292 285
@@ -300,20 +293,11 @@ namespace OpenSim.Services.Connectors
300 byte[] ret = new byte[s.Length]; 293 byte[] ret = new byte[s.Length];
301 s.Read(ret, 0, (int)s.Length); 294 s.Read(ret, 0, (int)s.Length);
302 295
303<<<<<<< HEAD
304 return ret; 296 return ret;
305 } 297 }
306 298
307 return null; 299 return null;
308 } 300 }
309=======
310 s.Close();
311 return ret;
312 }
313
314 s.Close();
315 return null;
316>>>>>>> avn/ubitvar
317 } 301 }
318 302
319 private class QueuedAssetRequest 303 private class QueuedAssetRequest
@@ -348,24 +332,13 @@ namespace OpenSim.Services.Connectors
348 List<AssetRetrievedEx> handlers; 332 List<AssetRetrievedEx> handlers;
349 lock (m_AssetHandlers) 333 lock (m_AssetHandlers)
350 { 334 {
351<<<<<<< HEAD
352 if (a != null && m_Cache != null)
353 m_Cache.Cache(a);
354=======
355 handlers = m_AssetHandlers[id]; 335 handlers = m_AssetHandlers[id];
356 m_AssetHandlers.Remove(id); 336 m_AssetHandlers.Remove(id);
357 } 337 }
358>>>>>>> avn/ubitvar
359 338
360 Util.FireAndForget(x => 339 Util.FireAndForget(x =>
361 { 340 {
362<<<<<<< HEAD 341
363 handlers = m_AssetHandlers[id];
364 m_AssetHandlers.Remove(id);
365 }
366 handlers.Invoke(a);
367 }, m_maxAssetRequestConcurrency, m_Auth);
368=======
369 foreach (AssetRetrievedEx h in handlers) 342 foreach (AssetRetrievedEx h in handlers)
370 { 343 {
371 // Util.FireAndForget(x => 344 // Util.FireAndForget(x =>
@@ -382,8 +355,6 @@ namespace OpenSim.Services.Connectors
382 355
383// if (handlers != null) 356// if (handlers != null)
384// handlers.Clear(); 357// handlers.Clear();
385>>>>>>> avn/ubitvar
386
387 success = true; 358 success = true;
388 } 359 }
389 } 360 }
@@ -510,32 +481,6 @@ namespace OpenSim.Services.Connectors
510 string newID; 481 string newID;
511 try 482 try
512 { 483 {
513<<<<<<< HEAD
514 newID = SynchronousRestObjectRequester.MakeRequest<AssetBase, string>("POST", uri, asset, m_Auth);
515 }
516 catch (Exception e)
517 {
518 m_log.Warn(string.Format("[ASSET CONNECTOR]: Unable to send asset {0} to asset server. Reason: {1} ", asset.ID, e.Message), e);
519 return string.Empty;
520 }
521
522 // TEMPORARY: SRAS returns 'null' when it's asked to store existing assets
523 if (newID == null)
524 {
525 m_log.DebugFormat("[ASSET CONNECTOR]: Storing of asset {0} returned null; assuming the asset already exists", asset.ID);
526 return asset.ID;
527 }
528
529 if (string.IsNullOrEmpty(newID))
530 return string.Empty;
531
532 asset.ID = newID;
533
534 if (m_Cache != null)
535 m_Cache.Cache(asset);
536
537 return newID;
538=======
539 newID = SynchronousRestObjectRequester. 484 newID = SynchronousRestObjectRequester.
540 MakeRequest<AssetBase, string>("POST", uri, asset, 25); 485 MakeRequest<AssetBase, string>("POST", uri, asset, 25);
541 if (newID == null || newID == "") 486 if (newID == null || newID == "")
@@ -588,7 +533,6 @@ namespace OpenSim.Services.Connectors
588 } 533 }
589 } 534 }
590 return asset.ID; 535 return asset.ID;
591>>>>>>> avn/ubitvar
592 } 536 }
593 537
594 public bool UpdateContent(string id, byte[] data) 538 public bool UpdateContent(string id, byte[] data)
diff --git a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
index 10b8d22..8abd046 100644
--- a/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Hypergrid/UserAgentServiceConnector.cs
@@ -100,14 +100,10 @@ namespace OpenSim.Services.Connectors.Hypergrid
100 m_log.Error("[USER AGENT CONNECTOR]: No Server URI named in section UserAgentService"); 100 m_log.Error("[USER AGENT CONNECTOR]: No Server URI named in section UserAgentService");
101 throw new Exception("UserAgent connector init error"); 101 throw new Exception("UserAgent connector init error");
102 } 102 }
103<<<<<<< HEAD
104 103
105 m_ServerURL = m_ServerURLHost = serviceURI; 104 m_ServerURL = m_ServerURLHost = serviceURI;
106 if (!m_ServerURL.EndsWith("/")) 105 if (!m_ServerURL.EndsWith("/"))
107 m_ServerURL += "/"; 106 m_ServerURL += "/";
108=======
109 m_ServerURL = serviceURI;
110>>>>>>> avn/ubitvar
111 107
112 //m_log.DebugFormat("[USER AGENT CONNECTOR]: new connector to {0}", m_ServerURL); 108 //m_log.DebugFormat("[USER AGENT CONNECTOR]: new connector to {0}", m_ServerURL);
113 } 109 }
diff --git a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
index e236ec3..70f1aee 100644
--- a/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
@@ -153,15 +153,9 @@ namespace OpenSim.Services.Connectors
153 } 153 }
154 catch (Exception e) 154 catch (Exception e)
155 { 155 {
156<<<<<<< HEAD
157 m_log.Warn(string.Format(
158 "[NEIGHBOUR SERVICES CONNECTOR]: Unable to send HelloNeighbour from {0} to {1} (uri {2}). Exception {3} ",
159 thisRegion.RegionName, region.RegionName, uri, e.Message), e);
160=======
161// m_log.WarnFormat( 156// m_log.WarnFormat(
162// "[NEIGHBOUR SERVICE CONNCTOR]: Unable to send HelloNeighbour from {0} to {1}. Exception {2}{3}", 157// "[NEIGHBOUR SERVICE CONNCTOR]: Unable to send HelloNeighbour from {0} to {1}. Exception {2}{3}",
163// thisRegion.RegionName, region.RegionName, e.Message, e.StackTrace); 158// thisRegion.RegionName, region.RegionName, e.Message, e.StackTrace);
164>>>>>>> avn/ubitvar
165 159
166 return false; 160 return false;
167 } 161 }
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
index 6043b70..bd35c6f 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
@@ -423,83 +423,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
423 423
424 #endregion IGridService 424 #endregion IGridService
425 425
426 private void UploadMapTile(IScene scene)
427 {
428 string errorMessage = null;
429
430 // Create a PNG map tile and upload it to the AddMapTile API
431 byte[] pngData = Utils.EmptyBytes;
432 IMapImageGenerator tileGenerator = scene.RequestModuleInterface<IMapImageGenerator>();
433 if (tileGenerator == null)
434 {
435 m_log.Warn("[SIMIAN GRID CONNECTOR]: Cannot upload PNG map tile without an IMapImageGenerator");
436 return;
437 }
438
439 using (Image mapTile = tileGenerator.CreateMapTile())
440 {
441 using (MemoryStream stream = new MemoryStream())
442 {
443 mapTile.Save(stream, ImageFormat.Png);
444 pngData = stream.ToArray();
445 }
446 }
447
448 List<MultipartForm.Element> postParameters = new List<MultipartForm.Element>()
449 {
450 new MultipartForm.Parameter("X", scene.RegionInfo.RegionLocX.ToString()),
451 new MultipartForm.Parameter("Y", scene.RegionInfo.RegionLocY.ToString()),
452 new MultipartForm.File("Tile", "tile.png", "image/png", pngData)
453 };
454
455 // Make the remote storage request
456 try
457 {
458 HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_ServerURI);
459
460 HttpWebResponse response = MultipartForm.Post(request, postParameters);
461 using (Stream responseStream = response.GetResponseStream())
462 {
463 string responseStr = null;
464
465 try
466 {
467 responseStr = responseStream.GetStreamString();
468 OSD responseOSD = OSDParser.Deserialize(responseStr);
469 if (responseOSD.Type == OSDType.Map)
470 {
471 OSDMap responseMap = (OSDMap)responseOSD;
472 if (responseMap["Success"].AsBoolean())
473 m_log.Info("[SIMIAN GRID CONNECTOR]: Uploaded " + pngData.Length + " byte PNG map tile to AddMapTile");
474 else
475 errorMessage = "Upload failed: " + responseMap["Message"].AsString();
476 }
477 else
478 {
479 errorMessage = "Response format was invalid:\n" + responseStr;
480 }
481 }
482 catch (Exception ex)
483 {
484 if (!String.IsNullOrEmpty(responseStr))
485 errorMessage = "Failed to parse the response:\n" + responseStr;
486 else
487 errorMessage = "Failed to retrieve the response: " + ex.Message;
488 }
489 }
490 }
491 catch (WebException ex)
492 {
493 errorMessage = ex.Message;
494 }
495
496 if (!String.IsNullOrEmpty(errorMessage))
497 {
498 m_log.WarnFormat("[SIMIAN GRID CONNECTOR]: Failed to store {0} byte PNG map tile for {1}: {2}",
499 pngData.Length, scene.RegionInfo.RegionName, errorMessage.Replace('\n', ' '));
500 }
501 }
502
503 private GridRegion GetNearestRegion(Vector3d position, bool onlyEnabled) 426 private GridRegion GetNearestRegion(Vector3d position, bool onlyEnabled)
504 { 427 {
505 NameValueCollection requestArgs = new NameValueCollection 428 NameValueCollection requestArgs = new NameValueCollection
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
index 08c5c50..563a1e7 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
@@ -191,15 +191,14 @@ namespace OpenSim.Services.Connectors.SimianGrid
191 return accounts; 191 return accounts;
192 } 192 }
193 193
194<<<<<<< HEAD
195 public void InvalidateCache(UUID userID) 194 public void InvalidateCache(UUID userID)
196 { 195 {
197 m_accountCache.Remove(userID); 196 m_accountCache.Remove(userID);
198======= 197 }
198
199 public List<UserAccount> GetUserAccountsWhere(UUID scopeID, string query) 199 public List<UserAccount> GetUserAccountsWhere(UUID scopeID, string query)
200 { 200 {
201 return null; 201 return null;
202>>>>>>> avn/ubitvar
203 } 202 }
204 203
205 public bool StoreUserAccount(UserAccount data) 204 public bool StoreUserAccount(UserAccount data)
diff --git a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
index 28b6de7..493d7e0 100644
--- a/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
@@ -283,13 +283,8 @@ namespace OpenSim.Services.Connectors.Simulation
283 } 283 }
284 284
285 285
286<<<<<<< HEAD 286
287 public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string myversion, List<UUID> featuresAvailable, out string version, out string reason) 287 public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string myversion, List<UUID> featuresAvailable, out string version, out string reason)
288=======
289 /// <summary>
290 /// </summary>
291 public bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string myversion, out string version, out string reason)
292>>>>>>> avn/ubitvar
293 { 288 {
294 reason = "Failed to contact destination"; 289 reason = "Failed to contact destination";
295 version = "Unknown"; 290 version = "Unknown";
@@ -306,7 +301,6 @@ namespace OpenSim.Services.Connectors.Simulation
306 request.Add("viaTeleport", OSD.FromBoolean(viaTeleport)); 301 request.Add("viaTeleport", OSD.FromBoolean(viaTeleport));
307 request.Add("position", OSD.FromString(position.ToString())); 302 request.Add("position", OSD.FromString(position.ToString()));
308 request.Add("my_version", OSD.FromString(myversion)); 303 request.Add("my_version", OSD.FromString(myversion));
309<<<<<<< HEAD
310 304
311 OSDArray features = new OSDArray(); 305 OSDArray features = new OSDArray();
312 foreach (UUID feature in featuresAvailable) 306 foreach (UUID feature in featuresAvailable)
@@ -314,8 +308,6 @@ namespace OpenSim.Services.Connectors.Simulation
314 308
315 request.Add("features", features); 309 request.Add("features", features);
316 310
317=======
318>>>>>>> avn/ubitvar
319 if (agentHomeURI != null) 311 if (agentHomeURI != null)
320 request.Add("agent_home_uri", OSD.FromString(agentHomeURI)); 312 request.Add("agent_home_uri", OSD.FromString(agentHomeURI));
321 313
@@ -366,8 +358,6 @@ namespace OpenSim.Services.Connectors.Simulation
366 return false; 358 return false;
367 } 359 }
368 360
369<<<<<<< HEAD
370
371 featuresAvailable.Clear(); 361 featuresAvailable.Clear();
372 362
373 if (result.ContainsKey("features")) 363 if (result.ContainsKey("features"))
@@ -377,12 +367,6 @@ namespace OpenSim.Services.Connectors.Simulation
377 foreach (OSD o in array) 367 foreach (OSD o in array)
378 featuresAvailable.Add(new UUID(o.AsString())); 368 featuresAvailable.Add(new UUID(o.AsString()));
379 } 369 }
380=======
381 OSDMap resp = (OSDMap)result["_Result"];
382 success = resp["success"].AsBoolean();
383 reason = resp["reason"].AsString();
384>>>>>>> avn/ubitvar
385
386 return success; 370 return success;
387 } 371 }
388 catch (Exception e) 372 catch (Exception e)
@@ -467,17 +451,13 @@ namespace OpenSim.Services.Connectors.Simulation
467 args["destination_name"] = OSD.FromString(destination.RegionName); 451 args["destination_name"] = OSD.FromString(destination.RegionName);
468 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString()); 452 args["destination_uuid"] = OSD.FromString(destination.RegionID.ToString());
469 453
470<<<<<<< HEAD 454
471 OSDMap result = WebUtil.PostToService(uri, args, 40000, false); 455 OSDMap result = WebUtil.PostToService(uri, args, 40000, false);
472 456
473 if (result == null) 457 if (result == null)
474 return false; 458 return false;
475 bool success = result["success"].AsBoolean(); 459 bool success = result["success"].AsBoolean();
476 if (!success) 460 if (!success)
477=======
478 OSDMap response = WebUtil.PostToService(uri, args, 40000);
479 if (response["Success"] == "False")
480>>>>>>> avn/ubitvar
481 return false; 461 return false;
482 } 462 }
483 catch (Exception e) 463 catch (Exception e)
diff --git a/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs b/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs
index e5fb5a8..15a9fbe 100644
--- a/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs
+++ b/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs
@@ -191,14 +191,13 @@ namespace OpenSim.Services.Connectors
191 return accounts; 191 return accounts;
192 } 192 }
193 193
194<<<<<<< HEAD
195 public void InvalidateCache(UUID userID) 194 public void InvalidateCache(UUID userID)
196 { 195 {
197======= 196 }
197
198 public List<UserAccount> GetUserAccountsWhere(UUID scopeID, string where) 198 public List<UserAccount> GetUserAccountsWhere(UUID scopeID, string where)
199 { 199 {
200 return null; // Not implemented for regions 200 return null; // Not implemented for regions
201>>>>>>> avn/ubitvar
202 } 201 }
203 202
204 public virtual bool StoreUserAccount(UserAccount data) 203 public virtual bool StoreUserAccount(UserAccount data)
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 8293c18..8059275 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -57,13 +57,10 @@ namespace OpenSim.Services.GridService
57 protected bool m_AllowDuplicateNames = false; 57 protected bool m_AllowDuplicateNames = false;
58 protected bool m_AllowHypergridMapSearch = false; 58 protected bool m_AllowHypergridMapSearch = false;
59 59
60<<<<<<< HEAD 60
61 protected bool m_SuppressVarregionOverlapCheckOnRegistration = false; 61 protected bool m_SuppressVarregionOverlapCheckOnRegistration = false;
62 62
63 private static Dictionary<string,object> m_ExtraFeatures = new Dictionary<string, object>(); 63 private static Dictionary<string,object> m_ExtraFeatures = new Dictionary<string, object>();
64=======
65 private static Dictionary<string, object> m_ExtraFeatures = new Dictionary<string, object>();
66>>>>>>> avn/ubitvar
67 64
68 public GridService(IConfigSource config) 65 public GridService(IConfigSource config)
69 : base(config) 66 : base(config)
@@ -159,15 +156,9 @@ namespace OpenSim.Services.GridService
159 156
160 if (loginConfig == null || gridConfig == null) 157 if (loginConfig == null || gridConfig == null)
161 return; 158 return;
162<<<<<<< HEAD
163
164 string configVal;
165
166=======
167 159
168 string configVal; 160 string configVal;
169 161
170>>>>>>> avn/ubitvar
171 configVal = loginConfig.GetString("SearchURL", string.Empty); 162 configVal = loginConfig.GetString("SearchURL", string.Empty);
172 if (!string.IsNullOrEmpty(configVal)) 163 if (!string.IsNullOrEmpty(configVal))
173 m_ExtraFeatures["search-server-url"] = configVal; 164 m_ExtraFeatures["search-server-url"] = configVal;
@@ -211,22 +202,11 @@ namespace OpenSim.Services.GridService
211 if (regionInfos.RegionID == UUID.Zero) 202 if (regionInfos.RegionID == UUID.Zero)
212 return "Invalid RegionID - cannot be zero UUID"; 203 return "Invalid RegionID - cannot be zero UUID";
213 204
214<<<<<<< HEAD
215 String reason = "Region overlaps another region"; 205 String reason = "Region overlaps another region";
216 RegionData region = FindAnyConflictingRegion(regionInfos, scopeID, out reason);
217 // If there is a conflicting region, if it has the same ID and same coordinates
218 // then it is a region re-registering (permissions and ownership checked later).
219 if ((region != null)
220 && ( (region.coordX != regionInfos.RegionCoordX)
221 || (region.coordY != regionInfos.RegionCoordY)
222 || (region.RegionID != regionInfos.RegionID) )
223 )
224=======
225 // we should not need to check for overlaps 206 // we should not need to check for overlaps
226 207
227 RegionData region = m_Database.Get(regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID); 208 RegionData region = m_Database.Get(regionInfos.RegionLocX, regionInfos.RegionLocY, scopeID);
228 if ((region != null) && (region.RegionID != regionInfos.RegionID)) 209 if ((region != null) && (region.RegionID != regionInfos.RegionID))
229>>>>>>> avn/ubitvar
230 { 210 {
231 // If not same ID and same coordinates, this new region has conflicts and can't be registered. 211 // If not same ID and same coordinates, this new region has conflicts and can't be registered.
232 m_log.WarnFormat("{0} Register region conflict in scope {1}. {2}", LogHeader, scopeID, reason); 212 m_log.WarnFormat("{0} Register region conflict in scope {1}. {2}", LogHeader, scopeID, reason);
@@ -508,11 +488,8 @@ namespace OpenSim.Services.GridService
508 if (region != null) 488 if (region != null)
509 { 489 {
510 // Not really? Maybe? 490 // Not really? Maybe?
511<<<<<<< HEAD 491
512 // The adjacent regions are presumed to be the same size as the current region
513=======
514/* this fails wiht var regions. My_sql db should now handle var regions 492/* this fails wiht var regions. My_sql db should now handle var regions
515>>>>>>> avn/ubitvar
516 List<RegionData> rdatas = m_Database.Get( 493 List<RegionData> rdatas = m_Database.Get(
517 region.posX - region.sizeX - 1, region.posY - region.sizeY - 1, 494 region.posX - region.sizeX - 1, region.posY - region.sizeY - 1,
518 region.posX + region.sizeX + 1, region.posY + region.sizeY + 1, scopeID); 495 region.posX + region.sizeX + 1, region.posY + region.sizeY + 1, scopeID);
@@ -898,11 +875,9 @@ namespace OpenSim.Services.GridService
898 return; 875 return;
899 } 876 }
900 877
901<<<<<<< HEAD 878
902 RegionData region = m_Database.Get((int)Util.RegionToWorldLoc(x), (int)Util.RegionToWorldLoc(y), UUID.Zero); 879 RegionData region = m_Database.Get((int)Util.RegionToWorldLoc(x), (int)Util.RegionToWorldLoc(y), UUID.Zero);
903======= 880
904 RegionData region = m_Database.Get((int)Util.RegionToWorldLoc((uint)x), (int)Util.RegionToWorldLoc((uint)y), UUID.Zero);
905>>>>>>> avn/ubitvar
906 if (region == null) 881 if (region == null)
907 { 882 {
908 MainConsole.Instance.OutputFormat("No region found at {0},{1}", x, y); 883 MainConsole.Instance.OutputFormat("No region found at {0},{1}", x, y);
@@ -919,11 +894,7 @@ namespace OpenSim.Services.GridService
919 ConsoleDisplayList dispList = new ConsoleDisplayList(); 894 ConsoleDisplayList dispList = new ConsoleDisplayList();
920 dispList.AddRow("Region Name", r.RegionName); 895 dispList.AddRow("Region Name", r.RegionName);
921 dispList.AddRow("Region ID", r.RegionID); 896 dispList.AddRow("Region ID", r.RegionID);
922<<<<<<< HEAD
923 dispList.AddRow("Position", string.Format("{0},{1}", r.coordX, r.coordY));
924=======
925 dispList.AddRow("Location", string.Format("{0},{1}", r.coordX, r.coordY)); 897 dispList.AddRow("Location", string.Format("{0},{1}", r.coordX, r.coordY));
926>>>>>>> avn/ubitvar
927 dispList.AddRow("Size", string.Format("{0}x{1}", r.sizeX, r.sizeY)); 898 dispList.AddRow("Size", string.Format("{0}x{1}", r.sizeX, r.sizeY));
928 dispList.AddRow("URI", r.Data["serverURI"]); 899 dispList.AddRow("URI", r.Data["serverURI"]);
929 dispList.AddRow("Owner ID", r.Data["owner_uuid"]); 900 dispList.AddRow("Owner ID", r.Data["owner_uuid"]);
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index b4577b0..5d9931b 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -343,11 +343,7 @@ namespace OpenSim.Services.GridService
343 GridRegion region = m_GridService.GetRegionByPosition(regInfo.ScopeID, regInfo.RegionLocX, regInfo.RegionLocY); 343 GridRegion region = m_GridService.GetRegionByPosition(regInfo.ScopeID, regInfo.RegionLocX, regInfo.RegionLocY);
344 if (region != null) 344 if (region != null)
345 { 345 {
346<<<<<<< HEAD
347 m_log.WarnFormat("[HYPERGRID LINKER]: Coordinates <{0},{1}> are already occupied by region {2} with uuid {3}",
348=======
349 m_log.WarnFormat("[HYPERGRID LINKER]: Coordinates {0}-{1} are already occupied by region {2} with uuid {3}", 346 m_log.WarnFormat("[HYPERGRID LINKER]: Coordinates {0}-{1} are already occupied by region {2} with uuid {3}",
350>>>>>>> avn/ubitvar
351 Util.WorldToRegionLoc((uint)regInfo.RegionLocX), Util.WorldToRegionLoc((uint)regInfo.RegionLocY), 347 Util.WorldToRegionLoc((uint)regInfo.RegionLocX), Util.WorldToRegionLoc((uint)regInfo.RegionLocY),
352 region.RegionName, region.RegionID); 348 region.RegionName, region.RegionID);
353 reason = "Coordinates are already in use"; 349 reason = "Coordinates are already in use";
@@ -383,13 +379,8 @@ namespace OpenSim.Services.GridService
383 region = m_GridService.GetRegionByUUID(scopeID, regionID); 379 region = m_GridService.GetRegionByUUID(scopeID, regionID);
384 if (region != null) 380 if (region != null)
385 { 381 {
386<<<<<<< HEAD 382 m_log.DebugFormat("[HYPERGRID LINKER]: Region already exists in coordinates <{0},{1}>",
387 m_log.DebugFormat("[HYPERGRID LINKER]: Region already exists in coordinates <{0},{1}>",
388 Util.WorldToRegionLoc((uint)region.RegionLocX), Util.WorldToRegionLoc((uint)region.RegionLocY)); 383 Util.WorldToRegionLoc((uint)region.RegionLocX), Util.WorldToRegionLoc((uint)region.RegionLocY));
389=======
390 m_log.DebugFormat("[HYPERGRID LINKER]: Region already exists in coordinates {0} {1}",
391 Util.WorldToRegionLoc((uint)regInfo.RegionLocX), Util.WorldToRegionLoc((uint)regInfo.RegionLocY));
392>>>>>>> avn/ubitvar
393 regInfo = region; 384 regInfo = region;
394 return true; 385 return true;
395 } 386 }
@@ -545,7 +536,6 @@ namespace OpenSim.Services.GridService
545 MainConsole.Instance.Output(new string('-', 72)); 536 MainConsole.Instance.Output(new string('-', 72));
546 foreach (RegionData r in regions) 537 foreach (RegionData r in regions)
547 { 538 {
548<<<<<<< HEAD
549 MainConsole.Instance.Output( 539 MainConsole.Instance.Output(
550 String.Format("{0}\n{2,-32} {1}\n", 540 String.Format("{0}\n{2,-32} {1}\n",
551 r.RegionName, r.RegionID, 541 r.RegionName, r.RegionID,
@@ -554,12 +544,6 @@ namespace OpenSim.Services.GridService
554 ) 544 )
555 ) 545 )
556 ); 546 );
557=======
558 MainConsole.Instance.Output(String.Format("{0}\n{2,-32} {1}\n",
559 r.RegionName, r.RegionID,
560 String.Format("{0},{1} ({2},{3})", r.posX, r.posY,
561 Util.WorldToRegionLoc((uint)r.posX), Util.WorldToRegionLoc((uint)r.posY))) );
562>>>>>>> avn/ubitvar
563 } 547 }
564 return; 548 return;
565 } 549 }
@@ -661,13 +645,8 @@ namespace OpenSim.Services.GridService
661 string externalHostName; 645 string externalHostName;
662 try 646 try
663 { 647 {
664<<<<<<< HEAD
665 xloc = Convert.ToUInt32(cmdparams[0]); 648 xloc = Convert.ToUInt32(cmdparams[0]);
666 yloc = Convert.ToUInt32(cmdparams[1]); 649 yloc = Convert.ToUInt32(cmdparams[1]);
667=======
668 xloc = (uint)Convert.ToInt32(cmdparams[0]);
669 yloc = (uint)Convert.ToInt32(cmdparams[1]);
670>>>>>>> avn/ubitvar
671 externalPort = Convert.ToUInt32(cmdparams[3]); 650 externalPort = Convert.ToUInt32(cmdparams[3]);
672 externalHostName = cmdparams[2]; 651 externalHostName = cmdparams[2];
673 //internalPort = Convert.ToUInt32(cmdparams[4]); 652 //internalPort = Convert.ToUInt32(cmdparams[4]);
@@ -770,13 +749,8 @@ namespace OpenSim.Services.GridService
770 string externalHostName; 749 string externalHostName;
771 uint realXLoc, realYLoc; 750 uint realXLoc, realYLoc;
772 751
773<<<<<<< HEAD
774 xloc = Convert.ToUInt32(config.GetString("xloc", "0")); 752 xloc = Convert.ToUInt32(config.GetString("xloc", "0"));
775 yloc = Convert.ToUInt32(config.GetString("yloc", "0")); 753 yloc = Convert.ToUInt32(config.GetString("yloc", "0"));
776=======
777 xloc = (uint)Convert.ToInt32(config.GetString("xloc", "0"));
778 yloc = (uint)Convert.ToInt32(config.GetString("yloc", "0"));
779>>>>>>> avn/ubitvar
780 externalPort = Convert.ToUInt32(config.GetString("externalPort", "0")); 754 externalPort = Convert.ToUInt32(config.GetString("externalPort", "0"));
781 externalHostName = config.GetString("externalHostName", ""); 755 externalHostName = config.GetString("externalHostName", "");
782 realXLoc = Convert.ToUInt32(config.GetString("real-xloc", "0")); 756 realXLoc = Convert.ToUInt32(config.GetString("real-xloc", "0"));
@@ -784,13 +758,8 @@ namespace OpenSim.Services.GridService
784 758
785 if (m_enableAutoMapping) 759 if (m_enableAutoMapping)
786 { 760 {
787<<<<<<< HEAD
788 xloc = (xloc % 100) + m_autoMappingX; 761 xloc = (xloc % 100) + m_autoMappingX;
789 yloc = (yloc % 100) + m_autoMappingY; 762 yloc = (yloc % 100) + m_autoMappingY;
790=======
791 xloc = (uint)((xloc % 100) + m_autoMappingX);
792 yloc = (uint)((yloc % 100) + m_autoMappingY);
793>>>>>>> avn/ubitvar
794 } 763 }
795 764
796 if (((realXLoc == 0) && (realYLoc == 0)) || 765 if (((realXLoc == 0) && (realYLoc == 0)) ||
diff --git a/OpenSim/Services/Interfaces/IBakedTextureService.cs b/OpenSim/Services/Interfaces/IBakedTextureService.cs
index ab88695..69df4a0 100644
--- a/OpenSim/Services/Interfaces/IBakedTextureService.cs
+++ b/OpenSim/Services/Interfaces/IBakedTextureService.cs
@@ -1,4 +1,3 @@
1<<<<<<< HEAD
2/* 1/*
3 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
4 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
@@ -26,14 +25,6 @@
26 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */ 26 */
28 27
29=======
30////////////////////////////////////////////////////////////////
31//
32// (c) 2009, 2010 Careminster Limited and Melanie Thielker
33//
34// All rights reserved
35//
36>>>>>>> avn/ubitvar
37using System; 28using System;
38using Nini.Config; 29using Nini.Config;
39 30
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 7e5597b..63c6e5f 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -159,23 +159,24 @@ namespace OpenSim.Services.Interfaces
159 } 159 }
160 } 160 }
161 set { 161 set {
162<<<<<<< HEAD
163 if (value.EndsWith("/")) {
164=======
165 if ( value == null) 162 if ( value == null)
166 { 163 {
167 m_serverURI = String.Empty; 164 m_serverURI = String.Empty;
168 return; 165 return;
169 } 166 }
170 167
171 if ( value.EndsWith("/") ) { 168 if ( value.EndsWith("/") )
172>>>>>>> avn/ubitvar 169 {
170
173 m_serverURI = value; 171 m_serverURI = value;
174 } else { 172 }
173 else
174 {
175 m_serverURI = value + '/'; 175 m_serverURI = value + '/';
176 } 176 }
177 } 177 }
178 } 178 }
179
179 protected string m_serverURI; 180 protected string m_serverURI;
180 181
181 /// <summary> 182 /// <summary>
@@ -368,6 +369,13 @@ namespace OpenSim.Services.Interfaces
368 if (kvp.ContainsKey("regionName")) 369 if (kvp.ContainsKey("regionName"))
369 RegionName = (string)kvp["regionName"]; 370 RegionName = (string)kvp["regionName"];
370 371
372 if (kvp.ContainsKey("access"))
373 {
374 byte access = Convert.ToByte((string)kvp["access"]);
375 Access = access;
376 Maturity = (int)Util.ConvertAccessLevelToMaturity(access);
377 }
378
371 if (kvp.ContainsKey("flags") && kvp["flags"] != null) 379 if (kvp.ContainsKey("flags") && kvp["flags"] != null)
372 RegionFlags = (OpenSim.Framework.RegionFlags?)Convert.ToInt32((string)kvp["flags"]); 380 RegionFlags = (OpenSim.Framework.RegionFlags?)Convert.ToInt32((string)kvp["flags"]);
373 381
@@ -404,9 +412,6 @@ namespace OpenSim.Services.Interfaces
404 if (kvp.ContainsKey("parcelMapTexture")) 412 if (kvp.ContainsKey("parcelMapTexture"))
405 UUID.TryParse((string)kvp["parcelMapTexture"], out ParcelImage); 413 UUID.TryParse((string)kvp["parcelMapTexture"], out ParcelImage);
406 414
407 if (kvp.ContainsKey("access"))
408 Access = Byte.Parse((string)kvp["access"]);
409
410 if (kvp.ContainsKey("regionSecret")) 415 if (kvp.ContainsKey("regionSecret"))
411 RegionSecret =(string)kvp["regionSecret"]; 416 RegionSecret =(string)kvp["regionSecret"];
412 417
@@ -539,110 +544,5 @@ namespace OpenSim.Services.Interfaces
539 { 544 {
540 get { return Util.UIntsToLong((uint)RegionLocX, (uint)RegionLocY); } 545 get { return Util.UIntsToLong((uint)RegionLocX, (uint)RegionLocY); }
541 } 546 }
542<<<<<<< HEAD
543=======
544
545 public Dictionary<string, object> ToKeyValuePairs()
546 {
547 Dictionary<string, object> kvp = new Dictionary<string, object>();
548 kvp["uuid"] = RegionID.ToString();
549 kvp["locX"] = RegionLocX.ToString();
550 kvp["locY"] = RegionLocY.ToString();
551 kvp["sizeX"] = RegionSizeX.ToString();
552 kvp["sizeY"] = RegionSizeY.ToString();
553 kvp["regionName"] = RegionName;
554 kvp["serverIP"] = ExternalHostName; //ExternalEndPoint.Address.ToString();
555 kvp["serverHttpPort"] = HttpPort.ToString();
556 kvp["serverURI"] = ServerURI;
557 kvp["serverPort"] = InternalEndPoint.Port.ToString();
558 kvp["regionMapTexture"] = TerrainImage.ToString();
559 kvp["parcelMapTexture"] = ParcelImage.ToString();
560 kvp["access"] = Access.ToString();
561 kvp["regionSecret"] = RegionSecret;
562 kvp["owner_uuid"] = EstateOwner.ToString();
563 kvp["Token"] = Token.ToString();
564 // Maturity doesn't seem to exist in the DB
565 return kvp;
566 }
567
568 public GridRegion(Dictionary<string, object> kvp)
569 {
570 if (kvp.ContainsKey("uuid"))
571 RegionID = new UUID((string)kvp["uuid"]);
572
573 if (kvp.ContainsKey("locX"))
574 RegionLocX = Convert.ToInt32((string)kvp["locX"]);
575
576 if (kvp.ContainsKey("locY"))
577 RegionLocY = Convert.ToInt32((string)kvp["locY"]);
578
579 if (kvp.ContainsKey("sizeX"))
580 RegionSizeX = Convert.ToInt32((string)kvp["sizeX"]);
581 else
582 RegionSizeX = (int)Constants.RegionSize;
583
584 if (kvp.ContainsKey("sizeY"))
585 RegionSizeY = Convert.ToInt32((string)kvp["sizeY"]);
586 else
587 RegionSizeY = (int)Constants.RegionSize;
588
589 if (kvp.ContainsKey("regionName"))
590 RegionName = (string)kvp["regionName"];
591
592 if (kvp.ContainsKey("access"))
593 {
594 byte access = Convert.ToByte((string)kvp["access"]);
595 Maturity = (int)Util.ConvertAccessLevelToMaturity(access);
596 }
597
598 if (kvp.ContainsKey("serverIP"))
599 {
600 //int port = 0;
601 //Int32.TryParse((string)kvp["serverPort"], out port);
602 //IPEndPoint ep = new IPEndPoint(IPAddress.Parse((string)kvp["serverIP"]), port);
603 ExternalHostName = (string)kvp["serverIP"];
604 }
605 else
606 ExternalHostName = "127.0.0.1";
607
608 if (kvp.ContainsKey("serverPort"))
609 {
610 Int32 port = 0;
611 Int32.TryParse((string)kvp["serverPort"], out port);
612 InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), port);
613 }
614
615 if (kvp.ContainsKey("serverHttpPort"))
616 {
617 UInt32 port = 0;
618 UInt32.TryParse((string)kvp["serverHttpPort"], out port);
619 HttpPort = port;
620 }
621
622 if (kvp.ContainsKey("serverURI"))
623 ServerURI = (string)kvp["serverURI"];
624
625 if (kvp.ContainsKey("regionMapTexture"))
626 UUID.TryParse((string)kvp["regionMapTexture"], out TerrainImage);
627
628 if (kvp.ContainsKey("parcelMapTexture"))
629 UUID.TryParse((string)kvp["parcelMapTexture"], out ParcelImage);
630
631 if (kvp.ContainsKey("access"))
632 Access = Byte.Parse((string)kvp["access"]);
633
634 if (kvp.ContainsKey("regionSecret"))
635 RegionSecret =(string)kvp["regionSecret"];
636
637 if (kvp.ContainsKey("owner_uuid"))
638 EstateOwner = new UUID(kvp["owner_uuid"].ToString());
639
640 if (kvp.ContainsKey("Token"))
641 Token = kvp["Token"].ToString();
642
643 // m_log.DebugFormat("{0} New GridRegion. id={1}, loc=<{2},{3}>, size=<{4},{5}>",
644 // LogHeader, RegionID, RegionLocX, RegionLocY, RegionSizeX, RegionSizeY);
645 }
646>>>>>>> avn/ubitvar
647 } 547 }
648} 548}
diff --git a/OpenSim/Services/Interfaces/IMapImageService.cs b/OpenSim/Services/Interfaces/IMapImageService.cs
index 0d1458e..b8d45dd 100644
--- a/OpenSim/Services/Interfaces/IMapImageService.cs
+++ b/OpenSim/Services/Interfaces/IMapImageService.cs
@@ -34,14 +34,8 @@ namespace OpenSim.Services.Interfaces
34 public interface IMapImageService 34 public interface IMapImageService
35 { 35 {
36 //List<MapBlockData> GetMapBlocks(UUID scopeID, int minX, int minY, int maxX, int maxY); 36 //List<MapBlockData> GetMapBlocks(UUID scopeID, int minX, int minY, int maxX, int maxY);
37<<<<<<< HEAD
38 bool AddMapTile(int x, int y, byte[] imageData, out string reason);
39 bool RemoveMapTile(int x, int y, out string reason);
40 byte[] GetMapTile(string fileName, out string format);
41=======
42 bool AddMapTile(int x, int y, byte[] imageData, UUID scopeID, out string reason); 37 bool AddMapTile(int x, int y, byte[] imageData, UUID scopeID, out string reason);
43 bool RemoveMapTile(int x, int y, UUID scopeID, out string reason); 38 bool RemoveMapTile(int x, int y, UUID scopeID, out string reason);
44 byte[] GetMapTile(string fileName, UUID scopeID, out string format); 39 byte[] GetMapTile(string fileName, UUID scopeID, out string format);
45>>>>>>> avn/ubitvar
46 } 40 }
47} 41}
diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs
index ee1e294..3573bea 100644
--- a/OpenSim/Services/Interfaces/ISimulationService.cs
+++ b/OpenSim/Services/Interfaces/ISimulationService.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Services.Interfaces
86 /// <param name="agentHomeURI">The visitor's Home URI. Will be missing (null) in older OpenSims.</param> 86 /// <param name="agentHomeURI">The visitor's Home URI. Will be missing (null) in older OpenSims.</param>
87 /// <param name="viaTeleport">True: via teleport; False: via cross (walking)</param> 87 /// <param name="viaTeleport">True: via teleport; False: via cross (walking)</param>
88 /// <param name="position">Position in the region</param> 88 /// <param name="position">Position in the region</param>
89<<<<<<< HEAD 89
90 /// <param name="sversion"> 90 /// <param name="sversion">
91 /// Version that the requesting simulator is runing. If null then no version check is carried out. 91 /// Version that the requesting simulator is runing. If null then no version check is carried out.
92 /// </param> 92 /// </param>
@@ -94,13 +94,6 @@ namespace OpenSim.Services.Interfaces
94 /// <param name="reason">[out] Optional error message</param> 94 /// <param name="reason">[out] Optional error message</param>
95 /// <returns>True: ok; False: not allowed</returns> 95 /// <returns>True: ok; False: not allowed</returns>
96 bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string sversion, List<UUID> features, out string version, out string reason); 96 bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string sversion, List<UUID> features, out string version, out string reason);
97=======
98 /// <param name="sversion">version that the requesting simulator is runing</param>
99 /// <param name="version">version that the target simulator is running</param>
100 /// <param name="reason">[out] Optional error message</param>
101 /// <returns>True: ok; False: not allowed</returns>
102 bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string sversion, out string version, out string reason);
103>>>>>>> avn/ubitvar
104 97
105 /// <summary> 98 /// <summary>
106 /// Message from receiving region to departing region, telling it got contacted by the client. 99 /// Message from receiving region to departing region, telling it got contacted by the client.
diff --git a/OpenSim/Services/Interfaces/IUserProfilesService.cs b/OpenSim/Services/Interfaces/IUserProfilesService.cs
index 319d307..121baa8 100644
--- a/OpenSim/Services/Interfaces/IUserProfilesService.cs
+++ b/OpenSim/Services/Interfaces/IUserProfilesService.cs
@@ -57,6 +57,11 @@ namespace OpenSim.Services.Interfaces
57 bool AvatarPropertiesRequest(ref UserProfileProperties prop, ref string result); 57 bool AvatarPropertiesRequest(ref UserProfileProperties prop, ref string result);
58 bool AvatarPropertiesUpdate(ref UserProfileProperties prop, ref string result); 58 bool AvatarPropertiesUpdate(ref UserProfileProperties prop, ref string result);
59 #endregion Profile Properties 59 #endregion Profile Properties
60
61 #region User Preferences
62 bool UserPreferencesRequest(ref UserPreferences pref, ref string result);
63 bool UserPreferencesUpdate(ref UserPreferences pref, ref string result);
64 #endregion User Preferences
60 65
61 #region Interests 66 #region Interests
62 bool AvatarInterestsUpdate(UserProfileProperties prop, ref string result); 67 bool AvatarInterestsUpdate(UserProfileProperties prop, ref string result);
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index 92d93ee..0f57c2e 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -234,13 +234,9 @@ namespace OpenSim.Services.LLLoginService
234 public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo, 234 public LLLoginResponse(UserAccount account, AgentCircuitData aCircuit, GridUserInfo pinfo,
235 GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService, 235 GridRegion destination, List<InventoryFolderBase> invSkel, FriendInfo[] friendsList, ILibraryService libService,
236 string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message, 236 string where, string startlocation, Vector3 position, Vector3 lookAt, List<InventoryItemBase> gestures, string message,
237<<<<<<< HEAD 237
238 GridRegion home, IPEndPoint clientIP, string mapTileURL, string searchURL, string currency,
239 string DSTZone, string destinationsURL, string avatarsURL, string classifiedFee, int maxAgentGroups)
240=======
241 GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string openIDURL, string searchURL, string currency, 238 GridRegion home, IPEndPoint clientIP, string mapTileURL, string profileURL, string openIDURL, string searchURL, string currency,
242 string DSTZone, string destinationsURL, string avatarsURL, UUID realID, string classifiedFee) 239 string DSTZone, string destinationsURL, string avatarsURL, UUID realID, string classifiedFee,int maxAgentGroups)
243>>>>>>> avn/ubitvar
244 : this() 240 : this()
245 { 241 {
246 FillOutInventoryData(invSkel, libService); 242 FillOutInventoryData(invSkel, libService);
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs
index ba69e95..29199ae 100644
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@@ -77,6 +77,8 @@ namespace OpenSim.Services.LLLoginService
77 protected string m_GatekeeperURL; 77 protected string m_GatekeeperURL;
78 protected bool m_AllowRemoteSetLoginLevel; 78 protected bool m_AllowRemoteSetLoginLevel;
79 protected string m_MapTileURL; 79 protected string m_MapTileURL;
80 protected string m_ProfileURL;
81 protected string m_OpenIDURL;
80 protected string m_SearchURL; 82 protected string m_SearchURL;
81 protected string m_Currency; 83 protected string m_Currency;
82 protected string m_ClassifiedFee; 84 protected string m_ClassifiedFee;
@@ -117,6 +119,8 @@ namespace OpenSim.Services.LLLoginService
117 m_GatekeeperURL = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI", 119 m_GatekeeperURL = Util.GetConfigVarFromSections<string>(config, "GatekeeperURI",
118 new string[] { "Startup", "Hypergrid", "LoginService" }, String.Empty); 120 new string[] { "Startup", "Hypergrid", "LoginService" }, String.Empty);
119 m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty); 121 m_MapTileURL = m_LoginServerConfig.GetString("MapTileURL", string.Empty);
122 m_ProfileURL = m_LoginServerConfig.GetString("ProfileServerURL", string.Empty);
123 m_OpenIDURL = m_LoginServerConfig.GetString("OpenIDServerURL", String.Empty);
120 m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty); 124 m_SearchURL = m_LoginServerConfig.GetString("SearchURL", string.Empty);
121 m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty); 125 m_Currency = m_LoginServerConfig.GetString("Currency", string.Empty);
122 m_ClassifiedFee = m_LoginServerConfig.GetString("ClassifiedFee", string.Empty); 126 m_ClassifiedFee = m_LoginServerConfig.GetString("ClassifiedFee", string.Empty);
@@ -262,13 +266,11 @@ namespace OpenSim.Services.LLLoginService
262 { 266 {
263 bool success = false; 267 bool success = false;
264 UUID session = UUID.Random(); 268 UUID session = UUID.Random();
265<<<<<<< HEAD 269
266 string processedMessage; 270 string processedMessage;
267======= 271
268 if (clientVersion.Contains("Radegast")) 272 if (clientVersion.Contains("Radegast"))
269 LibOMVclient = false; 273 LibOMVclient = false;
270>>>>>>> avn/ubitvar
271
272 274
273 m_log.InfoFormat("[LLOGIN SERVICE]: Login request for {0} {1} at {2} using viewer {3}, channel {4}, IP {5}, Mac {6}, Id0 {7}, Possible LibOMVGridProxy: {8} ", 275 m_log.InfoFormat("[LLOGIN SERVICE]: Login request for {0} {1} at {2} using viewer {3}, channel {4}, IP {5}, Mac {6}, Id0 {7}, Possible LibOMVGridProxy: {8} ",
274 firstName, lastName, startLocation, clientVersion, channel, clientIP.Address.ToString(), mac, id0, LibOMVclient.ToString()); 276 firstName, lastName, startLocation, clientVersion, channel, clientIP.Address.ToString(), mac, id0, LibOMVclient.ToString());
@@ -522,19 +524,11 @@ namespace OpenSim.Services.LLLoginService
522 processedMessage = processedMessage.Replace("\\n", "\n").Replace("<USERNAME>", firstName + " " + lastName); 524 processedMessage = processedMessage.Replace("\\n", "\n").Replace("<USERNAME>", firstName + " " + lastName);
523 525
524 LLLoginResponse response 526 LLLoginResponse response
525<<<<<<< HEAD
526 = new LLLoginResponse(
527 account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
528 where, startLocation, position, lookAt, gestures, processedMessage, home, clientIP,
529 m_MapTileURL, m_SearchURL, m_Currency, m_DSTZone,
530 m_DestinationGuide, m_AvatarPicker, m_ClassifiedFee, m_MaxAgentGroups);
531=======
532 = new LLLoginResponse( 527 = new LLLoginResponse(
533 account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService, 528 account, aCircuit, guinfo, destination, inventorySkel, friendsList, m_LibraryService,
534 where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP, 529 where, startLocation, position, lookAt, gestures, m_WelcomeMessage, home, clientIP,
535 m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone, 530 m_MapTileURL, m_ProfileURL, m_OpenIDURL, m_SearchURL, m_Currency, m_DSTZone,
536 m_DestinationGuide, m_AvatarPicker, realID, m_ClassifiedFee); 531 m_DestinationGuide, m_AvatarPicker, realID, m_ClassifiedFee,m_MaxAgentGroups);
537>>>>>>> avn/ubitvar
538 532
539 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName); 533 m_log.DebugFormat("[LLOGIN SERVICE]: All clear. Sending login response to {0} {1}", firstName, lastName);
540 534
diff --git a/OpenSim/Services/MapImageService/MapImageService.cs b/OpenSim/Services/MapImageService/MapImageService.cs
index fcace3a..6728752 100644
--- a/OpenSim/Services/MapImageService/MapImageService.cs
+++ b/OpenSim/Services/MapImageService/MapImageService.cs
@@ -131,16 +131,6 @@ namespace OpenSim.Services.MapImageService
131 return false; 131 return false;
132 } 132 }
133 } 133 }
134<<<<<<< HEAD
135
136 return UpdateMultiResolutionFilesAsync(x, y, out reason);
137 }
138
139 public bool RemoveMapTile(int x, int y, out string reason)
140 {
141 reason = String.Empty;
142 string fileName = GetFileName(1, x, y);
143=======
144 134
145 return UpdateMultiResolutionFiles(x, y, scopeID, out reason); 135 return UpdateMultiResolutionFiles(x, y, scopeID, out reason);
146 } 136 }
@@ -149,40 +139,25 @@ namespace OpenSim.Services.MapImageService
149 { 139 {
150 reason = String.Empty; 140 reason = String.Empty;
151 string fileName = GetFileName(1, x, y, scopeID); 141 string fileName = GetFileName(1, x, y, scopeID);
152>>>>>>> avn/ubitvar
153 142
154 lock (m_Sync) 143 lock (m_Sync)
155 { 144 {
156 try 145 try
157<<<<<<< HEAD
158 { 146 {
159 File.Delete(fileName); 147 File.Delete(fileName);
160 } 148 }
161 catch (Exception e) 149 catch (Exception e)
162 { 150 {
163======= 151
164 {
165 File.Delete(fileName);
166 }
167 catch (Exception e)
168 {
169>>>>>>> avn/ubitvar
170 m_log.WarnFormat("[MAP IMAGE SERVICE]: Unable to save delete file {0}: {1}", fileName, e); 152 m_log.WarnFormat("[MAP IMAGE SERVICE]: Unable to save delete file {0}: {1}", fileName, e);
171 reason = e.Message; 153 reason = e.Message;
172 return false; 154 return false;
173 } 155 }
174 } 156 }
175<<<<<<< HEAD
176
177 return UpdateMultiResolutionFilesAsync(x, y, out reason);
178 }
179
180=======
181
182 return UpdateMultiResolutionFiles(x, y, scopeID, out reason); 157 return UpdateMultiResolutionFiles(x, y, scopeID, out reason);
183 } 158 }
184 159
185>>>>>>> avn/ubitvar 160
186 // When large varregions start up, they can send piles of new map tiles. This causes 161 // When large varregions start up, they can send piles of new map tiles. This causes
187 // this multi-resolution routine to be called a zillion times an causes much CPU 162 // this multi-resolution routine to be called a zillion times an causes much CPU
188 // time to be spent creating multi-resolution tiles that will be replaced when 163 // time to be spent creating multi-resolution tiles that will be replaced when
@@ -191,25 +166,6 @@ namespace OpenSim.Services.MapImageService
191 { 166 {
192 public int xx; 167 public int xx;
193 public int yy; 168 public int yy;
194<<<<<<< HEAD
195 public mapToMultiRez(int pX, int pY)
196 {
197 xx = pX;
198 yy = pY;
199 }
200 };
201 private Queue<mapToMultiRez> multiRezToBuild = new Queue<mapToMultiRez>();
202 private bool UpdateMultiResolutionFilesAsync(int x, int y, out string reason)
203 {
204 reason = String.Empty;
205 lock (multiRezToBuild)
206 {
207 // m_log.DebugFormat("{0} UpdateMultiResolutionFilesAsync: scheduling update for <{1},{2}>", LogHeader, x, y);
208 multiRezToBuild.Enqueue(new mapToMultiRez(x, y));
209 if (multiRezToBuild.Count == 1)
210 Util.FireAndForget(
211 DoUpdateMultiResolutionFilesAsync, null, "MapImageService.DoUpdateMultiResolutionFilesAsync");
212=======
213 public UUID scopeID; 169 public UUID scopeID;
214 public mapToMultiRez(int pX, int pY, UUID pscopeID) 170 public mapToMultiRez(int pX, int pY, UUID pscopeID)
215 { 171 {
@@ -231,7 +187,6 @@ namespace OpenSim.Services.MapImageService
231 if (multiRezToBuild.Count == 1) 187 if (multiRezToBuild.Count == 1)
232 Util.FireAndForget( 188 Util.FireAndForget(
233 DoUpdateMultiResolutionFilesAsync); 189 DoUpdateMultiResolutionFilesAsync);
234>>>>>>> avn/ubitvar
235 } 190 }
236 191
237 return true; 192 return true;
@@ -239,15 +194,8 @@ namespace OpenSim.Services.MapImageService
239 194
240 private void DoUpdateMultiResolutionFilesAsync(object o) 195 private void DoUpdateMultiResolutionFilesAsync(object o)
241 { 196 {
242<<<<<<< HEAD
243 // This sleep causes the FireAndForget thread to be different than the invocation thread.
244 // It also allows other tiles to be uploaded so the multi-rez images are more likely
245 // to be correct.
246 Thread.Sleep(1 * 1000);
247=======
248 // let acumulate large region tiles 197 // let acumulate large region tiles
249 Thread.Sleep(60 * 1000); // large regions take time to upload tiles 198 Thread.Sleep(60 * 1000); // large regions take time to upload tiles
250>>>>>>> avn/ubitvar
251 199
252 while (multiRezToBuild.Count > 0) 200 while (multiRezToBuild.Count > 0)
253 { 201 {
@@ -261,35 +209,23 @@ namespace OpenSim.Services.MapImageService
261 { 209 {
262 int x = toMultiRez.xx; 210 int x = toMultiRez.xx;
263 int y = toMultiRez.yy; 211 int y = toMultiRez.yy;
264<<<<<<< HEAD
265 // m_log.DebugFormat("{0} DoUpdateMultiResolutionFilesAsync: doing build for <{1},{2}>", LogHeader, x, y);
266
267=======
268 UUID scopeID = toMultiRez.scopeID; 212 UUID scopeID = toMultiRez.scopeID;
269 // m_log.DebugFormat("{0} DoUpdateMultiResolutionFilesAsync: doing build for <{1},{2}>", LogHeader, x, y); 213 // m_log.DebugFormat("{0} DoUpdateMultiResolutionFilesAsync: doing build for <{1},{2}>", LogHeader, x, y);
270 214
271 int width = 1; 215 int width = 1;
272>>>>>>> avn/ubitvar 216
273 // Stitch seven more aggregate tiles together 217 // Stitch seven more aggregate tiles together
274 for (uint zoomLevel = 2; zoomLevel <= ZOOM_LEVELS; zoomLevel++) 218 for (uint zoomLevel = 2; zoomLevel <= ZOOM_LEVELS; zoomLevel++)
275 { 219 {
276 // Calculate the width (in full resolution tiles) and bottom-left 220 // Calculate the width (in full resolution tiles) and bottom-left
277 // corner of the current zoom level 221 // corner of the current zoom level
278<<<<<<< HEAD
279 int width = (int)Math.Pow(2, (double)(zoomLevel - 1));
280=======
281 width *= 2; 222 width *= 2;
282>>>>>>> avn/ubitvar
283 int x1 = x - (x % width); 223 int x1 = x - (x % width);
284 int y1 = y - (y % width); 224 int y1 = y - (y % width);
285 225
286 lock (m_Sync) // must lock the reading and writing of the maptile files 226 lock (m_Sync) // must lock the reading and writing of the maptile files
287 { 227 {
288<<<<<<< HEAD
289 if (!CreateTile(zoomLevel, x1, y1))
290=======
291 if (!CreateTile(zoomLevel, x1, y1, scopeID)) 228 if (!CreateTile(zoomLevel, x1, y1, scopeID))
292>>>>>>> avn/ubitvar
293 { 229 {
294 m_log.WarnFormat("[MAP IMAGE SERVICE]: Unable to create tile for {0},{1} at zoom level {1}", x, y, zoomLevel); 230 m_log.WarnFormat("[MAP IMAGE SERVICE]: Unable to create tile for {0},{1} at zoom level {1}", x, y, zoomLevel);
295 return; 231 return;
@@ -298,10 +234,6 @@ namespace OpenSim.Services.MapImageService
298 } 234 }
299 } 235 }
300 } 236 }
301<<<<<<< HEAD
302
303=======
304>>>>>>> avn/ubitvar
305 return; 237 return;
306 } 238 }
307 239
diff --git a/OpenSim/Services/UserProfilesService/UserProfilesService.cs b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
index 35fe31b..9a52e02 100644
--- a/OpenSim/Services/UserProfilesService/UserProfilesService.cs
+++ b/OpenSim/Services/UserProfilesService/UserProfilesService.cs
@@ -159,7 +159,7 @@ namespace OpenSim.Services.ProfilesService
159 } 159 }
160 #endregion Interests 160 #endregion Interests
161 161
162 /* 162
163 #region User Preferences 163 #region User Preferences
164 public bool UserPreferencesUpdate(ref UserPreferences pref, ref string result) 164 public bool UserPreferencesUpdate(ref UserPreferences pref, ref string result)
165 { 165 {
@@ -239,7 +239,7 @@ namespace OpenSim.Services.ProfilesService
239 return true; 239 return true;
240 } 240 }
241 #endregion User Preferences 241 #endregion User Preferences
242 */ 242
243 243
244 #region Utility 244 #region Utility
245 public OSD AvatarImageAssetsRequest(UUID avatarId) 245 public OSD AvatarImageAssetsRequest(UUID avatarId)
generated by cgit v1.1 at 2024-08-22 03:49:13 +0000