aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'careminster' into casperCasperW2009-11-2617-23/+81
|\
| * Add the dummy "Size" property to the list typeMelanie2009-11-251-0/+5
| * Merge branch 'master' into careminsterMelanie2009-11-2513-18/+71
| |\
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-11-2513-18/+71
| | |\
| | | * minor: add doc to a few parcel methodsJustin Clark-Casey (justincc)2009-11-255-7/+44
| | | * Change chat config code so that enabled = false actually does disable the cha...Justin Clark-Casey (justincc)2009-11-251-2/+3
| | | * minor: remove some mono compiler warnings, add --merge load oar switch to hel...Justin Clark-Casey (justincc)2009-11-254-6/+7
| | | * Implement oar mergingJustin Clark-Casey (justincc)2009-11-251-6/+10
| | | * Add MIT/X11 licensed NDesk.Options (http://www.ndesk.org/Options) DLL to aid ...Justin Clark-Casey (justincc)2009-11-254-1/+11
| | * | Change osTeleportAgent parameters from long to int. That numerical range isMelanie2009-11-253-5/+5
| | |/
| * | Change osTeleportAgent parameters from long to int. That numerical range isMelanie2009-11-253-5/+5
* | | Add nudge right and left to avatar movement (faster reaction times when stepp...CasperW2009-11-261-6/+14
|/ /
* | Merge branch 'master' into careminsterMelanie2009-11-2514-120/+176
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-11-2513-119/+175
| |\
| | * * Reverting last commit.. because it just made it worse.Teravus Ovares (Dan Olivares)2009-11-252-9/+0
| | * * Attempt number 1 to stop the repeating crouch animation that sometimes happ...Teravus Ovares (Dan Olivares)2009-11-252-0/+9
| | * Make load/save iar slightly better in the face of io failures by always attem...Justin Clark-Casey (justincc)2009-11-242-63/+77
| | * make save and load oar slightly more robust by always closing the archive str...Justin Clark-Casey (justincc)2009-11-243-13/+30
| | * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2009-11-242-13/+17
| | * pass all command parameters to load/save oar, not just the filenameJustin Clark-Casey (justincc)2009-11-245-28/+49
| | * minor: remove experimental tags from load iar and save iar commandsJustin Clark-Casey (justincc)2009-11-241-2/+2
| * | Add wildcard to prebuild include. Seems each file can only hold one projectMelanie2009-11-251-1/+1
| |/
* | 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