diff options
author | UbitUmarov | 2014-08-16 00:25:27 +0100 |
---|---|---|
committer | UbitUmarov | 2014-08-16 00:25:27 +0100 |
commit | 7d967c37f41c850393a6dd6b80942b2528e4e7d8 (patch) | |
tree | e6a66f109cbadcac53e37d3bb34f4cc2d2bc4613 | |
parent | on teleports dont send baked textures assets in CreateClient, they will do on... (diff) | |
download | opensim-SC-7d967c37f41c850393a6dd6b80942b2528e4e7d8.zip opensim-SC-7d967c37f41c850393a6dd6b80942b2528e4e7d8.tar.gz opensim-SC-7d967c37f41c850393a6dd6b80942b2528e4e7d8.tar.bz2 opensim-SC-7d967c37f41c850393a6dd6b80942b2528e4e7d8.tar.xz |
*test* just send default appearance ( something along path doesnt like
null there )
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index 7ddd1c6..8d2a276 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
@@ -722,7 +722,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
722 | agentCircuit.child = true; | 722 | agentCircuit.child = true; |
723 | 723 | ||
724 | // agentCircuit.Appearance = sp.Appearance; | 724 | // agentCircuit.Appearance = sp.Appearance; |
725 | agentCircuit.Appearance = new AvatarAppearance(sp.Appearance, true, false); | 725 | // agentCircuit.Appearance = new AvatarAppearance(sp.Appearance, true, false); |
726 | agentCircuit.Appearance = new AvatarAppearance(); | ||
726 | 727 | ||
727 | if (currentAgentCircuit != null) | 728 | if (currentAgentCircuit != null) |
728 | { | 729 | { |
@@ -1848,7 +1849,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1848 | agent.child = true; | 1849 | agent.child = true; |
1849 | 1850 | ||
1850 | //agent.Appearance = sp.Appearance; | 1851 | //agent.Appearance = sp.Appearance; |
1851 | agent.Appearance = new AvatarAppearance(sp.Appearance, true, false); // guess this should be a lot less | 1852 | //agent.Appearance = new AvatarAppearance(sp.Appearance, true, false); |
1853 | agent.Appearance = new AvatarAppearance(); | ||
1852 | 1854 | ||
1853 | agent.CapsPath = CapsUtil.GetRandomCapsObjectPath(); | 1855 | agent.CapsPath = CapsUtil.GetRandomCapsObjectPath(); |
1854 | 1856 | ||
@@ -1965,7 +1967,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
1965 | agent.startpos = sp.AbsolutePosition + CalculateOffset(sp, neighbour); | 1967 | agent.startpos = sp.AbsolutePosition + CalculateOffset(sp, neighbour); |
1966 | agent.child = true; | 1968 | agent.child = true; |
1967 | // agent.Appearance = sp.Appearance; | 1969 | // agent.Appearance = sp.Appearance; |
1968 | agent.Appearance = new AvatarAppearance(sp.Appearance, true, false); // guess this should be a lot less | 1970 | // agent.Appearance = new AvatarAppearance(sp.Appearance, true, false); |
1971 | agent.Appearance = new AvatarAppearance(); | ||
1969 | if (currentAgentCircuit != null) | 1972 | if (currentAgentCircuit != null) |
1970 | { | 1973 | { |
1971 | agent.ServiceURLs = currentAgentCircuit.ServiceURLs; | 1974 | agent.ServiceURLs = currentAgentCircuit.ServiceURLs; |