aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Append a prefix to the god avatar names appearing in chat whilst in god mode ...CasperW2009-11-242-3/+11
* Merge branch 'careminster' of kitto@tor.k-grid.com:/home/kitto/opensim into c...Melanie2009-11-2414-619/+848
|\
| * Removed some extra debug chatterCasperW2009-11-242-2/+1
| * Drop all locking of part.TaskInventory in favour of a ReaderWriterLockSlim lo...CasperW2009-11-248-481/+685
| * Swap the locking of m_EventQueue and m_Script to ease locks on script invento...CasperW2009-11-231-115/+119
| * Fixed nullrefsCasperW2009-11-232-21/+29
| * Added some [DebuggerNonUserCode] modifiers to functions that throw EventAbort...CasperW2009-11-235-1/+15
* | Merge branch 'master' into careminsterMelanie2009-11-243-41/+4844
|\ \ | |/ |/|
| * * This concludes the packet migrations from the big nasty switch into packet ...Teravus Ovares (Dan Olivares)2009-11-231-20/+1537
| * * Moved 60 more packet handlers to Packet Handler Delegates.Teravus Ovares (Dan Olivares)2009-11-231-21/+2055
| * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2009-11-231-0/+154
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimAdam Frisby2009-11-231-6/+1104
| | |\
| | * | * Implements SQL Rollback support to Inventory Service for quicker backup res...Adam Frisby2009-11-231-0/+154
| * | | * Resolves mantis 4390 http://opensimulator.org/mantis/view.php?id=4390Teravus Ovares (Dan Olivares)2009-11-231-1/+1
| | |/ | |/|
| * | Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2009-11-231-5/+22
| |\ \ | | |/
| * | * Moved 40 more Packet handlers to the PacketDelegate and out of the 5000 lin...Teravus Ovares (Dan Olivares)2009-11-231-6/+1104
* | | Revert "testing checkout"Melanie2009-11-231-1/+1
* | | testing checkoutunknown2009-11-231-1/+1
* | | Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into caremin...Melanie2009-11-231-30/+69
|\ \ \
| * | | Add non-scripted sit, fix scripted sit.KittoFlora2009-11-221-30/+69
* | | | Merge branch 'master' into careminsterMelanie2009-11-2343-123/+994
|\ \ \ \ | | |_|/ | |/| |
| * | | * Adds a modicum of additional checking to the Inventory Service (MySQL only)Adam Frisby2009-11-231-5/+22
| | |/ | |/|
| * | * Request from Adam to add InfoFormat logging to the InventoryService for whe...Teravus Ovares (Dan Olivares)2009-11-221-0/+1
| * | Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2009-11-2237-107/+591
| |\ \
| | * | Formatting cleanup.Jeff Ames2009-11-2337-107/+591
| * | | * Adds a test for if the collision is at the bottom of the capsule on avatar....Teravus Ovares (Dan Olivares)2009-11-221-1/+12
| |/ /
| * | * Added missing lock to m_forcelist when AddForce is called. When a user dr...Teravus Ovares (Dan Olivares)2009-11-221-3/+26
| * | * This doesn't fix mantis 3522, but it should mitigate it.Teravus Ovares (Dan Olivares)2009-11-221-0/+43
| * | * The client prevents the avatar from landing if the avatar is going above an...Teravus Ovares (Dan Olivares)2009-11-221-5/+10
| * | * Switched over 15 more packet types from the 5000 line switch to the Packet ...Teravus Ovares (Dan Olivares)2009-11-221-6/+293
* | | Merge branch 'master' into careminsterMelanie2009-11-221-6/+373
|\ \ \ | |/ /
| * | * Moved 13 more packet type handlers to PacketHandler Delegates.. and out o...Teravus Ovares (Dan Olivares)2009-11-221-6/+373
* | | Merge branch 'master' into careminsterMelanie2009-11-222-11/+108
|\ \ \ | |/ /
| * | * Comment out some example code for later.Teravus Ovares (Dan Olivares)2009-11-211-2/+2
| * | * Move a few of the ProcessInPacket switch case blocks into packet handler de...Teravus Ovares (Dan Olivares)2009-11-211-6/+103
| * | * This fixes landing on Prim and removes the hack from yesterday. Landing ...Teravus Ovares (Dan Olivares)2009-11-212-5/+5
* | | Minor packet ordering fixCasperW2009-11-212-11/+30
* | | Improved avatar responsiveness.CasperW2009-11-216-48/+163
* | | Merge branch 'master' into careminsterMelanie2009-11-216-5/+38
|\ \ \ | |/ / | | / | |/ |/|
| * * Hack to get avatar to land on prim. This is a big nasty hack that tricks ...Teravus Ovares (Dan Olivares)2009-11-211-0/+2
| * * Fixes the second of two terse update issues. Physical objects should react ...Teravus Ovares (Dan Olivares)2009-11-212-0/+4
| * * Fixes one of two terse update issues. There's still one left, but this one...Teravus Ovares (Dan Olivares)2009-11-212-1/+12
| * Fix http://opensimulator.org/mantis/view.php?id=3874 - parenthesis in for sta...Justin Clark-Casey (justincc)2009-11-202-2/+20
| * Merge branch 'master' of ssh://dahlia@myConnection01/var/git/opensimdahlia2009-11-208-66/+101
| |\
| * | remove early return from PrimitiveBaseShape.ToOmvPrimitive() when prim is a s...dahlia2009-11-201-2/+0
* | | Merge branch 'careminster' into testsKittoFlora2009-11-1923-546/+911
|\ \ \
| * \ \ Merge branch 'master' into careminsterMelanie2009-11-198-65/+87
| |\ \ \ | | | |/ | | |/|
| | * | minor: tweak log message to say which region is being enabled for loginsJustin Clark-Casey (justincc)2009-11-181-5/+6
| | * | minor: Correct some inventory corrector log messages and add more identifying...Justin Clark-Casey (justincc)2009-11-181-19/+20
| | * | minor: correct error messages when queryfolder failsJustin Clark-Casey (justincc)2009-11-182-7/+2