diff options
-rw-r--r-- | OpenSim/Data/UserDataBase.cs | 2 | ||||
-rw-r--r-- | ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs | 26 | ||||
-rw-r--r-- | ThirdParty/3Di/LoadBalancer/TcpServer.cs | 2 |
3 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Data/UserDataBase.cs b/OpenSim/Data/UserDataBase.cs index 82cbda4..50325b2 100644 --- a/OpenSim/Data/UserDataBase.cs +++ b/OpenSim/Data/UserDataBase.cs | |||
@@ -74,7 +74,7 @@ namespace OpenSim.Data | |||
74 | } | 74 | } |
75 | public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) { | 75 | public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) { |
76 | aplist[user] = appearance; | 76 | aplist[user] = appearance; |
77 | m_log.Info("[APPEARANCE] Setting appearance for " + user.ToString() + appearance.ToString() ); | 77 | m_log.Info("[APPEARANCE] Setting appearance for " + user.ToString() + appearance.ToString()); |
78 | } | 78 | } |
79 | public abstract void AddAttachment(LLUUID user, LLUUID item); | 79 | public abstract void AddAttachment(LLUUID user, LLUUID item); |
80 | public abstract void RemoveAttachment(LLUUID user, LLUUID item); | 80 | public abstract void RemoveAttachment(LLUUID user, LLUUID item); |
diff --git a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs index 25147d0..bdddbbb 100644 --- a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs +++ b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs | |||
@@ -839,8 +839,8 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer | |||
839 | { | 839 | { |
840 | //m_log.Info("[SPLITSCENE] "+String.Format("UpdatePhysics called {0}", regionID)); | 840 | //m_log.Info("[SPLITSCENE] "+String.Format("UpdatePhysics called {0}", regionID)); |
841 | 841 | ||
842 | //m_log.Info("[SPLITSCENE] "+"LocalUpdatePhysics [region port:{0}, client:{1}, position:{2}, velocity:{3}, flying:{4}]", | 842 | //m_log.Info("[SPLITSCENE] "+"LocalUpdatePhysics [region port:{0}, client:{1}, position:{2}, velocity:{3}, flying:{4}]", |
843 | // regionPort, scenePresenceID.ToString(), position.ToString(), | 843 | // regionPort, scenePresenceID.ToString(), position.ToString(), |
844 | // velocity.ToString(), flying); | 844 | // velocity.ToString(), flying); |
845 | 845 | ||
846 | RegionInfo region = SearchRegionFromPortNum(regionPort); | 846 | RegionInfo region = SearchRegionFromPortNum(regionPort); |
@@ -857,7 +857,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer | |||
857 | return; | 857 | return; |
858 | } | 858 | } |
859 | 859 | ||
860 | // m_log.Info("[SPLITSCENE] "+"LocalUpdatePhysics [region:{0}, client:{1}]", | 860 | // m_log.Info("[SPLITSCENE] "+"LocalUpdatePhysics [region:{0}, client:{1}]", |
861 | // regionID.ToString(), pre.UUID.ToString()); | 861 | // regionID.ToString(), pre.UUID.ToString()); |
862 | 862 | ||
863 | pre.AbsolutePosition = position; // will set PhysicsActor.Position | 863 | pre.AbsolutePosition = position; // will set PhysicsActor.Position |
@@ -882,9 +882,9 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer | |||
882 | { | 882 | { |
883 | LLClientView client = (LLClientView) pre.ControllingClient; | 883 | LLClientView client = (LLClientView) pre.ControllingClient; |
884 | 884 | ||
885 | // Because data changes by the physics simulation when the client doesn't move, | 885 | // Because data changes by the physics simulation when the client doesn't move, |
886 | // if MovementFlag is false, It is necessary to synchronize. | 886 | // if MovementFlag is false, It is necessary to synchronize. |
887 | //if (pre.MovementFlag!=0 && client.PacketProcessingEnabled==true) | 887 | //if (pre.MovementFlag!=0 && client.PacketProcessingEnabled==true) |
888 | if (client.IsActive) | 888 | if (client.IsActive) |
889 | { | 889 | { |
890 | //m_log.Info("[SPLITSCENE] "+String.Format("Client moving in {0} {1}", scene.RegionInfo.RegionID, pre.AbsolutePosition)); | 890 | //m_log.Info("[SPLITSCENE] "+String.Format("Client moving in {0} {1}", scene.RegionInfo.RegionID, pre.AbsolutePosition)); |
@@ -898,14 +898,14 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer | |||
898 | 898 | ||
899 | if (isLocalNeighbour[i]) | 899 | if (isLocalNeighbour[i]) |
900 | { | 900 | { |
901 | //m_log.Info("[SPLITSCENE] "+"Synchronize ScenePresence (Local) [region:{0}=>{1}, client:{2}]", | 901 | //m_log.Info("[SPLITSCENE] "+"Synchronize ScenePresence (Local) [region:{0}=>{1}, client:{2}]", |
902 | // scene.RegionInfo.RegionID, regionPortList[i], pre.UUID.ToString()); | 902 | // scene.RegionInfo.RegionID, regionPortList[i], pre.UUID.ToString()); |
903 | LocalUpdatePhysics(regionPortList[i], pre.UUID, pre.AbsolutePosition, pre.Velocity, pre.PhysicsActor.Flying); | 903 | LocalUpdatePhysics(regionPortList[i], pre.UUID, pre.AbsolutePosition, pre.Velocity, pre.PhysicsActor.Flying); |
904 | } | 904 | } |
905 | else | 905 | else |
906 | { | 906 | { |
907 | //m_log.Info("[SPLITSCENE] "+"Synchronize ScenePresence (Remote) [region port:{0}, client:{1}, position:{2}, velocity:{3}, flying:{4}]", | 907 | //m_log.Info("[SPLITSCENE] "+"Synchronize ScenePresence (Remote) [region port:{0}, client:{1}, position:{2}, velocity:{3}, flying:{4}]", |
908 | // regionPortList[i], pre.UUID.ToString(), pre.AbsolutePosition.ToString(), | 908 | // regionPortList[i], pre.UUID.ToString(), pre.AbsolutePosition.ToString(), |
909 | // pre.Velocity.ToString(), pre.PhysicsActor.Flying); | 909 | // pre.Velocity.ToString(), pre.PhysicsActor.Flying); |
910 | 910 | ||
911 | 911 | ||
@@ -917,8 +917,8 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer | |||
917 | /* | 917 | /* |
918 | byte[] buff = new byte[12+12+1]; | 918 | byte[] buff = new byte[12+12+1]; |
919 | 919 | ||
920 | Buffer.BlockCopy(pre.AbsolutePosition.GetBytes(), 0, buff, 0, 12); | 920 | Buffer.BlockCopy(pre.AbsolutePosition.GetBytes(), 0, buff, 0, 12); |
921 | Buffer.BlockCopy(pre.Velocity.GetBytes(), 0, buff, 12, 12); | 921 | Buffer.BlockCopy(pre.Velocity.GetBytes(), 0, buff, 12, 12); |
922 | buff[24] = (byte)((pre.PhysicsActor.Flying)?1:0); | 922 | buff[24] = (byte)((pre.PhysicsActor.Flying)?1:0); |
923 | 923 | ||
924 | // create header | 924 | // create header |
@@ -959,13 +959,13 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer | |||
959 | 959 | ||
960 | if (isLocalNeighbour[i]) | 960 | if (isLocalNeighbour[i]) |
961 | { | 961 | { |
962 | //m_log.Info("[SPLITSCENE] "+"Synchronize Packet (Local) [type:{0}, client:{1}]", | 962 | //m_log.Info("[SPLITSCENE] "+"Synchronize Packet (Local) [type:{0}, client:{1}]", |
963 | // packet.Type.ToString(), agentID.ToString()); | 963 | // packet.Type.ToString(), agentID.ToString()); |
964 | LocalUpdatePacket(regionPortList[i], agentID, packet, throttlePacketType); | 964 | LocalUpdatePacket(regionPortList[i], agentID, packet, throttlePacketType); |
965 | } | 965 | } |
966 | else | 966 | else |
967 | { | 967 | { |
968 | //m_log.Info("[SPLITSCENE] "+"Synchronize Packet (Remote) [type:{0}, client:{1}]", | 968 | //m_log.Info("[SPLITSCENE] "+"Synchronize Packet (Remote) [type:{0}, client:{1}]", |
969 | // packet.Type.ToString(), agentID.ToString()); | 969 | // packet.Type.ToString(), agentID.ToString()); |
970 | // to bytes | 970 | // to bytes |
971 | byte[] buff = packet.ToBytes(); | 971 | byte[] buff = packet.ToBytes(); |
@@ -995,7 +995,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer | |||
995 | 995 | ||
996 | RegionInfo region = SearchRegionFromPortNum(regionPort); | 996 | RegionInfo region = SearchRegionFromPortNum(regionPort); |
997 | 997 | ||
998 | // m_log.Info("[SPLITSCENE] "+"LocalUpdatePacket [region port:{0}, client:{1}, packet type:{2}]", | 998 | // m_log.Info("[SPLITSCENE] "+"LocalUpdatePacket [region port:{0}, client:{1}, packet type:{2}]", |
999 | // regionPort, agentID.ToString(), packet.GetType().ToString()); | 999 | // regionPort, agentID.ToString(), packet.GetType().ToString()); |
1000 | 1000 | ||
1001 | if (sceneManager.TryGetScene(region.RegionID, out scene)) | 1001 | if (sceneManager.TryGetScene(region.RegionID, out scene)) |
diff --git a/ThirdParty/3Di/LoadBalancer/TcpServer.cs b/ThirdParty/3Di/LoadBalancer/TcpServer.cs index 1457299..fd5e9e2 100644 --- a/ThirdParty/3Di/LoadBalancer/TcpServer.cs +++ b/ThirdParty/3Di/LoadBalancer/TcpServer.cs | |||
@@ -144,7 +144,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer | |||
144 | { | 144 | { |
145 | //MainLog.Instance.Verbose("TCPSERVER", "Processing body"); | 145 | //MainLog.Instance.Verbose("TCPSERVER", "Processing body"); |
146 | 146 | ||
147 | // reading body | 147 | // reading body |
148 | byte[] packet = new byte[state.header.numbytes]; | 148 | byte[] packet = new byte[state.header.numbytes]; |
149 | state.ms_ptr.Position = current_pos + TcpClient.internalPacketHeaderSize; | 149 | state.ms_ptr.Position = current_pos + TcpClient.internalPacketHeaderSize; |
150 | state.ms_ptr.Read(packet, 0, state.header.numbytes); | 150 | state.ms_ptr.Read(packet, 0, state.header.numbytes); |