aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins
diff options
context:
space:
mode:
authorJeff Ames2008-09-18 16:07:06 +0000
committerJeff Ames2008-09-18 16:07:06 +0000
commitac083becd96c5966e412f94696eab38250d9c179 (patch)
tree5cfa5f1829a7f566d0cb8f15df123b679047e335 /OpenSim/ApplicationPlugins
parentcode formatting cleanup. (diff)
downloadopensim-SC_OLD-ac083becd96c5966e412f94696eab38250d9c179.zip
opensim-SC_OLD-ac083becd96c5966e412f94696eab38250d9c179.tar.gz
opensim-SC_OLD-ac083becd96c5966e412f94696eab38250d9c179.tar.bz2
opensim-SC_OLD-ac083becd96c5966e412f94696eab38250d9c179.tar.xz
Update svn properties, minor formatting cleanup.
Diffstat (limited to 'OpenSim/ApplicationPlugins')
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs8
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs4
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs4
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs8
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs4
5 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
index bc706f0..42266ce 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
@@ -65,9 +65,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
65 65
66 if (!qPrefix.StartsWith(Rest.UrlPathSeparator)) 66 if (!qPrefix.StartsWith(Rest.UrlPathSeparator))
67 { 67 {
68 Rest.Log.InfoFormat("{0} Domain is relative, adding absolute prefix", MsgId); 68 Rest.Log.InfoFormat("{0} Domain is relative, adding absolute prefix", MsgId);
69 qPrefix = String.Format("{0}{1}{2}", Rest.Prefix, Rest.UrlPathSeparator, qPrefix); 69 qPrefix = String.Format("{0}{1}{2}", Rest.Prefix, Rest.UrlPathSeparator, qPrefix);
70 Rest.Log.InfoFormat("{0} Domain is now <{1}>", MsgId, qPrefix); 70 Rest.Log.InfoFormat("{0} Domain is now <{1}>", MsgId, qPrefix);
71 } 71 }
72 72
73 // Register interface using the absolute URI. 73 // Register interface using the absolute URI.
@@ -282,7 +282,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
282 Rest.Log.WarnFormat("{0} Method {1} not supported for {2}", 282 Rest.Log.WarnFormat("{0} Method {1} not supported for {2}",
283 MsgId, rdata.method, rdata.path); 283 MsgId, rdata.method, rdata.path);
284 rdata.Fail(Rest.HttpStatusCodeMethodNotAllowed, 284 rdata.Fail(Rest.HttpStatusCodeMethodNotAllowed,
285 String.Format("{0} not supported", rdata.method)); 285 String.Format("{0} not supported", rdata.method));
286 break; 286 break;
287 } 287 }
288 } 288 }
@@ -669,7 +669,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
669 case "VisualParameters" : 669 case "VisualParameters" :
670 { 670 {
671 xml.ReadContentAsBase64(rdata.userAppearance.VisualParams, 671 xml.ReadContentAsBase64(rdata.userAppearance.VisualParams,
672 0,rdata.userAppearance.VisualParams.Length); 672 0, rdata.userAppearance.VisualParams.Length);
673 indata = true; 673 indata = true;
674 } 674 }
675 break; 675 break;
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
index 5fd8015..b67922f 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
@@ -57,9 +57,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
57 57
58 if (!qPrefix.StartsWith(Rest.UrlPathSeparator)) 58 if (!qPrefix.StartsWith(Rest.UrlPathSeparator))
59 { 59 {
60 Rest.Log.InfoFormat("{0} Prefixing domain name ({1})", MsgId, qPrefix); 60 Rest.Log.InfoFormat("{0} Prefixing domain name ({1})", MsgId, qPrefix);
61 qPrefix = String.Format("{0}{1}{2}", Rest.Prefix, Rest.UrlPathSeparator, qPrefix); 61 qPrefix = String.Format("{0}{1}{2}", Rest.Prefix, Rest.UrlPathSeparator, qPrefix);
62 Rest.Log.InfoFormat("{0} Fully qualified domain name is <{1}>", MsgId, qPrefix); 62 Rest.Log.InfoFormat("{0} Fully qualified domain name is <{1}>", MsgId, qPrefix);
63 } 63 }
64 64
65 // Register interface using the fully-qualified prefix 65 // Register interface using the fully-qualified prefix
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
index 126b757..fd4c295 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestHandler.cs
@@ -264,8 +264,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
264 264
265 if (Rest.Prefix.Substring(0,1) != Rest.UrlPathSeparator) 265 if (Rest.Prefix.Substring(0,1) != Rest.UrlPathSeparator)
266 { 266 {
267 Rest.Log.WarnFormat("{0} Prefix <{1}> is not absolute and must be", MsgId, Rest.Prefix); 267 Rest.Log.WarnFormat("{0} Prefix <{1}> is not absolute and must be", MsgId, Rest.Prefix);
268 Rest.Log.InfoFormat("{0} Prefix changed to </{1}>", MsgId, Rest.Prefix); 268 Rest.Log.InfoFormat("{0} Prefix changed to </{1}>", MsgId, Rest.Prefix);
269 Rest.Prefix = String.Format("{0}{1}", Rest.UrlPathSeparator, Rest.Prefix); 269 Rest.Prefix = String.Format("{0}{1}", Rest.UrlPathSeparator, Rest.Prefix);
270 } 270 }
271 271
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
index 6791cba..0aad058 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
@@ -66,9 +66,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
66 66
67 if (!qPrefix.StartsWith(Rest.UrlPathSeparator)) 67 if (!qPrefix.StartsWith(Rest.UrlPathSeparator))
68 { 68 {
69 Rest.Log.InfoFormat("{0} Domain is relative, adding absolute prefix", MsgId); 69 Rest.Log.InfoFormat("{0} Domain is relative, adding absolute prefix", MsgId);
70 qPrefix = String.Format("{0}{1}{2}", Rest.Prefix, Rest.UrlPathSeparator, qPrefix); 70 qPrefix = String.Format("{0}{1}{2}", Rest.Prefix, Rest.UrlPathSeparator, qPrefix);
71 Rest.Log.InfoFormat("{0} Domain is now <{1}>", MsgId, qPrefix); 71 Rest.Log.InfoFormat("{0} Domain is now <{1}>", MsgId, qPrefix);
72 } 72 }
73 73
74 // Register interface using the absolute URI. 74 // Register interface using the absolute URI.
@@ -331,9 +331,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
331 331
332 default : 332 default :
333 Rest.Log.WarnFormat("{0} Method {1} not supported for {2}", 333 Rest.Log.WarnFormat("{0} Method {1} not supported for {2}",
334 MsgId, rdata.method, rdata.path); 334 MsgId, rdata.method, rdata.path);
335 rdata.Fail(Rest.HttpStatusCodeMethodNotAllowed, 335 rdata.Fail(Rest.HttpStatusCodeMethodNotAllowed,
336 String.Format("{0} not supported", rdata.method)); 336 String.Format("{0} not supported", rdata.method));
337 break; 337 break;
338 } 338 }
339 } 339 }
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs
index 8d28dd6..b24b5ed 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestTestServices.cs
@@ -58,9 +58,9 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
58 58
59 if (!qPrefix.StartsWith(Rest.UrlPathSeparator)) 59 if (!qPrefix.StartsWith(Rest.UrlPathSeparator))
60 { 60 {
61 Rest.Log.InfoFormat("{0} Domain is relative, adding absolute prefix", MsgId); 61 Rest.Log.InfoFormat("{0} Domain is relative, adding absolute prefix", MsgId);
62 qPrefix = String.Format("{0}{1}{2}", Rest.Prefix, Rest.UrlPathSeparator, qPrefix); 62 qPrefix = String.Format("{0}{1}{2}", Rest.Prefix, Rest.UrlPathSeparator, qPrefix);
63 Rest.Log.InfoFormat("{0} Domain is now <{1}>", MsgId, qPrefix); 63 Rest.Log.InfoFormat("{0} Domain is now <{1}>", MsgId, qPrefix);
64 } 64 }
65 65
66 // Load test cases 66 // Load test cases