aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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 ↵Justin Clark-Casey (justincc)2009-11-251-2/+3
| | | | | | | | | | | | chat module
| | * minor: remove some mono compiler warnings, add --merge load oar switch to ↵Justin Clark-Casey (justincc)2009-11-254-6/+7
| | | | | | | | | | | | help information
| | * Implement oar mergingJustin Clark-Casey (justincc)2009-11-251-6/+10
| | | | | | | | | | | | | | | | | | | | | 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
| | * Add MIT/X11 licensed NDesk.Options (http://www.ndesk.org/Options) DLL to aid ↵Justin Clark-Casey (justincc)2009-11-254-1/+11
| | | | | | | | | | | | command line parsing
| * | Change osTeleportAgent parameters from long to int. That numerical range isMelanie2009-11-253-5/+5
| |/ | | | | | | | | not even supported by the underlying type, so there is no need to ask for a type the script can not even supply.
* | Change osTeleportAgent parameters from long to int. That numerical range isMelanie2009-11-253-5/+5
| | | | | | | | | | not even supported by the underlying type, so there is no need to ask for a type the script can not even supply.
* | 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 ↵Teravus Ovares (Dan Olivares)2009-11-252-0/+9
| | | | | | | | | | | | | | | | | | | | | 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.
| | * Make load/save iar slightly better in the face of io failures by always ↵Justin Clark-Casey (justincc)2009-11-242-63/+77
| | | | | | | | | | | | attempting to close the streams
| | * make save and load oar slightly more robust by always closing the archive ↵Justin Clark-Casey (justincc)2009-11-243-13/+30
| | | | | | | | | | | | streams even if there has been an error
| | * 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
| | | | | | | | | | | | unfortunately, these commands cannot yet be properly relocated to the region modules due to deficiencies in the region module infrastructure
| | * 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
| | | | | | | | (disabled by default, config entry admin_prefix)
* | Merge branch 'careminster' of kitto@tor.k-grid.com:/home/kitto/opensim into ↵Melanie2009-11-2414-619/+848
|\ \ | | | | | | | | | careminster
| * | Removed some extra debug chatterCasperW2009-11-242-2/+1
| | |
| * | Drop all locking of part.TaskInventory in favour of a ReaderWriterLockSlim ↵CasperW2009-11-248-481/+685
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Swap the locking of m_EventQueue and m_Script to ease locks on script ↵CasperW2009-11-231-115/+119
| | | | | | | | | | | | inventory operations
| * | Fixed nullrefsCasperW2009-11-232-21/+29
| | |
| * | Added some [DebuggerNonUserCode] modifiers to functions that throw ↵CasperW2009-11-235-1/+15
| | | | | | | | | | | | EventAbortException() to ease debugging on Visual Studio
* | | 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
| | | | | | | | handler delegates.
| * * 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 ↵Adam Frisby2009-11-231-0/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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"
| * | | * 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 ↵Teravus Ovares (Dan Olivares)2009-11-231-6/+1104
| | | | | | | | | | | | line switch.
* | | Revert "testing checkout"Melanie2009-11-231-1/+1
| | | | | | | | | | | | This reverts commit 234b29cf66ae79ab686fcce8a84499dbf031b161.
* | | testing checkoutunknown2009-11-231-1/+1
| | |
* | | Merge branch 'tests' of kitto@tor.k-grid.com:/home/kitto/opensim into ↵Melanie2009-11-231-30/+69
|\ \ \ | | | | | | | | | | | | careminster
| * | | 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
| | |/ | |/| | | | | | | | | | * 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.
| * | * Request from Adam to add InfoFormat logging to the InventoryService for ↵Teravus Ovares (Dan Olivares)2009-11-221-0/+1
| | | | | | | | | | | | when deleting folders by folderID occurs
| * | 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 ↵Teravus Ovares (Dan Olivares)2009-11-221-1/+12
| |/ / | | | | | | | | | avatar. This prevents the 'double jump' capability that's been occurring for ages when avatar collide with prim on the side.
| * | * Added missing lock to m_forcelist when AddForce is called. When a user ↵Teravus Ovares (Dan Olivares)2009-11-221-3/+26
| | | | | | | | | | | | | | | | | | 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.
| * | * This doesn't fix mantis 3522, but it should mitigate it.Teravus Ovares (Dan Olivares)2009-11-221-0/+43
| | | | | | | | | | | | * 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.
| * | * The client prevents the avatar from landing if the avatar is going above ↵Teravus Ovares (Dan Olivares)2009-11-221-5/+10
| | | | | | | | | | | | | | | | | | 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.
| * | * Switched over 15 more packet types from the 5000 line switch to the Packet ↵Teravus Ovares (Dan Olivares)2009-11-221-6/+293
| | | | | | | | | | | | handler delegate
* | | Merge branch 'master' into careminsterMelanie2009-11-221-6/+373
|\ \ \ | |/ /