aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs')
-rw-r--r--OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs15
1 files changed, 11 insertions, 4 deletions
diff --git a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
index 6983154..11cda6e 100644
--- a/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
+++ b/OpenSim/ApplicationPlugins/Rest/Inventory/RestAppearanceServices.cs
@@ -63,6 +63,16 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
63 Rest.Log.InfoFormat("{0} User appearance services initializing", MsgId); 63 Rest.Log.InfoFormat("{0} User appearance services initializing", MsgId);
64 Rest.Log.InfoFormat("{0} Using REST Implementation Version {1}", MsgId, Rest.Version); 64 Rest.Log.InfoFormat("{0} Using REST Implementation Version {1}", MsgId, Rest.Version);
65 65
66 // This is better than a null reference.
67
68 if (Rest.AvatarServices == null)
69 throw new Exception(String.Format("{0} OpenSim inventory services are not available",
70 MsgId));
71
72 if (Rest.UserServices == null)
73 throw new Exception(String.Format("{0} OpenSim user profile services are not available",
74 MsgId));
75
66 // If a relative path was specified for the handler's domain, 76 // If a relative path was specified for the handler's domain,
67 // add the standard prefix to make it absolute, e.g. /admin 77 // add the standard prefix to make it absolute, e.g. /admin
68 78
@@ -170,9 +180,6 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
170 180
171 try 181 try
172 { 182 {
173 // digest scheme seems borked: disable it for the time
174 // being
175 rdata.scheme = Rest.AS_BASIC;
176 if (!rdata.IsAuthenticated) 183 if (!rdata.IsAuthenticated)
177 { 184 {
178 rdata.Fail(Rest.HttpStatusCodeNotAuthorized,String.Format("user \"{0}\" could not be authenticated", rdata.userName)); 185 rdata.Fail(Rest.HttpStatusCodeNotAuthorized,String.Format("user \"{0}\" could not be authenticated", rdata.userName));
@@ -731,7 +738,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
731 738
732 if (asset != UUID.Zero) 739 if (asset != UUID.Zero)
733 { 740 {
734 rdata.writer.WriteAttributeString("Item",asset.ToString()); 741 rdata.writer.WriteAttributeString("Asset",asset.ToString());
735 } 742 }
736 rdata.writer.WriteEndElement(); 743 rdata.writer.WriteEndElement();
737 } 744 }