brought zircon branch into trunk

1 files changed, 2 insertions, 1 deletions

diff --git a/ogs/gridserver/src/GridHttp.cs b/OGS/gridserver/src/GridHttp.cs
index 833a8ac..496a3bc 100644
--- a/ogs/gridserver/src/GridHttp.cs
+++ b/OGS/gridserver/src/GridHttp.cs
@@ -38,6 +38,7 @@ using System.Collections;
 using System.Collections.Generic;

 using libsecondlife;

 using ServerConsole;

+using OpenSim.Framework.Sims;

 

 namespace OpenGridServices

 {

@@ -73,7 +74,7 @@ namespace OpenGridServices
                         switch(request.MethodName) {

                                 case "get_sim_info":

                                         ulong req_handle=(ulong)Convert.ToInt64(requestData["region_handle"]);

-                                        SimProfile TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByHandle(req_handle);

+                                        SimProfileBase TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByHandle(req_handle);

                                         string RecvKey="";

                                         string caller=(string)requestData["caller"];

                                         switch(caller) {