From 4b00203fa5d1ae645cf7bd67d061ee751d5c447b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 25 Jun 2013 00:15:55 +0100
Subject: Tidy up SOG.UpdateRootPosition() to eliminate unnecessary copying of
Vector3 structs
---
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index f1036ae..75d0667 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -3028,8 +3028,8 @@ namespace OpenSim.Region.Framework.Scenes
///
/// Update just the root prim position in a linkset
///
- ///
- public void UpdateRootPosition(Vector3 pos)
+ ///
+ public void UpdateRootPosition(Vector3 newPos)
{
// m_log.DebugFormat(
// "[SCENE OBJECT GROUP]: Updating root position of {0} {1} to {2}", Name, LocalId, pos);
@@ -3038,16 +3038,10 @@ namespace OpenSim.Region.Framework.Scenes
// for (int i = 0; i < parts.Length; i++)
// parts[i].StoreUndoState();
- Vector3 newPos = new Vector3(pos.X, pos.Y, pos.Z);
- Vector3 oldPos =
- new Vector3(AbsolutePosition.X + m_rootPart.OffsetPosition.X,
- AbsolutePosition.Y + m_rootPart.OffsetPosition.Y,
- AbsolutePosition.Z + m_rootPart.OffsetPosition.Z);
+ Vector3 oldPos = AbsolutePosition + RootPart.OffsetPosition;
Vector3 diff = oldPos - newPos;
- Vector3 axDiff = new Vector3(diff.X, diff.Y, diff.Z);
Quaternion partRotation = m_rootPart.RotationOffset;
- axDiff *= Quaternion.Inverse(partRotation);
- diff = axDiff;
+ diff *= Quaternion.Inverse(partRotation);
SceneObjectPart[] parts = m_parts.GetArray();
for (int i = 0; i < parts.Length; i++)
--
cgit v1.1
From ce9b1320d273890610a2ccd4f1ada39498135049 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 25 Jun 2013 00:41:46 +0100
Subject: Improve situation where editing just the root prim of an attachment
causes other prims to be set to very far off positions on reattach.
Functionally the same as the patch by tglion in http://opensimulator.org/mantis/view.php?id=5334
However, not yet perfect - after editing just root prim on reattach the position is still wrong, though other prims are not set to far off positions.
---
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 75d0667..4b4e4ba 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -3038,7 +3038,16 @@ namespace OpenSim.Region.Framework.Scenes
// for (int i = 0; i < parts.Length; i++)
// parts[i].StoreUndoState();
- Vector3 oldPos = AbsolutePosition + RootPart.OffsetPosition;
+ Vector3 oldPos;
+
+ // FIXME: This improves the situation where editing just the root prim of an attached object would send
+ // all the other parts to oblivion after detach/reattach. However, a problem remains since the root prim
+ // still ends up in the wrong position on reattach.
+ if (IsAttachment)
+ oldPos = RootPart.OffsetPosition;
+ else
+ oldPos = AbsolutePosition + RootPart.OffsetPosition;
+
Vector3 diff = oldPos - newPos;
Quaternion partRotation = m_rootPart.RotationOffset;
diff *= Quaternion.Inverse(partRotation);
--
cgit v1.1
From f78d2ef166a523397c770858176eff646be4021d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 25 Jun 2013 00:46:15 +0100
Subject: Update temporary "Unknown UserUMMTGUN2" name to "Unknown
UserUMMTGUN3" to see if Diva's recent HG updates (post 6c7e33f) fix this
issue.
This string is returned if a UserManagementModule.TryGetUserNames() cannot find a server-side name binding or a user account for a given UUID.
This is only called when the viewer requests a binding via the UDP UUIDNameRequest message
---
.../Region/CoreModules/Framework/UserManagement/UserManagementModule.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 864e181..194b591 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -320,7 +320,7 @@ namespace OpenSim.Region.CoreModules.Framework.UserManagement
else
{
names[0] = "Unknown";
- names[1] = "UserUMMTGUN2";
+ names[1] = "UserUMMTGUN3";
return false;
}
--
cgit v1.1
From f7d09b898ad6df32b3f07cb64657623980178c2f Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 27 Jun 2013 23:14:28 +0100
Subject: Make the concept of namespaces explicit in dynamic attributes
This is in order to reduce the likelihood of naming clashes, make it easier to filter in/out attributes, ensure uniformity, etc.
All dynattrs in the opensim distro itself or likely future ones should be in the "OpenSim" namespace.
This does alter the underlying dynattrs data structure. All data in previous structures may not be available, though old structures should not cause errors.
This is done without notice since this feature has been explicitly labelled as experimental, subject to change and has not been in a release.
However, existing materials data is being preserved by moving it to the "Materials" store in the "OpenSim" namespace.
---
.../Framework/DynamicAttributes/DAExampleModule.cs | 17 ++++++---
.../Framework/DynamicAttributes/DOExampleModule.cs | 8 ++--
.../World/Serialiser/Tests/SerialiserTests.cs | 44 ++++++++++++++++++----
.../Scenes/Serialization/SceneObjectSerializer.cs | 2 +-
OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 18 +++++----
.../Materials/MaterialsDemoModule.cs | 26 +++++--------
6 files changed, 72 insertions(+), 43 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs b/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs
index 1f1568f..0c632b1 100644
--- a/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs
@@ -44,11 +44,12 @@ namespace OpenSim.Region.CoreModules.Framework.DynamicAttributes.DAExampleModule
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "DAExampleModule")]
public class DAExampleModule : INonSharedRegionModule
{
-// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
- private static readonly bool ENABLED = false; // enable for testing
+ private readonly bool ENABLED = false; // enable for testing
- public const string DANamespace = "DAExample Module";
+ public const string Namespace = "Example";
+ public const string StoreName = "DA";
protected Scene m_scene;
protected IDialogModule m_dialogMod;
@@ -65,6 +66,8 @@ namespace OpenSim.Region.CoreModules.Framework.DynamicAttributes.DAExampleModule
m_scene = scene;
m_scene.EventManager.OnSceneGroupMove += OnSceneGroupMove;
m_dialogMod = m_scene.RequestModuleInterface();
+
+ m_log.DebugFormat("[DA EXAMPLE MODULE]: Added region {0}", m_scene.Name);
}
}
@@ -91,7 +94,7 @@ namespace OpenSim.Region.CoreModules.Framework.DynamicAttributes.DAExampleModule
if (sop == null)
return true;
- if (!sop.DynAttrs.TryGetValue(DANamespace, out attrs))
+ if (!sop.DynAttrs.TryGetStore(Namespace, StoreName, out attrs))
attrs = new OSDMap();
OSDInteger newValue;
@@ -106,12 +109,14 @@ namespace OpenSim.Region.CoreModules.Framework.DynamicAttributes.DAExampleModule
attrs["moves"] = newValue;
- sop.DynAttrs[DANamespace] = attrs;
+ sop.DynAttrs.SetStore(Namespace, StoreName, attrs);
}
sop.ParentGroup.HasGroupChanged = true;
- m_dialogMod.SendGeneralAlert(string.Format("{0} {1} moved {2} times", sop.Name, sop.UUID, newValue));
+ string msg = string.Format("{0} {1} moved {2} times", sop.Name, sop.UUID, newValue);
+ m_log.DebugFormat("[DA EXAMPLE MODULE]: {0}", msg);
+ m_dialogMod.SendGeneralAlert(msg);
return true;
}
diff --git a/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DOExampleModule.cs b/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DOExampleModule.cs
index 650aa35..166a994 100644
--- a/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DOExampleModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DOExampleModule.cs
@@ -64,8 +64,8 @@ namespace OpenSim.Region.Framework.DynamicAttributes.DOExampleModule
private Scene m_scene;
private IDialogModule m_dialogMod;
-
- public string Name { get { return "DOExample Module"; } }
+
+ public string Name { get { return "DO"; } }
public Type ReplaceableInterface { get { return null; } }
public void Initialise(IConfigSource source) {}
@@ -106,7 +106,7 @@ namespace OpenSim.Region.Framework.DynamicAttributes.DOExampleModule
// Console.WriteLine("Here for {0}", so.Name);
- if (rootPart.DynAttrs.TryGetValue(DAExampleModule.DANamespace, out attrs))
+ if (rootPart.DynAttrs.TryGetStore(DAExampleModule.Namespace, DAExampleModule.StoreName, out attrs))
{
movesSoFar = attrs["moves"].AsInteger();
@@ -114,7 +114,7 @@ namespace OpenSim.Region.Framework.DynamicAttributes.DOExampleModule
"[DO EXAMPLE MODULE]: Found saved moves {0} for {1} in {2}", movesSoFar, so.Name, m_scene.Name);
}
- rootPart.DynObjs.Add(Name, new MyObject(movesSoFar));
+ rootPart.DynObjs.Add(DAExampleModule.Namespace, Name, new MyObject(movesSoFar));
}
private bool OnSceneGroupMove(UUID groupId, Vector3 delta)
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
index b4348c9..66059fb 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
@@ -144,7 +144,20 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
None
00000000-0000-0000-0000-000000000000
0
-
+
+
+
+
+
@@ -333,7 +346,20 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
0
2147483647
None
-
+
+
+
+
+
00000000-0000-0000-0000-000000000000
@@ -362,7 +388,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
Assert.That(rootPart.UUID, Is.EqualTo(new UUID("e6a5a05e-e8cc-4816-8701-04165e335790")));
Assert.That(rootPart.CreatorID, Is.EqualTo(new UUID("a6dacf01-4636-4bb9-8a97-30609438af9d")));
Assert.That(rootPart.Name, Is.EqualTo("PrimMyRide"));
- OSDMap store = rootPart.DynAttrs["MyStore"];
+ OSDMap store = rootPart.DynAttrs.GetStore("MyNamespace", "MyStore");
Assert.AreEqual(42, store["the answer"].AsInteger());
// TODO: Check other properties
@@ -414,13 +440,14 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
rp.CreatorID = rpCreatorId;
rp.Shape = shape;
+ string daNamespace = "MyNamespace";
string daStoreName = "MyStore";
string daKey = "foo";
string daValue = "bar";
OSDMap myStore = new OSDMap();
myStore.Add(daKey, daValue);
rp.DynAttrs = new DAMap();
- rp.DynAttrs[daStoreName] = myStore;
+ rp.DynAttrs.SetStore(daNamespace, daStoreName, myStore);
SceneObjectGroup so = new SceneObjectGroup(rp);
@@ -481,7 +508,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
Assert.That(name, Is.EqualTo(rpName));
Assert.That(creatorId, Is.EqualTo(rpCreatorId));
Assert.NotNull(daMap);
- Assert.AreEqual(daValue, daMap[daStoreName][daKey].AsString());
+ Assert.AreEqual(daValue, daMap.GetStore(daNamespace, daStoreName)[daKey].AsString());
}
[Test]
@@ -496,7 +523,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
Assert.That(rootPart.UUID, Is.EqualTo(new UUID("9be68fdd-f740-4a0f-9675-dfbbb536b946")));
Assert.That(rootPart.CreatorID, Is.EqualTo(new UUID("b46ef588-411e-4a8b-a284-d7dcfe8e74ef")));
Assert.That(rootPart.Name, Is.EqualTo("PrimFun"));
- OSDMap store = rootPart.DynAttrs["MyStore"];
+ OSDMap store = rootPart.DynAttrs.GetStore("MyNamespace", "MyStore");
Assert.AreEqual("Rosebud", store["last words"].AsString());
// TODO: Check other properties
@@ -522,13 +549,14 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
rp.CreatorID = rpCreatorId;
rp.Shape = shape;
+ string daNamespace = "MyNamespace";
string daStoreName = "MyStore";
string daKey = "foo";
string daValue = "bar";
OSDMap myStore = new OSDMap();
myStore.Add(daKey, daValue);
rp.DynAttrs = new DAMap();
- rp.DynAttrs[daStoreName] = myStore;
+ rp.DynAttrs.SetStore(daNamespace, daStoreName, myStore);
SceneObjectGroup so = new SceneObjectGroup(rp);
@@ -585,7 +613,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
Assert.That(name, Is.EqualTo(rpName));
Assert.That(creatorId, Is.EqualTo(rpCreatorId));
Assert.NotNull(daMap);
- Assert.AreEqual(daValue, daMap[daStoreName][daKey].AsString());
+ Assert.AreEqual(daValue, daMap.GetStore(daNamespace, daStoreName)[daKey].AsString());
}
}
}
\ No newline at end of file
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 3882b45..945745e 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -1290,7 +1290,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
if (sop.MediaUrl != null)
writer.WriteElementString("MediaUrl", sop.MediaUrl.ToString());
- if (sop.DynAttrs.Count > 0)
+ if (sop.DynAttrs.CountNamespaces > 0)
{
writer.WriteStartElement("DynAttrs");
sop.DynAttrs.WriteXml(writer);
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 0e83781..586b59d 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -212,7 +212,6 @@ namespace OpenSim.Region.Framework.Scenes
// }
// }
-
///
/// Gather all of the texture asset UUIDs used to reference "Materials" such as normal and specular maps
///
@@ -221,20 +220,23 @@ namespace OpenSim.Region.Framework.Scenes
public void GatherMaterialsUuids(SceneObjectPart part, IDictionary assetUuids)
{
// scan thru the dynAttrs map of this part for any textures used as materials
- OSDMap OSMaterials = null;
+ OSD osdMaterials = null;
lock (part.DynAttrs)
{
- if (part.DynAttrs.ContainsKey("OS:Materials"))
- OSMaterials = part.DynAttrs["OS:Materials"];
- if (OSMaterials != null && OSMaterials.ContainsKey("Materials"))
+ if (part.DynAttrs.ContainsStore("OpenSim", "Materials"))
+ {
+ OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials");
+ materialsStore.TryGetValue("Materials", out osdMaterials);
+ }
+
+ if (osdMaterials != null)
{
- OSD osd = OSMaterials["Materials"];
//m_log.Info("[UUID Gatherer]: found Materials: " + OSDParser.SerializeJsonString(osd));
- if (osd is OSDArray)
+ if (osdMaterials is OSDArray)
{
- OSDArray matsArr = osd as OSDArray;
+ OSDArray matsArr = osdMaterials as OSDArray;
foreach (OSDMap matMap in matsArr)
{
try
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index 4ab6609..5b15a73 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -178,7 +178,7 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
void GetStoredMaterialsForPart(SceneObjectPart part)
{
- OSDMap OSMaterials = null;
+ OSD OSMaterials = null;
OSDArray matsArr = null;
if (part.DynAttrs == null)
@@ -188,23 +188,20 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
lock (part.DynAttrs)
{
- if (part.DynAttrs.ContainsKey("OS:Materials"))
- OSMaterials = part.DynAttrs["OS:Materials"];
- if (OSMaterials != null && OSMaterials.ContainsKey("Materials"))
+ if (part.DynAttrs.ContainsStore("OpenSim", "Materials"))
{
-
- OSD osd = OSMaterials["Materials"];
- if (osd is OSDArray)
- matsArr = osd as OSDArray;
+ OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials");
+ materialsStore.TryGetValue("Materials", out OSMaterials);
}
- }
- if (OSMaterials == null)
- return;
+ if (OSMaterials != null && OSMaterials is OSDArray)
+ matsArr = OSMaterials as OSDArray;
+ else
+ return;
+ }
m_log.Info("[MaterialsDemoModule]: OSMaterials: " + OSDParser.SerializeJsonString(OSMaterials));
-
if (matsArr == null)
{
m_log.Info("[MaterialsDemoModule]: matsArr is null :( ");
@@ -215,7 +212,6 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
{
if (elemOsd != null && elemOsd is OSDMap)
{
-
OSDMap matMap = elemOsd as OSDMap;
if (matMap.ContainsKey("ID") && matMap.ContainsKey("Material"))
{
@@ -232,7 +228,6 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
}
}
-
void StoreMaterialsForPart(SceneObjectPart part)
{
try
@@ -277,7 +272,7 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
OSMaterials["Materials"] = matsArr;
lock (part.DynAttrs)
- part.DynAttrs["OS:Materials"] = OSMaterials;
+ part.DynAttrs.SetStore("OpenSim", "Materials", OSMaterials);
}
catch (Exception e)
{
@@ -285,7 +280,6 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
}
}
-
public string RenderMaterialsPostCap(string request, string path,
string param, IOSHttpRequest httpRequest,
IOSHttpResponse httpResponse)
--
cgit v1.1
From 149487ea0f74a46a70c98b3a31259b667f4d29b2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 27 Jun 2013 23:42:35 +0100
Subject: refactor: Move code for gathering textures referenced by materials
into MaterialsDemoModule from UuidGatherer
This code is now triggered via EventManager.OnGatherUuids which modules can subscribe to.
---
OpenSim/Region/Framework/Scenes/EventManager.cs | 31 ++++++++++
OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 69 +--------------------
.../Materials/MaterialsDemoModule.cs | 72 +++++++++++++++++++++-
3 files changed, 103 insertions(+), 69 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index a246319..720bfa9 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -1021,6 +1021,16 @@ namespace OpenSim.Region.Framework.Scenes
///
public event TeleportFail OnTeleportFail;
+ public delegate void GatherUuids(SceneObjectPart sop, IDictionary assetUuids);
+
+ ///
+ /// Triggered when UUIDs referenced by a scene object are being gathered for archiving, hg transfer, etc.
+ ///
+ ///
+ /// The listener should add references to the IDictionary as appropriate.
+ ///
+ public event GatherUuids OnGatherUuids;
+
public class MoneyTransferArgs : EventArgs
{
public UUID sender;
@@ -3237,5 +3247,26 @@ namespace OpenSim.Region.Framework.Scenes
}
}
}
+
+ public void TriggerGatherUuids(SceneObjectPart sop, IDictionary assetUuids)
+ {
+ GatherUuids handler = OnGatherUuids;
+
+ if (handler != null)
+ {
+ foreach (GatherUuids d in handler.GetInvocationList())
+ {
+ try
+ {
+ d(sop, assetUuids);
+ }
+ catch (Exception e)
+ {
+ m_log.ErrorFormat("[EVENT MANAGER]: Delegate for TriggerUuidGather failed - continuing {0} - {1}",
+ e.Message, e.StackTrace);
+ }
+ }
+ }
+ }
}
}
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 586b59d..3492813 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -186,8 +186,7 @@ namespace OpenSim.Region.Framework.Scenes
GatherAssetUuids(tii.AssetID, (AssetType)tii.Type, assetUuids);
}
- // get any texture UUIDs used for materials such as normal and specular maps
- GatherMaterialsUuids(part, assetUuids);
+ part.ParentGroup.Scene.EventManager.TriggerGatherUuids(part, assetUuids);
}
catch (Exception e)
{
@@ -211,71 +210,7 @@ namespace OpenSim.Region.Framework.Scenes
// Monitor.Pulse(this);
// }
// }
-
- ///
- /// Gather all of the texture asset UUIDs used to reference "Materials" such as normal and specular maps
- ///
- ///
- ///
- public void GatherMaterialsUuids(SceneObjectPart part, IDictionary assetUuids)
- {
- // scan thru the dynAttrs map of this part for any textures used as materials
- OSD osdMaterials = null;
-
- lock (part.DynAttrs)
- {
- if (part.DynAttrs.ContainsStore("OpenSim", "Materials"))
- {
- OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials");
- materialsStore.TryGetValue("Materials", out osdMaterials);
- }
-
- if (osdMaterials != null)
- {
- //m_log.Info("[UUID Gatherer]: found Materials: " + OSDParser.SerializeJsonString(osd));
-
- if (osdMaterials is OSDArray)
- {
- OSDArray matsArr = osdMaterials as OSDArray;
- foreach (OSDMap matMap in matsArr)
- {
- try
- {
- if (matMap.ContainsKey("Material"))
- {
- OSDMap mat = matMap["Material"] as OSDMap;
- if (mat.ContainsKey("NormMap"))
- {
- UUID normalMapId = mat["NormMap"].AsUUID();
- if (normalMapId != UUID.Zero)
- {
- assetUuids[normalMapId] = AssetType.Texture;
- //m_log.Info("[UUID Gatherer]: found normal map ID: " + normalMapId.ToString());
- }
- }
- if (mat.ContainsKey("SpecMap"))
- {
- UUID specularMapId = mat["SpecMap"].AsUUID();
- if (specularMapId != UUID.Zero)
- {
- assetUuids[specularMapId] = AssetType.Texture;
- //m_log.Info("[UUID Gatherer]: found specular map ID: " + specularMapId.ToString());
- }
- }
- }
-
- }
- catch (Exception e)
- {
- m_log.Warn("[UUID Gatherer]: exception getting materials: " + e.Message);
- }
- }
- }
- }
- }
- }
-
-
+
///
/// Get an asset synchronously, potentially using an asynchronous callback. If the
/// asynchronous callback is used, we will wait for it to complete.
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index 5b15a73..e7b8928 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -121,9 +121,11 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
return;
m_log.DebugFormat("[MaterialsDemoModule]: REGION {0} ADDED", scene.RegionInfo.RegionName);
+
m_scene = scene;
- m_scene.EventManager.OnRegisterCaps += new EventManager.RegisterCapsEvent(OnRegisterCaps);
- m_scene.EventManager.OnObjectAddedToScene += new Action(EventManager_OnObjectAddedToScene);
+ m_scene.EventManager.OnRegisterCaps += OnRegisterCaps;
+ m_scene.EventManager.OnObjectAddedToScene += EventManager_OnObjectAddedToScene;
+ m_scene.EventManager.OnGatherUuids += GatherMaterialsUuids;
}
void EventManager_OnObjectAddedToScene(SceneObjectGroup obj)
@@ -157,6 +159,10 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
if (!m_enabled)
return;
+ m_scene.EventManager.OnRegisterCaps -= OnRegisterCaps;
+ m_scene.EventManager.OnObjectAddedToScene -= EventManager_OnObjectAddedToScene;
+ m_scene.EventManager.OnGatherUuids -= GatherMaterialsUuids;
+
m_log.DebugFormat("[MaterialsDemoModule]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
}
@@ -569,5 +575,67 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
output.Flush();
}
+ ///
+ /// Gather all of the texture asset UUIDs used to reference "Materials" such as normal and specular maps
+ ///
+ ///
+ ///
+ private void GatherMaterialsUuids(SceneObjectPart part, IDictionary assetUuids)
+ {
+ // scan thru the dynAttrs map of this part for any textures used as materials
+ OSD osdMaterials = null;
+
+ lock (part.DynAttrs)
+ {
+ if (part.DynAttrs.ContainsStore("OpenSim", "Materials"))
+ {
+ OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials");
+ materialsStore.TryGetValue("Materials", out osdMaterials);
+ }
+
+ if (osdMaterials != null)
+ {
+ //m_log.Info("[UUID Gatherer]: found Materials: " + OSDParser.SerializeJsonString(osd));
+
+ if (osdMaterials is OSDArray)
+ {
+ OSDArray matsArr = osdMaterials as OSDArray;
+ foreach (OSDMap matMap in matsArr)
+ {
+ try
+ {
+ if (matMap.ContainsKey("Material"))
+ {
+ OSDMap mat = matMap["Material"] as OSDMap;
+ if (mat.ContainsKey("NormMap"))
+ {
+ UUID normalMapId = mat["NormMap"].AsUUID();
+ if (normalMapId != UUID.Zero)
+ {
+ assetUuids[normalMapId] = AssetType.Texture;
+ //m_log.Info("[UUID Gatherer]: found normal map ID: " + normalMapId.ToString());
+ }
+ }
+ if (mat.ContainsKey("SpecMap"))
+ {
+ UUID specularMapId = mat["SpecMap"].AsUUID();
+ if (specularMapId != UUID.Zero)
+ {
+ assetUuids[specularMapId] = AssetType.Texture;
+ //m_log.Info("[UUID Gatherer]: found specular map ID: " + specularMapId.ToString());
+ }
+ }
+ }
+
+ }
+ catch (Exception e)
+ {
+ m_log.Warn("[MaterialsDemoModule]: exception getting materials: " + e.Message);
+ }
+ }
+ }
+ }
+ }
+ }
}
}
\ No newline at end of file
--
cgit v1.1
From c1b8f83dd4ad3e3c811a16b4b096edab7abccf8e Mon Sep 17 00:00:00 2001
From: dahlia
Date: Thu, 27 Jun 2013 17:53:15 -0700
Subject: test for null return from DynAttrs.GetStore()
---
OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs | 3 +++
1 file changed, 3 insertions(+)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index e7b8928..be2d8da 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -590,6 +590,9 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
if (part.DynAttrs.ContainsStore("OpenSim", "Materials"))
{
OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials");
+ if (materialsStore == null)
+ return;
+
materialsStore.TryGetValue("Materials", out osdMaterials);
}
--
cgit v1.1
From d47fc48b3230b6d5cb555014d6242960cd397810 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Thu, 27 Jun 2013 18:01:17 -0700
Subject: and yet another check for null returned from DynAttrs.GetStore()
---
OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs | 4 ++++
1 file changed, 4 insertions(+)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index be2d8da..34dc552 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -197,6 +197,10 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
if (part.DynAttrs.ContainsStore("OpenSim", "Materials"))
{
OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials");
+
+ if (materialsStore == null)
+ return;
+
materialsStore.TryGetValue("Materials", out OSMaterials);
}
--
cgit v1.1
From f6ce87c96d037787963d203346c5cb1a1dd52747 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 28 Jun 2013 18:50:33 +0100
Subject: Reinsert code for gathering uuids reference by materials back
directly into UuidGatherer for now.
This cannot be triggered as an event from Scene.EventManager since some invocations of UuidGatherer (e.g. IAR saving) use scene objects which are not in scenes.
There needs to be some way for modules to register for events which are not connected with a particular scene.
---
OpenSim/Region/Framework/Scenes/EventManager.cs | 58 ++++-----
OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 71 ++++++++++-
.../Materials/MaterialsDemoModule.cs | 136 +++++++++++----------
3 files changed, 168 insertions(+), 97 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 720bfa9..61b0ebd 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -1021,15 +1021,15 @@ namespace OpenSim.Region.Framework.Scenes
///
public event TeleportFail OnTeleportFail;
- public delegate void GatherUuids(SceneObjectPart sop, IDictionary assetUuids);
-
- ///
- /// Triggered when UUIDs referenced by a scene object are being gathered for archiving, hg transfer, etc.
- ///
- ///
- /// The listener should add references to the IDictionary as appropriate.
- ///
- public event GatherUuids OnGatherUuids;
+// public delegate void GatherUuids(SceneObjectPart sop, IDictionary assetUuids);
+//
+// ///
+// /// Triggered when UUIDs referenced by a scene object are being gathered for archiving, hg transfer, etc.
+// ///
+// ///
+// /// The listener should add references to the IDictionary as appropriate.
+// ///
+// public event GatherUuids OnGatherUuids;
public class MoneyTransferArgs : EventArgs
{
@@ -3248,25 +3248,25 @@ namespace OpenSim.Region.Framework.Scenes
}
}
- public void TriggerGatherUuids(SceneObjectPart sop, IDictionary assetUuids)
- {
- GatherUuids handler = OnGatherUuids;
-
- if (handler != null)
- {
- foreach (GatherUuids d in handler.GetInvocationList())
- {
- try
- {
- d(sop, assetUuids);
- }
- catch (Exception e)
- {
- m_log.ErrorFormat("[EVENT MANAGER]: Delegate for TriggerUuidGather failed - continuing {0} - {1}",
- e.Message, e.StackTrace);
- }
- }
- }
- }
+// public void TriggerGatherUuids(SceneObjectPart sop, IDictionary assetUuids)
+// {
+// GatherUuids handler = OnGatherUuids;
+//
+// if (handler != null)
+// {
+// foreach (GatherUuids d in handler.GetInvocationList())
+// {
+// try
+// {
+// d(sop, assetUuids);
+// }
+// catch (Exception e)
+// {
+// m_log.ErrorFormat("[EVENT MANAGER]: Delegate for TriggerUuidGather failed - continuing {0} - {1}",
+// e.Message, e.StackTrace);
+// }
+// }
+// }
+// }
}
}
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 3492813..4e5fb8e 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -186,7 +186,13 @@ namespace OpenSim.Region.Framework.Scenes
GatherAssetUuids(tii.AssetID, (AssetType)tii.Type, assetUuids);
}
- part.ParentGroup.Scene.EventManager.TriggerGatherUuids(part, assetUuids);
+ // FIXME: We need to make gathering modular but we cannot yet, since gatherers are not guaranteed
+ // to be called with scene objects that are in a scene (e.g. in the case of hg asset mapping and
+ // inventory transfer. There needs to be a way for a module to register a method without assuming a
+ // Scene.EventManager is present.
+// part.ParentGroup.Scene.EventManager.TriggerGatherUuids(part, assetUuids);
+
+ GatherMaterialsUuids(part, assetUuids);
}
catch (Exception e)
{
@@ -210,6 +216,69 @@ namespace OpenSim.Region.Framework.Scenes
// Monitor.Pulse(this);
// }
// }
+
+ ///
+ /// Gather all of the texture asset UUIDs used to reference "Materials" such as normal and specular maps
+ ///
+ ///
+ ///
+ public void GatherMaterialsUuids(SceneObjectPart part, IDictionary assetUuids)
+ {
+ // scan thru the dynAttrs map of this part for any textures used as materials
+ OSD osdMaterials = null;
+
+ lock (part.DynAttrs)
+ {
+ if (part.DynAttrs.ContainsStore("OpenSim", "Materials"))
+ {
+ OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials");
+ materialsStore.TryGetValue("Materials", out osdMaterials);
+ }
+
+ if (osdMaterials != null)
+ {
+ //m_log.Info("[UUID Gatherer]: found Materials: " + OSDParser.SerializeJsonString(osd));
+
+ if (osdMaterials is OSDArray)
+ {
+ OSDArray matsArr = osdMaterials as OSDArray;
+ foreach (OSDMap matMap in matsArr)
+ {
+ try
+ {
+ if (matMap.ContainsKey("Material"))
+ {
+ OSDMap mat = matMap["Material"] as OSDMap;
+ if (mat.ContainsKey("NormMap"))
+ {
+ UUID normalMapId = mat["NormMap"].AsUUID();
+ if (normalMapId != UUID.Zero)
+ {
+ assetUuids[normalMapId] = AssetType.Texture;
+ //m_log.Info("[UUID Gatherer]: found normal map ID: " + normalMapId.ToString());
+ }
+ }
+ if (mat.ContainsKey("SpecMap"))
+ {
+ UUID specularMapId = mat["SpecMap"].AsUUID();
+ if (specularMapId != UUID.Zero)
+ {
+ assetUuids[specularMapId] = AssetType.Texture;
+ //m_log.Info("[UUID Gatherer]: found specular map ID: " + specularMapId.ToString());
+ }
+ }
+ }
+
+ }
+ catch (Exception e)
+ {
+ m_log.Warn("[UUID Gatherer]: exception getting materials: " + e.Message);
+ }
+ }
+ }
+ }
+ }
+ }
///
/// Get an asset synchronously, potentially using an asynchronous callback. If the
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index 34dc552..1cfbab0 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -125,7 +125,7 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
m_scene = scene;
m_scene.EventManager.OnRegisterCaps += OnRegisterCaps;
m_scene.EventManager.OnObjectAddedToScene += EventManager_OnObjectAddedToScene;
- m_scene.EventManager.OnGatherUuids += GatherMaterialsUuids;
+// m_scene.EventManager.OnGatherUuids += GatherMaterialsUuids;
}
void EventManager_OnObjectAddedToScene(SceneObjectGroup obj)
@@ -161,7 +161,7 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
m_scene.EventManager.OnRegisterCaps -= OnRegisterCaps;
m_scene.EventManager.OnObjectAddedToScene -= EventManager_OnObjectAddedToScene;
- m_scene.EventManager.OnGatherUuids -= GatherMaterialsUuids;
+// m_scene.EventManager.OnGatherUuids -= GatherMaterialsUuids;
m_log.DebugFormat("[MaterialsDemoModule]: REGION {0} REMOVED", scene.RegionInfo.RegionName);
}
@@ -579,70 +579,72 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
output.Flush();
}
- ///
- /// Gather all of the texture asset UUIDs used to reference "Materials" such as normal and specular maps
- ///
- ///
- ///
- private void GatherMaterialsUuids(SceneObjectPart part, IDictionary assetUuids)
- {
- // scan thru the dynAttrs map of this part for any textures used as materials
- OSD osdMaterials = null;
-
- lock (part.DynAttrs)
- {
- if (part.DynAttrs.ContainsStore("OpenSim", "Materials"))
- {
- OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials");
- if (materialsStore == null)
- return;
-
- materialsStore.TryGetValue("Materials", out osdMaterials);
- }
-
- if (osdMaterials != null)
- {
- //m_log.Info("[UUID Gatherer]: found Materials: " + OSDParser.SerializeJsonString(osd));
-
- if (osdMaterials is OSDArray)
- {
- OSDArray matsArr = osdMaterials as OSDArray;
- foreach (OSDMap matMap in matsArr)
- {
- try
- {
- if (matMap.ContainsKey("Material"))
- {
- OSDMap mat = matMap["Material"] as OSDMap;
- if (mat.ContainsKey("NormMap"))
- {
- UUID normalMapId = mat["NormMap"].AsUUID();
- if (normalMapId != UUID.Zero)
- {
- assetUuids[normalMapId] = AssetType.Texture;
- //m_log.Info("[UUID Gatherer]: found normal map ID: " + normalMapId.ToString());
- }
- }
- if (mat.ContainsKey("SpecMap"))
- {
- UUID specularMapId = mat["SpecMap"].AsUUID();
- if (specularMapId != UUID.Zero)
- {
- assetUuids[specularMapId] = AssetType.Texture;
- //m_log.Info("[UUID Gatherer]: found specular map ID: " + specularMapId.ToString());
- }
- }
- }
-
- }
- catch (Exception e)
- {
- m_log.Warn("[MaterialsDemoModule]: exception getting materials: " + e.Message);
- }
- }
- }
- }
- }
- }
+ // FIXME: This code is currently still in UuidGatherer since we cannot use Scene.EventManager as some
+ // calls to the gatherer are done for objects with no scene.
+// ///
+// /// Gather all of the texture asset UUIDs used to reference "Materials" such as normal and specular maps
+// ///
+// ///
+// ///
+// private void GatherMaterialsUuids(SceneObjectPart part, IDictionary assetUuids)
+// {
+// // scan thru the dynAttrs map of this part for any textures used as materials
+// OSD osdMaterials = null;
+//
+// lock (part.DynAttrs)
+// {
+// if (part.DynAttrs.ContainsStore("OpenSim", "Materials"))
+// {
+// OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials");
+// if (materialsStore == null)
+// return;
+//
+// materialsStore.TryGetValue("Materials", out osdMaterials);
+// }
+//
+// if (osdMaterials != null)
+// {
+// //m_log.Info("[UUID Gatherer]: found Materials: " + OSDParser.SerializeJsonString(osd));
+//
+// if (osdMaterials is OSDArray)
+// {
+// OSDArray matsArr = osdMaterials as OSDArray;
+// foreach (OSDMap matMap in matsArr)
+// {
+// try
+// {
+// if (matMap.ContainsKey("Material"))
+// {
+// OSDMap mat = matMap["Material"] as OSDMap;
+// if (mat.ContainsKey("NormMap"))
+// {
+// UUID normalMapId = mat["NormMap"].AsUUID();
+// if (normalMapId != UUID.Zero)
+// {
+// assetUuids[normalMapId] = AssetType.Texture;
+// //m_log.Info("[UUID Gatherer]: found normal map ID: " + normalMapId.ToString());
+// }
+// }
+// if (mat.ContainsKey("SpecMap"))
+// {
+// UUID specularMapId = mat["SpecMap"].AsUUID();
+// if (specularMapId != UUID.Zero)
+// {
+// assetUuids[specularMapId] = AssetType.Texture;
+// //m_log.Info("[UUID Gatherer]: found specular map ID: " + specularMapId.ToString());
+// }
+// }
+// }
+//
+// }
+// catch (Exception e)
+// {
+// m_log.Warn("[MaterialsDemoModule]: exception getting materials: " + e.Message);
+// }
+// }
+// }
+// }
+// }
+// }
}
}
\ No newline at end of file
--
cgit v1.1
From cbb51227296df9b158430d4a8adfcc96bdd55ed5 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Fri, 28 Jun 2013 14:00:28 -0700
Subject: add some locking to materials storage dictionary
---
.../Materials/MaterialsDemoModule.cs | 72 +++++++++++++---------
1 file changed, 42 insertions(+), 30 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index 34dc552..19d8141 100644
--- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
+++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -173,11 +173,14 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
OSDMap GetMaterial(UUID id)
{
OSDMap map = null;
- if (m_knownMaterials.ContainsKey(id))
+ lock (m_knownMaterials)
{
- map = new OSDMap();
- map["ID"] = OSD.FromBinary(id.GetBytes());
- map["Material"] = m_knownMaterials[id];
+ if (m_knownMaterials.ContainsKey(id))
+ {
+ map = new OSDMap();
+ map["ID"] = OSD.FromBinary(id.GetBytes());
+ map["Material"] = m_knownMaterials[id];
+ }
}
return map;
}
@@ -227,7 +230,8 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
{
try
{
- m_knownMaterials[matMap["ID"].AsUUID()] = (OSDMap)matMap["Material"];
+ lock (m_knownMaterials)
+ m_knownMaterials[matMap["ID"].AsUUID()] = (OSDMap)matMap["Material"];
}
catch (Exception e)
{
@@ -251,8 +255,11 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
if (te.DefaultTexture != null)
{
- if (m_knownMaterials.ContainsKey(te.DefaultTexture.MaterialID))
- mats[te.DefaultTexture.MaterialID] = m_knownMaterials[te.DefaultTexture.MaterialID];
+ lock (m_knownMaterials)
+ {
+ if (m_knownMaterials.ContainsKey(te.DefaultTexture.MaterialID))
+ mats[te.DefaultTexture.MaterialID] = m_knownMaterials[te.DefaultTexture.MaterialID];
+ }
}
if (te.FaceTextures != null)
@@ -261,8 +268,11 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
{
if (face != null)
{
- if (m_knownMaterials.ContainsKey(face.MaterialID))
- mats[face.MaterialID] = m_knownMaterials[face.MaterialID];
+ lock (m_knownMaterials)
+ {
+ if (m_knownMaterials.ContainsKey(face.MaterialID))
+ mats[face.MaterialID] = m_knownMaterials[face.MaterialID];
+ }
}
}
}
@@ -323,18 +333,21 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
try
{
UUID id = new UUID(elem.AsBinary(), 0);
-
- if (m_knownMaterials.ContainsKey(id))
+
+ lock (m_knownMaterials)
{
- m_log.Info("[MaterialsDemoModule]: request for known material ID: " + id.ToString());
- OSDMap matMap = new OSDMap();
- matMap["ID"] = OSD.FromBinary(id.GetBytes());
+ if (m_knownMaterials.ContainsKey(id))
+ {
+ m_log.Info("[MaterialsDemoModule]: request for known material ID: " + id.ToString());
+ OSDMap matMap = new OSDMap();
+ matMap["ID"] = OSD.FromBinary(id.GetBytes());
- matMap["Material"] = m_knownMaterials[id];
- respArr.Add(matMap);
+ matMap["Material"] = m_knownMaterials[id];
+ respArr.Add(matMap);
+ }
+ else
+ m_log.Info("[MaterialsDemoModule]: request for UNKNOWN material ID: " + id.ToString());
}
- else
- m_log.Info("[MaterialsDemoModule]: request for UNKNOWN material ID: " + id.ToString());
}
catch (Exception e)
{
@@ -372,7 +385,8 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
m_log.Debug("[MaterialsDemoModule]: mat: " + OSDParser.SerializeJsonString(mat));
UUID id = HashOsd(mat);
- m_knownMaterials[id] = mat;
+ lock (m_knownMaterials)
+ m_knownMaterials[id] = mat;
var sop = m_scene.GetSceneObjectPart(matLocalID);
@@ -480,24 +494,22 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
m_log.Debug("[MaterialsDemoModule]: GET cap handler");
OSDMap resp = new OSDMap();
-
-
int matsCount = 0;
-
OSDArray allOsd = new OSDArray();
- foreach (KeyValuePair kvp in m_knownMaterials)
+ lock (m_knownMaterials)
{
- OSDMap matMap = new OSDMap();
-
- matMap["ID"] = OSD.FromBinary(kvp.Key.GetBytes());
+ foreach (KeyValuePair kvp in m_knownMaterials)
+ {
+ OSDMap matMap = new OSDMap();
- matMap["Material"] = kvp.Value;
- allOsd.Add(matMap);
- matsCount++;
+ matMap["ID"] = OSD.FromBinary(kvp.Key.GetBytes());
+ matMap["Material"] = kvp.Value;
+ allOsd.Add(matMap);
+ matsCount++;
+ }
}
-
resp["Zipped"] = ZCompressOSD(allOsd, false);
m_log.Debug("[MaterialsDemoModule]: matsCount: " + matsCount.ToString());
--
cgit v1.1
From 371085546d93c610770abe1182e2add1d75cb16e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 28 Jun 2013 23:57:41 +0100
Subject: Add materials store null check into UuidGatherer code.
---
OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 4 ++++
1 file changed, 4 insertions(+)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 4e5fb8e..8f69ce3 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -232,6 +232,10 @@ namespace OpenSim.Region.Framework.Scenes
if (part.DynAttrs.ContainsStore("OpenSim", "Materials"))
{
OSDMap materialsStore = part.DynAttrs.GetStore("OpenSim", "Materials");
+
+ if (materialsStore == null)
+ return;
+
materialsStore.TryGetValue("Materials", out osdMaterials);
}
--
cgit v1.1
From 0c9702156581cd3948fe07bdae23f3530105d2b5 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 29 Jun 2013 21:05:45 -0700
Subject: More debug for mantis #6625. It looks like the home friends list is
being fetched on HG TPs.
---
.../CoreModules/Avatar/Friends/HGFriendsModule.cs | 41 +++++++++++-----------
1 file changed, 21 insertions(+), 20 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
index b3e3aa2..ae45b99 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
@@ -183,6 +183,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
if (Util.ParseUniversalUserIdentifier(finfo.Friend, out id, out url, out first, out last, out tmp))
{
IUserManagement uMan = m_Scenes[0].RequestModuleInterface();
+ m_log.DebugFormat("[HGFRIENDS MODULE]: caching {0}", finfo.Friend);
uMan.AddUser(id, url + ";" + first + " " + last);
}
}
@@ -347,31 +348,31 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
return null;
}
- public override FriendInfo[] GetFriendsFromService(IClientAPI client)
- {
-// m_log.DebugFormat("[HGFRIENDS MODULE]: Entering GetFriendsFromService for {0}", client.Name);
- Boolean agentIsLocal = true;
- if (UserManagementModule != null)
- agentIsLocal = UserManagementModule.IsLocalGridUser(client.AgentId);
+// public override FriendInfo[] GetFriendsFromService(IClientAPI client)
+// {
+//// m_log.DebugFormat("[HGFRIENDS MODULE]: Entering GetFriendsFromService for {0}", client.Name);
+// Boolean agentIsLocal = true;
+// if (UserManagementModule != null)
+// agentIsLocal = UserManagementModule.IsLocalGridUser(client.AgentId);
- if (agentIsLocal)
- return base.GetFriendsFromService(client);
+// if (agentIsLocal)
+// return base.GetFriendsFromService(client);
- FriendInfo[] finfos = new FriendInfo[0];
- // Foreigner
- AgentCircuitData agentClientCircuit = ((Scene)(client.Scene)).AuthenticateHandler.GetAgentCircuitData(client.CircuitCode);
- if (agentClientCircuit != null)
- {
- //[XXX] string agentUUI = Util.ProduceUserUniversalIdentifier(agentClientCircuit);
+// FriendInfo[] finfos = new FriendInfo[0];
+// // Foreigner
+// AgentCircuitData agentClientCircuit = ((Scene)(client.Scene)).AuthenticateHandler.GetAgentCircuitData(client.CircuitCode);
+// if (agentClientCircuit != null)
+// {
+// //[XXX] string agentUUI = Util.ProduceUserUniversalIdentifier(agentClientCircuit);
- finfos = FriendsService.GetFriends(client.AgentId.ToString());
- m_log.DebugFormat("[HGFRIENDS MODULE]: Fetched {0} local friends for visitor {1}", finfos.Length, client.AgentId.ToString());
- }
+// finfos = FriendsService.GetFriends(client.AgentId.ToString());
+// m_log.DebugFormat("[HGFRIENDS MODULE]: Fetched {0} local friends for visitor {1}", finfos.Length, client.AgentId.ToString());
+// }
-// m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting GetFriendsFromService for {0}", client.Name);
+//// m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting GetFriendsFromService for {0}", client.Name);
- return finfos;
- }
+// return finfos;
+// }
protected override bool StoreRights(UUID agentID, UUID friendID, int rights)
{
--
cgit v1.1
From 8fa5d12fcb73ffcc7144009e0147febcfa3ce704 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 29 Jun 2013 21:26:58 -0700
Subject: One more debug mantis #6625
---
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 1 +
1 file changed, 1 insertion(+)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 41ea2a2..50371ce 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -292,6 +292,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
friendsData = new UserFriendData();
friendsData.PrincipalID = agentID;
friendsData.Friends = GetFriendsFromService(client);
+ m_log.DebugFormat("[FRIENDS MODULE]: User has {1} friends", friendsData.Friends.Length);
friendsData.Refcount = 1;
m_Friends[agentID] = friendsData;
--
cgit v1.1
From c462e0a51ce04a580eab49df6c679c20eff74c8d Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 29 Jun 2013 21:30:07 -0700
Subject: Fixed previous debug message
---
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 50371ce..d9d302c 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -292,7 +292,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
friendsData = new UserFriendData();
friendsData.PrincipalID = agentID;
friendsData.Friends = GetFriendsFromService(client);
- m_log.DebugFormat("[FRIENDS MODULE]: User has {1} friends", friendsData.Friends.Length);
+ m_log.DebugFormat("[FRIENDS MODULE]: User has {0} friends", friendsData.Friends.Length);
friendsData.Refcount = 1;
m_Friends[agentID] = friendsData;
--
cgit v1.1
From 74e7fac13fcb5d15d469d27694fc89d5f784ade0 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 29 Jun 2013 22:32:26 -0700
Subject: More on mantis #6625
---
.../ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
index 2d3ba82..70ba944 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteXInventoryServiceConnector.cs
@@ -204,7 +204,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
Util.FireAndForget(delegate
{
foreach (InventoryItemBase item in items)
- UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData);
+ if (!string.IsNullOrEmpty(item.CreatorData))
+ UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData);
});
}
--
cgit v1.1
From 1fc873d09fbc0d29e35d2a8f34c134bb8ac01480 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 30 Jun 2013 07:21:22 -0700
Subject: Same fix to LocalInventoryServiceConnector.cs
---
.../ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
index ec5751d..99913a9 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
@@ -196,7 +196,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
Util.FireAndForget(delegate
{
foreach (InventoryItemBase item in items)
- UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData);
+ if (!string.IsNullOrEmpty(item.CreatorData))
+ UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData);
});
}
--
cgit v1.1
From 1e97972f78a852f24664f730f2e502c3b8a680c8 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 30 Jun 2013 07:25:13 -0700
Subject: Revert "One more debug mantis #6625"
This reverts commit 8fa5d12fcb73ffcc7144009e0147febcfa3ce704.
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
---
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 1 -
1 file changed, 1 deletion(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index d9d302c..41ea2a2 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -292,7 +292,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
friendsData = new UserFriendData();
friendsData.PrincipalID = agentID;
friendsData.Friends = GetFriendsFromService(client);
- m_log.DebugFormat("[FRIENDS MODULE]: User has {0} friends", friendsData.Friends.Length);
friendsData.Refcount = 1;
m_Friends[agentID] = friendsData;
--
cgit v1.1