aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | |
| | * | 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
| * | | Merge branch 'master' into careminsterMelanie2009-11-1819-482/+825
| |\ \ \ | | |/ /
| | * | Change PresenceData to PresenceInfo to remove a naming conflict in theMelanie2009-11-183-2/+15
| | |/ | | | | | | | | | OpenSim.Data namespace
| | * Correct formatting of Primitive.Textures in ↵dahlia2009-11-171-1/+1
| | | | | | | | | | | | PrimitiveBaseShape.ToOmvPrimitive method
| | * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2009-11-172-0/+216
| | |\
| | | * Add the presence server connectorMelanie2009-11-172-0/+216
| | | |
| | * | refactor: Eliminate redundant CreateSceneViewer call on ScenePresence ↵Justin Clark-Casey (justincc)2009-11-171-4/+1
| | | | | | | | | | | | | | | | constructors since this is also done on other called constructors
| | * | Add scene animator set up to apparantly uncalled no-arg ScenePresence ↵Justin Clark-Casey (justincc)2009-11-171-1/+2
| | | | | | | | | | | | | | | | constructor
| | * | refactor: move AvatarAnimations, BinBVHAnimationJustin Clark-Casey (justincc)2009-11-174-61/+62
| | | |
| | * | minor: remove mono compiler warning due to unreachable code in GroupsModuleJustin Clark-Casey (justincc)2009-11-171-2/+2
| | | |
| | * | refactor: move AnimationSetJustin Clark-Casey (justincc)2009-11-172-2/+3
| | | |
| | * | refactor: move most animation methods from ScenePresence into a new ↵Justin Clark-Casey (justincc)2009-11-177-406/+499
| | |/ | | | | | | | | | ScenePresenceAnimator class
| | * minor: very minor formatting changeJustin Clark-Casey (justincc)2009-11-162-6/+1
| | |
| | * minor: add forgotton copyright headerJustin Clark-Casey (justincc)2009-11-161-0/+26
| | |
* | | Clean up messages in ODEKittoFlora2009-11-192-4/+4
| | |
* | | Fix merge conflictsKittoFlora2009-11-162-10/+3
| | |