aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
diff options
context:
space:
mode:
authorMelanie Thielker2017-01-05 19:07:37 +0000
committerMelanie Thielker2017-01-05 19:07:37 +0000
commitb16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch)
tree6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
parentMake it possible to disable the bakes module in the way it is described in co... (diff)
downloadopensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip
opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz
opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2
opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs26
1 files changed, 13 insertions, 13 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
index 98617d1..9f98554 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
@@ -114,9 +114,9 @@ namespace OpenSim.Region.Framework.Scenes
114 public bool AddInventoryItem(UUID agentID, uint localID, InventoryItemBase item, UUID copyItemID) 114 public bool AddInventoryItem(UUID agentID, uint localID, InventoryItemBase item, UUID copyItemID)
115 { 115 {
116// m_log.DebugFormat( 116// m_log.DebugFormat(
117// "[PRIM INVENTORY]: Adding inventory item {0} from {1} to part with local ID {2}", 117// "[PRIM INVENTORY]: Adding inventory item {0} from {1} to part with local ID {2}",
118// item.Name, remoteClient.Name, localID); 118// item.Name, remoteClient.Name, localID);
119 119
120 UUID newItemId = (copyItemID != UUID.Zero) ? copyItemID : item.ID; 120 UUID newItemId = (copyItemID != UUID.Zero) ? copyItemID : item.ID;
121 121
122 SceneObjectPart part = GetPart(localID); 122 SceneObjectPart part = GetPart(localID);
@@ -147,8 +147,8 @@ namespace OpenSim.Region.Framework.Scenes
147 // We're adding this to a prim we don't own. Force 147 // We're adding this to a prim we don't own. Force
148 // owner change 148 // owner change
149 taskItem.Flags |= (uint)InventoryItemFlags.ObjectSlamPerm; 149 taskItem.Flags |= (uint)InventoryItemFlags.ObjectSlamPerm;
150 } 150 }
151 else 151 else
152 { 152 {
153 taskItem.BasePermissions = item.BasePermissions; 153 taskItem.BasePermissions = item.BasePermissions;
154 taskItem.CurrentPermissions = item.CurrentPermissions; 154 taskItem.CurrentPermissions = item.CurrentPermissions;
@@ -156,13 +156,13 @@ namespace OpenSim.Region.Framework.Scenes
156 taskItem.GroupPermissions = item.GroupPermissions; 156 taskItem.GroupPermissions = item.GroupPermissions;
157 taskItem.NextPermissions = item.NextPermissions; 157 taskItem.NextPermissions = item.NextPermissions;
158 } 158 }
159 159
160 taskItem.Flags = item.Flags; 160 taskItem.Flags = item.Flags;
161 161
162// m_log.DebugFormat( 162// m_log.DebugFormat(
163// "[PRIM INVENTORY]: Flags are 0x{0:X} for item {1} added to part {2} by {3}", 163// "[PRIM INVENTORY]: Flags are 0x{0:X} for item {1} added to part {2} by {3}",
164// taskItem.Flags, taskItem.Name, localID, remoteClient.Name); 164// taskItem.Flags, taskItem.Name, localID, remoteClient.Name);
165 165
166 // TODO: These are pending addition of those fields to TaskInventoryItem 166 // TODO: These are pending addition of those fields to TaskInventoryItem
167// taskItem.SalePrice = item.SalePrice; 167// taskItem.SalePrice = item.SalePrice;
168// taskItem.SaleType = item.SaleType; 168// taskItem.SaleType = item.SaleType;
@@ -328,13 +328,13 @@ namespace OpenSim.Region.Framework.Scenes
328 xmldoc.AppendChild(xmlnode); 328 xmldoc.AppendChild(xmlnode);
329 XmlElement rootElement = xmldoc.CreateElement("", "ScriptData", 329 XmlElement rootElement = xmldoc.CreateElement("", "ScriptData",
330 String.Empty); 330 String.Empty);
331 331
332 xmldoc.AppendChild(rootElement); 332 xmldoc.AppendChild(rootElement);
333 333
334 334
335 XmlElement wrapper = xmldoc.CreateElement("", "ScriptStates", 335 XmlElement wrapper = xmldoc.CreateElement("", "ScriptStates",
336 String.Empty); 336 String.Empty);
337 337
338 rootElement.AppendChild(wrapper); 338 rootElement.AppendChild(wrapper);
339 339
340 foreach (KeyValuePair<UUID, string> state in states) 340 foreach (KeyValuePair<UUID, string> state in states)
@@ -362,7 +362,7 @@ namespace OpenSim.Region.Framework.Scenes
362 return; 362 return;
363 363
364 IScriptModule scriptModule = null; 364 IScriptModule scriptModule = null;
365 365
366 foreach (IScriptModule sm in s.RequestModuleInterfaces<IScriptModule>()) 366 foreach (IScriptModule sm in s.RequestModuleInterfaces<IScriptModule>())
367 { 367 {
368 if (sm.ScriptEngineName == s.DefaultScriptEngine) 368 if (sm.ScriptEngineName == s.DefaultScriptEngine)
@@ -401,7 +401,7 @@ namespace OpenSim.Region.Framework.Scenes
401 return; 401 return;
402 402
403 XmlElement dataE = (XmlElement)dataL[0]; 403 XmlElement dataE = (XmlElement)dataL[0];
404 404
405 foreach (XmlNode n in dataE.ChildNodes) 405 foreach (XmlNode n in dataE.ChildNodes)
406 { 406 {
407 XmlElement stateE = (XmlElement)n; 407 XmlElement stateE = (XmlElement)n;