* Made new Framework.Constants class, added RegionSize member.

* Converted all instances of "256" spotted to use RegionSize instead. Some approximations used for border crossings (ie 255.9f) are still using that value, but should be updated to use something based on RegionSize.
* Moving Terrain to a RegionModule, implemented ITerrainChannel and TerrainModule - nonfunctional, but will be soon.

1 files changed, 5 insertions, 5 deletions

diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs
index 9036884..00b691e 100644
--- a/OpenSim/Framework/Communications/LoginResponse.cs
+++ b/OpenSim/Framework/Communications/LoginResponse.cs
@@ -152,7 +152,7 @@ namespace OpenSim.Framework.UserManagement
             ErrorReason = "key";
             welcomeMessage = "Welcome to OpenSim!";
             seedCapability = String.Empty;
-            home = "{'region_handle':[r" + (1000*256).ToString() + ",r" + (1000*256).ToString() + "], 'position':[r" +
+            home = "{'region_handle':[r" + (1000*Constants.RegionSize).ToString() + ",r" + (1000*Constants.RegionSize).ToString() + "], 'position':[r" +
                    userProfile.homepos.X.ToString() + ",r" + userProfile.homepos.Y.ToString() + ",r" +
                    userProfile.homepos.Z.ToString() + "], 'look_at':[r" + userProfile.homelookat.X.ToString() + ",r" +
                    userProfile.homelookat.Y.ToString() + ",r" + userProfile.homelookat.Z.ToString() + "]}";
@@ -347,8 +347,8 @@ namespace OpenSim.Framework.UserManagement
                 responseData["home"] = home;
                 responseData["look_at"] = lookAt;
                 responseData["message"] = welcomeMessage;
-                responseData["region_x"] = (Int32) RegionX*256;
-                responseData["region_y"] = (Int32) RegionY*256;
+                responseData["region_x"] = (Int32)RegionX * Constants.RegionSize;
+                responseData["region_y"] = (Int32)RegionY * Constants.RegionSize;
 
                 //responseData["inventory-lib-root"] = new ArrayList(); // todo
 
@@ -447,8 +447,8 @@ namespace OpenSim.Framework.UserManagement
                 map["home"] = LLSD.FromString(home);
                 map["look_at"] = LLSD.FromString(lookAt);
                 map["message"] = LLSD.FromString(welcomeMessage);
-                map["region_x"] = LLSD.FromInteger(RegionX * 256);
-                map["region_y"] = LLSD.FromInteger(RegionY * 256);
+                map["region_x"] = LLSD.FromInteger(RegionX * Constants.RegionSize);
+                map["region_y"] = LLSD.FromInteger(RegionY * Constants.RegionSize);
 
                 if (m_buddyList != null)
                 {