aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorBlueWall2012-01-21 23:26:27 -0500
committerBlueWall2012-01-21 23:26:27 -0500
commit32d58d6e3e9a0ea1bfa808567d0f64c0652f8a85 (patch)
tree8c19dbfa8975080d7bbbeaa1e2de4072520c899f /OpenSim/Region/ClientStack
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-32d58d6e3e9a0ea1bfa808567d0f64c0652f8a85.zip
opensim-SC_OLD-32d58d6e3e9a0ea1bfa808567d0f64c0652f8a85.tar.gz
opensim-SC_OLD-32d58d6e3e9a0ea1bfa808567d0f64c0652f8a85.tar.bz2
opensim-SC_OLD-32d58d6e3e9a0ea1bfa808567d0f64c0652f8a85.tar.xz
Telehub Support:
Telehub settings now persist to the database and are saved across sim restarts. So-far this only works on MySQL. this is a work in progress, teleport routing is not yet implemented.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs14
1 files changed, 13 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index a94fb20..29ad966 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -9242,10 +9242,22 @@ namespace OpenSim.Region.ClientStack.LindenUDP
9242 { 9242 {
9243 UUID invoice = messagePacket.MethodData.Invoice; 9243 UUID invoice = messagePacket.MethodData.Invoice;
9244 UUID SenderID = messagePacket.AgentData.AgentID; 9244 UUID SenderID = messagePacket.AgentData.AgentID;
9245 UInt32 param1 = Convert.ToUInt32(Utils.BytesToString(messagePacket.ParamList[1].Parameter)); 9245 UInt32 param1 = 0u;
9246 9246
9247 string command = (string)Utils.BytesToString(messagePacket.ParamList[0].Parameter); 9247 string command = (string)Utils.BytesToString(messagePacket.ParamList[0].Parameter);
9248 9248
9249 if (command != "info ui")
9250 {
9251 try
9252 {
9253 param1 = Convert.ToUInt32(Utils.BytesToString(messagePacket.ParamList[1].Parameter));
9254 }
9255 catch (Exception ex)
9256 {
9257
9258 }
9259 }
9260
9249 EstateManageTelehub handlerEstateManageTelehub = OnEstateManageTelehub; 9261 EstateManageTelehub handlerEstateManageTelehub = OnEstateManageTelehub;
9250 if (handlerEstateManageTelehub != null) 9262 if (handlerEstateManageTelehub != null)
9251 { 9263 {