aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden
diff options
context:
space:
mode:
authorMelanie2012-01-31 21:53:32 +0000
committerMelanie2012-01-31 21:53:32 +0000
commit727ddffb71dc1f1b8e68d9e7604c7dc548d5c466 (patch)
treeffaf74e8404097569e635462e59513589827fa40 /OpenSim/Region/ClientStack/Linden
parentMerge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff)
parentMove object delete commands into a commands region module, in preparation for... (diff)
downloadopensim-SC_OLD-727ddffb71dc1f1b8e68d9e7604c7dc548d5c466.zip
opensim-SC_OLD-727ddffb71dc1f1b8e68d9e7604c7dc548d5c466.tar.gz
opensim-SC_OLD-727ddffb71dc1f1b8e68d9e7604c7dc548d5c466.tar.bz2
opensim-SC_OLD-727ddffb71dc1f1b8e68d9e7604c7dc548d5c466.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 4f09d8f..d126f5f 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -9316,9 +9316,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
9316 { 9316 {
9317 param1 = Convert.ToUInt32(Utils.BytesToString(messagePacket.ParamList[1].Parameter)); 9317 param1 = Convert.ToUInt32(Utils.BytesToString(messagePacket.ParamList[1].Parameter));
9318 } 9318 }
9319 catch (Exception ex) 9319 catch
9320 { 9320 {
9321
9322 } 9321 }
9323 } 9322 }
9324 9323