aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJeff Ames2007-11-17 08:14:17 +0000
committerJeff Ames2007-11-17 08:14:17 +0000
commita47328973866d0cdd4503f1bcfa5da6183f0f0b0 (patch)
tree33a54285c398311f180bda6ba0469071849fdcac
parentadded some POS gravity (diff)
downloadopensim-SC_OLD-a47328973866d0cdd4503f1bcfa5da6183f0f0b0.zip
opensim-SC_OLD-a47328973866d0cdd4503f1bcfa5da6183f0f0b0.tar.gz
opensim-SC_OLD-a47328973866d0cdd4503f1bcfa5da6183f0f0b0.tar.bz2
opensim-SC_OLD-a47328973866d0cdd4503f1bcfa5da6183f0f0b0.tar.xz
minor cleanup of some dodgy bits
-rw-r--r--OpenSim/Framework/ConfigurationMember.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs37
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs11
3 files changed, 16 insertions, 34 deletions
diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs
index 8e46a04..15008ae 100644
--- a/OpenSim/Framework/ConfigurationMember.cs
+++ b/OpenSim/Framework/ConfigurationMember.cs
@@ -199,7 +199,7 @@ namespace OpenSim.Framework
199 { 199 {
200 string console_result = ""; 200 string console_result = "";
201 string attribute = null; 201 string attribute = null;
202 if (useFile || (!useFile && configurationFromXMLNode != null)) 202 if (useFile || configurationFromXMLNode != null)
203 { 203 {
204 if (!ignoreNextFromConfig) 204 if (!ignoreNextFromConfig)
205 { 205 {
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index f840845..c811966 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -283,6 +283,13 @@ namespace OpenSim.Region.Environment.Scenes
283 isTexture = true; 283 isTexture = true;
284 } 284 }
285 AssetBase rezAsset = AssetCache.GetAsset(item.assetID, isTexture); 285 AssetBase rezAsset = AssetCache.GetAsset(item.assetID, isTexture);
286
287 if (rezAsset == null)
288 {
289 // lets try once more in case the asset cache is being slow getting the asset from server
290 rezAsset = AssetCache.GetAsset(item.assetID, isTexture);
291 }
292
286 if (rezAsset != null) 293 if (rezAsset != null)
287 { 294 {
288 string script = Util.FieldToString(rezAsset.Data); 295 string script = Util.FieldToString(rezAsset.Data);
@@ -290,18 +297,6 @@ namespace OpenSim.Region.Environment.Scenes
290 EventManager.TriggerRezScript(localID, copyID, script); 297 EventManager.TriggerRezScript(localID, copyID, script);
291 rezzed = true; 298 rezzed = true;
292 } 299 }
293 else
294 {
295 //lets try once more incase the asset cache is being slow getting the asset from server
296 rezAsset = AssetCache.GetAsset(item.assetID, isTexture);
297 if (rezAsset != null)
298 {
299 string script = Util.FieldToString(rezAsset.Data);
300 // Console.WriteLine("rez script " + script);
301 EventManager.TriggerRezScript(localID, copyID, script);
302 rezzed = true;
303 }
304 }
305 300
306 if (rezzed) 301 if (rezzed)
307 { 302 {
@@ -418,23 +413,19 @@ namespace OpenSim.Region.Environment.Scenes
418 if (item != null) 413 if (item != null)
419 { 414 {
420 AssetBase rezAsset = AssetCache.GetAsset(item.assetID, false); 415 AssetBase rezAsset = AssetCache.GetAsset(item.assetID, false);
416
417 if (rezAsset == null)
418 {
419 // lets try once more in case the asset cache is being slow getting the asset from server
420 rezAsset = AssetCache.GetAsset(item.assetID, false);
421 }
422
421 if (rezAsset != null) 423 if (rezAsset != null)
422 { 424 {
423 AddRezObject(Util.FieldToString(rezAsset.Data), pos); 425 AddRezObject(Util.FieldToString(rezAsset.Data), pos);
424 userInfo.DeleteItem(remoteClient.AgentId, item); 426 userInfo.DeleteItem(remoteClient.AgentId, item);
425 remoteClient.SendRemoveInventoryItem(itemID); 427 remoteClient.SendRemoveInventoryItem(itemID);
426 } 428 }
427 else
428 {
429 //lets try once more incase the asset cache is being slow getting the asset from server
430 rezAsset = AssetCache.GetAsset(item.assetID, false);
431 if (rezAsset != null)
432 {
433 AddRezObject(Util.FieldToString(rezAsset.Data), pos);
434 userInfo.DeleteItem(remoteClient.AgentId, item);
435 remoteClient.SendRemoveInventoryItem(itemID);
436 }
437 }
438 } 429 }
439 } 430 }
440 } 431 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 61cc973..b2e585d 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -62,7 +62,6 @@ namespace OpenSim.Region.Environment.Scenes
62 public Int32 CreationDate; 62 public Int32 CreationDate;
63 public uint ParentID = 0; 63 public uint ParentID = 0;
64 64
65
66 public uint OwnerMask = FULL_MASK_PERMISSIONS; 65 public uint OwnerMask = FULL_MASK_PERMISSIONS;
67 public uint NextOwnerMask = FULL_MASK_PERMISSIONS; 66 public uint NextOwnerMask = FULL_MASK_PERMISSIONS;
68 public uint GroupMask = FULL_MASK_PERMISSIONS; 67 public uint GroupMask = FULL_MASK_PERMISSIONS;
@@ -913,7 +912,7 @@ namespace OpenSim.Region.Environment.Scenes
913 /// that's not wholesome. Had to make m_scene public 912 /// that's not wholesome. Had to make m_scene public
914 PhysActor = null; 913 PhysActor = null;
915 914
916 if (!((ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) != 0)) 915 if ((ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) == 0)
917 { 916 {
918 PhysActor = m_parentGroup.m_scene.PhysScene.AddPrimShape( 917 PhysActor = m_parentGroup.m_scene.PhysScene.AddPrimShape(
919 Name, 918 Name,
@@ -929,15 +928,7 @@ namespace OpenSim.Region.Environment.Scenes
929 PhysActor.OnOutOfBounds += PhysicsOutOfBounds; 928 PhysActor.OnOutOfBounds += PhysicsOutOfBounds;
930 } 929 }
931 } 930 }
932
933
934
935 } 931 }
936
937
938
939
940
941 } 932 }
942 933
943 public void UpdateExtraParam(ushort type, bool inUse, byte[] data) 934 public void UpdateExtraParam(ushort type, bool inUse, byte[] data)