diff options
| author | Melanie | 2010-03-03 02:07:03 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-03 02:07:03 +0000 |
| commit | 028a87fe37002e7a0611f66babf1deee46c83804 (patch) | |
| tree | 387aec499fd60c2012bed8148e6a2ddc847c3d95 /OpenSim/Framework/Capabilities/Caps.cs | |
| parent | Revert "test" (diff) | |
| parent | Fixes Region.Framework tests. Although these tests don't fail, they need to b... (diff) | |
| download | opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.zip opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.gz opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.bz2 opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
This brings careminster on the level of master. To be tested
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Capabilities/Caps.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/Capabilities/Caps.cs b/OpenSim/Framework/Capabilities/Caps.cs index 74c6ab0..b27d011 100644 --- a/OpenSim/Framework/Capabilities/Caps.cs +++ b/OpenSim/Framework/Capabilities/Caps.cs | |||
| @@ -888,7 +888,7 @@ namespace OpenSim.Framework.Capabilities | |||
| 888 | } | 888 | } |
| 889 | 889 | ||
| 890 | AssetBase asset; | 890 | AssetBase asset; |
| 891 | asset = new AssetBase(assetID, assetName, assType); | 891 | asset = new AssetBase(assetID, assetName, assType, m_agentID.ToString()); |
| 892 | asset.Data = data; | 892 | asset.Data = data; |
| 893 | if (AddNewAsset != null) | 893 | if (AddNewAsset != null) |
| 894 | AddNewAsset(asset); | 894 | AddNewAsset(asset); |