aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-10-2015-453/+774
|\
| * minor: Rename assetCache constructor param in UUIDGatherer to assetService wh...Justin Clark-Casey (justincc)2012-10-201-2/+2
| * Relocate temporary debug message for sending group IMs to online members only...Justin Clark-Casey (justincc)2012-10-201-4/+12
| * Improve efficiency of friends notification by only make one PresenceService c...Justin Clark-Casey (justincc)2012-10-201-29/+24
| * Add experimental [Groups] MessageOnlineUsersOnly option for Flotsam XmlRpc gr...Justin Clark-Casey (justincc)2012-10-201-7/+69
| * 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 handl...Robert Adams2012-10-194-165/+240
| | * BulletSim: reorder avatar collision checking to eliminate double collision_end.Robert Adams2012-10-196-35/+43
| | * BulletSim: change nonimal physics frame rate to 55 to give same numbers as ODE.Robert Adams2012-10-196-52/+57
| | * BulletSim: remove code in ShapeCollection that hinted at shape sharing.Robert Adams2012-10-195-161/+138
| | * BulletSim: Fix small problems with last patch: BSScene.World properly initial...Robert Adams2012-10-193-11/+6
| | * BulletSim: Update BSCharacter to use API2 interface.Robert Adams2012-10-196-93/+250
| * | Add "debug groups verbose <true|false>" region console commandJustin Clark-Casey (justincc)2012-10-191-0/+29
| |/
| * minor: Increase attachment name field from 36 to 50 chars in "attachments sho...Justin Clark-Casey (justincc)2012-10-191-1/+1
| * 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
| * | altering documentation for llGetLinkName, as the current documentation is rat...SignpostMarv2012-10-191-1/+11
| * | 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
* | | 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 p...Justin Clark-Casey (justincc)2012-10-191-20/+93
| * | [UNTESTED] core Ode: stop trying to load a broken asset. Make brokenUbitUmarov2012-10-191-21/+97
| |/
* | Merge branch 'master' into careminsterMelanie2012-10-183-37/+102
|\ \ | |/
| * minor: Convert ad-hoc list building in ObjectCommandsModule to use ConsoleDis...Justin Clark-Casey (justincc)2012-10-181-21/+24
| * Add local and UUID to information output of "show object" and "show part" reg...Justin Clark-Casey (justincc)2012-10-181-0/+4
| * Add --full option to "show object name/uuid/pos" to show info on all parts of...Justin Clark-Casey (justincc)2012-10-181-20/+60
| * 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
| | * missing changed fileUbitUmarov2012-10-181-1/+1
| | * i update core ode plugin and make it load is meshs (i hope)UbitUmarov2012-10-182-2/+51
| * | Add number of inventory items to information displayed via "show part" consol...Justin Clark-Casey (justincc)2012-10-183-3/+21
| |/
* | Merge branch 'avination' into careminsterMelanie2012-10-1822-1198/+2319
|\ \
| * | Remove redundant and annoyingly modal message box in upload processing.Melanie2012-10-181-11/+11
| * | Merge branch 'ubitwork' into avinationMelanie2012-10-1721-1198/+2371
| |\ \
| | * | coment a debug warningUbitUmarov2012-10-161-1/+1
| | * | fixesUbitUmarov2012-10-163-67/+82
| | * | missing fileUbitUmarov2012-10-131-0/+2
| | * | add mesh cache expire on region startup. Expires will be relative toUbitUmarov2012-10-134-3/+88
| | * | retouch mesh idsUbitUmarov2012-10-132-11/+21
| | * | missing file (again)UbitUmarov2012-10-131-4/+8
| | * | longer meshs identification keys, so first part on disk cache is it's asset idUbitUmarov2012-10-131-1/+3