aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '440905ad14d4261df9da0fd2ce7e20a350982af1' into careminsterMelanie2013-05-251-53/+83
|\
| * change a hull debugging message to Debug instead of Infodahlia2013-05-241-1/+1
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimdahlia2013-05-242-1/+2
| |\
| * | correct some errors in decoding of mesh asset convex decomposition datadahlia2013-05-241-53/+83
* | | Merge branch 'master' into careminsterMelanie2013-05-246-156/+244
|\ \ \ | | |/ | |/|
| * | minor: Remove unnecessary duplication of AbsolutePosition Vector3 in SOG.Copy()Justin Clark-Casey (justincc)2013-05-241-1/+0
| * | Fix issue where llSetPayPrice on either one of a clone prim in the same OpenS...Justin Clark-Casey (justincc)2013-05-241-0/+2
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-05-231-4/+53
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimdahlia2013-05-231-1/+1
| | |\
| | * | add decoder for bounding convex hulldahlia2013-05-231-4/+53
| * | | Fix bug where a cloned object would report the wrong llGetNumberOfPrims() whe...Justin Clark-Casey (justincc)2013-05-231-0/+1
| | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-05-235-114/+210
| |\ \ | | |/
| | * Add DEBUG level logging in Meshmerizer for mesh parsing. There isRobert Adams2013-05-231-2/+25
| | * BulletSim: add locking around Meshmerizer use to eliminate possible raceRobert Adams2013-05-231-145/+157
| | * BulletSim: correct errors caused by misspelled INI parameter spec.Robert Adams2013-05-222-4/+7
| * | Fix bug where both ordinary UserManagementModule and HGUserManagementModules ...Justin Clark-Casey (justincc)2013-05-231-1/+1
* | | Merge branch 'master' into careminsterMelanie2013-05-2423-91/+477
|\ \ \ | | |/ | |/|
| * | BulletSim: specify directory for OpenSim.Region.Physics.MeshingRobert Adams2013-05-221-1/+1
| * | BulletSim: add code to experimentally use asset hull data.Robert Adams2013-05-223-4/+55
| * | BulletSim: fix problem with walking up stairs that are orientedRobert Adams2013-05-221-2/+9
| |/
| * Implement llSetSoundQueueing().Justin Clark-Casey (justincc)2013-05-224-6/+33
| * Revert "BulletSim: add code to experimentally use asset hull data."Robert Adams2013-05-213-55/+4
| * BulletSim: update DLLs and SOs with version containing gImpact code.Robert Adams2013-05-214-0/+0
| * BulletSim: add code to experimentally use asset hull data.Robert Adams2013-05-213-4/+55
| * BulletSim: add gImpact shape type. Add logic to use gImpact shapeRobert Adams2013-05-217-14/+167
| * Merge branch 'master' of git://opensimulator.org/git/opensimRobert Adams2013-05-215-59/+203
| |\
| | * To further help with tracking down the apperance of too much "Unknown User" i...Justin Clark-Casey (justincc)2013-05-214-6/+6
| | * Fix compile failure from recent git master 434c3cfJustin Clark-Casey (justincc)2013-05-211-1/+1
| | * Make "show name" command display HomeURL like "show names"Justin Clark-Casey (justincc)2013-05-211-4/+11
| | * minor: Change "show names" command to use consistent console display tableJustin Clark-Casey (justincc)2013-05-211-15/+9
| | * Add "show name" console command to make it possible to show a single binding ...Justin Clark-Casey (justincc)2013-05-211-0/+34
| | * Log when "Unknown User" is sent to a user because the UMM had no binding for ...Justin Clark-Casey (justincc)2013-05-211-17/+32
| | * Lock m_UserCache whilst iterating over it in UserManagementModule.GetUserData...Justin Clark-Casey (justincc)2013-05-211-4/+9
| | * fix error in hull point indexingdahlia2013-05-181-1/+1
| | * remove duplicate hull scalingdahlia2013-05-181-3/+3
| | * add prototype code to decode convex hulls from mesh assets. Please do not use...dahlia2013-05-181-21/+110
| * | BulletSim: fix BulletSim crashing if there is no [BulletSim] sectionRobert Adams2013-05-172-8/+12
| |/
* | Merge branch 'master' into careminsterMelanie2013-05-1631-12079/+12101
|\ \ | |/
| * minor: remove long commented out scene cache clearing code in EntityTransferM...Justin Clark-Casey (justincc)2013-05-161-9/+0
| * minor: Remove completely unused IClientAPI.RequestClientInfo() call from Enti...Justin Clark-Casey (justincc)2013-05-161-3/+0
| * Where this is not already happening, trigger asychoronous calls to CloseChild...Justin Clark-Casey (justincc)2013-05-163-2/+3
| * On closing child agents, send separate asynchronous requests to each neighbou...Justin Clark-Casey (justincc)2013-05-163-9/+5
| * On logout, send close child agent requests to neighbours asynchronously, so u...Justin Clark-Casey (justincc)2013-05-161-6/+3
| * fall back to using a display mesh for physics proxy if no physics_mesh entry ...dahlia2013-05-151-0/+4
| * Updated libopenmetaverse to a5ad7f200e9bd2e91604ba921d1db3768108686bLatif Khalifa2013-05-167-11955/+11955
| * Removed obsolete libopenmetaverse fileLatif Khalifa2013-05-161-57/+0
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-05-151-0/+3
| |\
| | * Eliminate race condition where SimStatsReporter starts reportingRobert Adams2013-05-141-0/+3
| * | Fix issue where osMakeNotecard() would fail if given a list containing vector...Justin Clark-Casey (justincc)2013-05-151-30/+30
| |/
| * Comment out log message about looking for asset data in remove asset service ...Justin Clark-Casey (justincc)2013-05-141-1/+1