diff options
author | Teravus Ovares | 2008-09-19 23:59:49 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-09-19 23:59:49 +0000 |
commit | 12946e3327026d8f7f1c21665cb8481aa89a45a7 (patch) | |
tree | 177dab3873fc26efc367230ef4a692640a60979b /OpenSim/Region/Environment | |
parent | * Implements an experimental method to define which region you want to go to ... (diff) | |
download | opensim-SC_OLD-12946e3327026d8f7f1c21665cb8481aa89a45a7.zip opensim-SC_OLD-12946e3327026d8f7f1c21665cb8481aa89a45a7.tar.gz opensim-SC_OLD-12946e3327026d8f7f1c21665cb8481aa89a45a7.tar.bz2 opensim-SC_OLD-12946e3327026d8f7f1c21665cb8481aa89a45a7.tar.xz |
* One more tweak in the OGP module to support OGP draft3.
* Recognize the proper cap message for rez_avatar/rez in the response cap.
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r-- | OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs | 9 |
1 files changed, 8 insertions, 1 deletions
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 | |||
760 | //LLSDMap outboundRequestMap = new LLSDMap(); | 760 | //LLSDMap outboundRequestMap = new LLSDMap(); |
761 | LLSDMap inboundRequestMap = (LLSDMap)request; | 761 | LLSDMap inboundRequestMap = (LLSDMap)request; |
762 | string rezAvatarString = inboundRequestMap["rez_avatar"].AsString(); | 762 | string rezAvatarString = inboundRequestMap["rez_avatar"].AsString(); |
763 | 763 | if (rezAvatarString.Length == 0) | |
764 | { | ||
765 | rezAvatarString = inboundRequestMap["rez_avatar/rez"].AsString(); | ||
766 | } | ||
764 | LLSDArray LookAtArray = new LLSDArray(); | 767 | LLSDArray LookAtArray = new LLSDArray(); |
765 | LookAtArray.Add(LLSD.FromInteger(1)); | 768 | LookAtArray.Add(LLSD.FromInteger(1)); |
766 | LookAtArray.Add(LLSD.FromInteger(1)); | 769 | LookAtArray.Add(LLSD.FromInteger(1)); |
@@ -802,6 +805,10 @@ namespace OpenSim.Region.Environment.Modules.InterGrid | |||
802 | if (rezResponseMap.ContainsKey("region_seed_capability")) | 805 | if (rezResponseMap.ContainsKey("region_seed_capability")) |
803 | rezRespSeedCap = rezResponseMap["region_seed_capability"].AsString(); | 806 | rezRespSeedCap = rezResponseMap["region_seed_capability"].AsString(); |
804 | 807 | ||
808 | // REPLACEMENT | ||
809 | if (rezResponseMap.ContainsKey("rez_avatar/rez")) | ||
810 | rezRespSeedCap = rezResponseMap["rez_avatar/rez"].AsString(); | ||
811 | |||
805 | // DEPRECIATED | 812 | // DEPRECIATED |
806 | string rezRespSim_ip = rezResponseMap["sim_ip"].AsString(); | 813 | string rezRespSim_ip = rezResponseMap["sim_ip"].AsString(); |
807 | 814 | ||