aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs5
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs26
2 files changed, 0 insertions, 31 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
index a8eae56..bc6a97d 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs
@@ -143,11 +143,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
143 asset.Data); 143 asset.Data);
144 144
145 m_assetsWritten++; 145 m_assetsWritten++;
146
147 //m_log.DebugFormat("[ARCHIVER]: Added asset {0}", m_assetsWritten);
148
149 if (m_assetsWritten % LOG_ASSET_LOAD_NOTIFICATION_INTERVAL == 0)
150 m_log.InfoFormat("[ARCHIVER]: Added {0} assets to archive", m_assetsWritten);
151 } 146 }
152 147
153 } 148 }
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index 9232db9..3b94dff 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -181,17 +181,6 @@ namespace OpenSim.Region.OptionalModules.World.NPC
181 AvatarAppearance npcAppearance = new AvatarAppearance(appearance, true); 181 AvatarAppearance npcAppearance = new AvatarAppearance(appearance, true);
182 acd.Appearance = npcAppearance; 182 acd.Appearance = npcAppearance;
183 183
184 /*
185 for (int i = 0;
186 i < acd.Appearance.Texture.FaceTextures.Length; i++)
187 {
188 m_log.DebugFormat(
189 "[NPC MODULE]: NPC avatar {0} has texture id {1} : {2}",
190 acd.AgentID, i,
191 acd.Appearance.Texture.FaceTextures[i]);
192 }
193 */
194
195 lock (m_avatars) 184 lock (m_avatars)
196 { 185 {
197 scene.AuthenticateHandler.AddNewCircuit(npcAvatar.CircuitCode, 186 scene.AuthenticateHandler.AddNewCircuit(npcAvatar.CircuitCode,
@@ -201,12 +190,6 @@ namespace OpenSim.Region.OptionalModules.World.NPC
201 ScenePresence sp; 190 ScenePresence sp;
202 if (scene.TryGetScenePresence(npcAvatar.AgentId, out sp)) 191 if (scene.TryGetScenePresence(npcAvatar.AgentId, out sp))
203 { 192 {
204 /*
205 m_log.DebugFormat(
206 "[NPC MODULE]: Successfully retrieved scene presence for NPC {0} {1}",
207 sp.Name, sp.UUID);
208 */
209
210 sp.CompleteMovement(npcAvatar, false); 193 sp.CompleteMovement(npcAvatar, false);
211 m_avatars.Add(npcAvatar.AgentId, npcAvatar); 194 m_avatars.Add(npcAvatar.AgentId, npcAvatar);
212 m_log.DebugFormat("[NPC MODULE]: Created NPC {0} {1}", npcAvatar.AgentId, sp.Name); 195 m_log.DebugFormat("[NPC MODULE]: Created NPC {0} {1}", npcAvatar.AgentId, sp.Name);
@@ -237,11 +220,6 @@ namespace OpenSim.Region.OptionalModules.World.NPC
237 if (sp.IsSatOnObject || sp.SitGround) 220 if (sp.IsSatOnObject || sp.SitGround)
238 return false; 221 return false;
239 222
240// m_log.DebugFormat(
241// "[NPC MODULE]: Moving {0} to {1} in {2}, noFly {3}, landAtTarget {4}",
242// sp.Name, pos, scene.RegionInfo.RegionName,
243// noFly, landAtTarget);
244
245 sp.MoveToTarget(pos, noFly, landAtTarget); 223 sp.MoveToTarget(pos, noFly, landAtTarget);
246 sp.SetAlwaysRun = running; 224 sp.SetAlwaysRun = running;
247 225
@@ -404,10 +382,6 @@ namespace OpenSim.Region.OptionalModules.World.NPC
404 { 382 {
405 if (m_avatars.TryGetValue(agentID, out av)) 383 if (m_avatars.TryGetValue(agentID, out av))
406 { 384 {
407 /*
408 m_log.DebugFormat("[NPC MODULE]: Found {0} {1} to remove",
409 agentID, av.Name);
410 */
411 doRemove = true; 385 doRemove = true;
412 } 386 }
413 } 387 }