5681e812a5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-10-29 23:19:06 +00:00
c97890ca69
Add "force gc" region console command which manually invokes garbage collection.
...
For debugging purposes.
2012-10-29 22:53:06 +00:00
5b0fc60296
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
2012-10-28 18:58:43 +00:00
502efdb894
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-10-28 18:43:28 +00:00
5a96ef52cb
Deep copy the collection of at_target objects so it can't be modified while
...
it's being iterated
2012-10-28 18:41:47 +00:00
dc2c198e5d
Set the script state to new rez when a scriptis saved, rather than region start.
...
Prevents CHANGED_REGION_RESTART being sent to scripts when saving.
2012-10-28 19:09:14 +01:00
1a34f42426
Add a property to determine if a link set is stored in the database. Also, fix
...
a bug where "Force object permissive" god action would fail to reset child prim
permissions.
2012-10-28 18:34:57 +01:00
0d00b97aec
Deep copy the collection of at_target objects so it can't be modified while
...
it's being iterated
2012-10-28 18:45:16 +00:00
707fa2bdb9
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-28 15:42:51 +01:00
db7f4074b5
revert last change
2012-10-28 14:39:04 +00:00
1bcecdaf30
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-28 15:34:54 +01:00
fbe4ec8ee0
fix ode timing
2012-10-28 14:32:55 +00:00
c513a3db59
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-28 15:05:39 +01:00
dd0323d89e
minor change
2012-10-28 14:04:39 +00:00
42479590f0
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-28 12:56:09 +01:00
8bb2905416
test limit ode exec time by time not number of loops done
2012-10-28 11:55:11 +00:00
e0510203f9
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-28 11:26:31 +01:00
ad7f273d95
more debug
2012-10-28 10:25:58 +00:00
3aff65e9a6
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-28 10:58:58 +01:00
e297e90bda
remove pre physics build testing
2012-10-28 09:57:41 +00:00
3ac8461d3f
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-10-28 10:54:40 +01:00
aa97014ee4
Add some extra debug on scene close
2012-10-28 09:51:27 +00:00
42cd27c46a
Merge branch 'master' into careminster
2012-10-28 00:30:55 +01:00
3531f29a6a
minor: Fix verbose IAR save message to make it a bit clearer that item data is being saved at that point, not asset data.
2012-10-27 00:24:25 +01:00
cc204497e0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-10-26 23:10:52 +01:00
67432fcbf2
Fix "save iar" hanging permanently if the asset request phase times out.
...
Unlike "save oar", this was happening on the same thread as the original request.
The timeout happens on another so the original thread is never aborted.
On "save oar" this leaves the thread hanging (still bad) but on "save iar" it left the console thread hanging.
Temporary fix is to make "save iar" do asset request on a separate thread, like "save oar".
Longer term fix will be to restructure asset save to use a ManualResetEvent rather than a separate timeout timer.
2012-10-26 23:08:59 +01:00
f3f794a122
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-10-26 21:47:41 +01:00
1c5f6e48b8
Separate LSL's notion of the default anim from the actually playing anims.
2012-10-26 21:23:20 +01:00
de6f147d3c
Revert "Fix for Mantis 0006376: Avatar no longer show Walking animation when any AO hud is"
...
This reverts commit fa484c3494
2012-10-26 21:16:27 +01:00
26cc57b6ca
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
2012-10-26 21:13:01 +01:00
16809bd0ea
minor: Make the error thrown logged when a simulator in grid mode is trying to set estate owner to a user that doesn't exist a little more obvious.
2012-10-26 02:36:58 +01:00
80dcc13af2
refactoring IWorldCommListenerInfo.GetRegexBitfield() method to be a field with a private setter
2012-10-26 02:08:00 +01:00
e977761071
adding ability for listeners to be filtered by regular expressions and a general-purpose function to see if a given string matches a given regex
2012-10-26 02:08:00 +01:00
18b1ee6f37
Formatting and casing correction in WorldCommModule, trailing new line in OSSL to get git diff to not complain
2012-10-26 02:08:00 +01:00
1b3b7a61ac
minor: Add comment as to why we are pulcking plain old ints out of the LSL_List when converting values from LSL for modInvoke()
2012-10-26 01:50:46 +01:00
ecdb88679e
Removing the apparently superfluous explicit namespace reference so that the if-else-if-else block in ConvertFromLSL can have a consistent appearance
2012-10-26 01:43:54 +01:00
01972cc9e8
system ints can end up in LSL lists, which can cause counter-intuitive unknown list element type errors in ConvertFromLSL (via modInvoke)
2012-10-26 01:43:53 +01:00
2fb89b5aac
Comment out InventoryTransferModule.NeedSceneCacheClear() and invocations since the call itself does nothing and the return value is ignored by all callers.
...
This is a very old method (+4 years) so is probably confusing code cruft.
2012-10-26 01:15:16 +01:00
85c909c0b5
Fixed saving non-square multi-region OARs
2012-10-26 00:06:44 +01:00
dc17cee044
minor: if a scene is already shutting down on Scene.Close(), warn and exit instead of attempting to run another shutdown concurrently.
...
Thanks to Oren Hurvitz for this change.
2012-10-25 23:47:55 +01:00
b4923da334
Changed "course" to "coarse" in several places
2012-10-25 23:32:37 +01:00
424f68b64b
Changed duplicate Asset ID's to unique ID's in CollisionSoundsAssetSet.xml
2012-10-25 23:30:48 +01:00
0482758e96
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-10-25 23:17:07 +01:00
22e216fd12
In Scene.Close(), dispose of the physics scene after base.Close() since script events can still access Physics scene until the script engine shuts down (triggered off base.Close())
...
XEngine listeners to EventManager.OnShutdown which is triggered from base.Close().
Possibly it could listen for the earlier OnSceneShuttingDown instead, but the easier solution right now is to relocate disposal of the physics scene.
This bug has existed since c150320
2012-10-25 22:55:29 +01:00
fa484c3494
Fix for Mantis 0006376: Avatar no longer show Walking animation when any AO hud is
...
loaded. Thank you tglion
2012-10-25 11:31:25 -07:00
c13a99dc5c
Fix script error messages not showing up in viewer 3 and associated viewers.
...
Viewer 3 will discard such a message if the chat message owner does not match the avatar.
We were filling the ownerID with the primID, so this never matched, hence viewer 3 did not see any script error messages.
This commit fills the ownerID in with the prim ownerID so the script owner will receive script error messages.
This does not affect viewer 1 and associated viewers which continue to process script errors as normal.
2012-10-25 03:26:12 +01:00
8af8319b95
Get osNpcCreate() and osNpcLoadAppearance() to generate a script error if appearance notecard does not exist, rather than returning UUID.Zero or silently failing.
2012-10-25 03:02:00 +01:00
d9aaf51561
When scripts generate expected exceptions (e.g. due to checked bad parameter) throw ScriptException instead of just a plain old exception.
...
This is to make it easier to distinguish these exceptions from unexpected OpenSimulator problems internally and in regression tests.
No functional changes.
2012-10-25 02:52:20 +01:00
ae662b54ea
Make osNpcCreate() return UUID.Zero instead of throwing an exception if notecard name is invalid. Make osNpcLoadAppearance() fail silently in same circumstance rather than throwing exception.
2012-10-25 01:07:06 +01:00
5d4ac5a90f
Add TestOsNpcLoadAppearance()
2012-10-25 00:59:27 +01:00
Justin Clark-Casey (justincc)