diff options
| author | Justin Clark-Casey (justincc) | 2013-01-10 01:45:56 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-01-10 01:45:56 +0000 |
| commit | 170d37696795d70799fb9b402400133088f389e9 (patch) | |
| tree | 9febce72e0bd0d23dce4bc1bfe617ba5b29e7348 | |
| parent | revert accidental change to MemoryWatchdog stat calculation in previous b1b4687 (diff) | |
| download | opensim-SC_OLD-170d37696795d70799fb9b402400133088f389e9.zip opensim-SC_OLD-170d37696795d70799fb9b402400133088f389e9.tar.gz opensim-SC_OLD-170d37696795d70799fb9b402400133088f389e9.tar.bz2 opensim-SC_OLD-170d37696795d70799fb9b402400133088f389e9.tar.xz | |
On baked texture save, replace any HG ID with an ordinary asset ID so the HGAssetBroker doesn't try to save back to the avatar's originating region
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index 0a69979..ce79f07 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
| @@ -287,6 +287,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
| 287 | 287 | ||
| 288 | if (asset != null) | 288 | if (asset != null) |
| 289 | { | 289 | { |
| 290 | // Replace an HG ID with the simple asset ID so that we can persist textures for foreign HG avatars | ||
| 291 | asset.ID = asset.FullID.ToString(); | ||
| 292 | |||
| 290 | asset.Temporary = false; | 293 | asset.Temporary = false; |
| 291 | asset.Local = false; | 294 | asset.Local = false; |
| 292 | m_scene.AssetService.Store(asset); | 295 | m_scene.AssetService.Store(asset); |