From 0e4db3ca3911d8ac7080f51931ffe71b388e7180 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 13 Jun 2011 07:56:52 -0700
Subject: Added experimental new capability URL called MapImageService meant to
work with Kokua viewer if devs are willing to do it.
---
.../ClientStack/Linden/Caps/MiscCapsModule.cs | 119 +++++++++++++++++++++
1 file changed, 119 insertions(+)
create mode 100644 OpenSim/Region/ClientStack/Linden/Caps/MiscCapsModule.cs
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/MiscCapsModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/MiscCapsModule.cs
new file mode 100644
index 0000000..d084a73
--- /dev/null
+++ b/OpenSim/Region/ClientStack/Linden/Caps/MiscCapsModule.cs
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Reflection;
+using log4net;
+using Nini.Config;
+using Mono.Addins;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using Caps = OpenSim.Framework.Capabilities.Caps;
+using OpenSim.Capabilities.Handlers;
+
+namespace OpenSim.Region.ClientStack.Linden
+{
+ ///
+ /// A module to place miscellaneous capabilities
+ ///
+ ///
+ [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+ public class MiscCapsModule : INonSharedRegionModule
+ {
+ private static readonly ILog m_log =
+ LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ private Scene m_scene;
+
+ private bool m_Enabled = false;
+ private string m_MapImageServerURL;
+
+ #region ISharedRegionModule Members
+
+ public void Initialise(IConfigSource source)
+ {
+ m_Enabled = true;
+ IConfig config = source.Configs["ClientStack.LindenCaps"];
+ if (config == null)
+ return;
+
+ m_MapImageServerURL = config.GetString("Cap_MapImageService", string.Empty);
+ }
+
+ public void AddRegion(Scene s)
+ {
+ if (!m_Enabled)
+ return;
+
+ m_scene = s;
+ }
+
+ public void RemoveRegion(Scene s)
+ {
+ if (!m_Enabled)
+ return;
+
+ m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
+ m_scene = null;
+ }
+
+ public void RegionLoaded(Scene s)
+ {
+ if (!m_Enabled)
+ return;
+
+ m_scene.EventManager.OnRegisterCaps += RegisterCaps;
+ }
+
+ public void PostInitialise()
+ {
+ }
+
+ public void Close() { }
+
+ public string Name { get { return "MiscCapsModule"; } }
+
+ public Type ReplaceableInterface
+ {
+ get { return null; }
+ }
+
+ #endregion
+
+ public void RegisterCaps(UUID agentID, Caps caps)
+ {
+ m_log.InfoFormat("[MISC CAPS MODULE]: {0} in region {1}", m_MapImageServerURL, m_scene.RegionInfo.RegionName);
+ if (m_MapImageServerURL != string.Empty)
+ caps.RegisterHandler("MapImageService", m_MapImageServerURL);
+ }
+
+ }
+}
--
cgit v1.1
From ab11835aeb341a34f479d9a6eb18de1ca9500c4a Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 13 Jun 2011 07:59:28 -0700
Subject: Same processing of the "/" in the MapImageService Cap as the one in
the login service.
---
OpenSim/Region/ClientStack/Linden/Caps/MiscCapsModule.cs | 6 ++++++
1 file changed, 6 insertions(+)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/MiscCapsModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/MiscCapsModule.cs
index d084a73..3dcd1e3 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/MiscCapsModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/MiscCapsModule.cs
@@ -66,6 +66,12 @@ namespace OpenSim.Region.ClientStack.Linden
return;
m_MapImageServerURL = config.GetString("Cap_MapImageService", string.Empty);
+ if (m_MapImageServerURL != string.Empty)
+ {
+ m_MapImageServerURL = m_MapImageServerURL.Trim();
+ if (!m_MapImageServerURL.EndsWith("/"))
+ m_MapImageServerURL = m_MapImageServerURL + "/";
+ }
}
public void AddRegion(Scene s)
--
cgit v1.1
From 822b9e085fca9dcf04e61b29b98daeecf7893d85 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 13 Jun 2011 10:21:29 -0700
Subject: Added SimulatorFeatures capability. Thanks Aurora devs for the
bootstrap on the contents of the response. Changed the experimental
capability introduced a couple of commits ago: now sending that extra
information as part of the response in the SimulatorFeatures cap.
---
.../ClientStack/Linden/Caps/MiscCapsModule.cs | 125 -----------------
.../Linden/Caps/SimulatorFeaturesModule.cs | 152 +++++++++++++++++++++
2 files changed, 152 insertions(+), 125 deletions(-)
delete mode 100644 OpenSim/Region/ClientStack/Linden/Caps/MiscCapsModule.cs
create mode 100644 OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/MiscCapsModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/MiscCapsModule.cs
deleted file mode 100644
index 3dcd1e3..0000000
--- a/OpenSim/Region/ClientStack/Linden/Caps/MiscCapsModule.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) Contributors, http://opensimulator.org/
- * See CONTRIBUTORS.TXT for a full list of copyright holders.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of the OpenSimulator Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-using System;
-using System.Collections;
-using System.Reflection;
-using log4net;
-using Nini.Config;
-using Mono.Addins;
-using OpenMetaverse;
-using OpenSim.Framework;
-using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Services.Interfaces;
-using Caps = OpenSim.Framework.Capabilities.Caps;
-using OpenSim.Capabilities.Handlers;
-
-namespace OpenSim.Region.ClientStack.Linden
-{
- ///
- /// A module to place miscellaneous capabilities
- ///
- ///
- [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
- public class MiscCapsModule : INonSharedRegionModule
- {
- private static readonly ILog m_log =
- LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
- private Scene m_scene;
-
- private bool m_Enabled = false;
- private string m_MapImageServerURL;
-
- #region ISharedRegionModule Members
-
- public void Initialise(IConfigSource source)
- {
- m_Enabled = true;
- IConfig config = source.Configs["ClientStack.LindenCaps"];
- if (config == null)
- return;
-
- m_MapImageServerURL = config.GetString("Cap_MapImageService", string.Empty);
- if (m_MapImageServerURL != string.Empty)
- {
- m_MapImageServerURL = m_MapImageServerURL.Trim();
- if (!m_MapImageServerURL.EndsWith("/"))
- m_MapImageServerURL = m_MapImageServerURL + "/";
- }
- }
-
- public void AddRegion(Scene s)
- {
- if (!m_Enabled)
- return;
-
- m_scene = s;
- }
-
- public void RemoveRegion(Scene s)
- {
- if (!m_Enabled)
- return;
-
- m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
- m_scene = null;
- }
-
- public void RegionLoaded(Scene s)
- {
- if (!m_Enabled)
- return;
-
- m_scene.EventManager.OnRegisterCaps += RegisterCaps;
- }
-
- public void PostInitialise()
- {
- }
-
- public void Close() { }
-
- public string Name { get { return "MiscCapsModule"; } }
-
- public Type ReplaceableInterface
- {
- get { return null; }
- }
-
- #endregion
-
- public void RegisterCaps(UUID agentID, Caps caps)
- {
- m_log.InfoFormat("[MISC CAPS MODULE]: {0} in region {1}", m_MapImageServerURL, m_scene.RegionInfo.RegionName);
- if (m_MapImageServerURL != string.Empty)
- caps.RegisterHandler("MapImageService", m_MapImageServerURL);
- }
-
- }
-}
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
new file mode 100644
index 0000000..9f78948
--- /dev/null
+++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
@@ -0,0 +1,152 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections;
+using System.Reflection;
+using log4net;
+using Nini.Config;
+using Mono.Addins;
+using OpenMetaverse;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework;
+using OpenSim.Framework.Servers.HttpServer;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Services.Interfaces;
+using Caps = OpenSim.Framework.Capabilities.Caps;
+
+namespace OpenSim.Region.ClientStack.Linden
+{
+ ///
+ /// SimulatorFeatures capability. This is required for uploading Mesh.
+ /// Since is accepts an open-ended response, we also send more information
+ /// for viewers that care to interpret it.
+ ///
+ /// NOTE: Part of this code was adapted from the Aurora project, specifically
+ /// the normal part of the response in the capability handler.
+ ///
+ ///
+ [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+ public class SimulatorFeaturesModule : ISharedRegionModule
+ {
+ private static readonly ILog m_log =
+ LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ private Scene m_scene;
+
+ private string m_MapImageServerURL = string.Empty;
+ private string m_SearchURL = string.Empty;
+
+ #region ISharedRegionModule Members
+
+ public void Initialise(IConfigSource source)
+ {
+ IConfig config = source.Configs["SimulatorFeatures"];
+ if (config == null)
+ return;
+
+ m_MapImageServerURL = config.GetString("MapImageServerURI", string.Empty);
+ if (m_MapImageServerURL != string.Empty)
+ {
+ m_MapImageServerURL = m_MapImageServerURL.Trim();
+ if (!m_MapImageServerURL.EndsWith("/"))
+ m_MapImageServerURL = m_MapImageServerURL + "/";
+ }
+
+ m_SearchURL = config.GetString("SearchServerURI", string.Empty);
+ }
+
+ public void AddRegion(Scene s)
+ {
+ m_scene = s;
+ m_scene.EventManager.OnRegisterCaps += RegisterCaps;
+ }
+
+ public void RemoveRegion(Scene s)
+ {
+ m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
+ }
+
+ public void RegionLoaded(Scene s)
+ {
+ }
+
+ public void PostInitialise()
+ {
+ }
+
+ public void Close() { }
+
+ public string Name { get { return "SimulatorFeaturesModule"; } }
+
+ public Type ReplaceableInterface
+ {
+ get { return null; }
+ }
+
+ #endregion
+
+ public void RegisterCaps(UUID agentID, Caps caps)
+ {
+ IRequestHandler reqHandler = new RestHTTPHandler("GET", "/CAPS/" + UUID.Random(), SimulatorFeatures);
+ caps.RegisterHandler("SimulatorFeatures", reqHandler);
+ }
+
+ private Hashtable SimulatorFeatures(Hashtable mDhttpMethod)
+ {
+ m_log.DebugFormat("[SIMULATOR FEATURES MODULE]: SimulatorFeatures request");
+ OSDMap data = new OSDMap();
+ data["MeshRezEnabled"] = true;
+ data["MeshUploadEnabled"] = true;
+ data["MeshXferEnabled"] = true;
+ data["PhysicsMaterialsEnabled"] = true;
+
+ OSDMap typesMap = new OSDMap();
+ typesMap["convex"] = true;
+ typesMap["none"] = true;
+ typesMap["prim"] = true;
+ data["PhysicsShapeTypes"] = typesMap;
+
+ // Extra information for viewers that want to use it
+ OSDMap gridServicesMap = new OSDMap();
+ if (m_MapImageServerURL != string.Empty)
+ gridServicesMap["map-server-url"] = m_MapImageServerURL;
+ if (m_SearchURL != string.Empty)
+ gridServicesMap["search"] = m_SearchURL;
+ data["GridServices"] = gridServicesMap;
+
+ //Send back data
+ Hashtable responsedata = new Hashtable();
+ responsedata["int_response_code"] = 200;
+ responsedata["content_type"] = "text/plain";
+ responsedata["keepalive"] = false;
+ responsedata["str_response_string"] = OSDParser.SerializeLLSDXmlString(data);
+ return responsedata;
+ }
+
+ }
+}
--
cgit v1.1
From 603dbea190de26dce5160f5ab9730ffc1375ec26 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 14 Jun 2011 00:51:18 +0100
Subject: tweak messages. Make verbose inventory item save message give the
item name as well as item id and asset id
---
.../Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | 4 +++-
OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index c2ad079..36ecb3b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -147,7 +147,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
protected void SaveInvItem(InventoryItemBase inventoryItem, string path, Dictionary options, IUserAccountService userAccountService)
{
if (options.ContainsKey("verbose"))
- m_log.InfoFormat("[INVENTORY ARCHIVER]: Saving item {0} with asset {1}", inventoryItem.ID, inventoryItem.AssetID);
+ m_log.InfoFormat(
+ "[INVENTORY ARCHIVER]: Saving item {0} {1} with asset {2}",
+ inventoryItem.ID, inventoryItem.Name, inventoryItem.AssetID);
string filename = path + CreateArchiveItemName(inventoryItem);
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
index 3078ab3..6a9c3d0 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs
@@ -198,11 +198,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver
m_log.ErrorFormat(
"[ARCHIVER]: (... {0} more not shown)", uuids.Count - MAX_UUID_DISPLAY_ON_TIMEOUT);
- m_log.Error("[ARCHIVER]: OAR save aborted. PLEASE DO NOT USE THIS OAR, IT WILL BE INCOMPLETE.");
+ m_log.Error("[ARCHIVER]: Archive save aborted. PLEASE DO NOT USE THIS ARCHIVE, IT WILL BE INCOMPLETE.");
}
catch (Exception e)
{
- m_log.ErrorFormat("[ARCHIVER]: Timeout handler exception {0}", e);
+ m_log.ErrorFormat("[ARCHIVER]: Timeout handler exception {0}{1}", e.Message, e.StackTrace);
}
finally
{
--
cgit v1.1
From 7a4fbdac7c18415d442f6af0b75fe8fcdc2eb509 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Wed, 15 Jun 2011 11:22:51 -0700
Subject: Added an expiring cache for region information to the
RemoteGridService connector. Timeout is currently set at five minutes.
Negative results are not cached.
The result is that operations like send an instant message do
not have to go through the grid service every time.
---
.../ServiceConnectorsOut/Grid/RegionInfoCache.cs | 137 +++++++++++++++++++++
.../Grid/RemoteGridServiceConnector.cs | 34 ++++-
2 files changed, 169 insertions(+), 2 deletions(-)
create mode 100644 OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionInfoCache.cs
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionInfoCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionInfoCache.cs
new file mode 100644
index 0000000..786e0b5
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionInfoCache.cs
@@ -0,0 +1,137 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+using System;
+using System.Reflection;
+using System.Collections.Generic;
+using OpenSim.Framework;
+using OpenSim.Services.Interfaces;
+using OpenMetaverse;
+using log4net;
+using GridRegion = OpenSim.Services.Interfaces.GridRegion;
+
+namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
+{
+ public class RegionInfoCache
+ {
+ private const double CACHE_EXPIRATION_SECONDS = 300.0; // 5 minutes
+
+// private static readonly ILog m_log =
+// LogManager.GetLogger(
+// MethodBase.GetCurrentMethod().DeclaringType);
+
+ internal struct ScopedRegionUUID
+ {
+ public UUID m_scopeID;
+ public UUID m_regionID;
+ public ScopedRegionUUID(UUID scopeID, UUID regionID)
+ {
+ m_scopeID = scopeID;
+ m_regionID = regionID;
+ }
+ }
+
+ internal struct ScopedRegionName
+ {
+ public UUID m_scopeID;
+ public string m_name;
+ public ScopedRegionName(UUID scopeID, string name)
+ {
+ m_scopeID = scopeID;
+ m_name = name;
+ }
+ }
+
+ private ExpiringCache m_UUIDCache;
+ private ExpiringCache m_NameCache;
+
+ public RegionInfoCache()
+ {
+ m_UUIDCache = new ExpiringCache();
+ m_NameCache = new ExpiringCache();
+ }
+
+ public void Cache(GridRegion rinfo)
+ {
+ if (rinfo != null)
+ this.Cache(rinfo.ScopeID,rinfo.RegionID,rinfo);
+ }
+
+ public void Cache(UUID scopeID, UUID regionID, GridRegion rinfo)
+ {
+ // for now, do not cache negative results; this is because
+ // we need to figure out how to handle regions coming online
+ // in a timely way
+ if (rinfo == null)
+ return;
+
+ ScopedRegionUUID id = new ScopedRegionUUID(scopeID,regionID);
+
+ // Cache even null accounts
+ m_UUIDCache.AddOrUpdate(id, rinfo, CACHE_EXPIRATION_SECONDS);
+ if (rinfo != null)
+ {
+ ScopedRegionName name = new ScopedRegionName(scopeID,rinfo.RegionName);
+ m_NameCache.AddOrUpdate(name, id, CACHE_EXPIRATION_SECONDS);
+ }
+ }
+
+ public GridRegion Get(UUID scopeID, UUID regionID, out bool inCache)
+ {
+ inCache = false;
+
+ GridRegion rinfo = null;
+ ScopedRegionUUID id = new ScopedRegionUUID(scopeID,regionID);
+ if (m_UUIDCache.TryGetValue(id, out rinfo))
+ {
+ inCache = true;
+ return rinfo;
+ }
+
+ return null;
+ }
+
+ public GridRegion Get(UUID scopeID, string name, out bool inCache)
+ {
+ inCache = false;
+
+ ScopedRegionName sname = new ScopedRegionName(scopeID,name);
+
+ ScopedRegionUUID id;
+ if (m_NameCache.TryGetValue(sname, out id))
+ {
+ GridRegion rinfo = null;
+ if (m_UUIDCache.TryGetValue(id, out rinfo))
+ {
+ inCache = true;
+ return rinfo;
+ }
+ }
+
+ return null;
+ }
+ }
+}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
index 33cc838..6f364ae 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
@@ -53,6 +53,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
private IGridService m_LocalGridService;
private IGridService m_RemoteGridService;
+ private RegionInfoCache m_RegionInfoCache = new RegionInfoCache();
+
public RemoteGridServicesConnector()
{
}
@@ -169,10 +171,16 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
public GridRegion GetRegionByUUID(UUID scopeID, UUID regionID)
{
- GridRegion rinfo = m_LocalGridService.GetRegionByUUID(scopeID, regionID);
+ bool inCache = false;
+ GridRegion rinfo = m_RegionInfoCache.Get(scopeID,regionID,out inCache);
+ if (inCache)
+ return rinfo;
+
+ rinfo = m_LocalGridService.GetRegionByUUID(scopeID, regionID);
if (rinfo == null)
rinfo = m_RemoteGridService.GetRegionByUUID(scopeID, regionID);
+ m_RegionInfoCache.Cache(scopeID,regionID,rinfo);
return rinfo;
}
@@ -187,10 +195,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
public GridRegion GetRegionByName(UUID scopeID, string regionName)
{
- GridRegion rinfo = m_LocalGridService.GetRegionByName(scopeID, regionName);
+ bool inCache = false;
+ GridRegion rinfo = m_RegionInfoCache.Get(scopeID,regionName, out inCache);
+ if (inCache)
+ return rinfo;
+
+ rinfo = m_LocalGridService.GetRegionByName(scopeID, regionName);
if (rinfo == null)
rinfo = m_RemoteGridService.GetRegionByName(scopeID, regionName);
+ // can't cache negative results for name lookups
+ m_RegionInfoCache.Cache(rinfo);
return rinfo;
}
@@ -204,8 +219,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
{
//m_log.DebugFormat("[REMOTE GRID CONNECTOR]: Remote GetRegionsByName {0} found {1} regions", name, grinfo.Count);
foreach (GridRegion r in grinfo)
+ {
+ m_RegionInfoCache.Cache(r);
if (rinfo.Find(delegate(GridRegion gr) { return gr.RegionID == r.RegionID; }) == null)
rinfo.Add(r);
+ }
}
return rinfo;
@@ -221,8 +239,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
{
//m_log.DebugFormat("[REMOTE GRID CONNECTOR]: Remote GetRegionRange {0} found {1} regions", name, grinfo.Count);
foreach (GridRegion r in grinfo)
+ {
+ m_RegionInfoCache.Cache(r);
if (rinfo.Find(delegate(GridRegion gr) { return gr.RegionID == r.RegionID; }) == null)
rinfo.Add(r);
+ }
}
return rinfo;
@@ -238,8 +259,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
{
//m_log.DebugFormat("[REMOTE GRID CONNECTOR]: Remote GetDefaultRegions {0} found {1} regions", name, grinfo.Count);
foreach (GridRegion r in grinfo)
+ {
+ m_RegionInfoCache.Cache(r);
if (rinfo.Find(delegate(GridRegion gr) { return gr.RegionID == r.RegionID; }) == null)
rinfo.Add(r);
+ }
}
return rinfo;
@@ -255,8 +279,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
{
//m_log.DebugFormat("[REMOTE GRID CONNECTOR]: Remote GetFallbackRegions {0} found {1} regions", name, grinfo.Count);
foreach (GridRegion r in grinfo)
+ {
+ m_RegionInfoCache.Cache(r);
if (rinfo.Find(delegate(GridRegion gr) { return gr.RegionID == r.RegionID; }) == null)
rinfo.Add(r);
+ }
}
return rinfo;
@@ -272,8 +299,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
{
//m_log.DebugFormat("[REMOTE GRID CONNECTOR]: Remote GetHyperlinks {0} found {1} regions", name, grinfo.Count);
foreach (GridRegion r in grinfo)
+ {
+ m_RegionInfoCache.Cache(r);
if (rinfo.Find(delegate(GridRegion gr) { return gr.RegionID == r.RegionID; }) == null)
rinfo.Add(r);
+ }
}
return rinfo;
--
cgit v1.1
From 29da57e3802948bbffce43c071e6c97742cabf84 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Wed, 15 Jun 2011 11:26:45 -0700
Subject: Add the PhysActor to the correct SOP when duplicating a physical
prim. Thanks, MisterBlue
---
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 79660a3..f745169 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1449,18 +1449,23 @@ namespace OpenSim.Region.Framework.Scenes
foreach (SceneObjectPart part in partList)
{
+ SceneObjectPart newPart;
if (part.UUID != m_rootPart.UUID)
{
- SceneObjectPart newPart = dupe.CopyPart(part, OwnerID, GroupID, userExposed);
+ newPart = dupe.CopyPart(part, OwnerID, GroupID, userExposed);
newPart.LinkNum = part.LinkNum;
}
+ else
+ {
+ newPart = dupe.m_rootPart;
+ }
// Need to duplicate the physics actor as well
if (part.PhysActor != null && userExposed)
{
PrimitiveBaseShape pbs = part.Shape;
- part.PhysActor
+ newPart.PhysActor
= m_scene.PhysicsScene.AddPrimShape(
string.Format("{0}/{1}", part.Name, part.UUID),
pbs,
@@ -1469,8 +1474,8 @@ namespace OpenSim.Region.Framework.Scenes
part.RotationOffset,
part.PhysActor.IsPhysical);
- part.PhysActor.LocalID = part.LocalId;
- part.DoPhysicsPropertyUpdate(part.PhysActor.IsPhysical, true);
+ newPart.PhysActor.LocalID = part.LocalId;
+ newPart.DoPhysicsPropertyUpdate(part.PhysActor.IsPhysical, true);
}
}
--
cgit v1.1
From ad84728aba1ea5efe0d237c89e1578657e6d8288 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Wed, 15 Jun 2011 11:31:32 -0700
Subject: Add localID to physical object creation functions.
---
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 +-
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 4 ++--
OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 +-
OpenSim/Region/Physics/Manager/PhysicsActor.cs | 7 ++++++-
OpenSim/Region/Physics/Manager/PhysicsScene.cs | 15 +++++++++++++++
5 files changed, 25 insertions(+), 5 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index f745169..42ac9aa 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1467,6 +1467,7 @@ namespace OpenSim.Region.Framework.Scenes
newPart.PhysActor
= m_scene.PhysicsScene.AddPrimShape(
+ part.LocalId,
string.Format("{0}/{1}", part.Name, part.UUID),
pbs,
part.AbsolutePosition,
@@ -1474,7 +1475,6 @@ namespace OpenSim.Region.Framework.Scenes
part.RotationOffset,
part.PhysActor.IsPhysical);
- newPart.PhysActor.LocalID = part.LocalId;
newPart.DoPhysicsPropertyUpdate(part.PhysActor.IsPhysical, true);
}
}
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index a215b20..c6d8c73 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1582,6 +1582,7 @@ namespace OpenSim.Region.Framework.Scenes
if (!isPhantom && !IsAttachment && !(Shape.PathCurve == (byte) Extrusion.Flexible))
{
PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape(
+ LocalId,
string.Format("{0}/{1}", Name, UUID),
Shape,
AbsolutePosition,
@@ -1594,7 +1595,6 @@ namespace OpenSim.Region.Framework.Scenes
{
PhysActor.SOPName = this.Name; // save object name and desc into the PhysActor so ODE internals know the joint/body info
PhysActor.SOPDescription = this.Description;
- PhysActor.LocalID = LocalId;
DoPhysicsPropertyUpdate(RigidBody, true);
PhysActor.SetVolumeDetect(VolumeDetectActive ? 1 : 0);
}
@@ -4410,6 +4410,7 @@ namespace OpenSim.Region.Framework.Scenes
{
// It's not phantom anymore. So make sure the physics engine get's knowledge of it
PhysActor = m_parentGroup.Scene.PhysicsScene.AddPrimShape(
+ LocalId,
string.Format("{0}/{1}", Name, UUID),
Shape,
AbsolutePosition,
@@ -4420,7 +4421,6 @@ namespace OpenSim.Region.Framework.Scenes
pa = PhysActor;
if (pa != null)
{
- pa.LocalID = LocalId;
DoPhysicsPropertyUpdate(UsePhysics, true);
if (m_parentGroup != null)
{
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index f6295b1..80aafd0 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3295,7 +3295,7 @@ namespace OpenSim.Region.Framework.Scenes
Vector3 pVec = AbsolutePosition;
// Old bug where the height was in centimeters instead of meters
- m_physicsActor = scene.AddAvatar(Firstname + "." + Lastname, pVec,
+ m_physicsActor = scene.AddAvatar(LocalId, Firstname + "." + Lastname, pVec,
new Vector3(0f, 0f, m_appearance.AvatarHeight), isFlying);
scene.AddPhysicsActorTaint(m_physicsActor);
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
index 880c3ea..1c36e55 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs
@@ -142,7 +142,12 @@ namespace OpenSim.Region.Physics.Manager
public abstract PrimitiveBaseShape Shape { set; }
- public abstract uint LocalID { set; }
+ uint m_baseLocalID;
+ public virtual uint LocalID
+ {
+ set { m_baseLocalID = value; }
+ get { return m_baseLocalID; }
+ }
public abstract bool Grabbed { set; }
diff --git a/OpenSim/Region/Physics/Manager/PhysicsScene.cs b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
index 217d307..54c50f8 100644
--- a/OpenSim/Region/Physics/Manager/PhysicsScene.cs
+++ b/OpenSim/Region/Physics/Manager/PhysicsScene.cs
@@ -66,6 +66,13 @@ namespace OpenSim.Region.Physics.Manager
public abstract PhysicsActor AddAvatar(string avName, Vector3 position, Vector3 size, bool isFlying);
+ public virtual PhysicsActor AddAvatar(uint localID, string avName, Vector3 position, Vector3 size, bool isFlying)
+ {
+ PhysicsActor ret = AddAvatar(avName, position, size, isFlying);
+ if (ret != null) ret.LocalID = localID;
+ return ret;
+ }
+
public abstract void RemoveAvatar(PhysicsActor actor);
public abstract void RemovePrim(PhysicsActor prim);
@@ -75,6 +82,14 @@ namespace OpenSim.Region.Physics.Manager
public abstract PhysicsActor AddPrimShape(string primName, PrimitiveBaseShape pbs, Vector3 position,
Vector3 size, Quaternion rotation, bool isPhysical);
+ public virtual PhysicsActor AddPrimShape(uint localID, string primName, PrimitiveBaseShape pbs, Vector3 position,
+ Vector3 size, Quaternion rotation, bool isPhysical)
+ {
+ PhysicsActor ret = AddPrimShape(primName, pbs, position, size, rotation, isPhysical);
+ if (ret != null) ret.LocalID = localID;
+ return ret;
+ }
+
public virtual float TimeDilation
{
get { return 1.0f; }
--
cgit v1.1
From 409738726d91791fbd3ea2328cea998f644f8787 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 16 Jun 2011 17:14:41 -0700
Subject: Added a couple of guards and warnings to the
MapImage/MapImageServiceModule.
---
.../ServiceConnectorsOut/MapImage/MapImageServiceModule.cs | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
index ee90859..e224670 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/MapImage/MapImageServiceModule.cs
@@ -112,6 +112,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
Object[] args = new Object[] { source };
m_MapService = ServerUtils.LoadPlugin(service, args);
+ if (m_MapService == null)
+ {
+ m_log.WarnFormat("[MAP IMAGE SERVICE MODULE]: Unable to load LocalServiceModule from {0}. MapService module disabled. Please fix the configuration.", service);
+ return;
+ }
m_refreshTimer.Enabled = true;
m_refreshTimer.AutoReset = true;
@@ -202,7 +207,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
{
m_log.DebugFormat("[MAP IMAGE SERVICE MODULE]: upload maptile for {0}", scene.RegionInfo.RegionName);
- // Create a PNG map tile and upload it to the AddMapTile API
+ // Create a JPG map tile and upload it to the AddMapTile API
byte[] jpgData = Utils.EmptyBytes;
IMapImageGenerator tileGenerator = scene.RequestModuleInterface();
if (tileGenerator == null)
@@ -220,13 +225,18 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.MapImage
}
}
+ if (jpgData == Utils.EmptyBytes)
+ {
+ m_log.WarnFormat("[MAP IMAGE SERVICE MODULE]: Tile image generation failed");
+ return;
+ }
+
string reason = string.Empty;
if (!m_MapService.AddMapTile((int)scene.RegionInfo.RegionLocX, (int)scene.RegionInfo.RegionLocY, jpgData, out reason))
{
m_log.DebugFormat("[MAP IMAGE SERVICE MODULE]: Unable to upload tile image for {0} at {1}-{2}: {3}",
scene.RegionInfo.RegionName, scene.RegionInfo.RegionLocX, scene.RegionInfo.RegionLocY, reason);
}
-
}
}
}
\ No newline at end of file
--
cgit v1.1