diff options
author | Sean Dague | 2008-07-02 20:31:17 +0000 |
---|---|---|
committer | Sean Dague | 2008-07-02 20:31:17 +0000 |
commit | 2c113c00cf5a8a026ed27e295ba107d21b458649 (patch) | |
tree | d263a3c2445acd57ba7020683f623e2d4ba85d89 /OpenSim/Region/Environment | |
parent | * Twiddle with archive asset extensions yet again (diff) | |
download | opensim-SC_OLD-2c113c00cf5a8a026ed27e295ba107d21b458649.zip opensim-SC_OLD-2c113c00cf5a8a026ed27e295ba107d21b458649.tar.gz opensim-SC_OLD-2c113c00cf5a8a026ed27e295ba107d21b458649.tar.bz2 opensim-SC_OLD-2c113c00cf5a8a026ed27e295ba107d21b458649.tar.xz |
property encapsulation for SOP
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 340 |
2 files changed, 245 insertions, 101 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs index 8e81702..7622609 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.Inventory.cs | |||
@@ -702,9 +702,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
702 | 702 | ||
703 | public void ApplyNextOwnerPermissions() | 703 | public void ApplyNextOwnerPermissions() |
704 | { | 704 | { |
705 | BaseMask &= NextOwnerMask; | 705 | _baseMask &= _nextOwnerMask; |
706 | OwnerMask &= NextOwnerMask; | 706 | _ownerMask &= _nextOwnerMask; |
707 | EveryoneMask &= NextOwnerMask; | 707 | _everyoneMask &= _nextOwnerMask; |
708 | 708 | ||
709 | foreach (TaskInventoryItem item in m_taskInventory.Values) | 709 | foreach (TaskInventoryItem item in m_taskInventory.Values) |
710 | { | 710 | { |
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 13968ec..3f5e618 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -236,19 +236,19 @@ namespace OpenSim.Region.Environment.Scenes | |||
236 | m_regionHandle = regionHandle; | 236 | m_regionHandle = regionHandle; |
237 | m_parentGroup = parent; | 237 | m_parentGroup = parent; |
238 | 238 | ||
239 | CreationDate = (Int32) (DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; | 239 | _creationDate = (Int32) (DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds; |
240 | OwnerID = ownerID; | 240 | _ownerID = ownerID; |
241 | _creatorID = OwnerID; | 241 | _creatorID = _ownerID; |
242 | LastOwnerID = LLUUID.Zero; | 242 | _lastOwnerID = LLUUID.Zero; |
243 | UUID = LLUUID.Random(); | 243 | UUID = LLUUID.Random(); |
244 | LocalId = (uint) (localID); | 244 | LocalId = (uint) (localID); |
245 | Shape = shape; | 245 | Shape = shape; |
246 | // Todo: Add More Object Parameter from above! | 246 | // Todo: Add More Object Parameter from above! |
247 | OwnershipCost = 0; | 247 | _ownershipCost = 0; |
248 | ObjectSaleType = (byte) 0; | 248 | _objectSaleType = (byte) 0; |
249 | SalePrice = 0; | 249 | _salePrice = 0; |
250 | Category = (uint) 0; | 250 | _category = (uint) 0; |
251 | LastOwnerID = _creatorID; | 251 | _lastOwnerID = _creatorID; |
252 | // End Todo: /// | 252 | // End Todo: /// |
253 | GroupPosition = groupPosition; | 253 | GroupPosition = groupPosition; |
254 | OffsetPosition = offsetPosition; | 254 | OffsetPosition = offsetPosition; |
@@ -262,8 +262,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
262 | // this appears to have the same UUID (!) as the prim. If this isn't the case, one can't drag items from | 262 | // this appears to have the same UUID (!) as the prim. If this isn't the case, one can't drag items from |
263 | // the prim into an agent inventory (Linden client reports that the "Object not found for drop" in its log | 263 | // the prim into an agent inventory (Linden client reports that the "Object not found for drop" in its log |
264 | 264 | ||
265 | Flags = 0; | 265 | _flags = 0; |
266 | Flags |= LLObject.ObjectFlags.CreateSelected; | 266 | _flags |= LLObject.ObjectFlags.CreateSelected; |
267 | 267 | ||
268 | TrimPermissions(); | 268 | TrimPermissions(); |
269 | //m_undo = new UndoStack<UndoState>(ParentGroup.GetSceneMaxUndo()); | 269 | //m_undo = new UndoStack<UndoState>(ParentGroup.GetSceneMaxUndo()); |
@@ -288,18 +288,18 @@ namespace OpenSim.Region.Environment.Scenes | |||
288 | m_regionHandle = regionHandle; | 288 | m_regionHandle = regionHandle; |
289 | m_parentGroup = parent; | 289 | m_parentGroup = parent; |
290 | TimeStampTerse = (uint) Util.UnixTimeSinceEpoch(); | 290 | TimeStampTerse = (uint) Util.UnixTimeSinceEpoch(); |
291 | CreationDate = creationDate; | 291 | _creationDate = creationDate; |
292 | OwnerID = ownerID; | 292 | _ownerID = ownerID; |
293 | _creatorID = creatorID; | 293 | _creatorID = creatorID; |
294 | LastOwnerID = lastOwnerID; | 294 | _lastOwnerID = lastOwnerID; |
295 | UUID = LLUUID.Random(); | 295 | UUID = LLUUID.Random(); |
296 | LocalId = (uint) (localID); | 296 | LocalId = (uint) (localID); |
297 | Shape = shape; | 297 | Shape = shape; |
298 | OwnershipCost = 0; | 298 | _ownershipCost = 0; |
299 | ObjectSaleType = (byte) 0; | 299 | _objectSaleType = (byte) 0; |
300 | SalePrice = 0; | 300 | _salePrice = 0; |
301 | Category = (uint) 0; | 301 | _category = (uint) 0; |
302 | LastOwnerID = _creatorID; | 302 | _lastOwnerID = _creatorID; |
303 | OffsetPosition = position; | 303 | OffsetPosition = position; |
304 | RotationOffset = rotation; | 304 | RotationOffset = rotation; |
305 | ObjectFlags = flags; | 305 | ObjectFlags = flags; |
@@ -335,22 +335,22 @@ namespace OpenSim.Region.Environment.Scenes | |||
335 | 335 | ||
336 | #region XML Schema | 336 | #region XML Schema |
337 | 337 | ||
338 | public LLUUID LastOwnerID; | 338 | private LLUUID _lastOwnerID; |
339 | public LLUUID OwnerID; | 339 | private LLUUID _ownerID; |
340 | public LLUUID GroupID; | 340 | private LLUUID _groupID; |
341 | public int OwnershipCost; | 341 | private int _ownershipCost; |
342 | public byte ObjectSaleType; | 342 | private byte _objectSaleType; |
343 | public int SalePrice; | 343 | private int _salePrice; |
344 | public uint Category; | 344 | private uint _category; |
345 | public Int32 CreationDate; | 345 | private Int32 _creationDate; |
346 | public uint ParentID = 0; | 346 | private uint _parentID = 0; |
347 | public LLUUID m_sitTargetAvatar = LLUUID.Zero; | 347 | private LLUUID m_sitTargetAvatar = LLUUID.Zero; |
348 | public uint BaseMask = (uint)PermissionMask.All; | 348 | private uint _baseMask = (uint)PermissionMask.All; |
349 | public uint OwnerMask = (uint)PermissionMask.All; | 349 | private uint _ownerMask = (uint)PermissionMask.All; |
350 | public uint GroupMask = (uint)PermissionMask.None; | 350 | private uint _groupMask = (uint)PermissionMask.None; |
351 | public uint EveryoneMask = (uint)PermissionMask.None; | 351 | private uint _everyoneMask = (uint)PermissionMask.None; |
352 | public uint NextOwnerMask = (uint)PermissionMask.All; | 352 | private uint _nextOwnerMask = (uint)PermissionMask.All; |
353 | public LLObject.ObjectFlags Flags = LLObject.ObjectFlags.None; | 353 | private LLObject.ObjectFlags _flags = LLObject.ObjectFlags.None; |
354 | 354 | ||
355 | public LLUUID CreatorID { | 355 | public LLUUID CreatorID { |
356 | get | 356 | get |
@@ -387,8 +387,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
387 | 387 | ||
388 | public uint ObjectFlags | 388 | public uint ObjectFlags |
389 | { | 389 | { |
390 | get { return (uint)Flags; } | 390 | get { return (uint)_flags; } |
391 | set { Flags = (LLObject.ObjectFlags)value; } | 391 | set { _flags = (LLObject.ObjectFlags)value; } |
392 | } | 392 | } |
393 | 393 | ||
394 | public LLUUID UUID | 394 | public LLUUID UUID |
@@ -432,7 +432,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
432 | get | 432 | get |
433 | { | 433 | { |
434 | // If this is a linkset, we don't want the physics engine mucking up our group position here. | 434 | // If this is a linkset, we don't want the physics engine mucking up our group position here. |
435 | if (PhysActor != null && ParentID == 0) | 435 | if (PhysActor != null && _parentID == 0) |
436 | { | 436 | { |
437 | m_groupPosition.X = PhysActor.Position.X; | 437 | m_groupPosition.X = PhysActor.Position.X; |
438 | m_groupPosition.Y = PhysActor.Position.Y; | 438 | m_groupPosition.Y = PhysActor.Position.Y; |
@@ -461,7 +461,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
461 | { | 461 | { |
462 | 462 | ||
463 | // Root prim actually goes at Position | 463 | // Root prim actually goes at Position |
464 | if (ParentID == 0) | 464 | if (_parentID == 0) |
465 | { | 465 | { |
466 | PhysActor.Position = new PhysicsVector(value.X, value.Y, value.Z); | 466 | PhysActor.Position = new PhysicsVector(value.X, value.Y, value.Z); |
467 | 467 | ||
@@ -515,7 +515,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
515 | get | 515 | get |
516 | { | 516 | { |
517 | // We don't want the physics engine mucking up the rotations in a linkset | 517 | // We don't want the physics engine mucking up the rotations in a linkset |
518 | if (PhysActor != null && ParentID == 0) | 518 | if (PhysActor != null && _parentID == 0) |
519 | { | 519 | { |
520 | if (PhysActor.Orientation.x != 0 || PhysActor.Orientation.y != 0 | 520 | if (PhysActor.Orientation.x != 0 || PhysActor.Orientation.y != 0 |
521 | || PhysActor.Orientation.z != 0 || PhysActor.Orientation.w != 0) | 521 | || PhysActor.Orientation.z != 0 || PhysActor.Orientation.w != 0) |
@@ -538,7 +538,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
538 | try | 538 | try |
539 | { | 539 | { |
540 | // Root prim gets value directly | 540 | // Root prim gets value directly |
541 | if (ParentID == 0) | 541 | if (_parentID == 0) |
542 | { | 542 | { |
543 | PhysActor.Orientation = new Quaternion(value.W, value.X, value.Y, value.Z); | 543 | PhysActor.Orientation = new Quaternion(value.W, value.X, value.Y, value.Z); |
544 | //m_log.Info("[PART]: RO1:" + PhysActor.Orientation.ToString()); | 544 | //m_log.Info("[PART]: RO1:" + PhysActor.Orientation.ToString()); |
@@ -757,7 +757,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
757 | 757 | ||
758 | public LLUUID ObjectOwner | 758 | public LLUUID ObjectOwner |
759 | { | 759 | { |
760 | get { return OwnerID; } | 760 | get { return _ownerID; } |
761 | } | 761 | } |
762 | 762 | ||
763 | public SceneObjectGroup ParentGroup | 763 | public SceneObjectGroup ParentGroup |
@@ -796,6 +796,150 @@ namespace OpenSim.Region.Environment.Scenes | |||
796 | } | 796 | } |
797 | } | 797 | } |
798 | 798 | ||
799 | public uint ParentID { | ||
800 | get { | ||
801 | return _parentID; | ||
802 | } | ||
803 | set { | ||
804 | _parentID = value; | ||
805 | } | ||
806 | } | ||
807 | |||
808 | public int CreationDate { | ||
809 | get { | ||
810 | return _creationDate; | ||
811 | } | ||
812 | set { | ||
813 | _creationDate = value; | ||
814 | } | ||
815 | } | ||
816 | |||
817 | public uint Category { | ||
818 | get { | ||
819 | return _category; | ||
820 | } | ||
821 | set { | ||
822 | _category = value; | ||
823 | } | ||
824 | } | ||
825 | |||
826 | public int SalePrice { | ||
827 | get { | ||
828 | return _salePrice; | ||
829 | } | ||
830 | set { | ||
831 | _salePrice = value; | ||
832 | } | ||
833 | } | ||
834 | |||
835 | public byte ObjectSaleType { | ||
836 | get { | ||
837 | return _objectSaleType; | ||
838 | } | ||
839 | set { | ||
840 | _objectSaleType = value; | ||
841 | } | ||
842 | } | ||
843 | |||
844 | public int OwnershipCost { | ||
845 | get { | ||
846 | return _ownershipCost; | ||
847 | } | ||
848 | set { | ||
849 | _ownershipCost = value; | ||
850 | } | ||
851 | } | ||
852 | |||
853 | public LLUUID GroupID { | ||
854 | get { | ||
855 | return _groupID; | ||
856 | } | ||
857 | set { | ||
858 | _groupID = value; | ||
859 | } | ||
860 | } | ||
861 | |||
862 | public LLUUID OwnerID { | ||
863 | get { | ||
864 | return _ownerID; | ||
865 | } | ||
866 | set { | ||
867 | _ownerID = value; | ||
868 | } | ||
869 | } | ||
870 | |||
871 | public LLUUID LastOwnerID { | ||
872 | get { | ||
873 | return _lastOwnerID; | ||
874 | } | ||
875 | set { | ||
876 | _lastOwnerID = value; | ||
877 | } | ||
878 | } | ||
879 | |||
880 | public uint BaseMask { | ||
881 | get { | ||
882 | return _baseMask; | ||
883 | } | ||
884 | set { | ||
885 | _baseMask = value; | ||
886 | } | ||
887 | } | ||
888 | |||
889 | public uint OwnerMask { | ||
890 | get { | ||
891 | return _ownerMask; | ||
892 | } | ||
893 | set { | ||
894 | _ownerMask = value; | ||
895 | } | ||
896 | } | ||
897 | |||
898 | public uint GroupMask { | ||
899 | get { | ||
900 | return _groupMask; | ||
901 | } | ||
902 | set { | ||
903 | _groupMask = value; | ||
904 | } | ||
905 | } | ||
906 | |||
907 | public uint EveryoneMask { | ||
908 | get { | ||
909 | return _everyoneMask; | ||
910 | } | ||
911 | set { | ||
912 | _everyoneMask = value; | ||
913 | } | ||
914 | } | ||
915 | |||
916 | public uint NextOwnerMask { | ||
917 | get { | ||
918 | return _nextOwnerMask; | ||
919 | } | ||
920 | set { | ||
921 | _nextOwnerMask = value; | ||
922 | } | ||
923 | } | ||
924 | |||
925 | public libsecondlife.LLObject.ObjectFlags Flags { | ||
926 | get { | ||
927 | return _flags; | ||
928 | } | ||
929 | set { | ||
930 | _flags = value; | ||
931 | } | ||
932 | } | ||
933 | |||
934 | public LLUUID SitTargetAvatar { | ||
935 | get { | ||
936 | return m_sitTargetAvatar; | ||
937 | } | ||
938 | set { | ||
939 | m_sitTargetAvatar = value; | ||
940 | } | ||
941 | } | ||
942 | |||
799 | 943 | ||
800 | 944 | ||
801 | #endregion Public Properties with only Get | 945 | #endregion Public Properties with only Get |
@@ -871,7 +1015,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
871 | if ((ObjectFlags & (uint) flag) == 0) | 1015 | if ((ObjectFlags & (uint) flag) == 0) |
872 | { | 1016 | { |
873 | //Console.WriteLine("Adding flag: " + ((LLObject.ObjectFlags) flag).ToString()); | 1017 | //Console.WriteLine("Adding flag: " + ((LLObject.ObjectFlags) flag).ToString()); |
874 | Flags |= flag; | 1018 | _flags |= flag; |
875 | } | 1019 | } |
876 | //uint currflag = (uint)Flags; | 1020 | //uint currflag = (uint)Flags; |
877 | //System.Console.WriteLine("Aprev: " + prevflag.ToString() + " curr: " + Flags.ToString()); | 1021 | //System.Console.WriteLine("Aprev: " + prevflag.ToString() + " curr: " + Flags.ToString()); |
@@ -1046,8 +1190,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
1046 | dupe.UUID = LLUUID.Random(); | 1190 | dupe.UUID = LLUUID.Random(); |
1047 | 1191 | ||
1048 | dupe.LocalId = localID; | 1192 | dupe.LocalId = localID; |
1049 | dupe.OwnerID = AgentID; | 1193 | dupe._ownerID = AgentID; |
1050 | dupe.GroupID = GroupID; | 1194 | dupe._groupID = GroupID; |
1051 | dupe.GroupPosition = new LLVector3(GroupPosition.X, GroupPosition.Y, GroupPosition.Z); | 1195 | dupe.GroupPosition = new LLVector3(GroupPosition.X, GroupPosition.Y, GroupPosition.Z); |
1052 | dupe.OffsetPosition = new LLVector3(OffsetPosition.X, OffsetPosition.Y, OffsetPosition.Z); | 1196 | dupe.OffsetPosition = new LLVector3(OffsetPosition.X, OffsetPosition.Y, OffsetPosition.Z); |
1053 | dupe.RotationOffset = | 1197 | dupe.RotationOffset = |
@@ -1057,10 +1201,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
1057 | dupe.AngularVelocity = new LLVector3(0, 0, 0); | 1201 | dupe.AngularVelocity = new LLVector3(0, 0, 0); |
1058 | dupe.ObjectFlags = ObjectFlags; | 1202 | dupe.ObjectFlags = ObjectFlags; |
1059 | 1203 | ||
1060 | dupe.OwnershipCost = OwnershipCost; | 1204 | dupe._ownershipCost = _ownershipCost; |
1061 | dupe.ObjectSaleType = ObjectSaleType; | 1205 | dupe._objectSaleType = _objectSaleType; |
1062 | dupe.SalePrice = SalePrice; | 1206 | dupe._salePrice = _salePrice; |
1063 | dupe.Category = Category; | 1207 | dupe._category = _category; |
1064 | 1208 | ||
1065 | dupe.TaskInventory = (TaskInventoryDictionary)dupe.TaskInventory.Clone(); | 1209 | dupe.TaskInventory = (TaskInventoryDictionary)dupe.TaskInventory.Clone(); |
1066 | 1210 | ||
@@ -1068,7 +1212,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1068 | dupe.ResetIDs(linkNum); | 1212 | dupe.ResetIDs(linkNum); |
1069 | 1213 | ||
1070 | // This may be wrong... it might have to be applied in SceneObjectGroup to the object that's being duplicated. | 1214 | // This may be wrong... it might have to be applied in SceneObjectGroup to the object that's being duplicated. |
1071 | dupe.LastOwnerID = ObjectOwner; | 1215 | dupe._lastOwnerID = ObjectOwner; |
1072 | 1216 | ||
1073 | byte[] extraP = new byte[Shape.ExtraParams.Length]; | 1217 | byte[] extraP = new byte[Shape.ExtraParams.Length]; |
1074 | Array.Copy(Shape.ExtraParams, extraP, extraP.Length); | 1218 | Array.Copy(Shape.ExtraParams, extraP, extraP.Length); |
@@ -1095,7 +1239,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1095 | part.Shape = shape; | 1239 | part.Shape = shape; |
1096 | 1240 | ||
1097 | part.Name = "Primitive"; | 1241 | part.Name = "Primitive"; |
1098 | part.OwnerID = LLUUID.Random(); | 1242 | part._ownerID = LLUUID.Random(); |
1099 | 1243 | ||
1100 | return part; | 1244 | return part; |
1101 | } | 1245 | } |
@@ -1140,7 +1284,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1140 | 1284 | ||
1141 | PhysActor.OnRequestTerseUpdate += PhysicsRequestingTerseUpdate; | 1285 | PhysActor.OnRequestTerseUpdate += PhysicsRequestingTerseUpdate; |
1142 | PhysActor.OnOutOfBounds += PhysicsOutOfBounds; | 1286 | PhysActor.OnOutOfBounds += PhysicsOutOfBounds; |
1143 | if (ParentID != 0 && ParentID != LocalId) | 1287 | if (_parentID != 0 && _parentID != LocalId) |
1144 | { | 1288 | { |
1145 | if (ParentGroup.RootPart.PhysActor != null) | 1289 | if (ParentGroup.RootPart.PhysActor != null) |
1146 | { | 1290 | { |
@@ -1193,11 +1337,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
1193 | 1337 | ||
1194 | public uint GetEffectiveObjectFlags() | 1338 | public uint GetEffectiveObjectFlags() |
1195 | { | 1339 | { |
1196 | LLObject.ObjectFlags f = Flags; | 1340 | LLObject.ObjectFlags f = _flags; |
1197 | if (m_parentGroup == null || m_parentGroup.RootPart == this) | 1341 | if (m_parentGroup == null || m_parentGroup.RootPart == this) |
1198 | f &= ~(LLObject.ObjectFlags.Touch | LLObject.ObjectFlags.Money); | 1342 | f &= ~(LLObject.ObjectFlags.Touch | LLObject.ObjectFlags.Money); |
1199 | 1343 | ||
1200 | return (uint)Flags | (uint)LocalFlags; | 1344 | return (uint)_flags | (uint)LocalFlags; |
1201 | } | 1345 | } |
1202 | 1346 | ||
1203 | public LLVector3 GetGeometricCenter() | 1347 | public LLVector3 GetGeometricCenter() |
@@ -1247,23 +1391,23 @@ namespace OpenSim.Region.Environment.Scenes | |||
1247 | 1391 | ||
1248 | info.AddValue("TaskInventory", TaskInventory_work); | 1392 | info.AddValue("TaskInventory", TaskInventory_work); |
1249 | 1393 | ||
1250 | info.AddValue("LastOwnerID", LastOwnerID.UUID); | 1394 | info.AddValue("LastOwnerID", _lastOwnerID.UUID); |
1251 | info.AddValue("OwnerID", OwnerID.UUID); | 1395 | info.AddValue("OwnerID", _ownerID.UUID); |
1252 | info.AddValue("GroupID", GroupID.UUID); | 1396 | info.AddValue("GroupID", _groupID.UUID); |
1253 | 1397 | ||
1254 | info.AddValue("OwnershipCost", OwnershipCost); | 1398 | info.AddValue("OwnershipCost", _ownershipCost); |
1255 | info.AddValue("ObjectSaleType", ObjectSaleType); | 1399 | info.AddValue("ObjectSaleType", _objectSaleType); |
1256 | info.AddValue("SalePrice", SalePrice); | 1400 | info.AddValue("SalePrice", _salePrice); |
1257 | info.AddValue("Category", Category); | 1401 | info.AddValue("Category", _category); |
1258 | 1402 | ||
1259 | info.AddValue("CreationDate", CreationDate); | 1403 | info.AddValue("CreationDate", _creationDate); |
1260 | info.AddValue("ParentID", ParentID); | 1404 | info.AddValue("ParentID", _parentID); |
1261 | 1405 | ||
1262 | info.AddValue("OwnerMask", OwnerMask); | 1406 | info.AddValue("OwnerMask", _ownerMask); |
1263 | info.AddValue("NextOwnerMask", NextOwnerMask); | 1407 | info.AddValue("NextOwnerMask", _nextOwnerMask); |
1264 | info.AddValue("GroupMask", GroupMask); | 1408 | info.AddValue("GroupMask", _groupMask); |
1265 | info.AddValue("EveryoneMask", EveryoneMask); | 1409 | info.AddValue("EveryoneMask", _everyoneMask); |
1266 | info.AddValue("BaseMask", BaseMask); | 1410 | info.AddValue("BaseMask", _baseMask); |
1267 | 1411 | ||
1268 | info.AddValue("m_particleSystem", m_particleSystem); | 1412 | info.AddValue("m_particleSystem", m_particleSystem); |
1269 | 1413 | ||
@@ -1278,7 +1422,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1278 | info.AddValue("m_uuid", m_uuid.UUID); | 1422 | info.AddValue("m_uuid", m_uuid.UUID); |
1279 | info.AddValue("m_localID", m_localId); | 1423 | info.AddValue("m_localID", m_localId); |
1280 | info.AddValue("m_name", m_name); | 1424 | info.AddValue("m_name", m_name); |
1281 | info.AddValue("m_flags", Flags); | 1425 | info.AddValue("m_flags", _flags); |
1282 | info.AddValue("m_material", m_material); | 1426 | info.AddValue("m_material", m_material); |
1283 | info.AddValue("m_regionHandle", m_regionHandle); | 1427 | info.AddValue("m_regionHandle", m_regionHandle); |
1284 | 1428 | ||
@@ -1324,11 +1468,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
1324 | 1468 | ||
1325 | public void GetProperties(IClientAPI client) | 1469 | public void GetProperties(IClientAPI client) |
1326 | { | 1470 | { |
1327 | client.SendObjectPropertiesReply(LLUUID.Zero, (ulong)CreationDate, _creatorID, LLUUID.Zero, LLUUID.Zero, | 1471 | client.SendObjectPropertiesReply(LLUUID.Zero, (ulong)_creationDate, _creatorID, LLUUID.Zero, LLUUID.Zero, |
1328 | GroupID, (short)InventorySerial, LastOwnerID, UUID, OwnerID, | 1472 | _groupID, (short)InventorySerial, _lastOwnerID, UUID, _ownerID, |
1329 | ParentGroup.RootPart.TouchName, new byte[0], ParentGroup.RootPart.SitName, Name, Description, | 1473 | ParentGroup.RootPart.TouchName, new byte[0], ParentGroup.RootPart.SitName, Name, Description, |
1330 | ParentGroup.RootPart.OwnerMask, ParentGroup.RootPart.NextOwnerMask, ParentGroup.RootPart.GroupMask, ParentGroup.RootPart.EveryoneMask, | 1474 | ParentGroup.RootPart._ownerMask, ParentGroup.RootPart._nextOwnerMask, ParentGroup.RootPart._groupMask, ParentGroup.RootPart._everyoneMask, |
1331 | ParentGroup.RootPart.BaseMask); | 1475 | ParentGroup.RootPart._baseMask); |
1332 | } | 1476 | } |
1333 | 1477 | ||
1334 | public LLUUID GetRootPartUUID() | 1478 | public LLUUID GetRootPartUUID() |
@@ -1513,12 +1657,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
1513 | DetectedObject detobj = new DetectedObject(); | 1657 | DetectedObject detobj = new DetectedObject(); |
1514 | detobj.keyUUID = obj.UUID; | 1658 | detobj.keyUUID = obj.UUID; |
1515 | detobj.nameStr = obj.Name; | 1659 | detobj.nameStr = obj.Name; |
1516 | detobj.ownerUUID = obj.OwnerID; | 1660 | detobj.ownerUUID = obj._ownerID; |
1517 | detobj.posVector = obj.AbsolutePosition; | 1661 | detobj.posVector = obj.AbsolutePosition; |
1518 | detobj.rotQuat = obj.GetWorldRotation(); | 1662 | detobj.rotQuat = obj.GetWorldRotation(); |
1519 | detobj.velVector = obj.Velocity; | 1663 | detobj.velVector = obj.Velocity; |
1520 | detobj.colliderType = 0; | 1664 | detobj.colliderType = 0; |
1521 | detobj.groupUUID = obj.GroupID; | 1665 | detobj.groupUUID = obj._groupID; |
1522 | colliding.Add(detobj); | 1666 | colliding.Add(detobj); |
1523 | } | 1667 | } |
1524 | else | 1668 | else |
@@ -1579,12 +1723,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
1579 | DetectedObject detobj = new DetectedObject(); | 1723 | DetectedObject detobj = new DetectedObject(); |
1580 | detobj.keyUUID = obj.UUID; | 1724 | detobj.keyUUID = obj.UUID; |
1581 | detobj.nameStr = obj.Name; | 1725 | detobj.nameStr = obj.Name; |
1582 | detobj.ownerUUID = obj.OwnerID; | 1726 | detobj.ownerUUID = obj._ownerID; |
1583 | detobj.posVector = obj.AbsolutePosition; | 1727 | detobj.posVector = obj.AbsolutePosition; |
1584 | detobj.rotQuat = obj.GetWorldRotation(); | 1728 | detobj.rotQuat = obj.GetWorldRotation(); |
1585 | detobj.velVector = obj.Velocity; | 1729 | detobj.velVector = obj.Velocity; |
1586 | detobj.colliderType = 0; | 1730 | detobj.colliderType = 0; |
1587 | detobj.groupUUID = obj.GroupID; | 1731 | detobj.groupUUID = obj._groupID; |
1588 | colliding.Add(detobj); | 1732 | colliding.Add(detobj); |
1589 | } | 1733 | } |
1590 | else | 1734 | else |
@@ -1647,12 +1791,12 @@ namespace OpenSim.Region.Environment.Scenes | |||
1647 | DetectedObject detobj = new DetectedObject(); | 1791 | DetectedObject detobj = new DetectedObject(); |
1648 | detobj.keyUUID = obj.UUID; | 1792 | detobj.keyUUID = obj.UUID; |
1649 | detobj.nameStr = obj.Name; | 1793 | detobj.nameStr = obj.Name; |
1650 | detobj.ownerUUID = obj.OwnerID; | 1794 | detobj.ownerUUID = obj._ownerID; |
1651 | detobj.posVector = obj.AbsolutePosition; | 1795 | detobj.posVector = obj.AbsolutePosition; |
1652 | detobj.rotQuat = obj.GetWorldRotation(); | 1796 | detobj.rotQuat = obj.GetWorldRotation(); |
1653 | detobj.velVector = obj.Velocity; | 1797 | detobj.velVector = obj.Velocity; |
1654 | detobj.colliderType = 0; | 1798 | detobj.colliderType = 0; |
1655 | detobj.groupUUID = obj.GroupID; | 1799 | detobj.groupUUID = obj._groupID; |
1656 | colliding.Add(detobj); | 1800 | colliding.Add(detobj); |
1657 | } | 1801 | } |
1658 | else | 1802 | else |
@@ -1755,7 +1899,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1755 | if ((ObjectFlags & (uint) flag) != 0) | 1899 | if ((ObjectFlags & (uint) flag) != 0) |
1756 | { | 1900 | { |
1757 | //Console.WriteLine("Removing flag: " + ((LLObject.ObjectFlags)flag).ToString()); | 1901 | //Console.WriteLine("Removing flag: " + ((LLObject.ObjectFlags)flag).ToString()); |
1758 | Flags &= ~flag; | 1902 | _flags &= ~flag; |
1759 | } | 1903 | } |
1760 | //System.Console.WriteLine("prev: " + prevflag.ToString() + " curr: " + Flags.ToString()); | 1904 | //System.Console.WriteLine("prev: " + prevflag.ToString() + " curr: " + Flags.ToString()); |
1761 | //ScheduleFullUpdate(); | 1905 | //ScheduleFullUpdate(); |
@@ -1950,19 +2094,19 @@ namespace OpenSim.Region.Environment.Scenes | |||
1950 | { | 2094 | { |
1951 | clientFlags &= ~(uint) LLObject.ObjectFlags.CreateSelected; | 2095 | clientFlags &= ~(uint) LLObject.ObjectFlags.CreateSelected; |
1952 | 2096 | ||
1953 | if (remoteClient.AgentId == OwnerID) | 2097 | if (remoteClient.AgentId == _ownerID) |
1954 | { | 2098 | { |
1955 | if ((uint) (Flags & LLObject.ObjectFlags.CreateSelected) != 0) | 2099 | if ((uint) (_flags & LLObject.ObjectFlags.CreateSelected) != 0) |
1956 | { | 2100 | { |
1957 | clientFlags |= (uint) LLObject.ObjectFlags.CreateSelected; | 2101 | clientFlags |= (uint) LLObject.ObjectFlags.CreateSelected; |
1958 | Flags &= ~LLObject.ObjectFlags.CreateSelected; | 2102 | _flags &= ~LLObject.ObjectFlags.CreateSelected; |
1959 | } | 2103 | } |
1960 | } | 2104 | } |
1961 | 2105 | ||
1962 | byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A}; | 2106 | byte[] color = new byte[] {m_color.R, m_color.G, m_color.B, m_color.A}; |
1963 | remoteClient.SendPrimitiveToClient(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape, | 2107 | remoteClient.SendPrimitiveToClient(m_regionHandle, (ushort)(m_parentGroup.GetTimeDilation() * (float)ushort.MaxValue), LocalId, m_shape, |
1964 | lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid, OwnerID, | 2108 | lPos, Velocity, Acceleration, RotationOffset, RotationalVelocity, clientFlags, m_uuid, _ownerID, |
1965 | m_text, color, ParentID, m_particleSystem, m_clickAction, m_TextureAnimation, m_IsAttachment, | 2109 | m_text, color, _parentID, m_particleSystem, m_clickAction, m_TextureAnimation, m_IsAttachment, |
1966 | m_attachmentPoint,fromAssetID, Sound, SoundGain, SoundFlags, SoundRadius); | 2110 | m_attachmentPoint,fromAssetID, Sound, SoundGain, SoundFlags, SoundRadius); |
1967 | } | 2111 | } |
1968 | 2112 | ||
@@ -2001,7 +2145,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2001 | if (volume < 0) | 2145 | if (volume < 0) |
2002 | volume = 0; | 2146 | volume = 0; |
2003 | 2147 | ||
2004 | LLUUID ownerID = OwnerID; | 2148 | LLUUID ownerID = _ownerID; |
2005 | LLUUID objectID = UUID; | 2149 | LLUUID objectID = UUID; |
2006 | LLUUID parentID = GetRootPartUUID(); | 2150 | LLUUID parentID = GetRootPartUUID(); |
2007 | LLUUID soundID = LLUUID.Zero; | 2151 | LLUUID soundID = LLUUID.Zero; |
@@ -2169,7 +2313,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2169 | 2313 | ||
2170 | public void SetGroup(LLUUID groupID, IClientAPI client) | 2314 | public void SetGroup(LLUUID groupID, IClientAPI client) |
2171 | { | 2315 | { |
2172 | GroupID = groupID; | 2316 | _groupID = groupID; |
2173 | GetProperties(client); | 2317 | GetProperties(client); |
2174 | m_updateFlag = 2; | 2318 | m_updateFlag = 2; |
2175 | } | 2319 | } |
@@ -2185,7 +2329,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
2185 | // Use this for attachments! LocalID should be avatar's localid | 2329 | // Use this for attachments! LocalID should be avatar's localid |
2186 | public void SetParentLocalId(uint localID) | 2330 | public void SetParentLocalId(uint localID) |
2187 | { | 2331 | { |
2188 | ParentID = localID; | 2332 | _parentID = localID; |
2189 | } | 2333 | } |
2190 | 2334 | ||
2191 | public void SetPhysicsAxisRotation() | 2335 | public void SetPhysicsAxisRotation() |
@@ -2766,11 +2910,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
2766 | 2910 | ||
2767 | public void TrimPermissions() | 2911 | public void TrimPermissions() |
2768 | { | 2912 | { |
2769 | BaseMask &= (uint)PermissionMask.All; | 2913 | _baseMask &= (uint)PermissionMask.All; |
2770 | OwnerMask &= (uint)PermissionMask.All; | 2914 | _ownerMask &= (uint)PermissionMask.All; |
2771 | GroupMask &= (uint)PermissionMask.All; | 2915 | _groupMask &= (uint)PermissionMask.All; |
2772 | EveryoneMask &= (uint)PermissionMask.All; | 2916 | _everyoneMask &= (uint)PermissionMask.All; |
2773 | NextOwnerMask &= (uint)PermissionMask.All; | 2917 | _nextOwnerMask &= (uint)PermissionMask.All; |
2774 | } | 2918 | } |
2775 | 2919 | ||
2776 | public void Undo() | 2920 | public void Undo() |
@@ -2837,21 +2981,21 @@ namespace OpenSim.Region.Environment.Scenes | |||
2837 | bool set = addRemTF == 1; | 2981 | bool set = addRemTF == 1; |
2838 | 2982 | ||
2839 | // Are we the owner? | 2983 | // Are we the owner? |
2840 | if (AgentID == OwnerID) | 2984 | if (AgentID == _ownerID) |
2841 | { | 2985 | { |
2842 | switch (field) | 2986 | switch (field) |
2843 | { | 2987 | { |
2844 | case 2: | 2988 | case 2: |
2845 | OwnerMask = ApplyMask(OwnerMask, set, mask); | 2989 | _ownerMask = ApplyMask(_ownerMask, set, mask); |
2846 | break; | 2990 | break; |
2847 | case 4: | 2991 | case 4: |
2848 | GroupMask = ApplyMask(GroupMask, set, mask); | 2992 | _groupMask = ApplyMask(_groupMask, set, mask); |
2849 | break; | 2993 | break; |
2850 | case 8: | 2994 | case 8: |
2851 | EveryoneMask = ApplyMask(EveryoneMask, set, mask); | 2995 | _everyoneMask = ApplyMask(_everyoneMask, set, mask); |
2852 | break; | 2996 | break; |
2853 | case 16: | 2997 | case 16: |
2854 | NextOwnerMask = ApplyMask(NextOwnerMask, set, mask); | 2998 | _nextOwnerMask = ApplyMask(_nextOwnerMask, set, mask); |
2855 | break; | 2999 | break; |
2856 | } | 3000 | } |
2857 | SendFullUpdateToAllClients(); | 3001 | SendFullUpdateToAllClients(); |