aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ \ | |/ /
| * | * 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.
* | | 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 ↵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.
* | | 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
| | | | | | | | 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
| |\
| * | remove early return from PrimitiveBaseShape.ToOmvPrimitive() when prim is a ↵dahlia2009-11-201-2/+0
| | | | | | | | | | | | sculpty
* | | 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 ↵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
| | | |