Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: Justin Clark-Casey (justincc) 2013-06-28 23:35:44 +0100
committer: Justin Clark-Casey (justincc) 2013-06-28 23:35:44 +0100
commit: eed15703edeb3a25e76e095aa0da6e2eba106f9c (patch)
tree: cf2df480757c7f6afbc04352d59fc6279bd5bf85
parent: Add IMG_BLOOM1.jp2 to standard asset set, which is used in stars. (diff)
parent: Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
download: opensim-SC-eed15703edeb3a25e76e095aa0da6e2eba106f9c.zip
opensim-SC-eed15703edeb3a25e76e095aa0da6e2eba106f9c.tar.gz
opensim-SC-eed15703edeb3a25e76e095aa0da6e2eba106f9c.tar.bz2
opensim-SC-eed15703edeb3a25e76e095aa0da6e2eba106f9c.tar.xz
1 files changed, 42 insertions, 30 deletions
diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
index 1cfbab0..3a39971 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();
+                if (m_knownMaterials.ContainsKey(id))
-                map["ID"] = OSD.FromBinary(id.GetBytes());
+                {
-                map["Material"] = m_knownMaterials[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))
+                    lock (m_knownMaterials)
-                        mats[te.DefaultTexture.MaterialID] = m_knownMaterials[te.DefaultTexture.MaterialID];
+                    {
+                        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))
+                            lock (m_knownMaterials)
-                                mats[face.MaterialID] = m_knownMaterials[face.MaterialID];
+                            {
+                                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());
+                                        if (m_knownMaterials.ContainsKey(id))
-                                        OSDMap matMap = new OSDMap();
+                                        {
-                                        matMap["ID"] = OSD.FromBinary(id.GetBytes());
+                                            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];
+                                            matMap["Material"] = m_knownMaterials[id];
-                                        respArr.Add(matMap);
+                                            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<UUID, OSDMap> kvp in m_knownMaterials)
+            lock (m_knownMaterials)
            {
-                OSDMap matMap = new OSDMap();
+                foreach (KeyValuePair<UUID, OSDMap> kvp in m_knownMaterials)
+                {
-                matMap["ID"] = OSD.FromBinary(kvp.Key.GetBytes());
+                    OSDMap matMap = new OSDMap();
-                matMap["Material"] = kvp.Value;
+                    matMap["ID"] = OSD.FromBinary(kvp.Key.GetBytes());
-                allOsd.Add(matMap);
+                    matMap["Material"] = kvp.Value;
-                matsCount++;
+                    allOsd.Add(matMap);
+                    matsCount++;
+                }
            }
            resp["Zipped"] = ZCompressOSD(allOsd, false);
            m_log.Debug("[MaterialsDemoModule]: matsCount: " + matsCount.ToString());
author	Justin Clark-Casey (justincc)	2013-06-28 23:35:44 +0100
committer	Justin Clark-Casey (justincc)	2013-06-28 23:35:44 +0100
commit	eed15703edeb3a25e76e095aa0da6e2eba106f9c (patch)
tree	cf2df480757c7f6afbc04352d59fc6279bd5bf85
parent	Add IMG_BLOOM1.jp2 to standard asset set, which is used in stars. (diff)
parent	Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
download	opensim-SC-eed15703edeb3a25e76e095aa0da6e2eba106f9c.zip opensim-SC-eed15703edeb3a25e76e095aa0da6e2eba106f9c.tar.gz opensim-SC-eed15703edeb3a25e76e095aa0da6e2eba106f9c.tar.bz2 opensim-SC-eed15703edeb3a25e76e095aa0da6e2eba106f9c.tar.xz

