diff options
| author | Melanie | 2009-12-21 22:06:17 +0000 |
|---|---|---|
| committer | Melanie | 2009-12-21 22:06:17 +0000 |
| commit | 1fe8a1beaff64e3d403d77f15f3db33b69a63f1a (patch) | |
| tree | df77fc92acb18cd1f36e3e83120e832dac218b6d /OpenSim | |
| parent | When a script has been loaded, remove it's state entry, so recompiling (diff) | |
| parent | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-1fe8a1beaff64e3d403d77f15f3db33b69a63f1a.zip opensim-SC_OLD-1fe8a1beaff64e3d403d77f15f3db33b69a63f1a.tar.gz opensim-SC_OLD-1fe8a1beaff64e3d403d77f15f3db33b69a63f1a.tar.bz2 opensim-SC_OLD-1fe8a1beaff64e3d403d77f15f3db33b69a63f1a.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Services/Connectors/Grid/HypergridServiceConnector.cs | 3 |
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 | { |