From 3bf88587277b83c0b6f058fabba7d46a3b5a6a00 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 28 Aug 2008 14:41:54 +0000 Subject: Update svn properties, formatting cleanup. --- OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | 2 +- .../Communications/Cache/UserProfileCacheService.cs | 2 +- OpenSim/Framework/Communications/Capabilities/Caps.cs | 4 ++-- OpenSim/Framework/Communications/GridInfoService.cs | 14 +++++++------- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'OpenSim/Framework/Communications') 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 // "[INVENTORY CACHE]: Received item {0} {1} for user {2}", // itemInfo.Name, itemInfo.ID, userID); InventoryFolderImpl folder = null; - + if ( RootFolder != null ) folder = RootFolder.FindFolder(itemInfo.Folder); 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 { if (userID == LLUUID.Zero) return; - + lock (m_userProfiles) { 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 IMoneyModule mm = scene.RequestModuleInterface(); - if(mm != null) + if (mm != null) { - if(!mm.UploadCovered(client)) + if (!mm.UploadCovered(client)) { client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false); 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 /// GridInfoService uses the [GridInfo] section of the /// standard OpenSim.ini file --- which is not optimal, but /// anything else requires a general redesign of the config - /// system. + /// system. /// public GridInfoService(IConfigSource configSource) { @@ -65,7 +65,7 @@ namespace OpenSim.Framework.Communications /// public GridInfoService() { - try + try { IConfigSource configSource = new IniConfigSource(Path.Combine(Util.configDir(), "OpenSim.ini")); loadGridInfo(configSource); @@ -84,15 +84,15 @@ namespace OpenSim.Framework.Communications IConfig startupCfg = configSource.Configs["Startup"]; IConfig gridCfg = configSource.Configs["GridInfo"]; IConfig netCfg = configSource.Configs["Network"]; - + bool grid = startupCfg.GetBoolean("gridmode", false); - + if (grid) _info["mode"] = "grid"; - else + else _info["mode"] = "standalone"; - - + + if (null != gridCfg) { foreach (string k in gridCfg.GetKeys()) -- cgit v1.1