From 90402133669a2d01878b88c2bc38dca60b07223e Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Fri, 16 May 2008 05:30:39 +0000 Subject: [PATCH] Set svn:ignore. Minor formatting cleanup. --- OpenSim/Data/UserDataBase.cs | 2 +- .../3Di/LoadBalancer/LoadBalancerPlugin.cs | 26 +++++++++---------- 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 82cbda4800..50325b23c8 100644 --- a/OpenSim/Data/UserDataBase.cs +++ b/OpenSim/Data/UserDataBase.cs @@ -74,7 +74,7 @@ namespace OpenSim.Data } public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) { aplist[user] = appearance; - m_log.Info("[APPEARANCE] Setting appearance for " + user.ToString() + appearance.ToString() ); + m_log.Info("[APPEARANCE] Setting appearance for " + user.ToString() + appearance.ToString()); } public abstract void AddAttachment(LLUUID user, LLUUID item); public abstract void RemoveAttachment(LLUUID user, LLUUID item); diff --git a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs index 25147d0c4e..bdddbbb0eb 100644 --- a/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs +++ b/ThirdParty/3Di/LoadBalancer/LoadBalancerPlugin.cs @@ -839,8 +839,8 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer { //m_log.Info("[SPLITSCENE] "+String.Format("UpdatePhysics called {0}", regionID)); - //m_log.Info("[SPLITSCENE] "+"LocalUpdatePhysics [region port:{0}, client:{1}, position:{2}, velocity:{3}, flying:{4}]", - // regionPort, scenePresenceID.ToString(), position.ToString(), + //m_log.Info("[SPLITSCENE] "+"LocalUpdatePhysics [region port:{0}, client:{1}, position:{2}, velocity:{3}, flying:{4}]", + // regionPort, scenePresenceID.ToString(), position.ToString(), // velocity.ToString(), flying); RegionInfo region = SearchRegionFromPortNum(regionPort); @@ -857,7 +857,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer return; } -// m_log.Info("[SPLITSCENE] "+"LocalUpdatePhysics [region:{0}, client:{1}]", +// m_log.Info("[SPLITSCENE] "+"LocalUpdatePhysics [region:{0}, client:{1}]", // regionID.ToString(), pre.UUID.ToString()); pre.AbsolutePosition = position; // will set PhysicsActor.Position @@ -882,9 +882,9 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer { LLClientView client = (LLClientView) pre.ControllingClient; - // Because data changes by the physics simulation when the client doesn't move, + // Because data changes by the physics simulation when the client doesn't move, // if MovementFlag is false, It is necessary to synchronize. - //if (pre.MovementFlag!=0 && client.PacketProcessingEnabled==true) + //if (pre.MovementFlag!=0 && client.PacketProcessingEnabled==true) if (client.IsActive) { //m_log.Info("[SPLITSCENE] "+String.Format("Client moving in {0} {1}", scene.RegionInfo.RegionID, pre.AbsolutePosition)); @@ -898,14 +898,14 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer if (isLocalNeighbour[i]) { - //m_log.Info("[SPLITSCENE] "+"Synchronize ScenePresence (Local) [region:{0}=>{1}, client:{2}]", + //m_log.Info("[SPLITSCENE] "+"Synchronize ScenePresence (Local) [region:{0}=>{1}, client:{2}]", // scene.RegionInfo.RegionID, regionPortList[i], pre.UUID.ToString()); LocalUpdatePhysics(regionPortList[i], pre.UUID, pre.AbsolutePosition, pre.Velocity, pre.PhysicsActor.Flying); } else { - //m_log.Info("[SPLITSCENE] "+"Synchronize ScenePresence (Remote) [region port:{0}, client:{1}, position:{2}, velocity:{3}, flying:{4}]", - // regionPortList[i], pre.UUID.ToString(), pre.AbsolutePosition.ToString(), + //m_log.Info("[SPLITSCENE] "+"Synchronize ScenePresence (Remote) [region port:{0}, client:{1}, position:{2}, velocity:{3}, flying:{4}]", + // regionPortList[i], pre.UUID.ToString(), pre.AbsolutePosition.ToString(), // pre.Velocity.ToString(), pre.PhysicsActor.Flying); @@ -917,8 +917,8 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer /* byte[] buff = new byte[12+12+1]; - Buffer.BlockCopy(pre.AbsolutePosition.GetBytes(), 0, buff, 0, 12); - Buffer.BlockCopy(pre.Velocity.GetBytes(), 0, buff, 12, 12); + Buffer.BlockCopy(pre.AbsolutePosition.GetBytes(), 0, buff, 0, 12); + Buffer.BlockCopy(pre.Velocity.GetBytes(), 0, buff, 12, 12); buff[24] = (byte)((pre.PhysicsActor.Flying)?1:0); // create header @@ -959,13 +959,13 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer if (isLocalNeighbour[i]) { - //m_log.Info("[SPLITSCENE] "+"Synchronize Packet (Local) [type:{0}, client:{1}]", + //m_log.Info("[SPLITSCENE] "+"Synchronize Packet (Local) [type:{0}, client:{1}]", // packet.Type.ToString(), agentID.ToString()); LocalUpdatePacket(regionPortList[i], agentID, packet, throttlePacketType); } else { - //m_log.Info("[SPLITSCENE] "+"Synchronize Packet (Remote) [type:{0}, client:{1}]", + //m_log.Info("[SPLITSCENE] "+"Synchronize Packet (Remote) [type:{0}, client:{1}]", // packet.Type.ToString(), agentID.ToString()); // to bytes byte[] buff = packet.ToBytes(); @@ -995,7 +995,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer RegionInfo region = SearchRegionFromPortNum(regionPort); -// m_log.Info("[SPLITSCENE] "+"LocalUpdatePacket [region port:{0}, client:{1}, packet type:{2}]", +// m_log.Info("[SPLITSCENE] "+"LocalUpdatePacket [region port:{0}, client:{1}, packet type:{2}]", // regionPort, agentID.ToString(), packet.GetType().ToString()); if (sceneManager.TryGetScene(region.RegionID, out scene)) diff --git a/ThirdParty/3Di/LoadBalancer/TcpServer.cs b/ThirdParty/3Di/LoadBalancer/TcpServer.cs index 1457299031..fd5e9e203a 100644 --- a/ThirdParty/3Di/LoadBalancer/TcpServer.cs +++ b/ThirdParty/3Di/LoadBalancer/TcpServer.cs @@ -144,7 +144,7 @@ namespace OpenSim.ApplicationPlugins.LoadBalancer { //MainLog.Instance.Verbose("TCPSERVER", "Processing body"); - // reading body + // reading body byte[] packet = new byte[state.header.numbytes]; state.ms_ptr.Position = current_pos + TcpClient.internalPacketHeaderSize; state.ms_ptr.Read(packet, 0, state.header.numbytes);