diff options
| author | Melanie | 2012-05-08 00:07:13 +0100 |
|---|---|---|
| committer | Melanie | 2012-05-08 00:07:13 +0100 |
| commit | 900afbd53e419fe1bf9cc6ae801e4fc64d719157 (patch) | |
| tree | 44d3003e49a3acf9ab8dbdf6afe45dc9a6c2e2af /OpenSim/Region/ClientStack | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'ubitwork' into avination (diff) | |
| download | opensim-SC-900afbd53e419fe1bf9cc6ae801e4fc64d719157.zip opensim-SC-900afbd53e419fe1bf9cc6ae801e4fc64d719157.tar.gz opensim-SC-900afbd53e419fe1bf9cc6ae801e4fc64d719157.tar.bz2 opensim-SC-900afbd53e419fe1bf9cc6ae801e4fc64d719157.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to 'OpenSim/Region/ClientStack')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 40ebed1..bb76717 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
| @@ -11631,8 +11631,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 11631 | 11631 | ||
| 11632 | udata.scale = new Vector3(block.Data, 0); | 11632 | udata.scale = new Vector3(block.Data, 0); |
| 11633 | 11633 | ||
| 11634 | // udata.change = ObjectChangeType.groupS; | 11634 | udata.change = ObjectChangeType.groupS; |
| 11635 | udata.change = ObjectChangeType.primS; // to conform to current SL | ||
| 11636 | updatehandler(localId, udata, this); | 11635 | updatehandler(localId, udata, this); |
| 11637 | 11636 | ||
| 11638 | break; | 11637 | break; |
| @@ -11643,8 +11642,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 11643 | udata.position = new Vector3(block.Data, 0); | 11642 | udata.position = new Vector3(block.Data, 0); |
| 11644 | udata.scale = new Vector3(block.Data, 12); | 11643 | udata.scale = new Vector3(block.Data, 12); |
| 11645 | 11644 | ||
| 11646 | // udata.change = ObjectChangeType.groupPS; | 11645 | udata.change = ObjectChangeType.groupPS; |
| 11647 | udata.change = ObjectChangeType.primPS; // to conform to current SL | ||
| 11648 | updatehandler(localId, udata, this); | 11646 | updatehandler(localId, udata, this); |
| 11649 | break; | 11647 | break; |
| 11650 | 11648 | ||