aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index d1a16e0..10be283 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -180,6 +180,8 @@ namespace OpenSim.Region.Environment.Scenes
180 ScenePresence.LoadAnims(); 180 ScenePresence.LoadAnims();
181 181
182 httpListener = httpServer; 182 httpListener = httpServer;
183
184
183 } 185 }
184 186
185 #endregion 187 #endregion
@@ -497,7 +499,7 @@ namespace OpenSim.Region.Environment.Scenes
497 public void LoadPrimsFromStorage() 499 public void LoadPrimsFromStorage()
498 { 500 {
499 MainLog.Instance.Verbose("Loading objects from datastore"); 501 MainLog.Instance.Verbose("Loading objects from datastore");
500 List<SceneObjectGroup> PrimsFromDB = storageManager.DataStore.LoadObjects(); 502 List<SceneObjectGroup> PrimsFromDB = storageManager.DataStore.LoadObjects(this.m_regInfo.SimUUID);
501 foreach (SceneObjectGroup prim in PrimsFromDB) 503 foreach (SceneObjectGroup prim in PrimsFromDB)
502 { 504 {
503 AddEntityFromStorage(prim); 505 AddEntityFromStorage(prim);
@@ -707,7 +709,7 @@ namespace OpenSim.Region.Environment.Scenes
707 client.OnFetchInventory += commsManager.UserProfiles.HandleFetchInventory; 709 client.OnFetchInventory += commsManager.UserProfiles.HandleFetchInventory;
708 client.OnAssetUploadRequest += commsManager.TransactionsManager.HandleUDPUploadRequest; 710 client.OnAssetUploadRequest += commsManager.TransactionsManager.HandleUDPUploadRequest;
709 client.OnXferReceive += commsManager.TransactionsManager.HandleXfer; 711 client.OnXferReceive += commsManager.TransactionsManager.HandleXfer;
710 // client.OnRequestXfer += RequestXfer; 712 // client.OnRequestXfer += RequestXfer;
711 713
712 client.OnRequestAvatarProperties += RequestAvatarProperty; 714 client.OnRequestAvatarProperties += RequestAvatarProperty;
713 715
@@ -919,9 +921,7 @@ namespace OpenSim.Region.Environment.Scenes
919 if (agent.CapsPath != "") 921 if (agent.CapsPath != "")
920 { 922 {
921 //Console.WriteLine("new user, so creating caps handler for it"); 923 //Console.WriteLine("new user, so creating caps handler for it");
922 Caps cap = 924 Caps cap = new Caps(assetCache, httpListener, m_regInfo.ExternalHostName, m_regInfo.ExternalEndPoint.Port, agent.CapsPath, agent.AgentID);
923 new Caps(assetCache, httpListener, m_regInfo.ExternalHostName, m_regInfo.ExternalEndPoint.Port,
924 agent.CapsPath, agent.AgentID);
925 Util.SetCapsURL(agent.AgentID, "http://" + m_regInfo.ExternalHostName + ":" + httpListener.Port.ToString() + "/CAPS/" + agent.CapsPath + "0000/"); 925 Util.SetCapsURL(agent.AgentID, "http://" + m_regInfo.ExternalHostName + ":" + httpListener.Port.ToString() + "/CAPS/" + agent.CapsPath + "0000/");
926 cap.RegisterHandlers(); 926 cap.RegisterHandlers();
927 cap.AddNewInventoryItem = this.AddInventoryItem; 927 cap.AddNewInventoryItem = this.AddInventoryItem;