aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorCasperW2009-12-23 14:15:27 +0100
committerCasperW2009-12-23 14:15:27 +0100
commitc54e0953d09f74be65f7f1939af16afcb8ade054 (patch)
tree30fdda415425190bb50a752d7b84f64e0a29db9b /OpenSim/Services
parentAdded some null reference and deleted group checks to certain functions to fi... (diff)
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC_OLD-c54e0953d09f74be65f7f1939af16afcb8ade054.zip
opensim-SC_OLD-c54e0953d09f74be65f7f1939af16afcb8ade054.tar.gz
opensim-SC_OLD-c54e0953d09f74be65f7f1939af16afcb8ade054.tar.bz2
opensim-SC_OLD-c54e0953d09f74be65f7f1939af16afcb8ade054.tar.xz
Merge branch 'master' of ssh://TOR/var/git/careminster
Diffstat (limited to 'OpenSim/Services')
-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 {