Commit Graph

11889 Commits (14073831d26172575655dbbfa7fd45c6366e9f60)

Author SHA1 Message Date
Melanie 58aad366dd Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2009-11-26 17:44:15 +00:00
Justin Clark-Casey (justincc) 377bc27c1f Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2009-11-26 19:02:41 +00:00
Justin Clark-Casey (justincc) 52dc9ec003 Bump trunk version number to 0.6.9.
This is a place holder name and not necessarily the version number that will be used
2009-11-26 19:00:57 +00:00
Jeff Lee 9d05962029 Added osGetRegionStats() function, to return a number of sim statistics 2009-11-26 17:43:17 +00:00
Jeff Lee d39c300d11 Added osGetRegionStats() function, to return a number of sim statistics 2009-11-26 17:43:00 +00:00
Melanie c6bfecccaa Fix a small bug. Trusted script crossings now work again 2009-11-26 17:16:22 +00:00
Melanie 41226dc991 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2009-11-26 17:05:48 +00:00
Melanie 9d63f90467 Remove the old (Remoting) region crossing code. Fix the new code to
pass script state and assembly again properly. Reintroduce respecting tht
TrustBinaries flag. Changes the interregion protocol! No version bump
because it was broken anyway, so with a version mismatch it will simply
stay broken, but not crash. Region corssing still doesn't work because
there is still monkey business with both rezzed prims being pushed across
a border and attached prims when walking across a border. Teleport is
untested by may work.
2009-11-26 17:03:09 +00:00
Justin Clark-Casey (justincc) ee0b5abc62 minor: reduce region ready logging verbosity 2009-11-26 16:51:10 +00:00
Justin Clark-Casey (justincc) 2bc19a1e23 Resolve issue where an iar load fails to preserve original item creators
See http://opensimulator.org/mantis/view.php?id=4394
This change preserves the uuid when a profile is found rather than the ospa
2009-11-26 16:39:30 +00:00
Melanie 05fc504ff3 Remove the old remoting-type interregion code for prim/script crossing 2009-11-26 12:16:42 +00:00
Melanie 88842edc95 Remove GetAssemblyName and friends from the SE interface. It's now handled
internally
2009-11-26 12:08:20 +00:00
Teravus Ovares (Dan Olivares) a5f2803c79 * Re-enable the AbsolutePosition = AbsolutePosition in the LSL_Api in the SetRot method if the object is not active physical. This is important for scripted rotating doors. without AbsolutePosition = AbsolutePosition, the door won't rotate. It's also important that we do not use AbsolutePosition = AbsolutePosition if the object is active physical because that would cause a complete rebuild of the object which would break vehicles. This is the best of both worlds right now. Doors as child prim should work again so long as you don't check the Physical box.
* Thanks talentraspel
* Thanks NixNerd
* Thanks KittoFlora
* Thanks lockd
2009-11-26 01:34:46 -05:00
Teravus Ovares (Dan Olivares) dac9c6fb23 Merge branch 'master' of ssh://MyConnection/var/git/opensim 2009-11-25 14:13:51 -05:00
OpenSim Master a3755d831d Patch: Fix a bug in LAND animation when the TickCount wraps into negative numbers
by Mic Bowman
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2009-11-25 14:13:29 -05:00
Melanie cc3617f74f Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2009-11-25 17:03:11 +00:00
Justin Clark-Casey (justincc) 59caa68e08 minor: add doc to a few parcel methods 2009-11-25 17:49:38 +00:00
Melanie 0b380f68d8 Change osTeleportAgent parameters from long to int. That numerical range is
not even supported by the underlying type, so there is no need to ask
for a type the script can not even supply.
2009-11-25 17:02:45 +00:00
Justin Clark-Casey (justincc) 40464f6cc6 Change chat config code so that enabled = false actually does disable the chat module 2009-11-25 16:23:37 +00:00
Justin Clark-Casey (justincc) a4d2a97bc6 minor: remove some mono compiler warnings, add --merge load oar switch to help information 2009-11-25 16:14:08 +00:00
Justin Clark-Casey (justincc) c18422ad3a Implement oar merging
An oar can now be merged with existing region contents by using the --merge option
For example, load oar --merge my.oar
Existing terrain, region settings and parcel data is left in place when an oar is merged.
See http://opensimulator.org/wiki/OpenSim_Archives#Usage for more information
2009-11-25 16:02:47 +00:00
Justin Clark-Casey (justincc) f9807884a4 Add MIT/X11 licensed NDesk.Options (http://www.ndesk.org/Options) DLL to aid command line parsing 2009-11-25 15:28:43 +00:00
Teravus Ovares (Dan Olivares) a642968fd5 * Reverting last commit.. because it just made it worse. 2009-11-25 04:00:52 -05:00
Melanie 4fbdc538c7 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2009-11-25 08:39:29 +00:00
Melanie f493249bc3 Add wildcard to prebuild include. Seems each file can only hold one project 2009-11-25 08:38:49 +00:00
Teravus Ovares (Dan Olivares) abddb60b8d * Attempt number 1 to stop the repeating crouch animation that sometimes happens.
* This tries to address it by correcting one potential bug where it never resets the falltimer.
* This tries to address it by telling Physics that we're not flying this step..  instead of waiting until the next step when the next agent update comes along.
2009-11-25 02:51:11 -05:00
Justin Clark-Casey (justincc) f605d59136 Make load/save iar slightly better in the face of io failures by always attempting to close the streams 2009-11-24 18:27:31 +00:00
Justin Clark-Casey (justincc) c083ab6824 make save and load oar slightly more robust by always closing the archive streams even if there has been an error 2009-11-24 17:47:09 +00:00
Justin Clark-Casey (justincc) 73dcbbd57a minor: remove some mono compiler warnings 2009-11-24 17:32:14 +00:00
Justin Clark-Casey (justincc) 88ead9ee63 pass all command parameters to load/save oar, not just the filename
unfortunately, these commands cannot yet be properly relocated to the region modules due to deficiencies in the region module infrastructure
2009-11-24 17:28:38 +00:00
Justin Clark-Casey (justincc) 52952a75ca minor: remove experimental tags from load iar and save iar commands 2009-11-24 15:20:02 +00:00
Teravus Ovares (Dan Olivares) cf36420d19 * This concludes the packet migrations from the big nasty switch into packet handler delegates. 2009-11-23 22:20:51 -05:00
Teravus Ovares (Dan Olivares) 3bfbd2952d * Moved 60 more packet handlers to Packet Handler Delegates. 2009-11-23 20:19:00 -05:00
Teravus Ovares (Dan Olivares) 97d38c67ab Merge branch 'master' of ssh://MyConnection/var/git/opensim 2009-11-23 11:44:48 -05:00
Teravus Ovares (Dan Olivares) 3ebb528c79 * Resolves mantis 4390 http://opensimulator.org/mantis/view.php?id=4390 2009-11-23 11:44:22 -05:00
Adam Frisby 5dba5f4273 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2009-11-23 17:20:47 +11:00
Adam Frisby b516fe67a0 * Implements SQL Rollback support to Inventory Service for quicker backup restoration.
* Can optionally replace the OpenGridMode committed earlier.
* Will create a series of incrementing restore SQL files, one per user, in folders listed per-day.
* For MySql Section of InventoryService INI:
rollback = "true"
rollbackdir = "/absolute/path/to/rollback/storage/dir"
2009-11-23 17:20:03 +11:00
Teravus Ovares (Dan Olivares) 383511bb70 Merge branch 'master' of ssh://MyConnection/var/git/opensim 2009-11-23 01:13:06 -05:00
Teravus Ovares (Dan Olivares) 976728029b * Moved 40 more Packet handlers to the PacketDelegate and out of the 5000 line switch. 2009-11-23 01:12:46 -05:00
Adam Frisby 4973c057eb * Adds a modicum of additional checking to the Inventory Service (MySQL only)
* Enable "opengridmode=true" in your Inventory Connector (where the mysql connection strings are) to enable if you are running a 'wide-open-grid'.
* More comprehensive rollback support being implemented, should be available later today.
2009-11-23 16:08:06 +11:00
Teravus Ovares (Dan Olivares) 7ecd43864f * Request from Adam to add InfoFormat logging to the InventoryService for when deleting folders by folderID occurs 2009-11-22 22:17:22 -05:00
Teravus Ovares (Dan Olivares) 94cb4b486a Merge branch 'master' of ssh://MyConnection/var/git/opensim 2009-11-22 22:05:26 -05:00
Teravus Ovares (Dan Olivares) 21f80b6507 * Adds a test for if the collision is at the bottom of the capsule on avatar. This prevents the 'double jump' capability that's been occurring for ages when avatar collide with prim on the side. 2009-11-22 22:04:52 -05:00
Jeff Ames 9f5c2acd12 Formatting cleanup. 2009-11-23 11:26:06 +09:00
Teravus Ovares (Dan Olivares) 9ba10af6b2 * Added missing lock to m_forcelist when AddForce is called. When a user dragged a prim, in some cases, it would corrupt the datatype in memory and throw spurious IndexOutOfRangeExceptions.
* Physics a situation that causes physics to spew redline messages to the console forever.
2009-11-22 21:08:54 -05:00
Teravus Ovares (Dan Olivares) 0ff3c28f90 * This doesn't fix mantis 3522, but it should mitigate it.
* If the start position is outside of the region on the X and Y, put the user in the center of the region and then damp the Z position at 720 if necessary.  If the start position is not outside of the region on the X or Y, then don't check the Z.
2009-11-22 20:21:33 -05:00
Teravus Ovares (Dan Olivares) c155099faf * The client prevents the avatar from landing if the avatar is going above an unknown certain speed, so, add a speed check on the server.
* This addresses the 'hump the prim' animation playing while you're moving forward full speed and pressing page down over a prim to land.
2009-11-22 19:26:00 -05:00
Teravus Ovares (Dan Olivares) 8db97f7dab * Switched over 15 more packet types from the 5000 line switch to the Packet handler delegate 2009-11-22 05:13:50 -05:00
Teravus Ovares (Dan Olivares) 968b7310f4 * Moved 13 more packet type handlers to PacketHandler Delegates.. and out of of that giant 5000 line switch, ProcessInPacket. 2009-11-22 03:48:56 -05:00
Teravus Ovares (Dan Olivares) 2c8fbc15e8 * Comment out some example code for later. 2009-11-21 21:59:31 -05:00