diff options
| author | Melanie Thielker | 2008-11-19 06:15:21 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-11-19 06:15:21 +0000 |
| commit | 3234472d6203671a492a73042a0b56d6301903e0 (patch) | |
| tree | 2d4c6ef2b21ee24d315e27564b5426cdfe77e9b3 /OpenSim/Data | |
| parent | Ensure that the physics representation of a deleted object is also removed (diff) | |
| download | opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.zip opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.tar.gz opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.tar.bz2 opensim-SC_OLD-3234472d6203671a492a73042a0b56d6301903e0.tar.xz | |
Reverting the texture sending patch and the new libOMV. This makes this
release a direct descendant of the stable 7364, with all the features and
none of the issues.
This omits the following patch chain: r7383 r7382 r7381 r7377 r7375 r7373
r7372 r7370 r7369 r7368 r7367 r7366
Diffstat (limited to 'OpenSim/Data')
| -rw-r--r-- | OpenSim/Data/RegionProfileData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/RegionProfileData.cs b/OpenSim/Data/RegionProfileData.cs index a683bf1..b30fcf5 100644 --- a/OpenSim/Data/RegionProfileData.cs +++ b/OpenSim/Data/RegionProfileData.cs | |||
| @@ -153,7 +153,7 @@ namespace OpenSim.Data | |||
| 153 | simData.regionLocX = Convert.ToUInt32((string) responseData["region_locx"]); | 153 | simData.regionLocX = Convert.ToUInt32((string) responseData["region_locx"]); |
| 154 | simData.regionLocY = Convert.ToUInt32((string) responseData["region_locy"]); | 154 | simData.regionLocY = Convert.ToUInt32((string) responseData["region_locy"]); |
| 155 | simData.regionHandle = | 155 | simData.regionHandle = |
| 156 | Utils.UIntsToLong((simData.regionLocX * Constants.RegionSize), | 156 | Helpers.UIntsToLong((simData.regionLocX*Constants.RegionSize), |
| 157 | (simData.regionLocY*Constants.RegionSize)); | 157 | (simData.regionLocY*Constants.RegionSize)); |
| 158 | simData.serverIP = (string) responseData["sim_ip"]; | 158 | simData.serverIP = (string) responseData["sim_ip"]; |
| 159 | simData.serverPort = Convert.ToUInt32((string) responseData["sim_port"]); | 159 | simData.serverPort = Convert.ToUInt32((string) responseData["sim_port"]); |