diff options
| author | Melanie | 2011-06-09 02:05:04 +0100 |
|---|---|---|
| committer | Melanie | 2011-06-09 02:05:04 +0100 |
| commit | 326c46ba70cea70ddfe4aef9a6b73edff63e126a (patch) | |
| tree | 5e76347b0d77f58717d8e5e4f3b8787ff01a18d7 /OpenSim/Framework/AssetBase.cs | |
| parent | Make the last otem in a list created with llCSV2List findable (diff) | |
| parent | Consistency fix on the last commit. (diff) | |
| download | opensim-SC_OLD-326c46ba70cea70ddfe4aef9a6b73edff63e126a.zip opensim-SC_OLD-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.gz opensim-SC_OLD-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.bz2 opensim-SC_OLD-326c46ba70cea70ddfe4aef9a6b73edff63e126a.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Framework/AssetBase.cs')
| -rw-r--r-- | OpenSim/Framework/AssetBase.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs index 98fa846..8e24f91 100644 --- a/OpenSim/Framework/AssetBase.cs +++ b/OpenSim/Framework/AssetBase.cs | |||
| @@ -223,6 +223,12 @@ namespace OpenSim.Framework | |||
| 223 | set { m_metadata.Temporary = value; } | 223 | set { m_metadata.Temporary = value; } |
| 224 | } | 224 | } |
| 225 | 225 | ||
| 226 | public string CreatorID | ||
| 227 | { | ||
| 228 | get { return m_metadata.CreatorID; } | ||
| 229 | set { m_metadata.CreatorID = value; } | ||
| 230 | } | ||
| 231 | |||
| 226 | public AssetFlags Flags | 232 | public AssetFlags Flags |
| 227 | { | 233 | { |
| 228 | get { return m_metadata.Flags; } | 234 | get { return m_metadata.Flags; } |