aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
authorMW2007-08-01 16:50:20 +0000
committerMW2007-08-01 16:50:20 +0000
commitedc572dacf3ff65c5584f8c02bb291abce0c7122 (patch)
tree0e1c8802d3bb8406883d01a1648b20d36215ec4e /OpenSim/Region/Environment/Scenes/Scene.cs
parentremove Adam's work around, this shouldn't be needed any more (diff)
downloadopensim-SC-edc572dacf3ff65c5584f8c02bb291abce0c7122.zip
opensim-SC-edc572dacf3ff65c5584f8c02bb291abce0c7122.tar.gz
opensim-SC-edc572dacf3ff65c5584f8c02bb291abce0c7122.tar.bz2
opensim-SC-edc572dacf3ff65c5584f8c02bb291abce0c7122.tar.xz
Some more work on SceneObject/primitive rewrites (AllNewSceneObjectGroup2 /Part2).
Updated the JavaVM to a later version I did (basically some clean up and a little bit more functional). Added SendLoadURL method to IClientAPI.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index dbc6f92..d75a7f3 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -550,7 +550,7 @@ namespace OpenSim.Region.Environment.Scenes
550 m_estateManager.sendRegionHandshake(client); 550 m_estateManager.sendRegionHandshake(client);
551 CreateAndAddScenePresence(client); 551 CreateAndAddScenePresence(client);
552 m_LandManager.sendParcelOverlay(client); 552 m_LandManager.sendParcelOverlay(client);
553 // commsManager.UserProfiles.AddNewUser(client.AgentId); 553 //commsManager.UserProfiles.AddNewUser(client.AgentId);
554 } 554 }
555 555
556 protected virtual void SubscribeToClientEvents(IClientAPI client) 556 protected virtual void SubscribeToClientEvents(IClientAPI client)
@@ -595,7 +595,7 @@ namespace OpenSim.Region.Environment.Scenes
595 595
596 client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage); 596 client.OnEstateOwnerMessage += new EstateOwnerMessageRequest(m_estateManager.handleEstateOwnerMessage);
597 597
598 // client.OnCreateNewInventoryItem += CreateNewInventoryItem; 598 // client.OnCreateNewInventoryItem += CreateNewInventoryItem;
599 //client.OnCreateNewInventoryFolder += commsManager.UserProfiles.HandleCreateInventoryFolder; 599 //client.OnCreateNewInventoryFolder += commsManager.UserProfiles.HandleCreateInventoryFolder;
600 client.OnFetchInventoryDescendents += commsManager.UserProfiles.HandleFecthInventoryDescendents; 600 client.OnFetchInventoryDescendents += commsManager.UserProfiles.HandleFecthInventoryDescendents;
601 client.OnRequestTaskInventory += RequestTaskInventory; 601 client.OnRequestTaskInventory += RequestTaskInventory;