aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorTeravus Ovares2008-10-10 12:59:16 +0000
committerTeravus Ovares2008-10-10 12:59:16 +0000
commitd19400db4479015fe334d81801025e13deec26a8 (patch)
tree908486899abb1d0265bc8c12ebc4583103c0f0d9 /OpenSim/Region
parentSome more decrufting (diff)
downloadopensim-SC_OLD-d19400db4479015fe334d81801025e13deec26a8.zip
opensim-SC_OLD-d19400db4479015fe334d81801025e13deec26a8.tar.gz
opensim-SC_OLD-d19400db4479015fe334d81801025e13deec26a8.tar.bz2
opensim-SC_OLD-d19400db4479015fe334d81801025e13deec26a8.tar.xz
* Just some OGP maintenance. Standards adherence type stuff.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs19
1 files changed, 12 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
index cb525cc..85e60d7 100644
--- a/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/Environment/Modules/InterGrid/OpenGridProtocolModule.cs
@@ -858,11 +858,12 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
858 int rrY = rezResponseMap["region_y"].AsInteger(); 858 int rrY = rezResponseMap["region_y"].AsInteger();
859 m_log.ErrorFormat("X:{0}, Y:{1}", rrX, rrY); 859 m_log.ErrorFormat("X:{0}, Y:{1}", rrX, rrY);
860 UUID rrRID = rezResponseMap["region_id"].AsUUID(); 860 UUID rrRID = rezResponseMap["region_id"].AsUUID();
861 861 LLSDArray RezResponsePositionArray = null;
862 string rrAccess = rezResponseMap["sim_access"].AsString(); 862 string rrAccess = rezResponseMap["sim_access"].AsString();
863 863 if (rezResponseMap.ContainsKey("position"))
864 LLSDArray RezResponsePositionArray = (LLSDArray)rezResponseMap["position"]; 864 {
865 865 RezResponsePositionArray = (LLSDArray)rezResponseMap["position"];
866 }
866 // DEPRECIATED 867 // DEPRECIATED
867 responseMap["seed_capability"] = LLSD.FromString(rezRespSeedCap); 868 responseMap["seed_capability"] = LLSD.FromString(rezRespSeedCap);
868 869
@@ -878,13 +879,17 @@ namespace OpenSim.Region.Environment.Modules.InterGrid
878 responseMap["region_y"] = LLSD.FromInteger(rrY ); 879 responseMap["region_y"] = LLSD.FromInteger(rrY );
879 responseMap["region_id"] = LLSD.FromUUID(rrRID); 880 responseMap["region_id"] = LLSD.FromUUID(rrRID);
880 responseMap["sim_access"] = LLSD.FromString(rrAccess); 881 responseMap["sim_access"] = LLSD.FromString(rrAccess);
881 responseMap["position"] = RezResponsePositionArray; 882
883 if (RezResponsePositionArray != null)
884 {
885 responseMap["position"] = RezResponsePositionArray;
886 }
882 responseMap["look_at"] = lookArray; 887 responseMap["look_at"] = lookArray;
883 responseMap["connect"] = LLSD.FromBoolean(true); 888 responseMap["connect"] = LLSD.FromBoolean(true);
884 889
885 ShutdownConnection(LocalID,this); 890 ShutdownConnection(LocalID,this);
886 891 // PLEASE STOP CHANGING THIS TO an M_LOG, M_LOG DOESN'T WORK ON MULTILINE .TOSTRINGS
887 m_log.Warn("RESPONSEDEREZ: " + responseMap.ToString()); 892 System.Console.WriteLine("RESPONSEDEREZ: " + responseMap.ToString());
888 return responseMap; 893 return responseMap;
889 } 894 }
890 else 895 else