diff options
| author | Melanie | 2012-10-07 02:48:28 +0100 |
|---|---|---|
| committer | Melanie | 2012-10-07 02:48:28 +0100 |
| commit | f7df68d922758c0a78664abe82d631579f6aa63f (patch) | |
| tree | 85daa41ff4b35653b4fbb987cbc852ad853decef /OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | refactor: Rename UserSessioNID -> UserSession in WebStatsModule since this is... (diff) | |
| download | opensim-SC-f7df68d922758c0a78664abe82d631579f6aa63f.zip opensim-SC-f7df68d922758c0a78664abe82d631579f6aa63f.tar.gz opensim-SC-f7df68d922758c0a78664abe82d631579f6aa63f.tar.bz2 opensim-SC-f7df68d922758c0a78664abe82d631579f6aa63f.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 6f00957..6ccabf1 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
| @@ -5962,7 +5962,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 5962 | msgpack.MessageBlock.ID, | 5962 | msgpack.MessageBlock.ID, |
| 5963 | msgpack.MessageBlock.Offline != 0 ? true : false, | 5963 | msgpack.MessageBlock.Offline != 0 ? true : false, |
| 5964 | msgpack.MessageBlock.Position, | 5964 | msgpack.MessageBlock.Position, |
| 5965 | msgpack.MessageBlock.BinaryBucket); | 5965 | msgpack.MessageBlock.BinaryBucket, |
| 5966 | true); | ||
| 5966 | 5967 | ||
| 5967 | handlerInstantMessage(this, im); | 5968 | handlerInstantMessage(this, im); |
| 5968 | } | 5969 | } |