aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2009-12-21 22:06:17 +0000
committerMelanie2009-12-21 22:06:17 +0000
commit1fe8a1beaff64e3d403d77f15f3db33b69a63f1a (patch)
treedf77fc92acb18cd1f36e3e83120e832dac218b6d
parentWhen a script has been loaded, remove it's state entry, so recompiling (diff)
parentMerge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC-1fe8a1beaff64e3d403d77f15f3db33b69a63f1a.zip
opensim-SC-1fe8a1beaff64e3d403d77f15f3db33b69a63f1a.tar.gz
opensim-SC-1fe8a1beaff64e3d403d77f15f3db33b69a63f1a.tar.bz2
opensim-SC-1fe8a1beaff64e3d403d77f15f3db33b69a63f1a.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs b/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs
index 968a6d6..7098b07 100644
--- a/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs
@@ -151,6 +151,9 @@ namespace OpenSim.Services.Connectors.Grid
151 151
152 m_AssetService.Store(ass); 152 m_AssetService.Store(ass);
153 153
154 // finally
155 info.TerrainImage = ass.FullID;
156
154 } 157 }
155 catch // LEGIT: Catching problems caused by OpenJPEG p/invoke 158 catch // LEGIT: Catching problems caused by OpenJPEG p/invoke
156 { 159 {