aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-10-237-142/+407
|\ | | | | | | | | Conflicts: OpenSim/Framework/LandData.cs
| * Refactor: Move Dwell reply to a module that can be disabled. The prior,Melanie2012-10-213-12/+111
| | | | | | | | hardcoded approach disabled the use of non-core dwell tracking modules.
| * SQLite DB: some values of land data will be not saved / loadedPixelTomsen2012-10-212-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 ↵PixelTomsen2012-10-202-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/opensimBlueWall2012-10-2016-461/+810
| |\
| | * minor: remove unnecessary bit of method doc from ↵Justin Clark-Casey (justincc)2012-10-201-3/+0
| | | | | | | | | | | | OdePrim.BadMeshAssetCollideBits that monodevelop inserted automatically
| | * Fix minor issues from commit 28483150Justin Clark-Casey (justincc)2012-10-201-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_ZOOMBlueWall2012-10-201-0/+1
| | | | | | | | | | | | Add support for V2/3 CLICK_ACTION_ZOOM to llSetClickAction
* | | Merge branch 'master' into careminsterMelanie2012-10-2019-458/+815
|\ \ \ | | |/ | |/|
| * | minor: Rename assetCache constructor param in UUIDGatherer to assetService ↵Justin Clark-Casey (justincc)2012-10-201-2/+2
| | | | | | | | | | | | which is what it is.
| * | Add method doc for IPresenceServiceJustin Clark-Casey (justincc)2012-10-201-1/+37
| | |
| * | Relocate temporary debug message for sending group IMs to online members ↵Justin Clark-Casey (justincc)2012-10-201-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-204-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-201-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 e469879Justin Clark-Casey (justincc)2012-10-201-1/+1
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-10-207-406/+623
| |\ \
| | * | BulletSim: add asset fetching so BulletSim works with new physics asset ↵Robert Adams2012-10-194-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 Adams2012-10-196-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 Adams2012-10-196-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 Adams2012-10-195-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 Adams2012-10-193-11/+6
| | | | | | | | | | | | | | | | initialized and setting of C++ parameters commented out. Comments and logging added.
| | * | BulletSim: Update BSCharacter to use API2 interface.Robert Adams2012-10-196-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 commandJustin Clark-Casey (justincc)2012-10-191-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-191-1/+1
| | | | | | | | show" report
| * Fix a few minor issues in ArchiveReadRequest logging.Justin Clark-Casey (justincc)2012-10-191-2/+2
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-10-192-21/+103
| |\
| | * normalize quaternion.Slerp outputsUbitUmarov2012-10-191-0/+1
| | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| * | altering documentation for llGetLinkName, as the current documentation is ↵SignpostMarv2012-10-191-1/+11
| | | | | | | | | | | | rather lengthy for a "summary".
| * | since llGetLinkName has a "simplest case", it should be the first check made.SignpostMarv2012-10-191-4/+4
| | |
| * | the simplest case for llGetLinkName also applies to the LINK_THIS constantSignpostMarv2012-10-191-1/+1
| | |
| * | ensuring that operand order in llGetLinkName is internally consistentSignpostMarv2012-10-191-1/+1
| | |
| * | minor: comment out currently unused logger in DynamicTextureModuleJustin Clark-Casey (justincc)2012-10-191-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-10-191-6/+11
|\ \ \ | | |/ | |/|
| * | [UNTESTED] core Ode: let broken mesh physical prims collide with land asUbitUmarov2012-10-191-6/+11
| | | | | | | | | | | | the defaul basic box so they don't go off world.
* | | Merge branch 'master' into careminsterMelanie2012-10-192-41/+190
|\ \ \ | |/ /
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-10-191-20/+93
| |\ \ | | |/
| | * Make "show part" console commands print out information about each item the ↵Justin Clark-Casey (justincc)2012-10-191-20/+93
| | | | | | | | | | | | part contains
| * | [UNTESTED] core Ode: stop trying to load a broken asset. Make brokenUbitUmarov2012-10-191-21/+97
| |/ | | | | | | assets behave like phantom by Nebadon request
* | Merge branch 'master' into careminsterMelanie2012-10-183-37/+102
|\ \ | |/
| * minor: Convert ad-hoc list building in ObjectCommandsModule to use ↵Justin Clark-Casey (justincc)2012-10-181-21/+24
| | | | | | | | ConsoleDisplayList
| * Add local and UUID to information output of "show object" and "show part" ↵Justin Clark-Casey (justincc)2012-10-181-0/+4
| | | | | | | | region console commands
| * Add --full option to "show object name/uuid/pos" to show info on all parts ↵Justin Clark-Casey (justincc)2012-10-181-20/+60
| | | | | | | | of an object, not just whole object summary information.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-10-185-40/+70
| |\
| | * Remove extraneous calls to the now commented CheckSculptAndLoadMelanie2012-10-181-24/+0
| | |
| | * extend coment to include all unused SOG CheckSculptAndLoad()UbitUmarov2012-10-181-3/+4
| | |
| | * [DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculptsUbitUmarov2012-10-182-14/+18
| | | | | | | | | | | | | | | | | | now Signed-off-by: Melanie <melanie@t-data.com>
| | * missing changed fileUbitUmarov2012-10-181-1/+1
| | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| | * i update core ode plugin and make it load is meshs (i hope)UbitUmarov2012-10-182-2/+51
| | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| * | Add number of inventory items to information displayed via "show part" ↵Justin Clark-Casey (justincc)2012-10-183-3/+21
| |/ | | | | | | console command
* | Merge branch 'avination' into careminsterMelanie2012-10-1823-1206/+2339
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/Physics/OdePlugin/OdeScene.cs