aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework
diff options
context:
space:
mode:
authorMelanie2010-11-24 18:56:25 +0100
committerMelanie2010-11-24 18:56:25 +0100
commitb3a71c6df1538c61247f7d4711aba4c840508db8 (patch)
tree2089c5b109ec504b16feea0ea44911f7d77fd849 /OpenSim/Region/CoreModules/Framework
parentPrevent a dump in the llGetLinkKey method when using LINK_ROOT in a single prim (diff)
downloadopensim-SC_OLD-b3a71c6df1538c61247f7d4711aba4c840508db8.zip
opensim-SC_OLD-b3a71c6df1538c61247f7d4711aba4c840508db8.tar.gz
opensim-SC_OLD-b3a71c6df1538c61247f7d4711aba4c840508db8.tar.bz2
opensim-SC_OLD-b3a71c6df1538c61247f7d4711aba4c840508db8.tar.xz
Prevent an overlength button label from producing a debug dump and aborting
the script.
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework')
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 81d6f70..aa7a1cd 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -925,8 +925,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
925 } 925 }
926 926
927 agent.MakeChildAgent(); 927 agent.MakeChildAgent();
928
928 // now we have a child agent in this region. Request all interesting data about other (root) agents 929 // now we have a child agent in this region. Request all interesting data about other (root) agents
929 agent.SendInitialFullUpdateToAllClients(); 930 agent.SendOtherAgentsAvatarDataToMe();
931 agent.SendOtherAgentsAppearanceToMe();
930 932
931 CrossAttachmentsIntoNewRegion(neighbourRegion, agent, true); 933 CrossAttachmentsIntoNewRegion(neighbourRegion, agent, true);
932 934