Commit Graph

11538 Commits (253e2ed699a899b74451ac51ed7875b3f98ffdd7)

Author SHA1 Message Date
Melanie 551696bb45 Merge branch 'master' into careminster 2009-12-02 10:22:21 +00:00
Melanie 5ee79c62bf Change default destination of deleted items to the trash folder. Everything
else still goes to L&F
2009-12-02 10:21:24 +00:00
Melanie ded16d3529 Merge branch 'master' into careminster 2009-12-02 00:36:53 +00:00
Teravus Ovares (Dan Olivares) d2c1610d17 * Test Autoconvert line ending on my repo.. 2009-12-01 11:35:32 -05:00
Teravus Ovares (Dan Olivares) 75e28b3a16 * Fix Inconsistent line ending style on Scene 2009-12-01 10:48:11 -05:00
Teravus Ovares (Dan Olivares) 7a2e8cb05f * Fix Inconsistent line ending style on ScenePresenceAnimator 2009-12-01 10:47:18 -05:00
Teravus Ovares (Dan Olivares) 56dca3b5a4 * Fix Inconsistent line ending style on SimStatsReporter 2009-12-01 10:45:36 -05:00
Teravus Ovares (Dan Olivares) 4af77e84b1 * Fix Inconsistent line ending style in Util 2009-12-01 10:21:22 -05:00
Teravus Ovares (Dan Olivares) d4073d9bd5 * Fix Inconsistent line ending style in LLUDPClient 2009-12-01 10:19:39 -05:00
Teravus Ovares (Dan Olivares) 475d23741d * Fix Inconsistent line ending style in ScenePresence 2009-12-01 10:17:17 -05:00
Justin Clark-Casey (justincc) 2900e04c7d Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2009-12-01 14:03:47 +00:00
Justin Clark-Casey (justincc) 85f7e4a6ab Remove leftover IronPython DLLs
This completes http://opensimulator.org/mantis/view.php?id=4395
2009-12-01 14:03:06 +00:00
CasperW 2e6dce434f Enforce physical prim max size on single prims.
Also convert a lock() to ReaderWriterLockSlim that i missed in the last commit
2009-11-30 21:52:55 +01:00
CasperW 9888f95068 Convert multiple lock()s which directly hinder script performance in linksets to ReaderWriterLockSlim. 2009-11-30 21:17:15 +01:00
Teravus Ovares (Dan Olivares) 83694e5578 * Add a close method to the ScenePresenceAnimator that dereferences the class variables and make the ScenePresence Close method call it. 2009-11-30 14:03:20 -05:00
Teravus Ovares (Dan Olivares) 0cb4ff1b68 * Modified ScenePresence to use the Util version of the EnvironmentTickCount method (and it's subtract method). Remove redundant EnvironmentTickCount definitions in ScenePresence. 2009-11-30 13:53:43 -05:00
Justin Clark-Casey (justincc) 17136724e2 minor: add disabled config and explanation for WebStats 2009-11-30 18:37:51 +00:00
Justin Clark-Casey (justincc) 87c88ff702 enable messaging_server_url by default in OpenSim.ini.example
having this enabled results just in warning messages if no message service is actually available
haivng this disabled results in an unexpected failure if no message service is available
2009-11-30 18:06:10 +00:00
Melanie 8bbb88ea4e Merge branch 'master' into careminster 2009-11-30 14:16:42 +00:00
Melanie 9549a06ead Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2009-11-30 14:15:32 +00:00
Melanie 984d5b0de6 Add "shutdown" command to ROBUST shell 2009-11-30 14:15:00 +00:00
dahlia 5b0bb1eff9 Merge branch 'master' of ssh://dahlia@myConnection01/var/git/opensim 2009-11-30 01:09:46 -08:00
dahlia e987e85c0c add agent position to output of "show users" console command 2009-11-30 01:09:03 -08:00
Melanie 69d83e1548 Merge branch 'master' into careminster 2009-11-30 08:25:40 +00:00
Teravus Ovares (Dan Olivares) 4338f4e1d7 * Patch from Misterblue to fix Environment.TickCount for statistics purposes. Resolves the wrap-around of the 32 bit uint.
* Teravus moved the Environment methods to the Util class
2009-11-29 05:06:25 -05:00
Melanie d3e7a52933 Merge branch 'master' into careminster 2009-11-28 09:26:00 +00:00
Melanie 9fd9211a38 Add some conditionals to references to the WorldComm module, so that the
module can be disabled without crashing the sim
2009-11-28 09:23:26 +00:00
Teravus Ovares (Dan Olivares) e7333515d9 Merge branch 'master' of ssh://MyConnection/var/git/opensim 2009-11-27 19:17:54 -05:00
Teravus Ovares (Dan Olivares) 8296413add * Re-enable lightweight packet tracking stats on a 3000 ms interval. 2009-11-27 19:17:36 -05:00
Justin Clark-Casey (justincc) 3e4000b9d9 Rename TestAssetDataPlugin to MockAssetDataPlugin 2009-11-27 19:56:06 +00:00
Justin Clark-Casey (justincc) 66f511c76a Remove unused GetDefaultAppearance() static function that is also available on AvatarFactoryModule 2009-11-27 19:45:33 +00:00
Justin Clark-Casey (justincc) e5661e5609 Remove stub Python module and DLLs since this was never fully implemented
It may be possible to reintroduce this if someone wants to implement a Python hookup for OpenSim scripting (I'm sure it can't be too hard).
Might be possible to import wholesale from modrex
See http://opensimulator.org/mantis/view.php?id=4395
Thanks mpallari
2009-11-27 19:31:19 +00:00
Justin Clark-Casey (justincc) 55a0896918 minor: remove mono compiler warning 2009-11-27 19:28:26 +00:00
Justin Clark-Casey (justincc) bdba4500ed minor: Add revolution to CONTRIBUTORS.txt 2009-11-27 19:27:01 +00:00
Justin Clark-Casey (justincc) e078fb2e71 Implement god mode user freezing and unfreezing
See http://opensimulator.org/mantis/view.php?id=4356
Thanks Revolution
I performed a subsequent probable bug fix in this patch
2009-11-27 19:23:51 +00:00
Justin Clark-Casey (justincc) eaa424778b minor: add KittyLiu to CONTRIBUTORS.txt 2009-11-27 19:02:48 +00:00
Justin Clark-Casey (justincc) 2e47e51475 Make locking of timers and listeners in script related functions consistent
See http://opensimulator.org/mantis/view.php?id=4316
Thanks KittyLiu!
2009-11-27 19:01:45 +00:00
Justin Clark-Casey (justincc) 0f745e928f Apply patch that fixes the failing T013_eStateSettingsRandomStorage test
See http://opensimulator.org/mantis/view.php?id=3993
Thanks Kunnis
2009-11-27 18:52:20 +00:00
Justin Clark-Casey (justincc) 251fd8c948 Apply patch to reduce git revision text length if running sim directly from a git tree
See http://opensimulator.org/mantis/view.php?id=4030
Thanks ChrisDown (and Bruce for reporting)
2009-11-27 18:24:21 +00:00
Justin Clark-Casey (justincc) 25e2b16451 Apply patch to stop failure of llParcelMediaCommandList() on group deeded land
See http://opensimulator.org/mantis/view.php?id=3999
2009-11-27 17:52:23 +00:00
Justin Clark-Casey (justincc) 32ef1b9e23 remove stringent content type checking to make it easier to load oars directly from urls 2009-11-27 15:10:12 +00:00
Justin Clark-Casey (justincc) 1f71523a5a minor: make irc bridge logging less verbose if it isn't actually enabled 2009-11-27 14:47:49 +00:00
Melanie b9eb244d6d Reset update flag when a SOG is deleted. This fixes llDie(); 2009-11-27 08:59:03 +00:00
Melanie aa695e92f7 Reset update flag when a SOG is deleted. This fixes llDie(); 2009-11-27 08:58:26 +00:00
Melanie 0ddd1ce0b7 Merge branch 'master' into careminster 2009-11-27 08:18:16 +00:00
Melanie 3ae3cd0a5b Make llDie virtual, since it's functionality is engine specific 2009-11-27 08:16:47 +00:00
Melanie cc18ab12f8 Merge branch 'master' into careminster 2009-11-27 00:40:56 +00:00
Teravus Ovares (Dan Olivares) f84da8e642 Merge branch 'master' of ssh://MyConnection/var/git/opensim 2009-11-26 17:03:19 -05:00
Teravus Ovares (Dan Olivares) e2200026ca * Fixes a case of d.BodyEnable with IntPtr.Zero passed as the parameter in linkset where EnableBody was called and the body is immediately disabled. The previous functionality assumed that a body was received in EnableBody but.. in some cases, it wasn't. 2009-11-26 17:03:00 -05:00
root 2c3f6aaa87 Merge branch 'careminster' into tests 2009-11-26 20:41:38 +01:00