diff options
author | Mike Mazur | 2009-02-25 00:32:26 +0000 |
---|---|---|
committer | Mike Mazur | 2009-02-25 00:32:26 +0000 |
commit | bdf95e54a2da5b60e7817d748f7389289a59bc5e (patch) | |
tree | e688db1880284466aef41abb545dc9ed50ea66cc /OpenSim/Region/Application | |
parent | Setting svn:eol-style=native on new files. (diff) | |
download | opensim-SC-bdf95e54a2da5b60e7817d748f7389289a59bc5e.zip opensim-SC-bdf95e54a2da5b60e7817d748f7389289a59bc5e.tar.gz opensim-SC-bdf95e54a2da5b60e7817d748f7389289a59bc5e.tar.bz2 opensim-SC-bdf95e54a2da5b60e7817d748f7389289a59bc5e.tar.xz |
A few updates necessary for load balancer.
- handle GetUser request for nonexistent user gracefully
- include throttle levels in ClientInfo
- code to save/restore throttles in client stack
- only update/send updates to active clients
- make animation classes serializable
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index f3e3d4f..2f3f198 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -561,8 +561,12 @@ namespace OpenSim | |||
561 | { | 561 | { |
562 | int port = regionInfo.InternalEndPoint.Port; | 562 | int port = regionInfo.InternalEndPoint.Port; |
563 | 563 | ||
564 | // set initial originRegionID to RegionID in RegionInfo. (it needs for loding prims) | 564 | // set initial RegionID to originRegionID in RegionInfo. (it needs for loding prims) |
565 | regionInfo.originRegionID = regionInfo.RegionID; | 565 | // Commented this out because otherwise regions can't register with |
566 | // the grid as there is already another region with the same UUID | ||
567 | // at those coordinates. This is required for the load balancer to work. | ||
568 | // --Mike, 2009.02.25 | ||
569 | //regionInfo.originRegionID = regionInfo.RegionID; | ||
566 | 570 | ||
567 | // set initial ServerURI | 571 | // set initial ServerURI |
568 | regionInfo.ServerURI = "http://" + regionInfo.ExternalHostName + ":" + regionInfo.InternalEndPoint.Port; | 572 | regionInfo.ServerURI = "http://" + regionInfo.ExternalHostName + ":" + regionInfo.InternalEndPoint.Port; |