diff options
| author | UbitUmarov | 2014-08-14 02:36:50 +0100 |
|---|---|---|
| committer | UbitUmarov | 2014-08-14 02:36:50 +0100 |
| commit | 395903d58fceb98d467daa49aaa277f54ea3f230 (patch) | |
| tree | 1eac9212ba0fcc9b8c69b5cfb4eea443f922f119 /OpenSim/Region | |
| parent | *DANGER* make baked textures cross and make use of it * UNTESTED * (diff) | |
| download | opensim-SC-395903d58fceb98d467daa49aaa277f54ea3f230.zip opensim-SC-395903d58fceb98d467daa49aaa277f54ea3f230.tar.gz opensim-SC-395903d58fceb98d467daa49aaa277f54ea3f230.tar.bz2 opensim-SC-395903d58fceb98d467daa49aaa277f54ea3f230.tar.xz | |
*DANGER* dont send baked textures assets to Neighbours. Possible we could
send a lot less
Diffstat (limited to 'OpenSim/Region')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs index af26998..71148ea 100644 --- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||
| @@ -1832,7 +1832,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 1832 | agent.InventoryFolder = UUID.Zero; | 1832 | agent.InventoryFolder = UUID.Zero; |
| 1833 | agent.startpos = new Vector3(128, 128, 70); | 1833 | agent.startpos = new Vector3(128, 128, 70); |
| 1834 | agent.child = true; | 1834 | agent.child = true; |
| 1835 | agent.Appearance = sp.Appearance; | 1835 | |
| 1836 | //agent.Appearance = sp.Appearance; | ||
| 1837 | agent.Appearance = new AvatarAppearance(sp.Appearance, true, false); // guess this should be a lot less | ||
| 1838 | |||
| 1836 | agent.CapsPath = CapsUtil.GetRandomCapsObjectPath(); | 1839 | agent.CapsPath = CapsUtil.GetRandomCapsObjectPath(); |
| 1837 | 1840 | ||
| 1838 | agent.ChildrenCapSeeds = new Dictionary<ulong, string>(sp.Scene.CapsModule.GetChildrenSeeds(sp.UUID)); | 1841 | agent.ChildrenCapSeeds = new Dictionary<ulong, string>(sp.Scene.CapsModule.GetChildrenSeeds(sp.UUID)); |
| @@ -1947,7 +1950,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer | |||
| 1947 | agent.InventoryFolder = UUID.Zero; | 1950 | agent.InventoryFolder = UUID.Zero; |
| 1948 | agent.startpos = sp.AbsolutePosition + CalculateOffset(sp, neighbour); | 1951 | agent.startpos = sp.AbsolutePosition + CalculateOffset(sp, neighbour); |
| 1949 | agent.child = true; | 1952 | agent.child = true; |
| 1950 | agent.Appearance = sp.Appearance; | 1953 | // agent.Appearance = sp.Appearance; |
| 1954 | agent.Appearance = new AvatarAppearance(sp.Appearance, true, false); // guess this should be a lot less | ||
| 1951 | if (currentAgentCircuit != null) | 1955 | if (currentAgentCircuit != null) |
| 1952 | { | 1956 | { |
| 1953 | agent.ServiceURLs = currentAgentCircuit.ServiceURLs; | 1957 | agent.ServiceURLs = currentAgentCircuit.ServiceURLs; |