Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

This commit is contained in:
Melanie
2009-12-21 22:06:17 +00:00

View File

@@ -151,6 +151,9 @@ namespace OpenSim.Services.Connectors.Grid
m_AssetService.Store(ass);
// finally
info.TerrainImage = ass.FullID;
}
catch // LEGIT: Catching problems caused by OpenJPEG p/invoke
{