diff options
| author | Melanie | 2010-03-31 04:38:19 +0100 |
|---|---|---|
| committer | Melanie | 2010-03-31 04:38:19 +0100 |
| commit | 4fefd05839d78dcdd108b0b216d831eb512ffd58 (patch) | |
| tree | eb9ffc6f1f96f674e796cf0f57cd6dd27b34eaa0 /OpenSim/Region/ClientStack/LindenUDP | |
| parent | Rename Meta7Windlight to LightShare (diff) | |
| parent | Adding the LightShare module and scripting API. This code was written by (diff) | |
| download | opensim-SC-4fefd05839d78dcdd108b0b216d831eb512ffd58.zip opensim-SC-4fefd05839d78dcdd108b0b216d831eb512ffd58.tar.gz opensim-SC-4fefd05839d78dcdd108b0b216d831eb512ffd58.tar.bz2 opensim-SC-4fefd05839d78dcdd108b0b216d831eb512ffd58.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Remerge the LightShare bits that were pushed to core
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 0762ed0..773baf5 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
| @@ -856,6 +856,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 856 | gmp.ParamList[i] = new GenericMessagePacket.ParamListBlock(); | 856 | gmp.ParamList[i] = new GenericMessagePacket.ParamListBlock(); |
| 857 | gmp.ParamList[i++].Parameter = val; | 857 | gmp.ParamList[i++].Parameter = val; |
| 858 | } | 858 | } |
| 859 | |||
| 859 | OutPacket(gmp, ThrottleOutPacketType.Task); | 860 | OutPacket(gmp, ThrottleOutPacketType.Task); |
| 860 | } | 861 | } |
| 861 | 862 | ||