Commit Graph

11345 Commits (5ffd59e7b870acb74ad7c6be4a1f49b62b013f21)

Author SHA1 Message Date
grid 5ffd59e7b8 Kill a NRE caused by an error message trying to print unavailable data 2009-12-10 22:09:16 -05:00
Melanie 0889b5aef1 Fix version number 2009-12-10 18:20:40 +00:00
Melanie 59ca92b10b Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster 2009-12-10 18:17:29 +00:00
Melanie 956f337046 Merge branch 'careminster' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster 2009-12-09 22:07:03 +00:00
CasperW a6a6bf007a Move osFunctions into a new Careminster script interface 2009-12-09 23:28:00 +01:00
Melanie 2e9890bbe6 Merge branch 'careminster' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster 2009-12-09 16:57:35 +00:00
Melanie f2427a7320 Merge branch 'master' into careminster 2009-12-09 16:57:26 +00:00
CasperW 2a6dbd068e Last bits and bobs to clean up the Meta7WindlightModule 2009-12-09 03:58:56 +01:00
unknown d092977f4a Windlight configuration option in ini, and migration 2009-12-09 01:53:41 +01:00
unknown e3f229225c Enable scripting interface for windlight 2009-12-09 01:34:26 +01:00
KittoFlora ee9d46c825 Correct AbsolutePosition calculation 2009-12-08 05:49:05 +01:00
unknown dbd8c400ce Merge branch 'careminster' into windlight 2009-12-07 18:14:02 +01:00
unknown 29a740ec8c Initial windlight codebase commit 2009-12-07 18:05:40 +01:00
Melanie dd5696e8bd Same for the remote auth connector 2009-12-07 14:31:55 +00:00
Melanie c2d3afdeee Same for the remote auth connector 2009-12-07 14:31:20 +00:00
Melanie 9155c9ee37 Merge branch 'master' into careminster 2009-12-07 14:14:00 +00:00
Melanie ad2c23d507 Stop AuthorizationService from throwing an error if it's not configured.
Optional services should not cause red spew when they're not wanted
2009-12-07 14:12:53 +00:00
KittoFlora 0d1d437bd3 Fix linked physical daughter prim position update. 2009-12-06 21:11:59 +01:00
CasperW b15f20520f Merge branch 'careminster' of ssh://TOR/home/kitto/opensim/ into careminster 2009-12-06 17:23:22 +01:00
CasperW 172e2f4e76 Fix to existing ReaderWriterLockSlim implementations 2009-12-06 17:23:07 +01:00
Melanie 23cd1b1954 Revert "Make ObjectSelect packet processing not use FireAndForget"
This reverts commit cade14c58c.
2009-12-06 05:24:43 +00:00
Melanie cade14c58c Make ObjectSelect packet processing not use FireAndForget 2009-12-06 05:14:17 +00:00
Kunnis 4c61fcfc40 Getting rid of the dead field RootInventoryFolderId on UserProfileData, It's not even stored in mysql.
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-06 03:57:15 +00:00
Melanie 1e222d52e6 Change EntityManager to use RWlocks 2009-12-06 03:56:15 +00:00
Melanie f9ae9afaac Fix build break from conflicted merge 2009-12-06 03:10:34 +00:00
Melanie 09bbfc1d56 Merge branch 'master' into careminster 2009-12-06 03:01:58 +00:00
Melanie a44749b9d2 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2009-12-06 02:54:47 +00:00
Teravus Ovares (Dan Olivares) 8d196dbd14 * Adds Normal to the fields returned by the Physics Raycaster
* Fixes recognizing when a sit target is and isn't set.
* * 1. Vector3.Zero.
* * 2. Orientation: x:0, y:0, z:0, w:1 - ZERO_ROTATION
* * (or) Orientation: x:0, y:0, z:0, w:0 - Invalid Quaternion
* * (or) Orientation: x:0, y:0, z:1, w:0 - Invalid mapping, some older objects still exist with it
2009-12-05 22:18:00 -05:00
Melanie 9453c42631 Experimental: Remove explicit property sends 2009-12-06 02:54:19 +00:00
Melanie 1a695875a7 Skip single prims in unlink selections 2009-12-06 02:54:09 +00:00
Melanie f71025aeed Change locking to not mix explicit Monitor.* calls with lock() 2009-12-06 02:54:00 +00:00
Melanie 5259a32319 Remove extra forced updates. They're not needed for each prim. Really. 2009-12-06 02:53:50 +00:00
Melanie 46d5add175 Lock updates out while linking and unlinking 2009-12-06 02:53:42 +00:00
Melanie e3a22ff37d Eliminate multiple updates on link/unlink 2009-12-06 02:53:34 +00:00
Melanie f8cc409034 Cause better packing of ObjectProperties 2009-12-06 02:53:24 +00:00
Melanie 79511ecce2 Experimental: Remove explicit property sends 2009-12-06 02:15:52 +00:00
Melanie 2fe75a62be Skip single prims in unlink selections 2009-12-06 02:00:32 +00:00
Melanie da414fd509 Change locking to not mix explicit Monitor.* calls with lock() 2009-12-06 01:20:39 +00:00
Melanie f2891e7738 Remove extra forced updates. They're not needed for each prim. Really. 2009-12-06 00:50:28 +00:00
Melanie fbefa8273b Lock updates out while linking and unlinking 2009-12-06 00:25:04 +00:00
Melanie ceccfe02d0 Eliminate multiple updates on link/unlink 2009-12-06 00:02:24 +00:00
Melanie 129de26032 Cause better packing of ObjectProperties 2009-12-05 23:25:30 +00:00
Melanie 43a6fa1d01 Merge branch 'master' into careminster 2009-12-05 19:53:54 +00:00
Teravus Ovares (Dan Olivares) 8e089b6d8d * Fix line endings in BaseHttpServer.cs 2009-12-05 13:23:05 -05:00
Teravus Ovares (Dan Olivares) c4b6010fb3 * Fixes mantis 4416. Animator is dereferenced on logout 2009-12-05 13:01:21 -05:00
KittoFlora cc8246206d Secnond revision of Sit and Stand for unscripted prims; Comment out
spammy debug messages in Interregion....
2009-12-05 09:03:02 +01:00
Justin Clark-Casey (justincc) c0f3a4c833 Allow terrain heightmaps to be loaded directly from URIs via the remote admin plugin
See http://opensimulator.org/mantis/view.php?id=4418
Thanks StrawberryFride
See
2009-12-04 18:26:58 +00:00
Teravus Ovares (Dan Olivares) 07786786fc * Clarifies that the PrimMaxPhys in OpenSim.ini.example does nothing. Tells user to set it in Regions.ini. Melanie might want to take a look at this and see if it should be removed altogether. 2009-12-03 20:30:40 -05:00
Teravus Ovares (Dan Olivares) 675d04dd5d Merge branch 'master' of ssh://MyConnection/var/git/opensim 2009-12-03 20:22:38 -05:00
Teravus Ovares (Dan Olivares) 781db43a76 * Fixes the 10x10x10 hard physics limitation. (wierdly, you have to set this for each region in your Regions.ini[PhysicalPrimMax = 10(default)])
* Adds a configurable maximum object mass before the mass is clamped.  Default is 10000.01.  Configurable by changing maximum_mass_object in the [ODEPhysicsSettings] section.
* Clamping the mass is important for limiting the amount of CPU an object can consume in physics calculations.  Too high, and the object overcomes restitution forces by gravity alone. This generates more collisions potentially leading to 'deep think'.
2009-12-03 20:21:10 -05:00