diff options
author | Melanie | 2011-11-24 01:16:37 +0000 |
---|---|---|
committer | Melanie | 2011-11-24 01:16:37 +0000 |
commit | a8270cb48cf8dbca7595da5963d8fafdb1141529 (patch) | |
tree | cf878acca0c652239f4441c3783647b6b0b688a6 /OpenSim/Region/Framework/Scenes/SceneBase.cs | |
parent | Merge branch 'master' into bigmerge (diff) | |
parent | Append asset ID to URL for storage requests to allow caching proxies to work ... (diff) | |
download | opensim-SC-a8270cb48cf8dbca7595da5963d8fafdb1141529.zip opensim-SC-a8270cb48cf8dbca7595da5963d8fafdb1141529.tar.gz opensim-SC-a8270cb48cf8dbca7595da5963d8fafdb1141529.tar.bz2 opensim-SC-a8270cb48cf8dbca7595da5963d8fafdb1141529.tar.xz |
Merge branch 'master' into bigmerge
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneBase.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneBase.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs index 73e9392..0fd5164 100644 --- a/OpenSim/Region/Framework/Scenes/SceneBase.cs +++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs | |||
@@ -451,7 +451,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
451 | } | 451 | } |
452 | else | 452 | else |
453 | { | 453 | { |
454 | return new T[] { default(T) }; | 454 | return new T[] {}; |
455 | } | 455 | } |
456 | } | 456 | } |
457 | 457 | ||