diff options
| author | UbitUmarov | 2016-08-19 03:05:25 +0100 |
|---|---|---|
| committer | UbitUmarov | 2016-08-19 03:05:25 +0100 |
| commit | 7ba3fb7b5d9c883b7a99d19f893ff6d43689b629 (patch) | |
| tree | 1ea4937e30520d440979ab02e92882f6f54a3e73 /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs | |
| parent | fix entity update flags update (diff) | |
| parent | catch some NULL refs (diff) | |
| download | opensim-SC-7ba3fb7b5d9c883b7a99d19f893ff6d43689b629.zip opensim-SC-7ba3fb7b5d9c883b7a99d19f893ff6d43689b629.tar.gz opensim-SC-7ba3fb7b5d9c883b7a99d19f893ff6d43689b629.tar.bz2 opensim-SC-7ba3fb7b5d9c883b7a99d19f893ff6d43689b629.tar.xz | |
merge issue
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs index 83f08e0..eb64f71 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/XmlRpcGroupsServicesConnectorModule.cs | |||
| @@ -1008,11 +1008,11 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
| 1008 | respData.Add("error", e.ToString()); | 1008 | respData.Add("error", e.ToString()); |
| 1009 | return respData; | 1009 | return respData; |
| 1010 | } | 1010 | } |
| 1011 | } | ||
| 1012 | 1011 | ||
| 1013 | if ((m_cacheTimeout > 0) && (CacheKey != null)) | 1012 | if ((m_cacheTimeout > 0) && (CacheKey != null)) |
| 1014 | { | 1013 | { |
| 1015 | m_memoryCache.AddOrUpdate(CacheKey, resp, TimeSpan.FromSeconds(m_cacheTimeout)); | 1014 | m_memoryCache.AddOrUpdate(CacheKey, resp, 10.0); |
| 1015 | } | ||
| 1016 | } | 1016 | } |
| 1017 | 1017 | ||
| 1018 | if (resp.Value is Hashtable) | 1018 | if (resp.Value is Hashtable) |