aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* 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
|/
* * 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
|\ \ | |/
| * * 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.
* | * Moved 40 more Packet handlers to the PacketDelegate and out of the 5000 ↵Teravus Ovares (Dan Olivares)2009-11-231-6/+1104
|/ | | | line switch.
* * 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
* * Moved 13 more packet type handlers to PacketHandler Delegates.. and out ↵Teravus Ovares (Dan Olivares)2009-11-221-6/+373
| | | | of of that giant 5000 line switch, ProcessInPacket.
* * 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 ↵Teravus Ovares (Dan Olivares)2009-11-211-6/+103
| | | | delegates
* * This fixes landing on Prim and removes the hack from yesterday. Landing ↵Teravus Ovares (Dan Olivares)2009-11-212-5/+5
| | | | on prim should work fine again.
* * 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
| | | | 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.
* * Fixes the second of two terse update issues. Physical objects should react ↵Teravus Ovares (Dan Olivares)2009-11-212-0/+4
| | | | normally again.
* * Fixes one of two terse update issues. There's still one left, but this ↵Teravus Ovares (Dan Olivares)2009-11-212-1/+12
| | | | one fixes the situation where the object on the server is moving but no updates are being sent.
* Fix http://opensimulator.org/mantis/view.php?id=3874 - parenthesis in for ↵Justin Clark-Casey (justincc)2009-11-202-2/+20
| | | | | | | | | | 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.
* Merge branch 'master' of ssh://dahlia@myConnection01/var/git/opensimdahlia2009-11-208-66/+101
|\
| * 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 ↵Justin Clark-Casey (justincc)2009-11-181-19/+20
| | | | | | | | identifying detail
| * minor: correct error messages when queryfolder failsJustin Clark-Casey (justincc)2009-11-182-7/+2
| |
| * minor: remove duplicate copyright notice in PollServiceWorkerThreadJustin Clark-Casey (justincc)2009-11-181-28/+1
| |
| * Implement generic delete methodMelanie2009-11-182-2/+16
| |
| * Tweak presence handling and whip up a database connector and handlerMelanie2009-11-185-4/+42
| | | | | | | | for testign the new generic table handling
| * Change PresenceData to PresenceInfo to remove a naming conflict in theMelanie2009-11-183-2/+15
| | | | | | | | OpenSim.Data namespace
* | remove early return from PrimitiveBaseShape.ToOmvPrimitive() when prim is a ↵dahlia2009-11-201-2/+0
|/ | | | sculpty