diff options
| author | Melanie Thielker | 2008-11-19 06:25:34 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-11-19 06:25:34 +0000 |
| commit | f518ca7feb33c0c1641ccb8f3956246b855f9b6c (patch) | |
| tree | 8dafdff97f14290b259bb04a03c5e7bb98756c24 /OpenSim/Grid/MessagingServer/MessageService.cs | |
| parent | Reverting the texture sending patch and the new libOMV. This makes this (diff) | |
| download | opensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.zip opensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.tar.gz opensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.tar.bz2 opensim-SC_OLD-f518ca7feb33c0c1641ccb8f3956246b855f9b6c.tar.xz | |
Reapply r7369 r7367 r7366 r7370 r7381. This brings it back up to the new
libOMV.
Diffstat (limited to '')
| -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 b4a0c21..1f04865 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 = Helpers.UIntsToLong((regX * Constants.RegionSize), (regY * Constants.RegionSize)); | 487 | regionProfile.regionHandle = Utils.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 | ||