ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 22:26:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
This commit is contained in:
Melanie
2013-02-27 20:40:48 +00:00
parent 578174d21c 61ba02e95f
commit ba0819be9e
5 changed files with 273 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
View File

@@ -443,7 +443,6 @@ default
string itemName = "TestNoStop";
SceneObjectPart partWhereRezzed = CreateScript(script, itemName, userId);
TaskInventoryItem rezzedItem = partWhereRezzed.Inventory.GetInventoryItem(itemName);
// Wait for the script to start the event before we try stopping it.
m_chatEvent.WaitOne(60000);