diff options
| author | Dan Lake | 2011-07-11 12:23:20 -0700 |
|---|---|---|
| committer | Dan Lake | 2011-07-11 12:23:20 -0700 |
| commit | b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a (patch) | |
| tree | 8fd2fa4567e2882e7f5dafdb8cf1de571917f23a /OpenSim/Framework/AssetBase.cs | |
| parent | Checkin 32 bit bulletsim shared library for Linux. (diff) | |
| parent | minor Tack the prim name on the end of the "experimental mesh proxy generatio... (diff) | |
| download | opensim-SC-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.zip opensim-SC-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.gz opensim-SC-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.bz2 opensim-SC-b9cbe92f30c97d6b402be73c8c6fd8e6894ef05a.tar.xz | |
Merge branch 'master' into bulletsim
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 5f68cda..e8c85c9 100644 --- a/OpenSim/Framework/AssetBase.cs +++ b/OpenSim/Framework/AssetBase.cs | |||
| @@ -273,6 +273,7 @@ namespace OpenSim.Framework | |||
| 273 | 273 | ||
| 274 | return m_id; | 274 | return m_id; |
| 275 | } | 275 | } |
| 276 | |||
| 276 | set | 277 | set |
| 277 | { | 278 | { |
| 278 | UUID uuid = UUID.Zero; | 279 | UUID uuid = UUID.Zero; |