Merge branch 'master' into avinationmerge

Conflicts:
	OpenSim/Framework/AvatarAppearance.cs
	OpenSim/Framework/Servers/ServerBase.cs
	OpenSim/Framework/VersionInfo.cs
	OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
	OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
	OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
	OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
	OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
	OpenSim/Services/HypergridService/GatekeeperService.cs
	OpenSim/Services/Interfaces/IAvatarService.cs
	OpenSim/Services/LLLoginService/LLLoginService.cs

2 files changed, 18 insertions, 8 deletions

diff --git a/OpenSim/Services/Interfaces/IAvatarService.cs b/OpenSim/Services/Interfaces/IAvatarService.cs
index 3663a7a..bd66dad 100644
--- a/OpenSim/Services/Interfaces/IAvatarService.cs
+++ b/OpenSim/Services/Interfaces/IAvatarService.cs
@@ -162,12 +162,11 @@ namespace OpenSim.Services.Interfaces
             }
 
             // Visual Params
-            //            string[] vps = new string[AvatarAppearance.VISUALPARAM_COUNT];
-            //            byte[] binary = appearance.VisualParams;
+            //string[] vps = new string[AvatarAppearance.VISUALPARAM_COUNT];
+            //byte[] binary = appearance.VisualParams;
 
             //            for (int i = 0 ; i < AvatarAppearance.VISUALPARAM_COUNT ; i++)
 
-
             byte[] binary = appearance.VisualParams;
             string[] vps = new string[binary.Length];
 
@@ -285,14 +284,13 @@ namespace OpenSim.Services.Interfaces
                 if (Data.ContainsKey("VisualParams"))
                 {
                     string[] vps = Data["VisualParams"].Split(new char[] {','});
-                    //                    byte[] binary = new byte[AvatarAppearance.VISUALPARAM_COUNT];
+                    //byte[] binary = new byte[AvatarAppearance.VISUALPARAM_COUNT];
 
-                    //                    for (int i = 0 ; i < vps.Length && i < binary.Length ; i++)
+                    //for (int i = 0 ; i < vps.Length && i < binary.Length ; i++)
                     byte[] binary = new byte[vps.Length];
 
                     for (int i = 0; i < vps.Length; i++)
-
-                    binary[i] = (byte)Convert.ToInt32(vps[i]);
+                        binary[i] = (byte)Convert.ToInt32(vps[i]);
                     
                     appearance.VisualParams = binary;
                 }
diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs
index 3573bea..257b578 100644
--- a/OpenSim/Services/Interfaces/ISimulationService.cs
+++ b/OpenSim/Services/Interfaces/ISimulationService.cs
@@ -34,6 +34,18 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 
 namespace OpenSim.Services.Interfaces
 {
+    public class EntityTransferContext
+    {
+        public EntityTransferContext()
+        {
+            InboundVersion = VersionInfo.SimulationServiceVersionAcceptedMax;
+            OutboundVersion = VersionInfo.SimulationServiceVersionSupportedMax;
+        }
+
+        public float InboundVersion { get; set; }
+        public float OutboundVersion { get; set; }
+    }
+
     public interface ISimulationService
     {
         /// <summary>
@@ -93,7 +105,7 @@ namespace OpenSim.Services.Interfaces
         /// <param name="version">Version that the target simulator is running</param>
         /// <param name="reason">[out] Optional error message</param>
         /// <returns>True: ok; False: not allowed</returns>
-        bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, string sversion, List<UUID> features, out string version, out string reason);
+        bool QueryAccess(GridRegion destination, UUID agentID, string agentHomeURI, bool viaTeleport, Vector3 position, List<UUID> features, EntityTransferContext ctx, out string reason);
 
         /// <summary>
         /// Message from receiving region to departing region, telling it got contacted by the client.