diff options
Diffstat (limited to '')
4 files changed, 11 insertions, 11 deletions
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs index 17f927d..3a20b9e 100644 --- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs +++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | |||
@@ -306,7 +306,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
306 | // "[INVENTORY CACHE]: Received item {0} {1} for user {2}", | 306 | // "[INVENTORY CACHE]: Received item {0} {1} for user {2}", |
307 | // itemInfo.Name, itemInfo.ID, userID); | 307 | // itemInfo.Name, itemInfo.ID, userID); |
308 | InventoryFolderImpl folder = null; | 308 | InventoryFolderImpl folder = null; |
309 | 309 | ||
310 | if ( RootFolder != null ) | 310 | if ( RootFolder != null ) |
311 | folder = RootFolder.FindFolder(itemInfo.Folder); | 311 | folder = RootFolder.FindFolder(itemInfo.Folder); |
312 | 312 | ||
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs index 017cb29..45f6c7e 100644 --- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs +++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | |||
@@ -168,7 +168,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
168 | { | 168 | { |
169 | if (userID == LLUUID.Zero) | 169 | if (userID == LLUUID.Zero) |
170 | return; | 170 | return; |
171 | 171 | ||
172 | lock (m_userProfiles) | 172 | lock (m_userProfiles) |
173 | { | 173 | { |
174 | if (m_userProfiles.ContainsKey(userID)) | 174 | if (m_userProfiles.ContainsKey(userID)) |
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index 18ddd9e..a7486d6 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs | |||
@@ -617,9 +617,9 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
617 | 617 | ||
618 | IMoneyModule mm = scene.RequestModuleInterface<IMoneyModule>(); | 618 | IMoneyModule mm = scene.RequestModuleInterface<IMoneyModule>(); |
619 | 619 | ||
620 | if(mm != null) | 620 | if (mm != null) |
621 | { | 621 | { |
622 | if(!mm.UploadCovered(client)) | 622 | if (!mm.UploadCovered(client)) |
623 | { | 623 | { |
624 | client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false); | 624 | client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false); |
625 | 625 | ||
diff --git a/OpenSim/Framework/Communications/GridInfoService.cs b/OpenSim/Framework/Communications/GridInfoService.cs index ce66c82..bd108c1 100644 --- a/OpenSim/Framework/Communications/GridInfoService.cs +++ b/OpenSim/Framework/Communications/GridInfoService.cs | |||
@@ -53,7 +53,7 @@ namespace OpenSim.Framework.Communications | |||
53 | /// GridInfoService uses the [GridInfo] section of the | 53 | /// GridInfoService uses the [GridInfo] section of the |
54 | /// standard OpenSim.ini file --- which is not optimal, but | 54 | /// standard OpenSim.ini file --- which is not optimal, but |
55 | /// anything else requires a general redesign of the config | 55 | /// anything else requires a general redesign of the config |
56 | /// system. | 56 | /// system. |
57 | /// </remarks> | 57 | /// </remarks> |
58 | public GridInfoService(IConfigSource configSource) | 58 | public GridInfoService(IConfigSource configSource) |
59 | { | 59 | { |
@@ -65,7 +65,7 @@ namespace OpenSim.Framework.Communications | |||
65 | /// </summary> | 65 | /// </summary> |
66 | public GridInfoService() | 66 | public GridInfoService() |
67 | { | 67 | { |
68 | try | 68 | try |
69 | { | 69 | { |
70 | IConfigSource configSource = new IniConfigSource(Path.Combine(Util.configDir(), "OpenSim.ini")); | 70 | IConfigSource configSource = new IniConfigSource(Path.Combine(Util.configDir(), "OpenSim.ini")); |
71 | loadGridInfo(configSource); | 71 | loadGridInfo(configSource); |
@@ -84,15 +84,15 @@ namespace OpenSim.Framework.Communications | |||
84 | IConfig startupCfg = configSource.Configs["Startup"]; | 84 | IConfig startupCfg = configSource.Configs["Startup"]; |
85 | IConfig gridCfg = configSource.Configs["GridInfo"]; | 85 | IConfig gridCfg = configSource.Configs["GridInfo"]; |
86 | IConfig netCfg = configSource.Configs["Network"]; | 86 | IConfig netCfg = configSource.Configs["Network"]; |
87 | 87 | ||
88 | bool grid = startupCfg.GetBoolean("gridmode", false); | 88 | bool grid = startupCfg.GetBoolean("gridmode", false); |
89 | 89 | ||
90 | if (grid) | 90 | if (grid) |
91 | _info["mode"] = "grid"; | 91 | _info["mode"] = "grid"; |
92 | else | 92 | else |
93 | _info["mode"] = "standalone"; | 93 | _info["mode"] = "standalone"; |
94 | 94 | ||
95 | 95 | ||
96 | if (null != gridCfg) | 96 | if (null != gridCfg) |
97 | { | 97 | { |
98 | foreach (string k in gridCfg.GetKeys()) | 98 | foreach (string k in gridCfg.GetKeys()) |