diff --git a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs index 1cfbab0..3a39971 100644 --- a/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs +++ b/OpenSim/Region/OptionalModules/Materials/MaterialsDemoModule.cs
@@ -173,11 +173,14 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
173	OSDMap GetMaterial(UUID id)	173	OSDMap GetMaterial(UUID id)
174	{	174	{
175	OSDMap map = null;	175	OSDMap map = null;
176	if (m_knownMaterials.ContainsKey(id))	176	lock (m_knownMaterials)
177	{	177	{
178	map = new OSDMap();	178	if (m_knownMaterials.ContainsKey(id))
179	map["ID"] = OSD.FromBinary(id.GetBytes());	179	{
180	map["Material"] = m_knownMaterials[id];	180	map = new OSDMap();
		181	map["ID"] = OSD.FromBinary(id.GetBytes());
		182	map["Material"] = m_knownMaterials[id];
		183	}
181	}	184	}
182	return map;	185	return map;
183	}	186	}
@@ -227,7 +230,8 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
227	{	230	{
228	try	231	try
229	{	232	{
230	m_knownMaterials[matMap["ID"].AsUUID()] = (OSDMap)matMap["Material"];	233	lock (m_knownMaterials)
		234	m_knownMaterials[matMap["ID"].AsUUID()] = (OSDMap)matMap["Material"];
231	}	235	}
232	catch (Exception e)	236	catch (Exception e)
233	{	237	{
@@ -251,8 +255,11 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
251		255
252	if (te.DefaultTexture != null)	256	if (te.DefaultTexture != null)
253	{	257	{
254	if (m_knownMaterials.ContainsKey(te.DefaultTexture.MaterialID))	258	lock (m_knownMaterials)
255	mats[te.DefaultTexture.MaterialID] = m_knownMaterials[te.DefaultTexture.MaterialID];	259	{
		260	if (m_knownMaterials.ContainsKey(te.DefaultTexture.MaterialID))
		261	mats[te.DefaultTexture.MaterialID] = m_knownMaterials[te.DefaultTexture.MaterialID];
		262	}
256	}	263	}
257		264
258	if (te.FaceTextures != null)	265	if (te.FaceTextures != null)
@@ -261,8 +268,11 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
261	{	268	{
262	if (face != null)	269	if (face != null)
263	{	270	{
264	if (m_knownMaterials.ContainsKey(face.MaterialID))	271	lock (m_knownMaterials)
265	mats[face.MaterialID] = m_knownMaterials[face.MaterialID];	272	{
		273	if (m_knownMaterials.ContainsKey(face.MaterialID))
		274	mats[face.MaterialID] = m_knownMaterials[face.MaterialID];
		275	}
266	}	276	}
267	}	277	}
268	}	278	}
@@ -323,18 +333,21 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
323	try	333	try
324	{	334	{
325	UUID id = new UUID(elem.AsBinary(), 0);	335	UUID id = new UUID(elem.AsBinary(), 0);
326		336
327	if (m_knownMaterials.ContainsKey(id))	337	lock (m_knownMaterials)
328	{	338	{
329	m_log.Info("[MaterialsDemoModule]: request for known material ID: " + id.ToString());	339	if (m_knownMaterials.ContainsKey(id))
330	OSDMap matMap = new OSDMap();	340	{
331	matMap["ID"] = OSD.FromBinary(id.GetBytes());	341	m_log.Info("[MaterialsDemoModule]: request for known material ID: " + id.ToString());
		342	OSDMap matMap = new OSDMap();
		343	matMap["ID"] = OSD.FromBinary(id.GetBytes());
332		344
333	matMap["Material"] = m_knownMaterials[id];	345	matMap["Material"] = m_knownMaterials[id];
334	respArr.Add(matMap);	346	respArr.Add(matMap);
		347	}
		348	else
		349	m_log.Info("[MaterialsDemoModule]: request for UNKNOWN material ID: " + id.ToString());
335	}	350	}
336	else
337	m_log.Info("[MaterialsDemoModule]: request for UNKNOWN material ID: " + id.ToString());
338	}	351	}
339	catch (Exception e)	352	catch (Exception e)
340	{	353	{
@@ -372,7 +385,8 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
372	m_log.Debug("[MaterialsDemoModule]: mat: " + OSDParser.SerializeJsonString(mat));	385	m_log.Debug("[MaterialsDemoModule]: mat: " + OSDParser.SerializeJsonString(mat));
373		386
374	UUID id = HashOsd(mat);	387	UUID id = HashOsd(mat);
375	m_knownMaterials[id] = mat;	388	lock (m_knownMaterials)
		389	m_knownMaterials[id] = mat;
376		390
377		391
378	var sop = m_scene.GetSceneObjectPart(matLocalID);	392	var sop = m_scene.GetSceneObjectPart(matLocalID);
@@ -480,24 +494,22 @@ namespace OpenSim.Region.OptionalModules.MaterialsDemoModule
480	m_log.Debug("[MaterialsDemoModule]: GET cap handler");	494	m_log.Debug("[MaterialsDemoModule]: GET cap handler");
481		495
482	OSDMap resp = new OSDMap();	496	OSDMap resp = new OSDMap();
483
484
485	int matsCount = 0;	497	int matsCount = 0;
486
487	OSDArray allOsd = new OSDArray();	498	OSDArray allOsd = new OSDArray();
488		499
489	foreach (KeyValuePair<UUID, OSDMap> kvp in m_knownMaterials)	500	lock (m_knownMaterials)
490	{	501	{
491	OSDMap matMap = new OSDMap();	502	foreach (KeyValuePair<UUID, OSDMap> kvp in m_knownMaterials)
492		503	{
493	matMap["ID"] = OSD.FromBinary(kvp.Key.GetBytes());	504	OSDMap matMap = new OSDMap();
494		505
495	matMap["Material"] = kvp.Value;	506	matMap["ID"] = OSD.FromBinary(kvp.Key.GetBytes());
496	allOsd.Add(matMap);	507	matMap["Material"] = kvp.Value;
497	matsCount++;	508	allOsd.Add(matMap);
		509	matsCount++;
		510	}
498	}	511	}
499		512
500
501	resp["Zipped"] = ZCompressOSD(allOsd, false);	513	resp["Zipped"] = ZCompressOSD(allOsd, false);
502	m_log.Debug("[MaterialsDemoModule]: matsCount: " + matsCount.ToString());	514	m_log.Debug("[MaterialsDemoModule]: matsCount: " + matsCount.ToString());
503		515