OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

minor cleanup of some dodgy bits

afrisby
Jeff Ames 2007-11-17 08:14:17 +00:00
parent ba9b317122
commit a473289738
3 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/ConfigurationMember.cs
View File

@ -199,7 +199,7 @@ namespace OpenSim.Framework
{ {
string console_result = ""; string console_result = "";
string attribute = null; string attribute = null;
if (useFile || (!useFile && configurationFromXMLNode != null)) if (useFile || configurationFromXMLNode != null)
{ {
if (!ignoreNextFromConfig) if (!ignoreNextFromConfig)
{ {

37
OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
View File

@ -283,6 +283,13 @@ namespace OpenSim.Region.Environment.Scenes
isTexture = true; isTexture = true;
} }
AssetBase rezAsset = AssetCache.GetAsset(item.assetID, isTexture); AssetBase rezAsset = AssetCache.GetAsset(item.assetID, isTexture);
if (rezAsset == null)
{
// lets try once more in case the asset cache is being slow getting the asset from server
rezAsset = AssetCache.GetAsset(item.assetID, isTexture);
}
if (rezAsset != null) if (rezAsset != null)
{ {
string script = Util.FieldToString(rezAsset.Data); string script = Util.FieldToString(rezAsset.Data);
@ -290,18 +297,6 @@ namespace OpenSim.Region.Environment.Scenes
EventManager.TriggerRezScript(localID, copyID, script); EventManager.TriggerRezScript(localID, copyID, script);
rezzed = true; rezzed = true;
} }
else
{
//lets try once more incase the asset cache is being slow getting the asset from server
rezAsset = AssetCache.GetAsset(item.assetID, isTexture);
if (rezAsset != null)
{
string script = Util.FieldToString(rezAsset.Data);
// Console.WriteLine("rez script " + script);
EventManager.TriggerRezScript(localID, copyID, script);
rezzed = true;
}
}
if (rezzed) if (rezzed)
{ {
@ -418,23 +413,19 @@ namespace OpenSim.Region.Environment.Scenes
if (item != null) if (item != null)
{ {
AssetBase rezAsset = AssetCache.GetAsset(item.assetID, false); AssetBase rezAsset = AssetCache.GetAsset(item.assetID, false);
if (rezAsset == null)
{
// lets try once more in case the asset cache is being slow getting the asset from server
rezAsset = AssetCache.GetAsset(item.assetID, false);
}
if (rezAsset != null) if (rezAsset != null)
{ {
AddRezObject(Util.FieldToString(rezAsset.Data), pos); AddRezObject(Util.FieldToString(rezAsset.Data), pos);
userInfo.DeleteItem(remoteClient.AgentId, item); userInfo.DeleteItem(remoteClient.AgentId, item);
remoteClient.SendRemoveInventoryItem(itemID); remoteClient.SendRemoveInventoryItem(itemID);
} }
else
{
//lets try once more incase the asset cache is being slow getting the asset from server
rezAsset = AssetCache.GetAsset(item.assetID, false);
if (rezAsset != null)
{
AddRezObject(Util.FieldToString(rezAsset.Data), pos);
userInfo.DeleteItem(remoteClient.AgentId, item);
remoteClient.SendRemoveInventoryItem(itemID);
}
}
} }
} }
} }

11
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@ -62,7 +62,6 @@ namespace OpenSim.Region.Environment.Scenes
public Int32 CreationDate; public Int32 CreationDate;
public uint ParentID = 0; public uint ParentID = 0;
public uint OwnerMask = FULL_MASK_PERMISSIONS; public uint OwnerMask = FULL_MASK_PERMISSIONS;
public uint NextOwnerMask = FULL_MASK_PERMISSIONS; public uint NextOwnerMask = FULL_MASK_PERMISSIONS;
public uint GroupMask = FULL_MASK_PERMISSIONS; public uint GroupMask = FULL_MASK_PERMISSIONS;
@ -913,7 +912,7 @@ namespace OpenSim.Region.Environment.Scenes
/// that's not wholesome. Had to make m_scene public /// that's not wholesome. Had to make m_scene public
PhysActor = null; PhysActor = null;
if (!((ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) != 0)) if ((ObjectFlags & (uint)LLObject.ObjectFlags.Phantom) == 0)
{ {
PhysActor = m_parentGroup.m_scene.PhysScene.AddPrimShape( PhysActor = m_parentGroup.m_scene.PhysScene.AddPrimShape(
Name, Name,
@ -929,15 +928,7 @@ namespace OpenSim.Region.Environment.Scenes
PhysActor.OnOutOfBounds += PhysicsOutOfBounds; PhysActor.OnOutOfBounds += PhysicsOutOfBounds;
} }
} }
} }
} }
public void UpdateExtraParam(ushort type, bool inUse, byte[] data) public void UpdateExtraParam(ushort type, bool inUse, byte[] data)