diff options
| author | Melanie | 2011-05-05 09:49:10 +0100 |
|---|---|---|
| committer | Melanie | 2011-05-05 09:49:10 +0100 |
| commit | 4beb0c9b9b402c1e8f70a02c0efa557c1f292f1c (patch) | |
| tree | 24e24cb7b424df74b13788d28be9d7588fbd99d0 /OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Test m_Enabled on RemoveRegion. (diff) | |
| download | opensim-SC-4beb0c9b9b402c1e8f70a02c0efa557c1f292f1c.zip opensim-SC-4beb0c9b9b402c1e8f70a02c0efa557c1f292f1c.tar.gz opensim-SC-4beb0c9b9b402c1e8f70a02c0efa557c1f292f1c.tar.bz2 opensim-SC-4beb0c9b9b402c1e8f70a02c0efa557c1f292f1c.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs (renamed from OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs) | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs index 3114d7f..3809f84 100644 --- a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/UploadObjectAssetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs | |||
| @@ -49,7 +49,7 @@ using OSDMap = OpenMetaverse.StructuredData.OSDMap; | |||
| 49 | using OpenSim.Framework.Capabilities; | 49 | using OpenSim.Framework.Capabilities; |
| 50 | using ExtraParamType = OpenMetaverse.ExtraParamType; | 50 | using ExtraParamType = OpenMetaverse.ExtraParamType; |
| 51 | 51 | ||
| 52 | namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps | 52 | namespace OpenSim.Region.ClientStack.Linden |
| 53 | { | 53 | { |
| 54 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 54 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] |
| 55 | public class UploadObjectAssetModule : INonSharedRegionModule | 55 | public class UploadObjectAssetModule : INonSharedRegionModule |