Melanie
81f7e9b462
Merge branch 'careminster' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster
2009-11-24 16:00:45 +00:00
CasperW
8383bde768
Removed some extra debug chatter
2009-11-24 18:18:19 +01:00
CasperW
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
Melanie
cad2bf5b08
Merge branch 'master' into careminster
2009-11-24 16:00:35 +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
CasperW
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
CasperW
73c2162ff6
Fixed nullrefs
2009-11-23 19:51:40 +01:00
CasperW
889ce36afa
Added some [DebuggerNonUserCode] modifiers to functions that throw EventAbortException() to ease debugging on Visual Studio
2009-11-23 17:59:24 +01: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
Melanie
c3d4b66953
Revert "testing checkout"
...
This reverts commit 234b29cf66
.
2009-11-23 12:52:52 +00:00
unknown
234b29cf66
testing checkout
2009-11-23 14:59:39 +01: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
Melanie
31827b0286
Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into careminster
2009-11-23 04:26:42 +00:00
Melanie
df121a7cd0
Merge branch 'master' into careminster
2009-11-23 04:24:58 +00: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
Melanie
03df03b269
Merge branch 'master' into careminster
2009-11-22 08:37:07 +00:00
KittoFlora
f1522e6204
Add non-scripted sit, fix scripted sit.
2009-11-22 08:31:35 +01:00
Melanie
87bce90086
Merge branch 'master' into careminster
2009-11-22 03:14:21 +00:00
Teravus Ovares (Dan Olivares)
2c8fbc15e8
* Comment out some example code for later.
2009-11-21 21:59:31 -05:00
Teravus Ovares (Dan Olivares)
079691b98f
* Move a few of the ProcessInPacket switch case blocks into packet handler delegates
2009-11-21 21:58:11 -05:00
Teravus Ovares (Dan Olivares)
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
CasperW
4a29a7f92c
Minor packet ordering fix
2009-11-21 16:51:08 +00:00
CasperW
0149265ee8
Improved avatar responsiveness.
2009-11-21 16:50:33 +00:00
Melanie
0844e5951c
Merge branch 'master' into careminster
2009-11-21 16:00:18 +00:00
Teravus Ovares (Dan Olivares)
247fc00ce7
* Hack to get avatar to land on prim. This is a big nasty hack that tricks the client into thinking you're landing on the terrain. There are some visual artifacts when you land. It's only temporary until we figure out how this broke.
2009-11-21 06:39:28 -05:00
Teravus Ovares (Dan Olivares)
7760da1a4c
* Fixes the second of two terse update issues. Physical objects should react normally again.
2009-11-21 04:39:41 -05:00
Teravus Ovares (Dan Olivares)
0ffda7128e
* Fixes one of two terse update issues. There's still one left, but this one fixes the situation where the object on the server is moving but no updates are being sent.
2009-11-21 04:33:34 -05:00
Justin Clark-Casey (justincc)
8f0db68424
Fix http://opensimulator.org/mantis/view.php?id=3874 - parenthesis in for statements cause script compile failures
...
This fixes a problem in OpenSim where statements of the form
for ((i = 0); (i < 10); (++i)) { ... }
do not compile even though they are valid lsl.
2009-11-20 18:39:39 +00:00
dahlia
0561cf7d93
Merge branch 'master' of ssh://dahlia@myConnection01/var/git/opensim
2009-11-20 03:12:36 -08:00
dahlia
54b5677f23
remove early return from PrimitiveBaseShape.ToOmvPrimitive() when prim is a sculpty
2009-11-20 03:12:07 -08:00
KittoFlora
251d1b8fbb
Merge branch 'careminster' into tests
2009-11-19 20:20:03 +01:00
KittoFlora
7f0f5060ec
Clean up messages in ODE
2009-11-19 20:13:26 +01:00
Melanie
d179f2cce9
Merge branch 'master' into careminster
2009-11-19 17:53:34 +00:00
Justin Clark-Casey (justincc)
622003ab09
minor: tweak log message to say which region is being enabled for logins
2009-11-18 20:27:37 +00:00
Justin Clark-Casey (justincc)
e31e141629
minor: Correct some inventory corrector log messages and add more identifying detail
2009-11-18 18:57:15 +00:00