diff options
5 files changed, 8 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs index 004e20c..cff2cf4 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs | |||
@@ -849,7 +849,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
849 | /// <param name="xferManager"></param> | 849 | /// <param name="xferManager"></param> |
850 | public void RequestInventoryFile(IClientAPI client, IXfer xferManager) | 850 | public void RequestInventoryFile(IClientAPI client, IXfer xferManager) |
851 | { | 851 | { |
852 | bool changed = CreateInventoryFile(); | 852 | CreateInventoryFile(); |
853 | 853 | ||
854 | if (m_inventorySerial == 0) // No inventory | 854 | if (m_inventorySerial == 0) // No inventory |
855 | { | 855 | { |
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 7b94202..03cd90f 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -1108,7 +1108,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1108 | /// </summary> | 1108 | /// </summary> |
1109 | public void CompleteMovement(IClientAPI client) | 1109 | public void CompleteMovement(IClientAPI client) |
1110 | { | 1110 | { |
1111 | DateTime startTime = DateTime.Now; | 1111 | // DateTime startTime = DateTime.Now; |
1112 | 1112 | ||
1113 | m_log.DebugFormat( | 1113 | m_log.DebugFormat( |
1114 | "[SCENE PRESENCE]: Completing movement of {0} into region {1}", | 1114 | "[SCENE PRESENCE]: Completing movement of {0} into region {1}", |
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index bbddd87..b66bfed 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs | |||
@@ -303,7 +303,7 @@ namespace OpenSim.Services.HypergridService | |||
303 | return m_UserAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID); | 303 | return m_UserAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID); |
304 | else | 304 | else |
305 | { | 305 | { |
306 | Object[] args = new Object[] { userURL }; | 306 | // Object[] args = new Object[] { userURL }; |
307 | IUserAgentService userAgentService = new UserAgentServiceConnector(userURL); | 307 | IUserAgentService userAgentService = new UserAgentServiceConnector(userURL); |
308 | if (userAgentService != null) | 308 | if (userAgentService != null) |
309 | { | 309 | { |
diff --git a/OpenSim/Services/HypergridService/HGInventoryService.cs b/OpenSim/Services/HypergridService/HGInventoryService.cs index 9ee1ae4..4b02698 100644 --- a/OpenSim/Services/HypergridService/HGInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGInventoryService.cs | |||
@@ -53,7 +53,7 @@ namespace OpenSim.Services.HypergridService | |||
53 | LogManager.GetLogger( | 53 | LogManager.GetLogger( |
54 | MethodBase.GetCurrentMethod().DeclaringType); | 54 | MethodBase.GetCurrentMethod().DeclaringType); |
55 | 55 | ||
56 | protected new IXInventoryData m_Database; | 56 | protected IXInventoryData m_Database; |
57 | 57 | ||
58 | private string m_ProfileServiceURL; | 58 | private string m_ProfileServiceURL; |
59 | private IUserAccountService m_UserAccountService; | 59 | private IUserAccountService m_UserAccountService; |
diff --git a/OpenSim/Services/HypergridService/UserAccountCache.cs b/OpenSim/Services/HypergridService/UserAccountCache.cs index 3e9aea1..65f9dd5 100644 --- a/OpenSim/Services/HypergridService/UserAccountCache.cs +++ b/OpenSim/Services/HypergridService/UserAccountCache.cs | |||
@@ -13,9 +13,10 @@ namespace OpenSim.Services.HypergridService | |||
13 | { | 13 | { |
14 | private const double CACHE_EXPIRATION_SECONDS = 120000.0; // 33 hours! | 14 | private const double CACHE_EXPIRATION_SECONDS = 120000.0; // 33 hours! |
15 | 15 | ||
16 | private static readonly ILog m_log = | 16 | // private static readonly ILog m_log = |
17 | LogManager.GetLogger( | 17 | // LogManager.GetLogger( |
18 | MethodBase.GetCurrentMethod().DeclaringType); | 18 | // MethodBase.GetCurrentMethod().DeclaringType); |
19 | |||
19 | private ExpiringCache<UUID, UserAccount> m_UUIDCache; | 20 | private ExpiringCache<UUID, UserAccount> m_UUIDCache; |
20 | 21 | ||
21 | private IUserAccountService m_UserAccountService; | 22 | private IUserAccountService m_UserAccountService; |