diff options
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/AvatarAppearance.cs | 53 | ||||
-rw-r--r-- | OpenSim/Framework/LocklessQueue.cs | 8 | ||||
-rw-r--r-- | OpenSim/Framework/Servers/ServerBase.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/ThrottleOutPacketType.cs | 2 |
4 files changed, 60 insertions, 7 deletions
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs index ffc3527..041fb94 100644 --- a/OpenSim/Framework/AvatarAppearance.cs +++ b/OpenSim/Framework/AvatarAppearance.cs | |||
@@ -1558,7 +1558,58 @@ namespace OpenSim.Framework | |||
1558 | SHAPE_EYELID_INNER_CORNER_UP = 214, | 1558 | SHAPE_EYELID_INNER_CORNER_UP = 214, |
1559 | SKIRT_SKIRT_RED = 215, | 1559 | SKIRT_SKIRT_RED = 215, |
1560 | SKIRT_SKIRT_GREEN = 216, | 1560 | SKIRT_SKIRT_GREEN = 216, |
1561 | SKIRT_SKIRT_BLUE = 217 | 1561 | SKIRT_SKIRT_BLUE = 217, |
1562 | |||
1563 | /// <summary> | ||
1564 | /// Avatar Physics section. These are 0 type visual params which get transmitted. | ||
1565 | /// </summary> | ||
1566 | |||
1567 | /// <summary> | ||
1568 | /// Breast Part 1 | ||
1569 | /// </summary> | ||
1570 | BREAST_PHYSICS_MASS = 218, | ||
1571 | BREAST_PHYSICS_GRAVITY = 219, | ||
1572 | BREAST_PHYSICS_DRAG = 220, | ||
1573 | BREAST_PHYSICS_UPDOWN_MAX_EFFECT = 221, | ||
1574 | BREAST_PHYSICS_UPDOWN_SPRING = 222, | ||
1575 | BREAST_PHYSICS_UPDOWN_GAIN = 223, | ||
1576 | BREAST_PHYSICS_UPDOWN_DAMPING = 224, | ||
1577 | BREAST_PHYSICS_INOUT_MAX_EFFECT = 225, | ||
1578 | BREAST_PHYSICS_INOUT_SPRING = 226, | ||
1579 | BREAST_PHYSICS_INOUT_GAIN = 227, | ||
1580 | BREAST_PHYSICS_INOUT_DAMPING = 228, | ||
1581 | /// <summary> | ||
1582 | /// Belly | ||
1583 | /// </summary> | ||
1584 | BELLY_PHYISCS_MASS = 229, | ||
1585 | BELLY_PHYSICS_GRAVITY = 230, | ||
1586 | BELLY_PHYSICS_DRAG = 231, | ||
1587 | BELLY_PHYISCS_UPDOWN_MAX_EFFECT = 232, | ||
1588 | BELLY_PHYSICS_UPDOWN_SPRING = 233, | ||
1589 | BELLY_PHYSICS_UPDOWN_GAIN = 234, | ||
1590 | BELLY_PHYSICS_UPDOWN_DAMPING = 235, | ||
1591 | |||
1592 | /// <summary> | ||
1593 | /// Butt | ||
1594 | /// </summary> | ||
1595 | BUTT_PHYSICS_MASS = 236, | ||
1596 | BUTT_PHYSICS_GRAVITY = 237, | ||
1597 | BUTT_PHYSICS_DRAG = 238, | ||
1598 | BUTT_PHYSICS_UPDOWN_MAX_EFFECT = 239, | ||
1599 | BUTT_PHYSICS_UPDOWN_SPRING = 240, | ||
1600 | BUTT_PHYSICS_UPDOWN_GAIN = 241, | ||
1601 | BUTT_PHYSICS_UPDOWN_DAMPING = 242, | ||
1602 | BUTT_PHYSICS_LEFTRIGHT_MAX_EFFECT = 243, | ||
1603 | BUTT_PHYSICS_LEFTRIGHT_SPRING = 244, | ||
1604 | BUTT_PHYSICS_LEFTRIGHT_GAIN = 245, | ||
1605 | BUTT_PHYSICS_LEFTRIGHT_DAMPING = 246, | ||
1606 | /// <summary> | ||
1607 | /// Breast Part 2 | ||
1608 | /// </summary> | ||
1609 | BREAST_PHYSICS_LEFTRIGHT_MAX_EFFECT = 247, | ||
1610 | BREAST_PHYSICS_LEFTRIGHT_SPRING= 248, | ||
1611 | BREAST_PHYSICS_LEFTRIGHT_GAIN = 249, | ||
1612 | BREAST_PHYSICS_LEFTRIGHT_DAMPING = 250 | ||
1562 | } | 1613 | } |
1563 | #endregion | 1614 | #endregion |
1564 | } | 1615 | } |
diff --git a/OpenSim/Framework/LocklessQueue.cs b/OpenSim/Framework/LocklessQueue.cs index 84f887c..9bd9baf 100644 --- a/OpenSim/Framework/LocklessQueue.cs +++ b/OpenSim/Framework/LocklessQueue.cs | |||
@@ -29,7 +29,7 @@ using System.Threading; | |||
29 | 29 | ||
30 | namespace OpenSim.Framework | 30 | namespace OpenSim.Framework |
31 | { | 31 | { |
32 | public sealed class LocklessQueue<T> | 32 | public class LocklessQueue<T> |
33 | { | 33 | { |
34 | private sealed class SingleLinkNode | 34 | private sealed class SingleLinkNode |
35 | { | 35 | { |
@@ -41,7 +41,7 @@ namespace OpenSim.Framework | |||
41 | SingleLinkNode tail; | 41 | SingleLinkNode tail; |
42 | int count; | 42 | int count; |
43 | 43 | ||
44 | public int Count { get { return count; } } | 44 | public virtual int Count { get { return count; } } |
45 | 45 | ||
46 | public LocklessQueue() | 46 | public LocklessQueue() |
47 | { | 47 | { |
@@ -76,7 +76,7 @@ namespace OpenSim.Framework | |||
76 | Interlocked.Increment(ref count); | 76 | Interlocked.Increment(ref count); |
77 | } | 77 | } |
78 | 78 | ||
79 | public bool Dequeue(out T item) | 79 | public virtual bool Dequeue(out T item) |
80 | { | 80 | { |
81 | item = default(T); | 81 | item = default(T); |
82 | SingleLinkNode oldHead = null; | 82 | SingleLinkNode oldHead = null; |
@@ -136,4 +136,4 @@ namespace OpenSim.Framework | |||
136 | (object)Interlocked.CompareExchange<SingleLinkNode>(ref location, newValue, comparand); | 136 | (object)Interlocked.CompareExchange<SingleLinkNode>(ref location, newValue, comparand); |
137 | } | 137 | } |
138 | } | 138 | } |
139 | } \ No newline at end of file | 139 | } |
diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs index c182a3a..9eb2281 100644 --- a/OpenSim/Framework/Servers/ServerBase.cs +++ b/OpenSim/Framework/Servers/ServerBase.cs | |||
@@ -531,7 +531,7 @@ namespace OpenSim.Framework.Servers | |||
531 | } | 531 | } |
532 | } | 532 | } |
533 | 533 | ||
534 | protected string GetVersionText() | 534 | public string GetVersionText() |
535 | { | 535 | { |
536 | return String.Format("Version: {0} (interface version {1})", m_version, VersionInfo.MajorInterfaceVersion); | 536 | return String.Format("Version: {0} (interface version {1})", m_version, VersionInfo.MajorInterfaceVersion); |
537 | } | 537 | } |
@@ -563,4 +563,4 @@ namespace OpenSim.Framework.Servers | |||
563 | m_console.OutputFormat(format, components); | 563 | m_console.OutputFormat(format, components); |
564 | } | 564 | } |
565 | } | 565 | } |
566 | } \ No newline at end of file | 566 | } |
diff --git a/OpenSim/Framework/ThrottleOutPacketType.cs b/OpenSim/Framework/ThrottleOutPacketType.cs index ca4b126..87899f0 100644 --- a/OpenSim/Framework/ThrottleOutPacketType.cs +++ b/OpenSim/Framework/ThrottleOutPacketType.cs | |||
@@ -47,6 +47,8 @@ namespace OpenSim.Framework | |||
47 | Texture = 5, | 47 | Texture = 5, |
48 | /// <summary>Non-texture assets</summary> | 48 | /// <summary>Non-texture assets</summary> |
49 | Asset = 6, | 49 | Asset = 6, |
50 | |||
51 | HighPriority = 128, | ||
50 | } | 52 | } |
51 | 53 | ||
52 | [Flags] | 54 | [Flags] |