diff options
author | Melanie Thielker | 2008-11-19 06:15:21 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-11-19 06:15:21 +0000 |
commit | 3234472d6203671a492a73042a0b56d6301903e0 (patch) | |
tree | 2d4c6ef2b21ee24d315e27564b5426cdfe77e9b3 /OpenSim/TestSuite | |
parent | Ensure that the physics representation of a deleted object is also removed (diff) | |
download | opensim-SC-3234472d6203671a492a73042a0b56d6301903e0.zip opensim-SC-3234472d6203671a492a73042a0b56d6301903e0.tar.gz opensim-SC-3234472d6203671a492a73042a0b56d6301903e0.tar.bz2 opensim-SC-3234472d6203671a492a73042a0b56d6301903e0.tar.xz |
Reverting the texture sending patch and the new libOMV. This makes this
release a direct descendant of the stable 7364, with all the features and
none of the issues.
This omits the following patch chain: r7383 r7382 r7381 r7377 r7375 r7373
r7372 r7370 r7369 r7368 r7367 r7366
Diffstat (limited to 'OpenSim/TestSuite')
-rw-r--r-- | OpenSim/TestSuite/PhysicsBot.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/TestSuite/PhysicsBot.cs b/OpenSim/TestSuite/PhysicsBot.cs index fd20a1e..c04e19e 100644 --- a/OpenSim/TestSuite/PhysicsBot.cs +++ b/OpenSim/TestSuite/PhysicsBot.cs | |||
@@ -96,7 +96,7 @@ namespace OpenSim.TestSuite | |||
96 | client.Self.Movement.AtPos = true; | 96 | client.Self.Movement.AtPos = true; |
97 | Thread.Sleep(somthing.Next(25, 75)); // Makes sure the bots keep walking for this time. | 97 | Thread.Sleep(somthing.Next(25, 75)); // Makes sure the bots keep walking for this time. |
98 | } | 98 | } |
99 | client.Self.Jump(true); | 99 | client.Self.Jump(); |
100 | 100 | ||
101 | string randomf = talkarray[somthing.Next(talkarray.Length)]; | 101 | string randomf = talkarray[somthing.Next(talkarray.Length)]; |
102 | if (talkarray.Length > 1 && randomf.Length > 1) | 102 | if (talkarray.Length > 1 && randomf.Length > 1) |
@@ -142,7 +142,7 @@ namespace OpenSim.TestSuite | |||
142 | m_action.Elapsed += new ElapsedEventHandler(m_action_Elapsed); | 142 | m_action.Elapsed += new ElapsedEventHandler(m_action_Elapsed); |
143 | m_action.Start(); | 143 | m_action.Start(); |
144 | OnConnected(this, EventType.CONNECTED); | 144 | OnConnected(this, EventType.CONNECTED); |
145 | client.Self.Jump(true); | 145 | client.Self.Jump(); |
146 | } | 146 | } |
147 | } | 147 | } |
148 | else | 148 | else |