diff options
| author | Melanie | 2013-03-13 02:02:46 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-13 02:02:46 +0000 |
| commit | 710381e838f842963cdc4d22fe9bdc1a30c3d745 (patch) | |
| tree | c16c3e223b7bdc574de33f8651cc13ff46235416 /OpenSim/Region/ClientStack/Linden/UDP | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: save some commented out log lines which will be useful again in future... (diff) | |
| download | opensim-SC_OLD-710381e838f842963cdc4d22fe9bdc1a30c3d745.zip opensim-SC_OLD-710381e838f842963cdc4d22fe9bdc1a30c3d745.tar.gz opensim-SC_OLD-710381e838f842963cdc4d22fe9bdc1a30c3d745.tar.bz2 opensim-SC_OLD-710381e838f842963cdc4d22fe9bdc1a30c3d745.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 0c3a102..5b2bad4 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
| @@ -7206,7 +7206,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 7206 | 7206 | ||
| 7207 | if (handlerUpdatePrimFlags != null) | 7207 | if (handlerUpdatePrimFlags != null) |
| 7208 | { | 7208 | { |
| 7209 | byte[] data = Pack.ToBytes(); | 7209 | // byte[] data = Pack.ToBytes(); |
| 7210 | // 46,47,48 are special positions within the packet | 7210 | // 46,47,48 are special positions within the packet |
| 7211 | // This may change so perhaps we need a better way | 7211 | // This may change so perhaps we need a better way |
| 7212 | // of storing this (OMV.FlagUpdatePacket.UsePhysics,etc?) | 7212 | // of storing this (OMV.FlagUpdatePacket.UsePhysics,etc?) |