diff options
| author | Adam Frisby | 2008-02-14 12:16:33 +0000 |
|---|---|---|
| committer | Adam Frisby | 2008-02-14 12:16:33 +0000 |
| commit | f3afa68a2af6ad5999e6efe3e4725cb17293108d (patch) | |
| tree | 4253a44bee39976d6b3dd6813439f5966cf12632 /OpenSim/Framework/Data | |
| parent | * Exposed AddHandlers in response to mantis #534. Thanks, kmeisthax! (diff) | |
| download | opensim-SC-f3afa68a2af6ad5999e6efe3e4725cb17293108d.zip opensim-SC-f3afa68a2af6ad5999e6efe3e4725cb17293108d.tar.gz opensim-SC-f3afa68a2af6ad5999e6efe3e4725cb17293108d.tar.bz2 opensim-SC-f3afa68a2af6ad5999e6efe3e4725cb17293108d.tar.xz | |
* 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.
Diffstat (limited to 'OpenSim/Framework/Data')
| -rw-r--r-- | OpenSim/Framework/Data/RegionProfileData.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Data/RegionProfileData.cs b/OpenSim/Framework/Data/RegionProfileData.cs index 48d3ebc..8119d01 100644 --- a/OpenSim/Framework/Data/RegionProfileData.cs +++ b/OpenSim/Framework/Data/RegionProfileData.cs | |||
| @@ -169,7 +169,7 @@ namespace OpenSim.Framework.Data | |||
| 169 | RegionProfileData simData = new RegionProfileData(); | 169 | RegionProfileData simData = new RegionProfileData(); |
| 170 | simData.regionLocX = Convert.ToUInt32((string) responseData["region_locx"]); | 170 | simData.regionLocX = Convert.ToUInt32((string) responseData["region_locx"]); |
| 171 | simData.regionLocY = Convert.ToUInt32((string) responseData["region_locy"]); | 171 | simData.regionLocY = Convert.ToUInt32((string) responseData["region_locy"]); |
| 172 | simData.regionHandle = Helpers.UIntsToLong((simData.regionLocX*256), (simData.regionLocY*256)); | 172 | simData.regionHandle = Helpers.UIntsToLong((simData.regionLocX * Constants.RegionSize), (simData.regionLocY * Constants.RegionSize)); |
| 173 | simData.serverIP = (string) responseData["sim_ip"]; | 173 | simData.serverIP = (string) responseData["sim_ip"]; |
| 174 | simData.serverPort = Convert.ToUInt32((string) responseData["sim_port"]); | 174 | simData.serverPort = Convert.ToUInt32((string) responseData["sim_port"]); |
| 175 | simData.httpPort = Convert.ToUInt32((string) responseData["http_port"]); | 175 | simData.httpPort = Convert.ToUInt32((string) responseData["http_port"]); |
| @@ -203,7 +203,7 @@ namespace OpenSim.Framework.Data | |||
| 203 | RegionProfileData simData = new RegionProfileData(); | 203 | RegionProfileData simData = new RegionProfileData(); |
| 204 | simData.regionLocX = Convert.ToUInt32((string) responseData["region_locx"]); | 204 | simData.regionLocX = Convert.ToUInt32((string) responseData["region_locx"]); |
| 205 | simData.regionLocY = Convert.ToUInt32((string) responseData["region_locy"]); | 205 | simData.regionLocY = Convert.ToUInt32((string) responseData["region_locy"]); |
| 206 | simData.regionHandle = Helpers.UIntsToLong((simData.regionLocX*256), (simData.regionLocY*256)); | 206 | simData.regionHandle = Helpers.UIntsToLong((simData.regionLocX * Constants.RegionSize), (simData.regionLocY * Constants.RegionSize)); |
| 207 | simData.serverIP = (string) responseData["sim_ip"]; | 207 | simData.serverIP = (string) responseData["sim_ip"]; |
| 208 | simData.serverPort = Convert.ToUInt32((string) responseData["sim_port"]); | 208 | simData.serverPort = Convert.ToUInt32((string) responseData["sim_port"]); |
| 209 | simData.httpPort = Convert.ToUInt32((string) responseData["http_port"]); | 209 | simData.httpPort = Convert.ToUInt32((string) responseData["http_port"]); |