OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

avinationmerge
Kitto Flora 2011-02-04 17:32:31 +00:00
parent b6dda231f2 9a9c9644ac
commit 511b12db6b
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Framework/WebUtil.cs
View File

@ -138,17 +138,17 @@ namespace OpenSim.Framework
/// </summary> /// </summary>
public static OSDMap PutToService(string url, OSDMap data) public static OSDMap PutToService(string url, OSDMap data)
{ {
return ServiceOSDRequest(url,data,"PUT",10000); return ServiceOSDRequest(url,data,"PUT",20000);
} }
public static OSDMap PostToService(string url, OSDMap data) public static OSDMap PostToService(string url, OSDMap data)
{ {
return ServiceOSDRequest(url,data,"POST",10000); return ServiceOSDRequest(url,data,"POST",20000);
} }
public static OSDMap GetFromService(string url) public static OSDMap GetFromService(string url)
{ {
return ServiceOSDRequest(url,null,"GET",10000); return ServiceOSDRequest(url,null,"GET",20000);
} }
public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout) public static OSDMap ServiceOSDRequest(string url, OSDMap data, string method, int timeout)
@ -275,7 +275,7 @@ namespace OpenSim.Framework
/// </summary> /// </summary>
public static OSDMap PostToService(string url, NameValueCollection data) public static OSDMap PostToService(string url, NameValueCollection data)
{ {
return ServiceFormRequest(url,data,10000); return ServiceFormRequest(url,data,20000);
} }
public static OSDMap ServiceFormRequest(string url, NameValueCollection data, int timeout) public static OSDMap ServiceFormRequest(string url, NameValueCollection data, int timeout)

8
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
View File

@ -48,7 +48,6 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
public string url; public string url;
public UUID urlcode; public UUID urlcode;
public Dictionary<UUID, RequestData> requests; public Dictionary<UUID, RequestData> requests;
public bool responseSent;
} }
public class RequestData public class RequestData
@ -61,6 +60,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
//public ManualResetEvent ev; //public ManualResetEvent ev;
public bool requestDone; public bool requestDone;
public int startTime; public int startTime;
public bool responseSent;
public string uri; public string uri;
} }
@ -200,13 +200,13 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
if (m_RequestMap.ContainsKey(request)) if (m_RequestMap.ContainsKey(request))
{ {
UrlData urlData = m_RequestMap[request]; UrlData urlData = m_RequestMap[request];
if (!urlData.responseSent) if (!urlData.requests[request].responseSent)
{ {
urlData.requests[request].responseCode = status; urlData.requests[request].responseCode = status;
urlData.requests[request].responseBody = body; urlData.requests[request].responseBody = body;
//urlData.requests[request].ev.Set(); //urlData.requests[request].ev.Set();
urlData.requests[request].requestDone = true; urlData.requests[request].requestDone = true;
urlData.responseSent = true; urlData.requests[request].responseSent = true;
} }
} }
else else
@ -444,7 +444,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
if (request.ContainsKey(key)) if (request.ContainsKey(key))
{ {
string val = (String)request[key]; string val = (String)request[key];
if (key == "") if (key != "")
{ {
queryString = queryString + key + "=" + val + "&"; queryString = queryString + key + "=" + val + "&";
} }

2
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -2555,6 +2555,8 @@ namespace OpenSim.Region.Framework.Scenes
{ {
*/ */
UserAccount uac = UserAccountService.GetUserAccount(RegionInfo.ScopeID, user); UserAccount uac = UserAccountService.GetUserAccount(RegionInfo.ScopeID, user);
if (uac == null)
return 0;
return uac.UserFlags; return uac.UserFlags;
//} //}
} }

2
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
View File

@ -373,6 +373,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
public const int PRIM_SCULPT_TYPE_TORUS = 2; public const int PRIM_SCULPT_TYPE_TORUS = 2;
public const int PRIM_SCULPT_TYPE_PLANE = 3; public const int PRIM_SCULPT_TYPE_PLANE = 3;
public const int PRIM_SCULPT_TYPE_CYLINDER = 4; public const int PRIM_SCULPT_TYPE_CYLINDER = 4;
public const int PRIM_SCULPT_FLAG_INVERT = 64;
public const int PRIM_SCULPT_FLAG_MIRROR = 128;
public const int MASK_BASE = 0; public const int MASK_BASE = 0;
public const int MASK_OWNER = 1; public const int MASK_OWNER = 1;

2
OpenSim/Region/ScriptEngine/Shared/LSL_Types.cs
View File

@ -1058,7 +1058,7 @@ namespace OpenSim.Region.ScriptEngine.Shared
{ {
list ret = new list(); list ret = new list();
double entry; double entry;
for (int i = 0; i < src.Data.Length - 1; i++) for (int i = 0; i < src.Data.Length; i++)
{ {
if (double.TryParse(src.Data[i].ToString(), NumberStyles.Float, Culture.NumberFormatInfo, out entry)) if (double.TryParse(src.Data[i].ToString(), NumberStyles.Float, Culture.NumberFormatInfo, out entry))
{ {