aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/ModuleLoader.cs22
-rw-r--r--OpenSim/Region/Environment/Modules/TextureDownloadModule.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs76
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneManager.cs8
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs64
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs6
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs69
10 files changed, 129 insertions, 138 deletions
diff --git a/OpenSim/Region/Environment/ModuleLoader.cs b/OpenSim/Region/Environment/ModuleLoader.cs
index d4031d9..bc0bbaf 100644
--- a/OpenSim/Region/Environment/ModuleLoader.cs
+++ b/OpenSim/Region/Environment/ModuleLoader.cs
@@ -78,7 +78,7 @@ namespace OpenSim.Region.Environment
78 DynamicTextureModule dynamicModule = new DynamicTextureModule(); 78 DynamicTextureModule dynamicModule = new DynamicTextureModule();
79 if (m_loadedSharedModules.ContainsKey(dynamicModule.Name)) 79 if (m_loadedSharedModules.ContainsKey(dynamicModule.Name))
80 { 80 {
81 m_log.Error(String.Format("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", dynamicModule.Name, "DynamicTextureModule")); 81 m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", dynamicModule.Name, "DynamicTextureModule");
82 } 82 }
83 else 83 else
84 { 84 {
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Environment
88 ChatModule chat = new ChatModule(); 88 ChatModule chat = new ChatModule();
89 if (m_loadedSharedModules.ContainsKey(chat.Name)) 89 if (m_loadedSharedModules.ContainsKey(chat.Name))
90 { 90 {
91 m_log.Error(String.Format("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", chat.Name, "ChatModule")); 91 m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", chat.Name, "ChatModule");
92 } 92 }
93 else 93 else
94 { 94 {
@@ -98,7 +98,7 @@ namespace OpenSim.Region.Environment
98 InstantMessageModule imMod = new InstantMessageModule(); 98 InstantMessageModule imMod = new InstantMessageModule();
99 if (m_loadedSharedModules.ContainsKey(imMod.Name)) 99 if (m_loadedSharedModules.ContainsKey(imMod.Name))
100 { 100 {
101 m_log.Error(String.Format("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", imMod.Name, "InstantMessageModule")); 101 m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", imMod.Name, "InstantMessageModule");
102 } 102 }
103 else 103 else
104 { 104 {
@@ -108,7 +108,7 @@ namespace OpenSim.Region.Environment
108 LoadImageURLModule loadMod = new LoadImageURLModule(); 108 LoadImageURLModule loadMod = new LoadImageURLModule();
109 if (m_loadedSharedModules.ContainsKey(loadMod.Name)) 109 if (m_loadedSharedModules.ContainsKey(loadMod.Name))
110 { 110 {
111 m_log.Error(String.Format("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", loadMod.Name, "LoadImageURLModule")); 111 m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", loadMod.Name, "LoadImageURLModule");
112 } 112 }
113 else 113 else
114 { 114 {
@@ -118,7 +118,7 @@ namespace OpenSim.Region.Environment
118 AvatarFactoryModule avatarFactory = new AvatarFactoryModule(); 118 AvatarFactoryModule avatarFactory = new AvatarFactoryModule();
119 if (m_loadedSharedModules.ContainsKey(avatarFactory.Name)) 119 if (m_loadedSharedModules.ContainsKey(avatarFactory.Name))
120 { 120 {
121 m_log.Error(String.Format("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", avatarFactory.Name, "AvarFactoryModule")); 121 m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", avatarFactory.Name, "AvarFactoryModule");
122 } 122 }
123 else 123 else
124 { 124 {
@@ -128,7 +128,7 @@ namespace OpenSim.Region.Environment
128 XMLRPCModule xmlRpcMod = new XMLRPCModule(); 128 XMLRPCModule xmlRpcMod = new XMLRPCModule();
129 if (m_loadedSharedModules.ContainsKey(xmlRpcMod.Name)) 129 if (m_loadedSharedModules.ContainsKey(xmlRpcMod.Name))
130 { 130 {
131 m_log.Error(String.Format("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", xmlRpcMod.Name, "XMLRPCModule")); 131 m_log.ErrorFormat("[MODULES]: Module name \"{0}\" already exists in module list. Module type {1} not added!", xmlRpcMod.Name, "XMLRPCModule");
132 } 132 }
133 else 133 else
134 { 134 {
@@ -186,17 +186,17 @@ namespace OpenSim.Region.Environment
186 186
187 if (modules.Length > 0) 187 if (modules.Length > 0)
188 { 188 {
189 m_log.Info(String.Format("[MODULES]: Found Module Library [{0}]", dllName)); 189 m_log.InfoFormat("[MODULES]: Found Module Library [{0}]", dllName);
190 foreach (IRegionModule module in modules) 190 foreach (IRegionModule module in modules)
191 { 191 {
192 if (!module.IsSharedModule) 192 if (!module.IsSharedModule)
193 { 193 {
194 m_log.Info(String.Format("[MODULES]: [{0}]: Initializing.", module.Name)); 194 m_log.InfoFormat("[MODULES]: [{0}]: Initializing.", module.Name);
195 InitializeModule(module, scene); 195 InitializeModule(module, scene);
196 } 196 }
197 else 197 else
198 { 198 {
199 m_log.Info(String.Format("[MODULES]: [{0}]: Loading Shared Module.", module.Name)); 199 m_log.InfoFormat("[MODULES]: [{0}]: Loading Shared Module.", module.Name);
200 LoadSharedModule(module); 200 LoadSharedModule(module);
201 } 201 }
202 } 202 }
@@ -246,7 +246,7 @@ namespace OpenSim.Region.Environment
246 } 246 }
247 catch (BadImageFormatException) 247 catch (BadImageFormatException)
248 { 248 {
249 //m_log.Info(String.Format("[MODULES]: The file [{0}] is not a module assembly.", e.FileName)); 249 //m_log.InfoFormat("[MODULES]: The file [{0}] is not a module assembly.", e.FileName);
250 } 250 }
251 } 251 }
252 252
@@ -270,7 +270,7 @@ namespace OpenSim.Region.Environment
270 } 270 }
271 catch (ReflectionTypeLoadException) 271 catch (ReflectionTypeLoadException)
272 { 272 {
273 m_log.Info(String.Format("[MODULES]: Could not load types for [{0}].", pluginAssembly.FullName)); 273 m_log.InfoFormat("[MODULES]: Could not load types for [{0}].", pluginAssembly.FullName);
274 } 274 }
275 } 275 }
276 276
diff --git a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
index 4f877be..cf558e0 100644
--- a/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
+++ b/OpenSim/Region/Environment/Modules/TextureDownloadModule.cs
@@ -174,7 +174,7 @@ namespace OpenSim.Region.Environment.Modules
174 // Make sure that any sender we currently have can get garbage collected 174 // Make sure that any sender we currently have can get garbage collected
175 sender = null; 175 sender = null;
176 176
177 //m_log.Info(String.Format("[TEXTURE DOWNLOAD] Texture sender queue size: {0}", m_queueSenders.Count())); 177 //m_log.InfoFormat("[TEXTURE DOWNLOAD] Texture sender queue size: {0}", m_queueSenders.Count());
178 } 178 }
179 } 179 }
180 180
diff --git a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
index 999f4a2..32bc7c3 100644
--- a/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
+++ b/OpenSim/Region/Environment/Modules/UserTextureDownloadService.cs
@@ -104,9 +104,9 @@ namespace OpenSim.Region.Environment.Modules
104 EnqueueTextureSender(textureSender); 104 EnqueueTextureSender(textureSender);
105 } 105 }
106 106
107 //m_log.Info(String.Format("[TEXTURE SENDER] Removing texture sender with uuid {0}", textureID)); 107 //m_log.InfoFormat("[TEXTURE SENDER] Removing texture sender with uuid {0}", textureID);
108 m_textureSenders.Remove(textureID); 108 m_textureSenders.Remove(textureID);
109 //m_log.Info(String.Format("[TEXTURE SENDER] Current texture senders in dictionary: {0}", m_textureSenders.Count)); 109 //m_log.InfoFormat("[TEXTURE SENDER] Current texture senders in dictionary: {0}", m_textureSenders.Count);
110 } 110 }
111 else 111 else
112 { 112 {
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 3a38bd2..19213fd 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -925,9 +925,9 @@ namespace OpenSim.Region.Environment.Scenes
925 } 925 }
926 else 926 else
927 { 927 {
928 m_log.Info(String.Format("[SCENE]: " + 928 m_log.InfoFormat("[SCENE]: " +
929 "DelinkObjects(): Could not find a root prim out of {0} as given to a delink request!", 929 "DelinkObjects(): Could not find a root prim out of {0} as given to a delink request!",
930 primIds)); 930 primIds);
931 } 931 }
932 } 932 }
933 933
@@ -975,7 +975,7 @@ namespace OpenSim.Region.Environment.Scenes
975 } 975 }
976 else 976 else
977 { 977 {
978 m_log.Warn(String.Format("[SCENE]: Attempted to duplicate nonexistant prim id {0}", GroupID)); 978 m_log.WarnFormat("[SCENE]: Attempted to duplicate nonexistant prim id {0}", GroupID);
979 } 979 }
980 } 980 }
981 981
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 28760fd..cc9d294 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -83,8 +83,8 @@ namespace OpenSim.Region.Environment.Scenes
83 83
84 if (!TryGetAvatar(avatarId, out avatar)) 84 if (!TryGetAvatar(avatarId, out avatar))
85 { 85 {
86 m_log.Error(String.Format( 86 m_log.ErrorFormat(
87 "[AGENTINVENTORY]: Could not find avatar {0} to add inventory item", avatarId)); 87 "[AGENTINVENTORY]: Could not find avatar {0} to add inventory item", avatarId);
88 return; 88 return;
89 } 89 }
90 90
@@ -146,10 +146,10 @@ namespace OpenSim.Region.Environment.Scenes
146 } 146 }
147 else 147 else
148 { 148 {
149 m_log.Error(String.Format( 149 m_log.ErrorFormat(
150 "[AGENTINVENTORY]: " + 150 "[AGENTINVENTORY]: " +
151 "Avatar {0} cannot be found to update its inventory item asset", 151 "Avatar {0} cannot be found to update its inventory item asset",
152 avatarId)); 152 avatarId);
153 } 153 }
154 154
155 return LLUUID.Zero; 155 return LLUUID.Zero;
@@ -171,10 +171,10 @@ namespace OpenSim.Region.Environment.Scenes
171 SceneObjectGroup group = part.ParentGroup; 171 SceneObjectGroup group = part.ParentGroup;
172 if (null == group) 172 if (null == group)
173 { 173 {
174 m_log.Error(String.Format( 174 m_log.ErrorFormat(
175 "[PRIMINVENTORY]: " + 175 "[PRIMINVENTORY]: " +
176 "Prim inventory update requested for item ID {0} in prim ID {1} but this prim does not exist", 176 "Prim inventory update requested for item ID {0} in prim ID {1} but this prim does not exist",
177 itemId, primId)); 177 itemId, primId);
178 178
179 return; 179 return;
180 } 180 }
@@ -220,10 +220,10 @@ namespace OpenSim.Region.Environment.Scenes
220 } 220 }
221 else 221 else
222 { 222 {
223 m_log.Error(String.Format( 223 m_log.ErrorFormat(
224 "[PRIMINVENTORY]: " + 224 "[PRIMINVENTORY]: " +
225 "Avatar {0} cannot be found to update its prim item asset", 225 "Avatar {0} cannot be found to update its prim item asset",
226 avatarId)); 226 avatarId);
227 } 227 }
228 } 228 }
229 229
@@ -498,8 +498,8 @@ namespace OpenSim.Region.Environment.Scenes
498 } 498 }
499 else 499 else
500 { 500 {
501 m_log.Error(String.Format( 501 m_log.ErrorFormat(
502 "[PRIMINVENTORY]: Inventory requested of prim {0} which doesn't exist", primLocalID)); 502 "[PRIMINVENTORY]: Inventory requested of prim {0} which doesn't exist", primLocalID);
503 } 503 }
504 } 504 }
505 505
@@ -524,11 +524,11 @@ namespace OpenSim.Region.Environment.Scenes
524 } 524 }
525 else 525 else
526 { 526 {
527 m_log.Error(String.Format( 527 m_log.ErrorFormat(
528 "[PRIMINVENTORY]: " + 528 "[PRIMINVENTORY]: " +
529 "Removal of item {0} requested of prim {1} but this prim does not exist", 529 "Removal of item {0} requested of prim {1} but this prim does not exist",
530 itemID, 530 itemID,
531 localID)); 531 localID);
532 } 532 }
533 } 533 }
534 534
@@ -548,18 +548,18 @@ namespace OpenSim.Region.Environment.Scenes
548 { 548 {
549 // TODO Retrieve itemID from client's inventory to pass on 549 // TODO Retrieve itemID from client's inventory to pass on
550 //group.AddInventoryItem(remoteClient, primLocalID, null); 550 //group.AddInventoryItem(remoteClient, primLocalID, null);
551 m_log.Info(String.Format( 551 m_log.InfoFormat(
552 "[PRIMINVENTORY]: " + 552 "[PRIMINVENTORY]: " +
553 "Non script prim inventory not yet implemented!" 553 "Non script prim inventory not yet implemented!"
554 + "\nUpdateTaskInventory called with item {0}, folder {1}, primLocalID {2}, user {3}", 554 + "\nUpdateTaskInventory called with item {0}, folder {1}, primLocalID {2}, user {3}",
555 itemID, folderID, primLocalID, remoteClient.Name)); 555 itemID, folderID, primLocalID, remoteClient.Name);
556 } 556 }
557 else 557 else
558 { 558 {
559 m_log.Warn(String.Format( 559 m_log.WarnFormat(
560 "[PRIMINVENTORY]: " + 560 "[PRIMINVENTORY]: " +
561 "Update with item {0} requested of prim {1} for {2} but this prim does not exist", 561 "Update with item {0} requested of prim {1} for {2} but this prim does not exist",
562 itemID, primLocalID, remoteClient.Name)); 562 itemID, primLocalID, remoteClient.Name);
563 } 563 }
564 } 564 }
565 565
@@ -604,18 +604,18 @@ namespace OpenSim.Region.Environment.Scenes
604 } 604 }
605 else 605 else
606 { 606 {
607 m_log.Error(String.Format( 607 m_log.ErrorFormat(
608 "[PRIMINVENTORY]: " + 608 "[PRIMINVENTORY]: " +
609 "Could not rez script {0} into prim local ID {1} for user {2}" 609 "Could not rez script {0} into prim local ID {1} for user {2}"
610 + " because the prim could not be found in the region!", 610 + " because the prim could not be found in the region!",
611 item.inventoryName, localID, remoteClient.Name)); 611 item.inventoryName, localID, remoteClient.Name);
612 } 612 }
613 } 613 }
614 else 614 else
615 { 615 {
616 m_log.Error(String.Format( 616 m_log.ErrorFormat(
617 "[PRIMINVENTORY]: Could not find script inventory item {0} to rez for {1}!", 617 "[PRIMINVENTORY]: Could not find script inventory item {0} to rez for {1}!",
618 itemID, remoteClient.Name)); 618 itemID, remoteClient.Name);
619 } 619 }
620 } 620 }
621 } 621 }
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index a4f5028..5026688 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1432,7 +1432,7 @@ namespace OpenSim.Region.Environment.Scenes
1432 { 1432 {
1433 if (m_scenePresences.Remove(agentID)) 1433 if (m_scenePresences.Remove(agentID))
1434 { 1434 {
1435 //m_log.Info(String.Format("[SCENE] Removed scene presence {0}", agentID)); 1435 //m_log.InfoFormat("[SCENE] Removed scene presence {0}", agentID);
1436 } 1436 }
1437 else 1437 else
1438 { 1438 {
@@ -1445,7 +1445,7 @@ namespace OpenSim.Region.Environment.Scenes
1445 { 1445 {
1446 if (Entities.Remove(agentID)) 1446 if (Entities.Remove(agentID))
1447 { 1447 {
1448 //m_log.Info(String.Format("[SCENE] Removed scene presence {0} from entities list", agentID)); 1448 //m_log.InfoFormat("[SCENE] Removed scene presence {0} from entities list", agentID);
1449 } 1449 }
1450 else 1450 else
1451 { 1451 {
@@ -1470,8 +1470,8 @@ namespace OpenSim.Region.Environment.Scenes
1470 // Remove client agent from profile, so new logins will work 1470 // Remove client agent from profile, so new logins will work
1471 CommsManager.UserService.clearUserAgent(agentID); 1471 CommsManager.UserService.clearUserAgent(agentID);
1472 1472
1473 //m_log.Info(String.Format("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false))); 1473 //m_log.InfoFormat("[SCENE] Memory pre GC {0}", System.GC.GetTotalMemory(false));
1474 //m_log.Info(String.Format("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true))); 1474 //m_log.InfoFormat("[SCENE] Memory post GC {0}", System.GC.GetTotalMemory(true));
1475 } 1475 }
1476 1476
1477 public override void CloseAllAgents(uint circuitcode) 1477 public override void CloseAllAgents(uint circuitcode)
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs
index 17d2959..0b88050 100644
--- a/OpenSim/Region/Environment/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs
@@ -296,10 +296,10 @@ namespace OpenSim.Region.Environment.Scenes
296 { 296 {
297 if (!scenePresence.IsChildAgent) 297 if (!scenePresence.IsChildAgent)
298 { 298 {
299 m_log.Error(String.Format("Packet debug for {0} {1} set to {2}", 299 m_log.ErrorFormat("Packet debug for {0} {1} set to {2}",
300 scenePresence.Firstname, 300 scenePresence.Firstname,
301 scenePresence.Lastname, 301 scenePresence.Lastname,
302 newDebug)); 302 newDebug);
303 303
304 scenePresence.ControllingClient.SetDebug(newDebug); 304 scenePresence.ControllingClient.SetDebug(newDebug);
305 } 305 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
index 6bd0575..e26ed5c 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs
@@ -55,10 +55,10 @@ namespace OpenSim.Region.Environment.Scenes
55 } 55 }
56 else 56 else
57 { 57 {
58 m_log.Error(String.Format( 58 m_log.ErrorFormat(
59 "[PRIMINVENTORY]: " + 59 "[PRIMINVENTORY]: " +
60 "Couldn't find part {0} in object group {1}, {2} to start script with ID {3}", 60 "Couldn't find part {0} in object group {1}, {2} to start script with ID {3}",
61 localID, Name, UUID, itemID)); 61 localID, Name, UUID, itemID);
62 } 62 }
63 } 63 }
64 64
@@ -76,10 +76,10 @@ namespace OpenSim.Region.Environment.Scenes
76// } 76// }
77// else 77// else
78// { 78// {
79// m_log.Error(String.Format( 79// m_log.ErrorFormat(
80// "[PRIMINVENTORY]: " + 80// "[PRIMINVENTORY]: " +
81// "Couldn't find part {0} in object group {1}, {2} to start script with ID {3}", 81// "Couldn't find part {0} in object group {1}, {2} to start script with ID {3}",
82// localID, Name, UUID, itemID)); 82// localID, Name, UUID, itemID);
83// } 83// }
84// } 84// }
85 85
@@ -123,10 +123,10 @@ namespace OpenSim.Region.Environment.Scenes
123 } 123 }
124 else 124 else
125 { 125 {
126 m_log.Error(String.Format( 126 m_log.ErrorFormat(
127 "[PRIMINVENTORY]: " + 127 "[PRIMINVENTORY]: " +
128 "Couldn't find part {0} in object group {1}, {2} to stop script with ID {3}", 128 "Couldn't find part {0} in object group {1}, {2} to stop script with ID {3}",
129 partID, Name, UUID, itemID)); 129 partID, Name, UUID, itemID);
130 } 130 }
131 } 131 }
132 132
@@ -144,10 +144,10 @@ namespace OpenSim.Region.Environment.Scenes
144 } 144 }
145 else 145 else
146 { 146 {
147 m_log.Error(String.Format( 147 m_log.ErrorFormat(
148 "[PRIMINVENTORY]: " + 148 "[PRIMINVENTORY]: " +
149 "Couldn't find part {0} in object group {1}, {2} to retreive prim inventory", 149 "Couldn't find part {0} in object group {1}, {2} to retreive prim inventory",
150 localID, Name, UUID)); 150 localID, Name, UUID);
151 } 151 }
152 return false; 152 return false;
153 } 153 }
@@ -161,10 +161,10 @@ namespace OpenSim.Region.Environment.Scenes
161 } 161 }
162 else 162 else
163 { 163 {
164 m_log.Error(String.Format( 164 m_log.ErrorFormat(
165 "[PRIMINVENTORY]: " + 165 "[PRIMINVENTORY]: " +
166 "Couldn't find part {0} in object group {1}, {2} to request inventory data", 166 "Couldn't find part {0} in object group {1}, {2} to request inventory data",
167 localID, Name, UUID)); 167 localID, Name, UUID);
168 } 168 }
169 } 169 }
170 170
@@ -200,10 +200,10 @@ namespace OpenSim.Region.Environment.Scenes
200 } 200 }
201 else 201 else
202 { 202 {
203 m_log.Error(String.Format( 203 m_log.ErrorFormat(
204 "[PRIMINVENTORY]: " + 204 "[PRIMINVENTORY]: " +
205 "Couldn't find prim local ID {0} in group {1}, {2} to add inventory item ID {3}", 205 "Couldn't find prim local ID {0} in group {1}, {2} to add inventory item ID {3}",
206 localID, Name, UUID, newItemId)); 206 localID, Name, UUID, newItemId);
207 } 207 }
208 208
209 return false; 209 return false;
@@ -224,10 +224,10 @@ namespace OpenSim.Region.Environment.Scenes
224 } 224 }
225 else 225 else
226 { 226 {
227 m_log.Error(String.Format( 227 m_log.ErrorFormat(
228 "[PRIMINVENTORY]: " + 228 "[PRIMINVENTORY]: " +
229 "Couldn't find prim local ID {0} in prim {1}, {2} to get inventory item ID {3}", 229 "Couldn't find prim local ID {0} in prim {1}, {2} to get inventory item ID {3}",
230 primID, part.Name, part.UUID, itemID)); 230 primID, part.Name, part.UUID, itemID);
231 } 231 }
232 232
233 return null; 233 return null;
@@ -250,10 +250,10 @@ namespace OpenSim.Region.Environment.Scenes
250 } 250 }
251 else 251 else
252 { 252 {
253 m_log.Error(String.Format( 253 m_log.ErrorFormat(
254 "[PRIMINVENTORY]: " + 254 "[PRIMINVENTORY]: " +
255 "Couldn't find prim ID {0} to update item {1}, {2}", 255 "Couldn't find prim ID {0} to update item {1}, {2}",
256 item.ParentPartID, item.Name, item.ItemID)); 256 item.ParentPartID, item.Name, item.ItemID);
257 } 257 }
258 258
259 return false; 259 return false;
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 5ae657e..c204389 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1003,9 +1003,9 @@ namespace OpenSim.Region.Environment.Scenes
1003 } 1003 }
1004 else 1004 else
1005 { 1005 {
1006 m_log.Info(String.Format("[SCENE]: " + 1006 m_log.InfoFormat("[SCENE]: " +
1007 "DelinkFromGroup(): Child prim local id {0} not found in object with root prim id {1}", 1007 "DelinkFromGroup(): Child prim local id {0} not found in object with root prim id {1}",
1008 partID, LocalId)); 1008 partID, LocalId);
1009 } 1009 }
1010 } 1010 }
1011 1011
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
index 62c3436..a27432d 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs
@@ -147,10 +147,10 @@ namespace OpenSim.Region.Environment.Scenes
147 /// <returns></returns> 147 /// <returns></returns>
148 public void StartScript(TaskInventoryItem item) 148 public void StartScript(TaskInventoryItem item)
149 { 149 {
150// m_log.Info(String.Format( 150// m_log.InfoFormat(
151// "[PRIMINVENTORY]: " + 151// "[PRIMINVENTORY]: " +
152// "Starting script {0}, {1} in prim {2}, {3}", 152// "Starting script {0}, {1} in prim {2}, {3}",
153// item.Name, item.ItemID, Name, UUID)); 153// item.Name, item.ItemID, Name, UUID);
154 AddFlag(LLObject.ObjectFlags.Scripted); 154 AddFlag(LLObject.ObjectFlags.Scripted);
155 155
156 if (!((m_parentGroup.Scene.RegionInfo.EstateSettings.regionFlags & Simulator.RegionFlags.SkipScripts) == Simulator.RegionFlags.SkipScripts)) 156 if (!((m_parentGroup.Scene.RegionInfo.EstateSettings.regionFlags & Simulator.RegionFlags.SkipScripts) == Simulator.RegionFlags.SkipScripts))
@@ -166,10 +166,10 @@ namespace OpenSim.Region.Environment.Scenes
166 } 166 }
167 else 167 else
168 { 168 {
169 m_log.Error(String.Format( 169 m_log.ErrorFormat(
170 "[PRIMINVENTORY]: " + 170 "[PRIMINVENTORY]: " +
171 "Couldn't start script {0}, {1} since asset ID {2} could not be found", 171 "Couldn't start script {0}, {1} since asset ID {2} could not be found",
172 item.Name, item.ItemID, item.AssetID)); 172 item.Name, item.ItemID, item.AssetID);
173 } 173 }
174 } 174 }
175 ScheduleFullUpdate(); 175 ScheduleFullUpdate();
@@ -192,10 +192,10 @@ namespace OpenSim.Region.Environment.Scenes
192 } 192 }
193 else 193 else
194 { 194 {
195 m_log.Error(String.Format( 195 m_log.ErrorFormat(
196 "[PRIMINVENTORY]: " + 196 "[PRIMINVENTORY]: " +
197 "Couldn't start script with ID {0} since it couldn't be found for prim {1}, {2}", 197 "Couldn't start script with ID {0} since it couldn't be found for prim {1}, {2}",
198 itemId, Name, UUID)); 198 itemId, Name, UUID);
199 } 199 }
200 } 200 }
201 } 201 }
@@ -206,27 +206,18 @@ namespace OpenSim.Region.Environment.Scenes
206 /// <param name="itemId"></param> 206 /// <param name="itemId"></param>
207 public void StopScript(LLUUID itemId) 207 public void StopScript(LLUUID itemId)
208 { 208 {
209
210
211 if (m_taskInventory.ContainsKey(itemId)) 209 if (m_taskInventory.ContainsKey(itemId))
212 { 210 {
213
214 m_parentGroup.Scene.EventManager.TriggerRemoveScript(LocalID, itemId); 211 m_parentGroup.Scene.EventManager.TriggerRemoveScript(LocalID, itemId);
215 m_parentGroup.AddActiveScriptCount(-1); 212 m_parentGroup.AddActiveScriptCount(-1);
216
217
218
219
220
221 } 213 }
222 else 214 else
223 { 215 {
224 m_log.Error(String.Format( 216 m_log.ErrorFormat(
225 "[PRIMINVENTORY]: " + 217 "[PRIMINVENTORY]: " +
226 "Couldn't stop script with ID {0} since it couldn't be found for prim {1}, {2}", 218 "Couldn't stop script with ID {0} since it couldn't be found for prim {1}, {2}",
227 itemId, Name, UUID)); 219 itemId, Name, UUID);
228 } 220 }
229
230 } 221 }
231 222
232 /// <summary> 223 /// <summary>
@@ -285,10 +276,10 @@ namespace OpenSim.Region.Environment.Scenes
285 } 276 }
286 else 277 else
287 { 278 {
288 m_log.Error(String.Format( 279 m_log.ErrorFormat(
289 "[PRIMINVENTORY]: " + 280 "[PRIMINVENTORY]: " +
290 "Tried to retrieve item ID {0} from prim {1}, {2} but the item does not exist in this inventory", 281 "Tried to retrieve item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
291 itemID, Name, UUID)); 282 itemID, Name, UUID);
292 } 283 }
293 } 284 }
294 285
@@ -317,10 +308,10 @@ namespace OpenSim.Region.Environment.Scenes
317 } 308 }
318 else 309 else
319 { 310 {
320 m_log.Error(String.Format( 311 m_log.ErrorFormat(
321 "[PRIMINVENTORY]: " + 312 "[PRIMINVENTORY]: " +
322 "Tried to retrieve item ID {0} from prim {1}, {2} but the item does not exist in this inventory", 313 "Tried to retrieve item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
323 item.ItemID, Name, UUID)); 314 item.ItemID, Name, UUID);
324 } 315 }
325 } 316 }
326 317
@@ -374,10 +365,10 @@ namespace OpenSim.Region.Environment.Scenes
374 } 365 }
375 else 366 else
376 { 367 {
377 m_log.Error(String.Format( 368 m_log.ErrorFormat(
378 "[PRIMINVENTORY]: " + 369 "[PRIMINVENTORY]: " +
379 "Tried to remove item ID {0} from prim {1}, {2} but the item does not exist in this inventory", 370 "Tried to remove item ID {0} from prim {1}, {2} but the item does not exist in this inventory",
380 itemID, Name, UUID)); 371 itemID, Name, UUID);
381 } 372 }
382 } 373 }
383 374
@@ -442,8 +433,8 @@ namespace OpenSim.Region.Environment.Scenes
442 433
443 fileData = Helpers.StringToField(invString.BuildString); 434 fileData = Helpers.StringToField(invString.BuildString);
444 435
445// m_log.Info(String.Format( 436// m_log.InfoFormat(
446// "[PRIMINVENTORY]: RequestInventoryFile fileData: {0}", Helpers.FieldToUTF8String(fileData))); 437// "[PRIMINVENTORY]: RequestInventoryFile fileData: {0}", Helpers.FieldToUTF8String(fileData));
447 438
448 if (fileData.Length > 2) 439 if (fileData.Length > 2)
449 { 440 {
generated by cgit v1.1 at 2024-07-16 15:13:35 +0000