aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs24
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 4d19d72..f27d0ab 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -1078,7 +1078,7 @@ namespace OpenSim.Region.Environment.Scenes
1078 } 1078 }
1079 } 1079 }
1080 1080
1081 1081
1082 /// <summary> 1082 /// <summary>
1083 /// Called when an object is removed from the environment into inventory. 1083 /// Called when an object is removed from the environment into inventory.
1084 /// </summary> 1084 /// </summary>
@@ -1087,7 +1087,7 @@ namespace OpenSim.Region.Environment.Scenes
1087 public virtual void DeRezObject(Packet packet, IClientAPI remoteClient) 1087 public virtual void DeRezObject(Packet packet, IClientAPI remoteClient)
1088 { 1088 {
1089 DeRezObjectPacket DeRezPacket = (DeRezObjectPacket) packet; 1089 DeRezObjectPacket DeRezPacket = (DeRezObjectPacket) packet;
1090 1090
1091 LLUUID folderID = LLUUID.Zero; 1091 LLUUID folderID = LLUUID.Zero;
1092 1092
1093 foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData) 1093 foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData)
@@ -1128,7 +1128,7 @@ namespace OpenSim.Region.Environment.Scenes
1128 1128
1129 else if (DeRezPacket.AgentBlock.Destination == 6) //Delete 1129 else if (DeRezPacket.AgentBlock.Destination == 6) //Delete
1130 { 1130 {
1131 permissionToTake = ExternalChecks.ExternalChecksCanDeleteObject(((SceneObjectGroup)selectedEnt).UUID, remoteClient.AgentId); 1131 permissionToTake = ExternalChecks.ExternalChecksCanDeleteObject(((SceneObjectGroup)selectedEnt).UUID, remoteClient.AgentId);
1132 permissionToDelete = ExternalChecks.ExternalChecksCanDeleteObject(((SceneObjectGroup)selectedEnt).UUID, remoteClient.AgentId); 1132 permissionToDelete = ExternalChecks.ExternalChecksCanDeleteObject(((SceneObjectGroup)selectedEnt).UUID, remoteClient.AgentId);
1133 } 1133 }
1134 else if (DeRezPacket.AgentBlock.Destination == 9) //Return 1134 else if (DeRezPacket.AgentBlock.Destination == 9) //Return
@@ -1251,7 +1251,7 @@ namespace OpenSim.Region.Environment.Scenes
1251 DeleteSceneObject(objectGroup); 1251 DeleteSceneObject(objectGroup);
1252 } 1252 }
1253 } 1253 }
1254 } 1254 }
1255 } 1255 }
1256 1256
1257 public void updateKnownAsset(IClientAPI remoteClient, SceneObjectGroup grp, LLUUID assetID, LLUUID agentID) 1257 public void updateKnownAsset(IClientAPI remoteClient, SceneObjectGroup grp, LLUUID assetID, LLUUID agentID)
@@ -1494,7 +1494,7 @@ namespace OpenSim.Region.Environment.Scenes
1494 } 1494 }
1495 1495
1496 group.ResetIDs(); 1496 group.ResetIDs();
1497 1497
1498 AddSceneObject(group); 1498 AddSceneObject(group);
1499 1499
1500 // if attachment we set it's asset id so object updates can reflect that 1500 // if attachment we set it's asset id so object updates can reflect that
@@ -1583,7 +1583,7 @@ namespace OpenSim.Region.Environment.Scenes
1583 } 1583 }
1584 } 1584 }
1585 } 1585 }
1586 1586
1587 return null; 1587 return null;
1588 } 1588 }
1589 1589
@@ -1606,7 +1606,7 @@ namespace OpenSim.Region.Environment.Scenes
1606 return null; 1606 return null;
1607 } 1607 }
1608 group.ResetIDs(); 1608 group.ResetIDs();
1609 1609
1610 AddSceneObject(group); 1610 AddSceneObject(group);
1611 1611
1612 // Set the startup parameter for on_rez event and llGetStartParameter() function 1612 // Set the startup parameter for on_rez event and llGetStartParameter() function
@@ -1674,7 +1674,7 @@ namespace OpenSim.Region.Environment.Scenes
1674 if (returnobjects.Length <= 0) 1674 if (returnobjects.Length <= 0)
1675 return false; 1675 return false;
1676 1676
1677 // for the moment we're going to store them individually.. however, in the future, the rezObject 1677 // for the moment we're going to store them individually.. however, in the future, the rezObject
1678 // will be able to have more items. 1678 // will be able to have more items.
1679 1679
1680 //string returnstring = ""; 1680 //string returnstring = "";
@@ -1684,9 +1684,9 @@ namespace OpenSim.Region.Environment.Scenes
1684 // returnstring += grp.ToXmlString2(); 1684 // returnstring += grp.ToXmlString2();
1685 //} 1685 //}
1686 //returnstring += "</scene>\n"; 1686 //returnstring += "</scene>\n";
1687
1688 1687
1689 1688
1689
1690 1690
1691 bool permissionToDelete = false; 1691 bool permissionToDelete = false;
1692 1692
@@ -1697,7 +1697,7 @@ namespace OpenSim.Region.Environment.Scenes
1697 if (userInfo == null) 1697 if (userInfo == null)
1698 { 1698 {
1699 CommsManager.UserProfileCacheService.AddNewUser(returnobjects[i].OwnerID); 1699 CommsManager.UserProfileCacheService.AddNewUser(returnobjects[i].OwnerID);
1700 1700
1701 } 1701 }
1702 if (userInfo != null) 1702 if (userInfo != null)
1703 { 1703 {
@@ -1807,7 +1807,7 @@ namespace OpenSim.Region.Environment.Scenes
1807 returningavatar.ControllingClient.SendAlertMessage(message); 1807 returningavatar.ControllingClient.SendAlertMessage(message);
1808 } 1808 }
1809 return false; 1809 return false;
1810 } 1810 }
1811 return true; 1811 return true;
1812 1812
1813 } 1813 }