aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
authormingchen2007-07-12 16:19:32 +0000
committermingchen2007-07-12 16:19:32 +0000
commitb27924d0a53e7cf316e3d753d0631b3c221ed887 (patch)
treee75858c45d3f3bfa3185b8812545d83052a4a12c /OpenSim/Region/Environment/Scenes/Scene.cs
parentNext time maybe I should check it still compiles before committing. (diff)
downloadopensim-SC_OLD-b27924d0a53e7cf316e3d753d0631b3c221ed887.zip
opensim-SC_OLD-b27924d0a53e7cf316e3d753d0631b3c221ed887.tar.gz
opensim-SC_OLD-b27924d0a53e7cf316e3d753d0631b3c221ed887.tar.bz2
opensim-SC_OLD-b27924d0a53e7cf316e3d753d0631b3c221ed887.tar.xz
*Found and fixed bug that crashed viewer when logging in or viewing land owners
*Reenabled estate manager; remember, the master avatar is the only one that can use this (by default: Test User with password 'test') *Still working on readding support for updating parcel information when logging in or moving into a new parcel
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs16
1 files changed, 9 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 80c61e1..d526b3c 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -487,15 +487,17 @@ namespace OpenSim.Region.Environment.Scenes
487 client.OnLinkObjects += this.LinkObjects; 487 client.OnLinkObjects += this.LinkObjects;
488 client.OnObjectDuplicate += this.DuplicateObject; 488 client.OnObjectDuplicate += this.DuplicateObject;
489 489
490 /* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest); 490 client.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest);
491 remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest); 491 client.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest);
492 remoteClient.OnParcelJoinRequest += new ParcelJoinRequest(parcelManager.handleParcelJoinRequest); 492 client.OnParcelJoinRequest += new ParcelJoinRequest(parcelManager.handleParcelJoinRequest);
493 remoteClient.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest); 493 client.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest);
494 remoteClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage); 494 client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage);
495 */ 495
496 this.estateManager.sendRegionHandshake(client); 496 this.estateManager.sendRegionHandshake(client);
497
498 CreateAndAddScenePresence(client); 497 CreateAndAddScenePresence(client);
498
499 this.parcelManager.sendParcelOverlay(client);
500
499 return; 501 return;
500 } 502 }
501 503