aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs33
-rw-r--r--OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs21
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs17
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs12
-rw-r--r--OpenSim/Region/ScriptEngine/XEngine/XEngine.cs8
5 files changed, 50 insertions, 41 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 78ae5e9..69aa0ed 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -189,7 +189,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
189 } 189 }
190 catch (Exception e) 190 catch (Exception e)
191 { 191 {
192 m_log.ErrorFormat("[ATTACHMENTS MODULE]: Unable to rez attachment: {0}{1}", e.Message, e.StackTrace); 192 UUID agentId = (sp.ControllingClient == null) ? (UUID)null : sp.ControllingClient.AgentId;
193 m_log.ErrorFormat("[ATTACHMENTS MODULE]: Unable to rez attachment with itemID {0}, assetID {1}, point {2} for {3}: {4}\n{5}",
194 attach.ItemID, attach.AssetID, p, agentId, e.Message, e.StackTrace);
193 } 195 }
194 } 196 }
195 } 197 }
@@ -440,7 +442,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
440 lock (sp.AttachmentsSyncLock) 442 lock (sp.AttachmentsSyncLock)
441 { 443 {
442 // Save avatar attachment information 444 // Save avatar attachment information
443 m_log.Debug("[ATTACHMENTS MODULE]: Detaching from UserID: " + sp.UUID + ", ItemID: " + itemID); 445// m_log.Debug("[ATTACHMENTS MODULE]: Detaching from UserID: " + sp.UUID + ", ItemID: " + itemID);
444 446
445 bool changed = sp.Appearance.DetachAttachment(itemID); 447 bool changed = sp.Appearance.DetachAttachment(itemID);
446 if (changed && m_scene.AvatarFactory != null) 448 if (changed && m_scene.AvatarFactory != null)
@@ -520,9 +522,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
520 522
521 if (grp.HasGroupChanged || (saveAllScripted && grp.ContainsScripts())) 523 if (grp.HasGroupChanged || (saveAllScripted && grp.ContainsScripts()))
522 { 524 {
523 m_log.DebugFormat( 525// m_log.DebugFormat(
524 "[ATTACHMENTS MODULE]: Updating asset for attachment {0}, attachpoint {1}", 526// "[ATTACHMENTS MODULE]: Updating asset for attachment {0}, attachpoint {1}",
525 grp.UUID, grp.AttachmentPoint); 527// grp.UUID, grp.AttachmentPoint);
526 528
527 string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp); 529 string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(grp);
528 530
@@ -553,12 +555,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
553 } 555 }
554 grp.HasGroupChanged = false; // Prevent it being saved over and over 556 grp.HasGroupChanged = false; // Prevent it being saved over and over
555 } 557 }
556 else 558// else
557 { 559// {
558 m_log.DebugFormat( 560// m_log.DebugFormat(
559 "[ATTACHMENTS MODULE]: Don't need to update asset for unchanged attachment {0}, attachpoint {1}", 561// "[ATTACHMENTS MODULE]: Don't need to update asset for unchanged attachment {0}, attachpoint {1}",
560 grp.UUID, grp.AttachmentPoint); 562// grp.UUID, grp.AttachmentPoint);
561 } 563// }
562 } 564 }
563 565
564 /// <summary> 566 /// <summary>
@@ -946,13 +948,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
946 // Calls attach with a Zero position 948 // Calls attach with a Zero position
947 if (AttachObject(sp, part.ParentGroup, AttachmentPt, false)) 949 if (AttachObject(sp, part.ParentGroup, AttachmentPt, false))
948 { 950 {
949 m_scene.EventManager.TriggerOnAttach(objectLocalID, part.ParentGroup.FromItemID, remoteClient.AgentId); 951// m_log.Debug(
952// "[ATTACHMENTS MODULE]: Saving avatar attachment. AgentID: " + remoteClient.AgentId
953// + ", AttachmentPoint: " + AttachmentPt);
950 954
951 // Save avatar attachment information 955 // Save avatar attachment information
952 m_log.Debug( 956 m_scene.EventManager.TriggerOnAttach(objectLocalID, part.ParentGroup.FromItemID, remoteClient.AgentId);
953 "[ATTACHMENTS MODULE]: Saving avatar attachment. AgentID: " + remoteClient.AgentId
954 + ", AttachmentPoint: " + AttachmentPt);
955
956 } 957 }
957 } 958 }
958 catch (Exception e) 959 catch (Exception e)
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 2bebd30..d98ea39 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
158 // Process the baked texture array 158 // Process the baked texture array
159 if (textureEntry != null) 159 if (textureEntry != null)
160 { 160 {
161 m_log.InfoFormat("[AVFACTORY]: Received texture update for {0} {1}", sp.Name, sp.UUID); 161// m_log.DebugFormat("[AVFACTORY]: Received texture update for {0} {1}", sp.Name, sp.UUID);
162 162
163// WriteBakedTexturesReport(sp, m_log.DebugFormat); 163// WriteBakedTexturesReport(sp, m_log.DebugFormat);
164 164
@@ -208,7 +208,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
208 ScenePresence sp = m_scene.GetScenePresence(agentId); 208 ScenePresence sp = m_scene.GetScenePresence(agentId);
209 if (sp == null) 209 if (sp == null)
210 { 210 {
211 m_log.WarnFormat("[AVFACTORY]: Agent {0} no longer in the scene", agentId); 211 // This is expected if the user has gone away.
212// m_log.DebugFormat("[AVFACTORY]: Agent {0} no longer in the scene", agentId);
212 return false; 213 return false;
213 } 214 }
214 215
@@ -248,10 +249,10 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
248 249
249 if (bakedTextureFace == null) 250 if (bakedTextureFace == null)
250 { 251 {
251 m_log.WarnFormat( 252 // This can happen legitimately, since some baked textures might not exist
252 "[AV FACTORY]: No texture ID set for {0} for {1} in {2} not found when trying to save permanently", 253 //m_log.WarnFormat(
253 bakeType, sp.Name, m_scene.RegionInfo.RegionName); 254 // "[AV FACTORY]: No texture ID set for {0} for {1} in {2} not found when trying to save permanently",
254 255 // bakeType, sp.Name, m_scene.RegionInfo.RegionName);
255 continue; 256 continue;
256 } 257 }
257 258
@@ -337,7 +338,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
337 return false; 338 return false;
338 } 339 }
339 340
340 m_log.DebugFormat("[AVFACTORY]: Completed texture check for {0} {1}", sp.Name, sp.UUID); 341// m_log.DebugFormat("[AVFACTORY]: Completed texture check for {0} {1}", sp.Name, sp.UUID);
341 342
342 // If we only found default textures, then the appearance is not cached 343 // If we only found default textures, then the appearance is not cached
343 return (defonly ? false : true); 344 return (defonly ? false : true);
@@ -417,7 +418,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
417// acd.AgentID, i, acd.Appearance.Texture.FaceTextures[i]); 418// acd.AgentID, i, acd.Appearance.Texture.FaceTextures[i]);
418 419
419 int ftIndex = (int)AppearanceManager.BakeTypeToAgentTextureIndex(bakeType); 420 int ftIndex = (int)AppearanceManager.BakeTypeToAgentTextureIndex(bakeType);
420 bakedTextures[bakeType] = faceTextures[ftIndex]; 421 Primitive.TextureEntryFace texture = faceTextures[ftIndex]; // this will be null if there's no such baked texture
422 bakedTextures[bakeType] = texture;
421 } 423 }
422 424
423 return bakedTextures; 425 return bakedTextures;
@@ -482,7 +484,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
482 ScenePresence sp = m_scene.GetScenePresence(agentid); 484 ScenePresence sp = m_scene.GetScenePresence(agentid);
483 if (sp == null) 485 if (sp == null)
484 { 486 {
485 m_log.WarnFormat("[AVFACTORY]: Agent {0} no longer in the scene", agentid); 487 // This is expected if the user has gone away.
488// m_log.DebugFormat("[AVFACTORY]: Agent {0} no longer in the scene", agentid);
486 return; 489 return;
487 } 490 }
488 491
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 2b790f4..690edce 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -172,13 +172,17 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
172 // Reset animations; the viewer does that in teleports. 172 // Reset animations; the viewer does that in teleports.
173 sp.Animator.ResetAnimations(); 173 sp.Animator.ResetAnimations();
174 174
175 string destinationRegionName = "(not found)";
176
175 try 177 try
176 { 178 {
177 if (regionHandle == sp.Scene.RegionInfo.RegionHandle) 179 if (regionHandle == sp.Scene.RegionInfo.RegionHandle)
178 { 180 {
181 destinationRegionName = sp.Scene.RegionInfo.RegionName;
182
179 m_log.DebugFormat( 183 m_log.DebugFormat(
180 "[ENTITY TRANSFER MODULE]: RequestTeleportToLocation {0} within {1}", 184 "[ENTITY TRANSFER MODULE]: RequestTeleportToLocation for {0} to {1} within existing region {2}",
181 position, sp.Scene.RegionInfo.RegionName); 185 sp.Name, position, destinationRegionName);
182 186
183 // Teleport within the same region 187 // Teleport within the same region
184 if (IsOutsideRegion(sp.Scene, position) || position.Z < 0) 188 if (IsOutsideRegion(sp.Scene, position) || position.Z < 0)
@@ -188,6 +192,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
188 m_log.WarnFormat( 192 m_log.WarnFormat(
189 "[ENTITY TRANSFER MODULE]: RequestTeleportToLocation() was given an illegal position of {0} for avatar {1}, {2}. Substituting {3}", 193 "[ENTITY TRANSFER MODULE]: RequestTeleportToLocation() was given an illegal position of {0} for avatar {1}, {2}. Substituting {3}",
190 position, sp.Name, sp.UUID, emergencyPos); 194 position, sp.Name, sp.UUID, emergencyPos);
195
191 position = emergencyPos; 196 position = emergencyPos;
192 } 197 }
193 198
@@ -234,6 +239,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
234 return; 239 return;
235 } 240 }
236 241
242 destinationRegionName = finalDestination.RegionName;
243
237 // check if HyperGrid teleport is allowed, based on user level 244 // check if HyperGrid teleport is allowed, based on user level
238 int flags = m_aScene.GridService.GetRegionFlags(sp.Scene.RegionInfo.ScopeID, reg.RegionID); 245 int flags = m_aScene.GridService.GetRegionFlags(sp.Scene.RegionInfo.ScopeID, reg.RegionID);
239 246
@@ -308,7 +315,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
308 } 315 }
309 catch (Exception e) 316 catch (Exception e)
310 { 317 {
311 m_log.WarnFormat("[ENTITY TRANSFER MODULE]: Exception on teleport: {0} {1}", e.Message, e.StackTrace); 318 m_log.ErrorFormat(
319 "[ENTITY TRANSFER MODULE]: Exception on teleport of {0} from {1}@{2} to {3}@{4}: {5}{6}",
320 sp.Name, sp.AbsolutePosition, sp.Scene.RegionInfo.RegionName, position, destinationRegionName,
321 e.Message, e.StackTrace);
322
312 sp.ControllingClient.SendTeleportFailed("Internal error"); 323 sp.ControllingClient.SendTeleportFailed("Internal error");
313 } 324 }
314 } 325 }
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index ebf5e84..4f80dea 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -155,18 +155,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC
155 ScenePresence sp; 155 ScenePresence sp;
156 if (scene.TryGetScenePresence(npcAvatar.AgentId, out sp)) 156 if (scene.TryGetScenePresence(npcAvatar.AgentId, out sp))
157 { 157 {
158 m_log.DebugFormat(
159 "[NPC MODULE]: Successfully retrieved scene presence for NPC {0} {1}", sp.Name, sp.UUID);
160
161 sp.CompleteMovement(npcAvatar, false); 158 sp.CompleteMovement(npcAvatar, false);
162 m_avatars.Add(npcAvatar.AgentId, npcAvatar); 159 m_avatars.Add(npcAvatar.AgentId, npcAvatar);
160 m_log.DebugFormat("[NPC MODULE]: Created NPC {0} {1}", npcAvatar.AgentId, sp.Name);
163 } 161 }
164 else
165 {
166 m_log.WarnFormat("[NPC MODULE]: Could not find scene presence for NPC {0} {1}", sp.Name, sp.UUID);
167 npcAvatar.AgentId = UUID.Zero;
168 }
169
170 } 162 }
171 ev.Set(); 163 ev.Set();
172 }); 164 });
@@ -308,7 +300,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
308 scene.RemoveClient(agentID, false); 300 scene.RemoveClient(agentID, false);
309 m_avatars.Remove(agentID); 301 m_avatars.Remove(agentID);
310 302
311// m_log.DebugFormat("[NPC MODULE]: Removed {0} {1}", agentID, av.Name); 303 m_log.DebugFormat("[NPC MODULE]: Removed NPC {0} {1}", agentID, av.Name);
312 return true; 304 return true;
313 } 305 }
314 } 306 }
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 5a02d4c..eeb125e 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1902,9 +1902,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1902 // if there already exists a file at that location, it may be locked. 1902 // if there already exists a file at that location, it may be locked.
1903 m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", path, ex.Message); 1903 m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", path, ex.Message);
1904 } 1904 }
1905
1906 string textpath = path + ".text";
1905 try 1907 try
1906 { 1908 {
1907 using (FileStream fs = File.Create(path + ".text")) 1909 using (FileStream fs = File.Create(textpath))
1908 { 1910 {
1909 using (StreamWriter sw = new StreamWriter(fs)) 1911 using (StreamWriter sw = new StreamWriter(fs))
1910 { 1912 {
@@ -1917,7 +1919,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1917 catch (IOException ex) 1919 catch (IOException ex)
1918 { 1920 {
1919 // if there already exists a file at that location, it may be locked. 1921 // if there already exists a file at that location, it may be locked.
1920 m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", path, ex.Message); 1922 m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", textpath, ex.Message);
1921 } 1923 }
1922 } 1924 }
1923 } 1925 }
@@ -1966,7 +1968,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
1966 catch (IOException ex) 1968 catch (IOException ex)
1967 { 1969 {
1968 // if there already exists a file at that location, it may be locked. 1970 // if there already exists a file at that location, it may be locked.
1969 m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", statepath, ex.Message); 1971 m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", mappath, ex.Message);
1970 } 1972 }
1971 } 1973 }
1972 1974