diff options
| author | root | 2011-07-05 04:01:59 +0100 |
|---|---|---|
| committer | root | 2011-07-05 04:01:59 +0100 |
| commit | 47cf9c8fe060af89cc14817dc762bcbfef956d5e (patch) | |
| tree | 56b21e617bbb4ce3a613780c81178de41ff062d3 /OpenSim/Framework/AssetBase.cs | |
| parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
| parent | Add TestClearCache() (diff) | |
| download | opensim-SC_OLD-47cf9c8fe060af89cc14817dc762bcbfef956d5e.zip opensim-SC_OLD-47cf9c8fe060af89cc14817dc762bcbfef956d5e.tar.gz opensim-SC_OLD-47cf9c8fe060af89cc14817dc762bcbfef956d5e.tar.bz2 opensim-SC_OLD-47cf9c8fe060af89cc14817dc762bcbfef956d5e.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
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 8e24f91..06e040f 100644 --- a/OpenSim/Framework/AssetBase.cs +++ b/OpenSim/Framework/AssetBase.cs | |||
| @@ -281,6 +281,7 @@ namespace OpenSim.Framework | |||
| 281 | 281 | ||
| 282 | return m_id; | 282 | return m_id; |
| 283 | } | 283 | } |
| 284 | |||
| 284 | set | 285 | set |
| 285 | { | 286 | { |
| 286 | UUID uuid = UUID.Zero; | 287 | UUID uuid = UUID.Zero; |