OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'melanie'

httptests
Melanie Thielker 2017-02-02 15:34:20 +00:00
parent 202fcc7d6f 6164573766
commit 07c39624ef
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
View File

@ -243,7 +243,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
if (m_Cache != null) if (m_Cache != null)
m_Cache.Get(id, out asset); m_Cache.Get(id, out asset);
return null; return asset;
} }
public AssetMetadata GetMetadata(string id) public AssetMetadata GetMetadata(string id)

2
OpenSim/Region/Framework/Scenes/EventManager.cs
View File

@ -3161,7 +3161,7 @@ namespace OpenSim.Region.Framework.Scenes
{ {
foreach (Action<Scene> d in handler.GetInvocationList()) foreach (Action<Scene> d in handler.GetInvocationList())
{ {
m_log.InfoFormat("[EVENT MANAGER]: TriggerSceneShuttingDown invoque {0}", d.Method.Name.ToString()); m_log.InfoFormat("[EVENT MANAGER]: TriggerSceneShuttingDown invoke {0}", d.Method.Name.ToString());
try try
{ {
d(s); d(s);