aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs2
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 91a0f19..1167576 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -59,7 +59,7 @@ namespace OpenSim
59 public delegate void ConsoleCommand(string[] comParams); 59 public delegate void ConsoleCommand(string[] comParams);
60 60
61 public class OpenSimMain : RegionApplicationBase, conscmd_callback 61 public class OpenSimMain : RegionApplicationBase, conscmd_callback
62 { 62 {
63 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 63 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
64 private string proxyUrl; 64 private string proxyUrl;
65 private int proxyOffset = 0; 65 private int proxyOffset = 0;
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 365c884..795224e 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -550,7 +550,7 @@ namespace OpenSim.Region.Environment.Scenes
550 m_physicsActor.Flying = isFlying; 550 m_physicsActor.Flying = isFlying;
551 551
552 m_scene.SwapRootAgentCount(false); 552 m_scene.SwapRootAgentCount(false);
553 m_scene.CommsManager.UserProfileCacheService.UpdateUserInventory(m_uuid); 553 m_scene.CommsManager.UserProfileCacheService.RequestInventoryForUser(m_uuid);
554 m_scene.AddCapsHandler(m_uuid); 554 m_scene.AddCapsHandler(m_uuid);
555 //if (!m_gotAllObjectsInScene) 555 //if (!m_gotAllObjectsInScene)
556 //{ 556 //{