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/Grid/MessagingServer | |
| 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/Grid/MessagingServer')
| -rw-r--r-- | OpenSim/Grid/MessagingServer/MessageService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Grid/MessagingServer/MessageService.cs b/OpenSim/Grid/MessagingServer/MessageService.cs index 1f04865..b4a0c21 100644 --- a/OpenSim/Grid/MessagingServer/MessageService.cs +++ b/OpenSim/Grid/MessagingServer/MessageService.cs | |||
| @@ -484,7 +484,7 @@ namespace OpenSim.Grid.MessagingServer | |||
| 484 | regionProfile = new RegionProfileData(); | 484 | regionProfile = new RegionProfileData(); |
| 485 | regionProfile.httpPort = (uint)Convert.ToInt32((string)responseData["http_port"]); | 485 | regionProfile.httpPort = (uint)Convert.ToInt32((string)responseData["http_port"]); |
| 486 | regionProfile.httpServerURI = "http://" + internalIpStr + ":" + regionProfile.httpPort + "/"; | 486 | regionProfile.httpServerURI = "http://" + internalIpStr + ":" + regionProfile.httpPort + "/"; |
| 487 | regionProfile.regionHandle = Utils.UIntsToLong((regX * Constants.RegionSize), (regY * Constants.RegionSize)); | 487 | regionProfile.regionHandle = Helpers.UIntsToLong((regX * Constants.RegionSize), (regY * Constants.RegionSize)); |
| 488 | regionProfile.regionLocX = regX; | 488 | regionProfile.regionLocX = regX; |
| 489 | regionProfile.regionLocY = regY; | 489 | regionProfile.regionLocY = regY; |
| 490 | 490 | ||