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
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
a642968fd5
* Reverting last commit.. because it just made it worse.
2009-11-25 04:00:52 -05:00
25b4160434
Merge branch 'master' into careminster
2009-11-25 08:45:41 +00:00
4fbdc538c7
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2009-11-25 08:39:29 +00:00
f493249bc3
Add wildcard to prebuild include. Seems each file can only hold one project
2009-11-25 08:38:49 +00:00
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
32c464ad1f
Fixed animation sequencing: SitHere, Falling, Stand/Walk etc. Login Init
...
Av Animation at Stand.
2009-11-25 08:03:09 +01:00
d5aceb6d95
Append a prefix to the god avatar names appearing in chat whilst in god mode (disabled by default, config entry admin_prefix)
2009-11-24 23:33:12 +01:00
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
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
73dcbbd57a
minor: remove some mono compiler warnings
2009-11-24 17:32:14 +00:00
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
81f7e9b462
Merge branch 'careminster' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster
2009-11-24 16:00:45 +00:00
8383bde768
Removed some extra debug chatter
2009-11-24 18:18:19 +01:00
d114713694
Drop all locking of part.TaskInventory in favour of a ReaderWriterLockSlim lock handler. This gives us:
...
- Faster prim inventory actions. Multiple threads can read at once.
- Fixes the known prim inventory thread locks
- In the event of a thread lock occurring, it will usually self heal after sixty seconds with an error message in the console
2009-11-24 18:02:12 +01:00
cad2bf5b08
Merge branch 'master' into careminster
2009-11-24 16:00:35 +00:00
52952a75ca
minor: remove experimental tags from load iar and save iar commands
2009-11-24 15:20:02 +00:00
cf36420d19
* This concludes the packet migrations from the big nasty switch into packet handler delegates.
2009-11-23 22:20:51 -05:00
3bfbd2952d
* Moved 60 more packet handlers to Packet Handler Delegates.
2009-11-23 20:19:00 -05:00
247c66b3fe
Swap the locking of m_EventQueue and m_Script to ease locks on script inventory operations
2009-11-23 20:25:53 +01:00
73c2162ff6
Fixed nullrefs
2009-11-23 19:51:40 +01:00
889ce36afa
Added some [DebuggerNonUserCode] modifiers to functions that throw EventAbortException() to ease debugging on Visual Studio
2009-11-23 17:59:24 +01:00
97d38c67ab
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-11-23 11:44:48 -05:00
3ebb528c79
* Resolves mantis 4390 http://opensimulator.org/mantis/view.php?id=4390
2009-11-23 11:44:22 -05:00
c3d4b66953
Revert "testing checkout"
...
This reverts commit 234b29cf66
2009-11-23 12:52:52 +00:00
234b29cf66
testing checkout
2009-11-23 14:59:39 +01:00
5dba5f4273
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-11-23 17:20:47 +11:00
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
383511bb70
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-11-23 01:13:06 -05:00
976728029b
* Moved 40 more Packet handlers to the PacketDelegate and out of the 5000 line switch.
2009-11-23 01:12:46 -05:00
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
31827b0286
Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster
2009-11-23 04:26:42 +00:00
df121a7cd0
Merge branch 'master' into careminster
2009-11-23 04:24:58 +00:00
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
94cb4b486a
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-11-22 22:05:26 -05:00
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
9f5c2acd12
Formatting cleanup.
2009-11-23 11:26:06 +09:00
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
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
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
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
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
03df03b269
Merge branch 'master' into careminster
2009-11-22 08:37:07 +00:00
f1522e6204
Add non-scripted sit, fix scripted sit.
2009-11-22 08:31:35 +01:00
87bce90086
Merge branch 'master' into careminster
2009-11-22 03:14:21 +00:00
2c8fbc15e8
* Comment out some example code for later.
2009-11-21 21:59:31 -05:00
079691b98f
* Move a few of the ProcessInPacket switch case blocks into packet handler delegates
2009-11-21 21:58:11 -05:00
f7916d10f3
* This fixes landing on Prim and removes the hack from yesterday. Landing on prim should work fine again.
2009-11-21 19:38:38 -05:00
4a29a7f92c
Minor packet ordering fix
2009-11-21 16:51:08 +00:00
Justin Clark-Casey (justincc)