Skip to content
Browse files

Properly pass null around for grid mode. Fixes issues with not being …

…able to process methods on the grid server.
  • Loading branch information...
1 parent 30f4dd6 commit 7beffd34d11684d2b992a23d0f49416a69f83989 Revolution Smythe committed Aug 5, 2012
View
8 Aurora/Framework/Services/ConnectorBase.cs
@@ -174,8 +174,10 @@ public object DoRemoteCall(bool forced, string url, bool urlOverrides, UUID user
foreach(ParameterInfo info in parameters)
{
OSD osd = o[i] == null ? null : Util.MakeOSD(o[i], o[i].GetType());
- if(osd != null)
+ if (osd != null)
map.Add(info.Name, osd);
+ else
+ map.Add(info.Name, new OSD());
i++;
}
List<string> m_ServerURIs = GetURIs(urlOverrides, map, url, userID);
@@ -352,7 +354,9 @@ public byte[] HandleMap(OSDMap args)
int paramNum = 0;
foreach (ParameterInfo param in paramInfo)
{
- if(param.ParameterType == typeof(OSD))
+ if (args[param.Name].Type == OSDType.Unknown)
+ parameters[paramNum++] = null;
+ else if(param.ParameterType == typeof(OSD))
parameters[paramNum++] = args[param.Name];
else
parameters[paramNum++] = Util.OSDToObject(args[param.Name], param.ParameterType);
View
12 Aurora/Modules/Avatar/AuroraSearch/AuroraSearchModule.cs
@@ -396,24 +396,12 @@ public void EventInfoRequest(IClientAPI remoteClient, uint queryEventID)
LandData landdata = directoryService.GetParcelInfo(landDir.parcelID);
if (landdata == null || landdata.Maturity != 0)
continue; //Not a PG land
-#if (!ISWIN)
- foreach (IScene scene in m_Scenes)
- {
- if (scene.RegionInfo.RegionID == landdata.RegionID)
- {
- //Global coords, so add the meters
- locX = scene.RegionInfo.RegionLocX;
- locY = scene.RegionInfo.RegionLocY;
- }
- }
-#else
foreach (IScene scene in m_Scenes.Where(scene => scene.RegionInfo.RegionID == landdata.RegionID))
{
//Global coords, so add the meters
locX = scene.RegionInfo.RegionLocX;
locY = scene.RegionInfo.RegionLocY;
}
-#endif
if (locY == 0 && locX == 0)
{
//Ask the grid service for the coordinates if the region is not local

0 comments on commit 7beffd3

Please sign in to comment.
Something went wrong with that request. Please try again.