Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-10-23 | 17 | -417/+767 |
|\ | |||||
| * | BulletSim: remove chatty debug message. | Robert Adams | 2012-10-22 | 2 | -2/+2 |
| | | |||||
| * | BulletSim: fix bug that caused error (and a crash on 32 bit Linux) when mesh ↵ | Robert Adams | 2012-10-22 | 8 | -35/+51 |
| | | | | | | | | assets weren't already in the cache. Comment cleanups. | ||||
| * | BulletSim: fix problem of not rebuilding shape by clearing last rebuild ↵ | Robert Adams | 2012-10-22 | 2 | -2/+8 |
| | | | | | | | | failed flag in BSPrim.ForceBodyShapeRebuild() | ||||
| * | BulletSim: remove trailing spaces to make git happy. | Robert Adams | 2012-10-22 | 8 | -36/+36 |
| | | |||||
| * | BulletSim: encorporate UBit's suggestion to save a copy of mesh raw data. | Robert Adams | 2012-10-22 | 1 | -2/+1 |
| | | |||||
| * | BulletSim: Create LinkSet abstract class and sparate constraint based ↵ | Robert Adams | 2012-10-22 | 3 | -319/+434 |
| | | | | | | | | linksets into own subclass. Will eventually add manual movement linkset subclass. | ||||
| * | Make it possible to turn the base UDP object packet pools on and off whilst ↵ | Justin Clark-Casey (justincc) | 2012-10-23 | 3 | -51/+132 |
| | | | | | | | | | | | | running via the "debug lludp pool <on|off>" console command. For debug purposes. This does not currently apply to the higher LLUDP packetpool. | ||||
| * | Add object count stats for new IncomingPacket and UDPPacketBuffer pools if ↵ | Justin Clark-Casey (justincc) | 2012-10-23 | 6 | -14/+153 |
| | | | | | | | | | | | | | | | | they are enabled. Add count stats for existing LLUDP pool. This introduces a pull stat type in addition to the push stat type. A pull stat takes a method on construction which knows how to update the stat on request. In this way, special interfaces for pull stat collection are not necessary. | ||||
| * | minor: Get content type handler logger to log "unset" for the content type ↵ | Justin Clark-Casey (justincc) | 2012-10-23 | 1 | -1/+1 |
| | | | | | | | | instead of blank if no content type was set. | ||||
| * | minor: Use LogIncomingToContentTypeHandler() method for incoming HTTP data ↵ | Justin Clark-Casey (justincc) | 2012-10-23 | 1 | -8/+2 |
| | | | | | | | | | | | | where this wasn't already used. This allows log level 5 (log sample or large part of incoming post data) to operate and removes copy/paste. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-10-23 | 7 | -142/+407 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Framework/LandData.cs | ||||
| * | Refactor: Move Dwell reply to a module that can be disabled. The prior, | Melanie | 2012-10-21 | 3 | -12/+111 |
| | | | | | | | | hardcoded approach disabled the use of non-core dwell tracking modules. | ||||
| * | SQLite DB: some values of land data will be not saved / loaded | PixelTomsen | 2012-10-21 | 2 | -5/+21 |
| | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=6370 Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
| * | Fix: invinite loading for Viewer3 : parcelinfo request of traffic-value ↵ | PixelTomsen | 2012-10-20 | 2 | -125/+272 |
| | | | | | | | | | | | | (implementation of dwell-value in LandData + eventhandler, return always 0); source-formatting of LandData Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-10-20 | 16 | -461/+810 |
| |\ | |||||
| | * | minor: remove unnecessary bit of method doc from ↵ | Justin Clark-Casey (justincc) | 2012-10-20 | 1 | -3/+0 |
| | | | | | | | | | | | | OdePrim.BadMeshAssetCollideBits that monodevelop inserted automatically | ||||
| | * | Fix minor issues from commit 28483150 | Justin Clark-Casey (justincc) | 2012-10-20 | 1 | -12/+17 |
| | | | | | | | | | | | | Fix spelling of collide, change to more self-documenting property BadMeshAssetCollideBits, add method doc, change to private to reduce code analysis complexity | ||||
| * | | Add CLICK_ACTION_ZOOM | BlueWall | 2012-10-20 | 1 | -0/+1 |
| | | | | | | | | | | | | Add support for V2/3 CLICK_ACTION_ZOOM to llSetClickAction | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-10-20 | 19 | -458/+815 |
|\ \ \ | | |/ | |/| | |||||
| * | | minor: Rename assetCache constructor param in UUIDGatherer to assetService ↵ | Justin Clark-Casey (justincc) | 2012-10-20 | 1 | -2/+2 |
| | | | | | | | | | | | | which is what it is. | ||||
| * | | Add method doc for IPresenceService | Justin Clark-Casey (justincc) | 2012-10-20 | 1 | -1/+37 |
| | | | |||||
| * | | Relocate temporary debug message for sending group IMs to online members ↵ | Justin Clark-Casey (justincc) | 2012-10-20 | 1 | -4/+12 |
| | | | | | | | | | | | | | | | | | | only so that we can add ms it takes to send. This is chiefly to assess how long it may still take to send messages to such filtered groups. | ||||
| * | | Improve efficiency of friends notification by only make one PresenceService ↵ | Justin Clark-Casey (justincc) | 2012-10-20 | 4 | -33/+28 |
| | | | | | | | | | | | | | | | | | | call for all friends rather than one for each friend. However, large groups could still take a very long time since we still need to message each avatar on different simulators. | ||||
| * | | Add experimental [Groups] MessageOnlineUsersOnly option for Flotsam XmlRpc ↵ | Justin Clark-Casey (justincc) | 2012-10-20 | 1 | -7/+69 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | groups. This retrieves and caches information from the PresenceService to only send messages to online users. This is reported to much improve performance for large groups where most users are offline. Cache is 20 seconds to balance requests against users not receiving messages until cache updates. This is an alternative to an approach where login/logout notification is sent directly from simulator to groups service. However, I'm not convinced that this PresenceService approach is actually better. Needs more thought. | ||||
| * | | Fix build break from commit e469879 | Justin Clark-Casey (justincc) | 2012-10-20 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-10-20 | 7 | -406/+623 |
| |\ \ | |||||
| | * | | BulletSim: add asset fetching so BulletSim works with new physics asset ↵ | Robert Adams | 2012-10-19 | 4 | -165/+240 |
| | | | | | | | | | | | | | | | | | | | | | | | | handling. Refactor some names to make them available for the asset tracking and fetching. | ||||
| | * | | BulletSim: reorder avatar collision checking to eliminate double collision_end. | Robert Adams | 2012-10-19 | 6 | -35/+43 |
| | | | | | | | | | | | | | | | | | | | | | | | | Various tweekings to avatar shape/mass/inertia/etc. Remove change from avatar radius to diameter. But still the avatar sinks. Collision_end now happens immediately rather than at the next subscription time. | ||||
| | * | | BulletSim: change nonimal physics frame rate to 55 to give same numbers as ODE. | Robert Adams | 2012-10-19 | 6 | -52/+57 |
| | | | | | | | | | | | | | | | | | | | | | | | | Change character scaling to represent size of capsule (diameter rather than radius) Modify create capsule call to pass radius and height. Eliminate errors when calculating shape inertia (should have some type checking). | ||||
| | * | | BulletSim: remove code in ShapeCollection that hinted at shape sharing. | Robert Adams | 2012-10-19 | 5 | -161/+138 |
| | | | | | | | | | | | | | | | | | | | | Add new function to ParameterDefn for calling BulletSimAPI to set values. Tweaking to BSCharacter parameter setting to try and have avatars stand. | ||||
| | * | | BulletSim: Fix small problems with last patch: BSScene.World properly ↵ | Robert Adams | 2012-10-19 | 3 | -11/+6 |
| | | | | | | | | | | | | | | | | initialized and setting of C++ parameters commented out. Comments and logging added. | ||||
| | * | | BulletSim: Update BSCharacter to use API2 interface. | Robert Adams | 2012-10-19 | 6 | -93/+250 |
| | |/ | | | | | | | | | | | | | | | | | | | | | | Add capsule shape to BSShapeCollection(). Remember last updated values so inter frame diffs can be computed. Parameterize avatarStandingFriction and reduce to 10 from 999. The latter high value made avatars very hard to push. Set CCD parameters for prims and characters of specified. | ||||
| * | | Add "debug groups verbose <true|false>" region console command | Justin Clark-Casey (justincc) | 2012-10-19 | 1 | -0/+29 |
| |/ | | | | | | | This allows one to turn on super-verbose groups debug logging on and off whilst the region is in operation. | ||||
| * | minor: Increase attachment name field from 36 to 50 chars in "attachments ↵ | Justin Clark-Casey (justincc) | 2012-10-19 | 1 | -1/+1 |
| | | | | | | | | show" report | ||||
| * | Fix a few minor issues in ArchiveReadRequest logging. | Justin Clark-Casey (justincc) | 2012-10-19 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-10-19 | 2 | -21/+103 |
| |\ | |||||
| | * | normalize quaternion.Slerp outputs | UbitUmarov | 2012-10-19 | 1 | -0/+1 |
| | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| * | | altering documentation for llGetLinkName, as the current documentation is ↵ | SignpostMarv | 2012-10-19 | 1 | -1/+11 |
| | | | | | | | | | | | | rather lengthy for a "summary". | ||||
| * | | since llGetLinkName has a "simplest case", it should be the first check made. | SignpostMarv | 2012-10-19 | 1 | -4/+4 |
| | | | |||||
| * | | the simplest case for llGetLinkName also applies to the LINK_THIS constant | SignpostMarv | 2012-10-19 | 1 | -1/+1 |
| | | | |||||
| * | | ensuring that operand order in llGetLinkName is internally consistent | SignpostMarv | 2012-10-19 | 1 | -1/+1 |
| | | | |||||
| * | | minor: comment out currently unused logger in DynamicTextureModule | Justin Clark-Casey (justincc) | 2012-10-19 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-10-19 | 1 | -6/+11 |
|\ \ \ | | |/ | |/| | |||||
| * | | [UNTESTED] core Ode: let broken mesh physical prims collide with land as | UbitUmarov | 2012-10-19 | 1 | -6/+11 |
| | | | | | | | | | | | | the defaul basic box so they don't go off world. | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-10-19 | 2 | -41/+190 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-10-19 | 1 | -20/+93 |
| |\ \ | | |/ | |||||
| | * | Make "show part" console commands print out information about each item the ↵ | Justin Clark-Casey (justincc) | 2012-10-19 | 1 | -20/+93 |
| | | | | | | | | | | | | part contains | ||||
| * | | [UNTESTED] core Ode: stop trying to load a broken asset. Make broken | UbitUmarov | 2012-10-19 | 1 | -21/+97 |
| |/ | | | | | | | assets behave like phantom by Nebadon request | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-10-18 | 3 | -37/+102 |
|\ \ | |/ |