diff options
| author | Melanie | 2011-10-12 00:10:15 +0200 |
|---|---|---|
| committer | Melanie | 2011-10-12 00:10:15 +0200 |
| commit | 1c2b5d99c9601a3d301f4bc0f53389cca831ee04 (patch) | |
| tree | 97fa9c758f429d5dee64234e442f2c83cd1b9994 /OpenSim/Framework/AssetBase.cs | |
| parent | Merge branch 'careminster-presence-refactor' into bigmerge (diff) | |
| parent | Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge (diff) | |
| download | opensim-SC-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.zip opensim-SC-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.tar.gz opensim-SC-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.tar.bz2 opensim-SC-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.tar.xz | |
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
Diffstat (limited to 'OpenSim/Framework/AssetBase.cs')
| -rw-r--r-- | OpenSim/Framework/AssetBase.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs index 06e040f..ff240be 100644 --- a/OpenSim/Framework/AssetBase.cs +++ b/OpenSim/Framework/AssetBase.cs | |||
| @@ -169,6 +169,7 @@ namespace OpenSim.Framework | |||
| 169 | get { return m_metadata.FullID; } | 169 | get { return m_metadata.FullID; } |
| 170 | set { m_metadata.FullID = value; } | 170 | set { m_metadata.FullID = value; } |
| 171 | } | 171 | } |
| 172 | |||
| 172 | /// <summary> | 173 | /// <summary> |
| 173 | /// Asset MetaData ID (transferring from UUID to string ID) | 174 | /// Asset MetaData ID (transferring from UUID to string ID) |
| 174 | /// </summary> | 175 | /// </summary> |