diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 277 |
1 files changed, 0 insertions, 277 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index fcca1bc..4c43c10 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
@@ -11481,21 +11481,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11481 | } | 11481 | } |
11482 | else | 11482 | else |
11483 | { | 11483 | { |
11484 | // m_log.DebugFormat( | ||
11485 | // "[CLIENT]: Processing block {0} type {1} for {2} {3}", | ||
11486 | // i, block.Type, part.Name, part.LocalId); | ||
11487 | |||
11488 | // // Do this once since fetch parts creates a new array. | ||
11489 | // SceneObjectPart[] parts = part.ParentGroup.Parts; | ||
11490 | // for (int j = 0; j < parts.Length; j++) | ||
11491 | // { | ||
11492 | // part.StoreUndoState(); | ||
11493 | // parts[j].IgnoreUndoUpdate = true; | ||
11494 | // } | ||
11495 | |||
11496 | // UpdatePrimGroupRotation handlerUpdatePrimGroupRotation; | ||
11497 | // UpdateVector handlerUpdatePrimGroupScale; | ||
11498 | |||
11499 | ClientChangeObject updatehandler = onClientChangeObject; | 11484 | ClientChangeObject updatehandler = onClientChangeObject; |
11500 | 11485 | ||
11501 | if (updatehandler != null) | 11486 | if (updatehandler != null) |
@@ -11536,7 +11521,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11536 | 11521 | ||
11537 | udata.what = ObjectChangeWhat.primPR; | 11522 | udata.what = ObjectChangeWhat.primPR; |
11538 | updatehandler(localId, udata, this); | 11523 | updatehandler(localId, udata, this); |
11539 | |||
11540 | break; | 11524 | break; |
11541 | 11525 | ||
11542 | case 4: // scale sp | 11526 | case 4: // scale sp |
@@ -11637,270 +11621,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
11637 | } | 11621 | } |
11638 | } | 11622 | } |
11639 | 11623 | ||
11640 | /* | ||
11641 | switch (block.Type) | ||
11642 | { | ||
11643 | case 1: //change position sp | ||
11644 | apos = new Vector3(block.Data, 0); | ||
11645 | |||
11646 | UpdateVector handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; | ||
11647 | if (handlerUpdatePrimSinglePosition != null) | ||
11648 | { | ||
11649 | part.StoreUndoState(); | ||
11650 | part.IgnoreUndoUpdate = true; | ||
11651 | |||
11652 | // m_log.Debug("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z); | ||
11653 | handlerUpdatePrimSinglePosition(localId, apos, this); | ||
11654 | |||
11655 | part.IgnoreUndoUpdate = false; | ||
11656 | } | ||
11657 | break; | ||
11658 | |||
11659 | case 2: // rotation sp | ||
11660 | arot = new Quaternion(block.Data, 0, true); | ||
11661 | |||
11662 | UpdatePrimSingleRotation handlerUpdatePrimSingleRotation = OnUpdatePrimSingleRotation; | ||
11663 | if (handlerUpdatePrimSingleRotation != null) | ||
11664 | { | ||
11665 | part.StoreUndoState(); | ||
11666 | part.IgnoreUndoUpdate = true; | ||
11667 | |||
11668 | handlerUpdatePrimSingleRotation(localId, arot, this); | ||
11669 | |||
11670 | part.IgnoreUndoUpdate = false; | ||
11671 | } | ||
11672 | break; | ||
11673 | |||
11674 | case 3: // position plus rotation | ||
11675 | apos = new Vector3(block.Data, 0); | ||
11676 | arot = new Quaternion(block.Data, 12, true); | ||
11677 | |||
11678 | UpdatePrimSingleRotationPosition handlerUpdatePrimSingleRotationPosition = OnUpdatePrimSingleRotationPosition; | ||
11679 | if (handlerUpdatePrimSingleRotationPosition != null) | ||
11680 | { | ||
11681 | part.StoreUndoState(); | ||
11682 | part.IgnoreUndoUpdate = true; | ||
11683 | |||
11684 | handlerUpdatePrimSingleRotationPosition(localId, arot, apos, this); | ||
11685 | |||
11686 | part.IgnoreUndoUpdate = false; | ||
11687 | } | ||
11688 | break; | ||
11689 | |||
11690 | case 4: // scale sp | ||
11691 | case 0x14: // uniform scale sp | ||
11692 | ascale = new Vector3(block.Data, 0); | ||
11693 | |||
11694 | UpdateVector handlerUpdatePrimScale = OnUpdatePrimScale; | ||
11695 | if (handlerUpdatePrimScale != null) | ||
11696 | { | ||
11697 | part.StoreUndoState(); | ||
11698 | part.IgnoreUndoUpdate = true; | ||
11699 | |||
11700 | handlerUpdatePrimScale(localId, ascale, this); | ||
11701 | |||
11702 | part.IgnoreUndoUpdate = false; | ||
11703 | } | ||
11704 | break; | ||
11705 | |||
11706 | case 5: // scale and position sp | ||
11707 | apos = new Vector3(block.Data, 0); | ||
11708 | ascale = new Vector3(block.Data, 12); | ||
11709 | |||
11710 | |||
11711 | handlerUpdatePrimScale = OnUpdatePrimScale; | ||
11712 | if (handlerUpdatePrimScale != null) | ||
11713 | { | ||
11714 | part.StoreUndoState(); | ||
11715 | part.IgnoreUndoUpdate = true; | ||
11716 | |||
11717 | handlerUpdatePrimScale(localId, ascale, this); | ||
11718 | |||
11719 | handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; | ||
11720 | |||
11721 | if (handlerUpdatePrimSinglePosition != null) | ||
11722 | { | ||
11723 | handlerUpdatePrimSinglePosition(localId, apos, this); | ||
11724 | } | ||
11725 | part.IgnoreUndoUpdate = false; | ||
11726 | } | ||
11727 | break; | ||
11728 | |||
11729 | case 0x15: //uniform scale and position | ||
11730 | apos = new Vector3(block.Data, 0); | ||
11731 | ascale = new Vector3(block.Data, 12); | ||
11732 | |||
11733 | |||
11734 | handlerUpdatePrimScale = OnUpdatePrimScale; | ||
11735 | if (handlerUpdatePrimScale != null) | ||
11736 | { | ||
11737 | part.StoreUndoState(false); | ||
11738 | part.IgnoreUndoUpdate = true; | ||
11739 | |||
11740 | // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); | ||
11741 | handlerUpdatePrimScale(localId, ascale, this); | ||
11742 | handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; | ||
11743 | if (handlerUpdatePrimSinglePosition != null) | ||
11744 | { | ||
11745 | handlerUpdatePrimSinglePosition(localId, apos, this); | ||
11746 | } | ||
11747 | |||
11748 | part.IgnoreUndoUpdate = false; | ||
11749 | } | ||
11750 | break; | ||
11751 | |||
11752 | // now group related (bit 4) | ||
11753 | case 9: //( 8 + 1 )group position | ||
11754 | apos = new Vector3(block.Data, 0); | ||
11755 | |||
11756 | UpdateVector handlerUpdateVector = OnUpdatePrimGroupPosition; | ||
11757 | |||
11758 | if (handlerUpdateVector != null) | ||
11759 | { | ||
11760 | part.StoreUndoState(true); | ||
11761 | part.IgnoreUndoUpdate = true; | ||
11762 | |||
11763 | handlerUpdateVector(localId, apos, this); | ||
11764 | |||
11765 | part.IgnoreUndoUpdate = false; | ||
11766 | } | ||
11767 | break; | ||
11768 | |||
11769 | case 0x0A: // (8 + 2) group rotation | ||
11770 | arot = new Quaternion(block.Data, 0, true); | ||
11771 | |||
11772 | UpdatePrimRotation handlerUpdatePrimRotation = OnUpdatePrimGroupRotation; | ||
11773 | if (handlerUpdatePrimRotation != null) | ||
11774 | { | ||
11775 | // Console.WriteLine("new rotation is " + rot3.X + " , " + rot3.Y + " , " + rot3.Z + " , " + rot3.W); | ||
11776 | part.StoreUndoState(true); | ||
11777 | part.IgnoreUndoUpdate = true; | ||
11778 | |||
11779 | handlerUpdatePrimRotation(localId, arot, this); | ||
11780 | |||
11781 | part.IgnoreUndoUpdate = false; | ||
11782 | } | ||
11783 | break; | ||
11784 | |||
11785 | case 0x0B: //( 8 + 2 + 1) group rotation and position | ||
11786 | apos = new Vector3(block.Data, 0); | ||
11787 | arot = new Quaternion(block.Data, 12, true); | ||
11788 | |||
11789 | handlerUpdatePrimGroupRotation = OnUpdatePrimGroupMouseRotation; | ||
11790 | if (handlerUpdatePrimGroupRotation != null) | ||
11791 | { | ||
11792 | // m_log.Debug("new rotation position is " + pos.X + " , " + pos.Y + " , " + pos.Z); | ||
11793 | // m_log.Debug("new group mouse rotation is " + rot4.X + " , " + rot4.Y + " , " + rot4.Z + " , " + rot4.W); | ||
11794 | part.StoreUndoState(true); | ||
11795 | part.IgnoreUndoUpdate = true; | ||
11796 | |||
11797 | handlerUpdatePrimGroupRotation(localId, apos, arot, this); | ||
11798 | |||
11799 | part.IgnoreUndoUpdate = false; | ||
11800 | } | ||
11801 | break; | ||
11802 | |||
11803 | case 0x0C: // (8 + 4) group scale | ||
11804 | // only afects root prim and only sent by viewer editor object tab scaling | ||
11805 | // mouse edition only allows uniform scaling | ||
11806 | // SL MAY CHANGE THIS in viewers | ||
11807 | |||
11808 | ascale = new Vector3(block.Data, 0); | ||
11809 | |||
11810 | handlerUpdatePrimScale = OnUpdatePrimScale; | ||
11811 | if (handlerUpdatePrimScale != null) | ||
11812 | { | ||
11813 | // m_log.Debug("new scale is " + scale7.X + " , " + scale7.Y + " , " + scale7.Z); | ||
11814 | part.StoreUndoState(false); // <- SL Exception make it apply to root prim and not group | ||
11815 | part.IgnoreUndoUpdate = true; | ||
11816 | |||
11817 | handlerUpdatePrimScale(localId, ascale, this); | ||
11818 | |||
11819 | part.IgnoreUndoUpdate = false; | ||
11820 | } | ||
11821 | break; | ||
11822 | |||
11823 | case 0x0D: //(8 + 4 + 1) group scale and position | ||
11824 | // exception as above | ||
11825 | |||
11826 | apos = new Vector3(block.Data, 0); | ||
11827 | ascale = new Vector3(block.Data, 12); | ||
11828 | |||
11829 | handlerUpdatePrimScale = OnUpdatePrimScale; | ||
11830 | if (handlerUpdatePrimScale != null) | ||
11831 | { | ||
11832 | //m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); | ||
11833 | part.StoreUndoState(false); // <- make it apply to root prim and not group | ||
11834 | part.IgnoreUndoUpdate = true; | ||
11835 | |||
11836 | handlerUpdatePrimScale(localId, ascale, this); | ||
11837 | |||
11838 | // Change the position based on scale (for bug number 246) | ||
11839 | handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition; | ||
11840 | // m_log.Debug("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z); | ||
11841 | if (handlerUpdatePrimSinglePosition != null) | ||
11842 | { | ||
11843 | handlerUpdatePrimSinglePosition(localId, apos, this); | ||
11844 | } | ||
11845 | |||
11846 | part.IgnoreUndoUpdate = false; | ||
11847 | } | ||
11848 | break; | ||
11849 | |||
11850 | case 0x1C: // (0x10 + 8 + 4 ) group scale UNIFORM | ||
11851 | ascale = new Vector3(block.Data, 0); | ||
11852 | |||
11853 | handlerUpdatePrimGroupScale = OnUpdatePrimGroupScale; | ||
11854 | if (handlerUpdatePrimGroupScale != null) | ||
11855 | { | ||
11856 | // m_log.Debug("new scale is " + scale7.X + " , " + scale7.Y + " , " + scale7.Z); | ||
11857 | part.StoreUndoState(true); | ||
11858 | part.IgnoreUndoUpdate = true; | ||
11859 | |||
11860 | handlerUpdatePrimGroupScale(localId, ascale, this); | ||
11861 | |||
11862 | part.IgnoreUndoUpdate = false; | ||
11863 | } | ||
11864 | break; | ||
11865 | |||
11866 | case 0x1D: // (UNIFORM + GROUP + SCALE + POS) | ||
11867 | apos = new Vector3(block.Data, 0); | ||
11868 | ascale = new Vector3(block.Data, 12); | ||
11869 | |||
11870 | |||
11871 | handlerUpdatePrimGroupScale = OnUpdatePrimGroupScale; | ||
11872 | if (handlerUpdatePrimGroupScale != null) | ||
11873 | { | ||
11874 | // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z); | ||
11875 | part.StoreUndoState(true); | ||
11876 | part.IgnoreUndoUpdate = true; | ||
11877 | |||
11878 | handlerUpdatePrimGroupScale(localId, ascale, this); | ||
11879 | |||
11880 | handlerUpdateVector = OnUpdatePrimGroupPosition; | ||
11881 | |||
11882 | if (handlerUpdateVector != null) | ||
11883 | { | ||
11884 | handlerUpdateVector(localId, apos, this); | ||
11885 | } | ||
11886 | |||
11887 | part.IgnoreUndoUpdate = false; | ||
11888 | } | ||
11889 | |||
11890 | break; | ||
11891 | |||
11892 | default: | ||
11893 | m_log.Debug("[CLIENT]: MultipleObjUpdate recieved an unknown packet type: " + (block.Type)); | ||
11894 | break; | ||
11895 | } | ||
11896 | */ | ||
11897 | // for (int j = 0; j < parts.Length; j++) | ||
11898 | // parts[j].IgnoreUndoUpdate = false; | ||
11899 | |||
11900 | } | 11624 | } |
11901 | } | 11625 | } |
11902 | } | 11626 | } |
11903 | |||
11904 | return true; | 11627 | return true; |
11905 | } | 11628 | } |
11906 | 11629 | ||