aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMelanie2010-04-30 11:49:24 +0100
committerMelanie2010-04-30 11:49:24 +0100
commit13960b3b866679caef3f598006cccf402e165341 (patch)
treee0fefe721da7d5bc6d168c9bcdf0a0bca2fe249a /OpenSim/Region/ClientStack
parentMerge branch 'careminster' into careminster-presence-refactor (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-13960b3b866679caef3f598006cccf402e165341.zip
opensim-SC_OLD-13960b3b866679caef3f598006cccf402e165341.tar.gz
opensim-SC_OLD-13960b3b866679caef3f598006cccf402e165341.tar.bz2
opensim-SC_OLD-13960b3b866679caef3f598006cccf402e165341.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 394d4e2..d5fda9d 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -11807,4 +11807,4 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11807 OutPacket(dialog, ThrottleOutPacketType.Task); 11807 OutPacket(dialog, ThrottleOutPacketType.Task);
11808 } 11808 }
11809 } 11809 }
11810} \ No newline at end of file 11810}