Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: Dan Lake 2012-03-27 12:51:58 -0700
committer: Dan Lake 2012-03-27 12:51:58 -0700
commit: 971d32fda3cf8384987a6709cd2242afecce13ab (patch)
tree: 2607c27fad429ff0036fe7b7d275ddf717397282 /OpenSim/Region/OptionalModules/Asset/AssetInfoModule.cs
parent: When loading objects from DB, first add to scene, then call TriggerOnSceneObj... (diff)
parent: HG: beginning of a more restrictive inventory access procedure (optional). Ex... (diff)
download: opensim-SC_OLD-971d32fda3cf8384987a6709cd2242afecce13ab.zip
opensim-SC_OLD-971d32fda3cf8384987a6709cd2242afecce13ab.tar.gz
opensim-SC_OLD-971d32fda3cf8384987a6709cd2242afecce13ab.tar.bz2
opensim-SC_OLD-971d32fda3cf8384987a6709cd2242afecce13ab.tar.xz
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/OptionalModules/Asset/AssetInfoModule.cs b/OpenSim/Region/OptionalModules/Asset/AssetInfoModule.cs
index a5207eb..41ec14f 100644
--- a/OpenSim/Region/OptionalModules/Asset/AssetInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Asset/AssetInfoModule.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Region.OptionalModules.Asset
                m_scene = scene;
            MainConsole.Instance.Commands.AddCommand(
-                "asset",
+                "Assets",
                false,
                "show asset",
                "show asset <ID>",
@@ -96,7 +96,7 @@ namespace OpenSim.Region.OptionalModules.Asset
                HandleShowAsset);
            MainConsole.Instance.Commands.AddCommand(
-                "asset", false, "dump asset",
+                "Assets", false, "dump asset",
                "dump asset <id>",
                "Dump an asset",
                HandleDumpAsset);
author	Dan Lake	2012-03-27 12:51:58 -0700
committer	Dan Lake	2012-03-27 12:51:58 -0700
commit	971d32fda3cf8384987a6709cd2242afecce13ab (patch)
tree	2607c27fad429ff0036fe7b7d275ddf717397282 /OpenSim/Region/OptionalModules/Asset/AssetInfoModule.cs
parent	When loading objects from DB, first add to scene, then call TriggerOnSceneObj... (diff)
parent	HG: beginning of a more restrictive inventory access procedure (optional). Ex... (diff)
download	opensim-SC_OLD-971d32fda3cf8384987a6709cd2242afecce13ab.zip opensim-SC_OLD-971d32fda3cf8384987a6709cd2242afecce13ab.tar.gz opensim-SC_OLD-971d32fda3cf8384987a6709cd2242afecce13ab.tar.bz2 opensim-SC_OLD-971d32fda3cf8384987a6709cd2242afecce13ab.tar.xz

diff --git a/OpenSim/Region/OptionalModules/Asset/AssetInfoModule.cs b/OpenSim/Region/OptionalModules/Asset/AssetInfoModule.cs index a5207eb..41ec14f 100644 --- a/OpenSim/Region/OptionalModules/Asset/AssetInfoModule.cs +++ b/OpenSim/Region/OptionalModules/Asset/AssetInfoModule.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Region.OptionalModules.Asset
88	m_scene = scene;	88	m_scene = scene;
89		89
90	MainConsole.Instance.Commands.AddCommand(	90	MainConsole.Instance.Commands.AddCommand(
91	"asset",	91	"Assets",
92	false,	92	false,
93	"show asset",	93	"show asset",
94	"show asset <ID>",	94	"show asset <ID>",
@@ -96,7 +96,7 @@ namespace OpenSim.Region.OptionalModules.Asset
96	HandleShowAsset);	96	HandleShowAsset);
97		97
98	MainConsole.Instance.Commands.AddCommand(	98	MainConsole.Instance.Commands.AddCommand(
99	"asset", false, "dump asset",	99	"Assets", false, "dump asset",
100	"dump asset <id>",	100	"dump asset <id>",
101	"Dump an asset",	101	"Dump an asset",
102	HandleDumpAsset);	102	HandleDumpAsset);