aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2012-03-11 03:28:17 +0000
committerUbitUmarov2012-03-11 03:28:17 +0000
commit1f7c0c2ea00154366964c0e75fb05a92d4b8f764 (patch)
tree6e427ec6716d1fd2367b146fe80ee74d26961bfe /OpenSim
parent cleanup + comments (diff)
downloadopensim-SC_OLD-1f7c0c2ea00154366964c0e75fb05a92d4b8f764.zip
opensim-SC_OLD-1f7c0c2ea00154366964c0e75fb05a92d4b8f764.tar.gz
opensim-SC_OLD-1f7c0c2ea00154366964c0e75fb05a92d4b8f764.tar.bz2
opensim-SC_OLD-1f7c0c2ea00154366964c0e75fb05a92d4b8f764.tar.xz
cleanup + comments
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs277
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 7d51323..7935222 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -11506,21 +11506,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11506 } 11506 }
11507 else 11507 else
11508 { 11508 {
11509// m_log.DebugFormat(
11510// "[CLIENT]: Processing block {0} type {1} for {2} {3}",
11511// i, block.Type, part.Name, part.LocalId);
11512
11513// // Do this once since fetch parts creates a new array.
11514// SceneObjectPart[] parts = part.ParentGroup.Parts;
11515// for (int j = 0; j < parts.Length; j++)
11516// {
11517// part.StoreUndoState();
11518// parts[j].IgnoreUndoUpdate = true;
11519// }
11520
11521// UpdatePrimGroupRotation handlerUpdatePrimGroupRotation;
11522// UpdateVector handlerUpdatePrimGroupScale;
11523
11524 ClientChangeObject updatehandler = onClientChangeObject; 11509 ClientChangeObject updatehandler = onClientChangeObject;
11525 11510
11526 if (updatehandler != null) 11511 if (updatehandler != null)
@@ -11561,7 +11546,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11561 11546
11562 udata.what = ObjectChangeWhat.primPR; 11547 udata.what = ObjectChangeWhat.primPR;
11563 updatehandler(localId, udata, this); 11548 updatehandler(localId, udata, this);
11564
11565 break; 11549 break;
11566 11550
11567 case 4: // scale sp 11551 case 4: // scale sp
@@ -11662,270 +11646,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
11662 } 11646 }
11663 } 11647 }
11664 11648
11665/*
11666 switch (block.Type)
11667 {
11668 case 1: //change position sp
11669 apos = new Vector3(block.Data, 0);
11670
11671 UpdateVector handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition;
11672 if (handlerUpdatePrimSinglePosition != null)
11673 {
11674 part.StoreUndoState();
11675 part.IgnoreUndoUpdate = true;
11676
11677 // m_log.Debug("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
11678 handlerUpdatePrimSinglePosition(localId, apos, this);
11679
11680 part.IgnoreUndoUpdate = false;
11681 }
11682 break;
11683
11684 case 2: // rotation sp
11685 arot = new Quaternion(block.Data, 0, true);
11686
11687 UpdatePrimSingleRotation handlerUpdatePrimSingleRotation = OnUpdatePrimSingleRotation;
11688 if (handlerUpdatePrimSingleRotation != null)
11689 {
11690 part.StoreUndoState();
11691 part.IgnoreUndoUpdate = true;
11692
11693 handlerUpdatePrimSingleRotation(localId, arot, this);
11694
11695 part.IgnoreUndoUpdate = false;
11696 }
11697 break;
11698
11699 case 3: // position plus rotation
11700 apos = new Vector3(block.Data, 0);
11701 arot = new Quaternion(block.Data, 12, true);
11702
11703 UpdatePrimSingleRotationPosition handlerUpdatePrimSingleRotationPosition = OnUpdatePrimSingleRotationPosition;
11704 if (handlerUpdatePrimSingleRotationPosition != null)
11705 {
11706 part.StoreUndoState();
11707 part.IgnoreUndoUpdate = true;
11708
11709 handlerUpdatePrimSingleRotationPosition(localId, arot, apos, this);
11710
11711 part.IgnoreUndoUpdate = false;
11712 }
11713 break;
11714
11715 case 4: // scale sp
11716 case 0x14: // uniform scale sp
11717 ascale = new Vector3(block.Data, 0);
11718
11719 UpdateVector handlerUpdatePrimScale = OnUpdatePrimScale;
11720 if (handlerUpdatePrimScale != null)
11721 {
11722 part.StoreUndoState();
11723 part.IgnoreUndoUpdate = true;
11724
11725 handlerUpdatePrimScale(localId, ascale, this);
11726
11727 part.IgnoreUndoUpdate = false;
11728 }
11729 break;
11730
11731 case 5: // scale and position sp
11732 apos = new Vector3(block.Data, 0);
11733 ascale = new Vector3(block.Data, 12);
11734
11735
11736 handlerUpdatePrimScale = OnUpdatePrimScale;
11737 if (handlerUpdatePrimScale != null)
11738 {
11739 part.StoreUndoState();
11740 part.IgnoreUndoUpdate = true;
11741
11742 handlerUpdatePrimScale(localId, ascale, this);
11743
11744 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition;
11745
11746 if (handlerUpdatePrimSinglePosition != null)
11747 {
11748 handlerUpdatePrimSinglePosition(localId, apos, this);
11749 }
11750 part.IgnoreUndoUpdate = false;
11751 }
11752 break;
11753
11754 case 0x15: //uniform scale and position
11755 apos = new Vector3(block.Data, 0);
11756 ascale = new Vector3(block.Data, 12);
11757
11758
11759 handlerUpdatePrimScale = OnUpdatePrimScale;
11760 if (handlerUpdatePrimScale != null)
11761 {
11762 part.StoreUndoState(false);
11763 part.IgnoreUndoUpdate = true;
11764
11765 // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
11766 handlerUpdatePrimScale(localId, ascale, this);
11767 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition;
11768 if (handlerUpdatePrimSinglePosition != null)
11769 {
11770 handlerUpdatePrimSinglePosition(localId, apos, this);
11771 }
11772
11773 part.IgnoreUndoUpdate = false;
11774 }
11775 break;
11776
11777// now group related (bit 4)
11778 case 9: //( 8 + 1 )group position
11779 apos = new Vector3(block.Data, 0);
11780
11781 UpdateVector handlerUpdateVector = OnUpdatePrimGroupPosition;
11782
11783 if (handlerUpdateVector != null)
11784 {
11785 part.StoreUndoState(true);
11786 part.IgnoreUndoUpdate = true;
11787
11788 handlerUpdateVector(localId, apos, this);
11789
11790 part.IgnoreUndoUpdate = false;
11791 }
11792 break;
11793
11794 case 0x0A: // (8 + 2) group rotation
11795 arot = new Quaternion(block.Data, 0, true);
11796
11797 UpdatePrimRotation handlerUpdatePrimRotation = OnUpdatePrimGroupRotation;
11798 if (handlerUpdatePrimRotation != null)
11799 {
11800 // Console.WriteLine("new rotation is " + rot3.X + " , " + rot3.Y + " , " + rot3.Z + " , " + rot3.W);
11801 part.StoreUndoState(true);
11802 part.IgnoreUndoUpdate = true;
11803
11804 handlerUpdatePrimRotation(localId, arot, this);
11805
11806 part.IgnoreUndoUpdate = false;
11807 }
11808 break;
11809
11810 case 0x0B: //( 8 + 2 + 1) group rotation and position
11811 apos = new Vector3(block.Data, 0);
11812 arot = new Quaternion(block.Data, 12, true);
11813
11814 handlerUpdatePrimGroupRotation = OnUpdatePrimGroupMouseRotation;
11815 if (handlerUpdatePrimGroupRotation != null)
11816 {
11817 // m_log.Debug("new rotation position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
11818 // m_log.Debug("new group mouse rotation is " + rot4.X + " , " + rot4.Y + " , " + rot4.Z + " , " + rot4.W);
11819 part.StoreUndoState(true);
11820 part.IgnoreUndoUpdate = true;
11821
11822 handlerUpdatePrimGroupRotation(localId, apos, arot, this);
11823
11824 part.IgnoreUndoUpdate = false;
11825 }
11826 break;
11827
11828 case 0x0C: // (8 + 4) group scale
11829 // only afects root prim and only sent by viewer editor object tab scaling
11830 // mouse edition only allows uniform scaling
11831 // SL MAY CHANGE THIS in viewers
11832
11833 ascale = new Vector3(block.Data, 0);
11834
11835 handlerUpdatePrimScale = OnUpdatePrimScale;
11836 if (handlerUpdatePrimScale != null)
11837 {
11838 // m_log.Debug("new scale is " + scale7.X + " , " + scale7.Y + " , " + scale7.Z);
11839 part.StoreUndoState(false); // <- SL Exception make it apply to root prim and not group
11840 part.IgnoreUndoUpdate = true;
11841
11842 handlerUpdatePrimScale(localId, ascale, this);
11843
11844 part.IgnoreUndoUpdate = false;
11845 }
11846 break;
11847
11848 case 0x0D: //(8 + 4 + 1) group scale and position
11849 // exception as above
11850
11851 apos = new Vector3(block.Data, 0);
11852 ascale = new Vector3(block.Data, 12);
11853
11854 handlerUpdatePrimScale = OnUpdatePrimScale;
11855 if (handlerUpdatePrimScale != null)
11856 {
11857 //m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
11858 part.StoreUndoState(false); // <- make it apply to root prim and not group
11859 part.IgnoreUndoUpdate = true;
11860
11861 handlerUpdatePrimScale(localId, ascale, this);
11862
11863 // Change the position based on scale (for bug number 246)
11864 handlerUpdatePrimSinglePosition = OnUpdatePrimSinglePosition;
11865 // m_log.Debug("new movement position is " + pos.X + " , " + pos.Y + " , " + pos.Z);
11866 if (handlerUpdatePrimSinglePosition != null)
11867 {
11868 handlerUpdatePrimSinglePosition(localId, apos, this);
11869 }
11870
11871 part.IgnoreUndoUpdate = false;
11872 }
11873 break;
11874
11875 case 0x1C: // (0x10 + 8 + 4 ) group scale UNIFORM
11876 ascale = new Vector3(block.Data, 0);
11877
11878 handlerUpdatePrimGroupScale = OnUpdatePrimGroupScale;
11879 if (handlerUpdatePrimGroupScale != null)
11880 {
11881 // m_log.Debug("new scale is " + scale7.X + " , " + scale7.Y + " , " + scale7.Z);
11882 part.StoreUndoState(true);
11883 part.IgnoreUndoUpdate = true;
11884
11885 handlerUpdatePrimGroupScale(localId, ascale, this);
11886
11887 part.IgnoreUndoUpdate = false;
11888 }
11889 break;
11890
11891 case 0x1D: // (UNIFORM + GROUP + SCALE + POS)
11892 apos = new Vector3(block.Data, 0);
11893 ascale = new Vector3(block.Data, 12);
11894
11895
11896 handlerUpdatePrimGroupScale = OnUpdatePrimGroupScale;
11897 if (handlerUpdatePrimGroupScale != null)
11898 {
11899 // m_log.Debug("new scale is " + scale.X + " , " + scale.Y + " , " + scale.Z);
11900 part.StoreUndoState(true);
11901 part.IgnoreUndoUpdate = true;
11902
11903 handlerUpdatePrimGroupScale(localId, ascale, this);
11904
11905 handlerUpdateVector = OnUpdatePrimGroupPosition;
11906
11907 if (handlerUpdateVector != null)
11908 {
11909 handlerUpdateVector(localId, apos, this);
11910 }
11911
11912 part.IgnoreUndoUpdate = false;
11913 }
11914
11915 break;
11916
11917 default:
11918 m_log.Debug("[CLIENT]: MultipleObjUpdate recieved an unknown packet type: " + (block.Type));
11919 break;
11920 }
11921*/
11922// for (int j = 0; j < parts.Length; j++)
11923// parts[j].IgnoreUndoUpdate = false;
11924
11925 } 11649 }
11926 } 11650 }
11927 } 11651 }
11928
11929 return true; 11652 return true;
11930 } 11653 }
11931 11654
generated by cgit v1.1 at 2024-11-05 13:06:13 +0000