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/AssetLandmark.cs | |
| parent | Revert "test" (diff) | |
| parent | Fixes Region.Framework tests. Although these tests don't fail, they need to b... (diff) | |
| download | opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.zip opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.tar.gz opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.tar.bz2 opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
This brings careminster on the level of master. To be tested
Diffstat (limited to 'OpenSim/Framework/AssetLandmark.cs')
| -rw-r--r-- | OpenSim/Framework/AssetLandmark.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Framework/AssetLandmark.cs b/OpenSim/Framework/AssetLandmark.cs index 058b442..7806c1f 100644 --- a/OpenSim/Framework/AssetLandmark.cs +++ b/OpenSim/Framework/AssetLandmark.cs | |||
| @@ -38,7 +38,7 @@ namespace OpenSim.Framework | |||
| 38 | public int Version; | 38 | public int Version; |
| 39 | 39 | ||
| 40 | public AssetLandmark(AssetBase a) | 40 | public AssetLandmark(AssetBase a) |
| 41 | : base(a.FullID, a.Name, a.Type) | 41 | : base(a.FullID, a.Name, a.Type, a.Metadata.CreatorID) |
| 42 | { | 42 | { |
| 43 | Data = a.Data; | 43 | Data = a.Data; |
| 44 | Description = a.Description; | 44 | Description = a.Description; |