From 12946e3327026d8f7f1c21665cb8481aa89a45a7 Mon Sep 17 00:00:00 2001 From: Teravus Ovares Date: Fri, 19 Sep 2008 23:59:49 +0000 Subject: * One more tweak in the OGP module to support OGP draft3. * Recognize the proper cap message for rez_avatar/rez in the response cap. --- .../Environment/Modules/InterGrid/OpenGridProtocolModule.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs index fdb24b1..dfa751c 100644 --- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs @@ -760,7 +760,10 @@ namespace OpenSim.Region.Environment.Modules.InterGrid //LLSDMap outboundRequestMap = new LLSDMap(); LLSDMap inboundRequestMap = (LLSDMap)request; string rezAvatarString = inboundRequestMap["rez_avatar"].AsString(); - + if (rezAvatarString.Length == 0) + { + rezAvatarString = inboundRequestMap["rez_avatar/rez"].AsString(); + } LLSDArray LookAtArray = new LLSDArray(); LookAtArray.Add(LLSD.FromInteger(1)); LookAtArray.Add(LLSD.FromInteger(1)); @@ -802,6 +805,10 @@ namespace OpenSim.Region.Environment.Modules.InterGrid if (rezResponseMap.ContainsKey("region_seed_capability")) rezRespSeedCap = rezResponseMap["region_seed_capability"].AsString(); + // REPLACEMENT + if (rezResponseMap.ContainsKey("rez_avatar/rez")) + rezRespSeedCap = rezResponseMap["rez_avatar/rez"].AsString(); + // DEPRECIATED string rezRespSim_ip = rezResponseMap["sim_ip"].AsString(); -- cgit v1.1