aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-05-3021-64/+150
|\
| * Try caching the user name for a new agent earlier on in the process of establ...Justin Clark-Casey (justincc)2013-05-293-5/+11
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-05-292-14/+27
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-2839-334/+820
| | |\
| | * | First change in Vivox for ages! -- added a lock to serialize calls to vivox s...Diva Canto2013-05-281-14/+25
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-2019-12093/+12114
| | |\ \
| | * | | Add commentDiva Canto2013-05-201-0/+2
| * | | | Add HG regression TestCachedUserNameForNewAgent()Justin Clark-Casey (justincc)2013-05-292-0/+77
| | |_|/ | |/| |
| * | | BulletSim: don't zero motion when changing vehicle type.Robert Adams2013-05-281-1/+4
| * | | BulletSim: default using mesh asset hulls to 'true'. This means that,Robert Adams2013-05-271-2/+2
| * | | BulletSim: enable GImpact shape for prims with cuts. Include DLLs and SOsRobert Adams2013-05-265-1/+1
| * | | Update the money framework to allow sending the new style linden "serverside ...Melanie2013-05-259-44/+32
* | | | Merge branch 'master' into careminsterMelanie2013-05-254-5/+16
|\ \ \ \ | |/ / /
| * | | Meshmerizer: remember to add the copied hull verts to the list of hulls.Robert Adams2013-05-241-0/+1
| * | | BulletSim: add VehicleInertiaFactor to allow modifying inertia.Robert Adams2013-05-242-1/+5
| * | | BulletSim: properly set mesh hash key in use tracking structure.Robert Adams2013-05-241-1/+4
| * | | Meshmerizer: add INI parameter to enable DEBUG mesh detail logging.Robert Adams2013-05-241-3/+6
* | | | Merge commit 'a087dbed7f57f3ec431782dd51ba43110a0f4ae3' into careminsterMelanie2013-05-250-0/+0
|\ \ \ \ | |/ / /
| * | | One more appearance change: drop sending the SendAppearance packetMic Bowman2013-05-241-1/+3
| * | | Protect one more update of the baked texture hashes.Mic Bowman2013-05-241-2/+5
| * | | This is an experimental patch that adds support for comparing textureMic Bowman2013-05-245-84/+147
* | | | 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