aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge branch 'avination' into ubitworkUbitUmarov2012-08-193-1/+12
|\ \ \ | |/ / | | / | |/ |/|
| * Make the console output from the reigon console hookableMelanie2012-08-182-0/+11
| |
| * Fix a typoMelanie2012-08-181-1/+1
| |
* | let setLinkPrimParams terminate even if there are no more parts.UbitUmarov2012-08-161-2/+3
| |
* | fix vs2010 buildUbitUmarov2012-08-165-3/+6
|/
* Merge branch 'master' into careminsterMelanie2012-08-1619-235/+483
|\ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Do a proper null check to avoid the overloaded operator == trapMelanie2012-08-161-1/+1
| |
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-08-1518-234/+482
| |\
| | * Don't enable the thread watchdog until all regions are ready.Justin Clark-Casey (justincc)2012-08-152-7/+33
| | | | | | | | | | | | This is to avoid false positives when the machine is under heavy load whilst starting up.
| | * adding ATTACH_*_PEC constantsSignpostMarv2012-08-151-0/+2
| | |
| | * BulletSim: update DLLs and SOsRobert Adams2012-08-154-0/+0
| | |
| | * BulletSim: add physics logging parameters to OpenSimDefaults.ini. Remove ↵Robert Adams2012-08-151-12/+17
| | | | | | | | | | | | trailing semis from some the of the value definitions.
| | * BulletSim: add hinge constraint.Robert Adams2012-08-153-6/+126
| | | | | | | | | | | | | | | | | | | | | Update BulletSimAPI with new constraint related function calls. Reorganize locking in BS6DofConstraint. Update BS6DofConstraint to do constraint reset correctly. Add new 'midpoint' construction of 6Dof constraint.
| | * BulletSim: add locking to constraintCollection and rename some of the public ↵Robert Adams2012-08-152-147/+197
| | | | | | | | | | | | method variables to reduce confusion between a physics scene and the real scene.
| | * BulletSim: clean up detail logging by adding many more debug log statements ↵Robert Adams2012-08-155-34/+44
| | | | | | | | | | | | and then commenting out most of the additions.
| | * BulletSim: don't recreate mesh unless it needs it when rebuilding the hull. ↵Robert Adams2012-08-151-15/+15
| | | | | | | | | | | | Make sure the collisionCollection is reallocated each tick to fix race condition of it being cleared while still in use.
| | * BulletSim: fix problem of a null reference exception on shutdown if there ↵Robert Adams2012-08-151-12/+13
| | | | | | | | | | | | were linksets in the region.
| | * BulletSim: Refactor BSConstraintCollection to add a new ↵Robert Adams2012-08-151-4/+12
| | | | | | | | | | | | RemoveAndDestroyConstraint(BSConstraint xx)
| | * BulletSim: add BSConstraint.RecomputConstraintVariables for the ↵Robert Adams2012-08-151-0/+17
| | | | | | | | | | | | recomputation after linksets changed, etc
| | * BulletSim: Add the class BSCharacter to the DetailLog outputRobert Adams2012-08-151-6/+10
| | |
| | * BulletSim: rework physics FPS calculation to make a more realistic number.Robert Adams2012-08-151-3/+8
| | |
| * | Implementing PRIM_LINK_TARGET in a non-recursive fashionSignpostMarv2012-08-151-49/+74
| |/
* | Remove AreUpdatesSuspended flag because it does nothingMelanie2012-08-163-36/+0
| |
* | Change case of areUpdatesSuspended to upper case as is proper for a propertyMelanie2012-08-163-20/+20
| |
* | Fix casts and calls for link primitive param setting for avatarsMelanie2012-08-161-4/+14
| |
* | Remove XML debug spam from vivox voiceMelanie2012-08-161-12/+12
| |
* | Do a proper null check to avoid the overloaded operator == trapMelanie2012-08-151-1/+1
| |
* | Add a real_id field to the login response if impersonation is used. The wrapperMelanie2012-08-159-6/+64
| | | | | | | | script needs this for proper logging.
* | Implementing PRIM_LINK_TARGET in a non-recursive fashionSignpostMarv2012-08-152-117/+107
| |
* | Merge branch 'master' into careminsterMelanie2012-08-150-0/+0
|\ \ | |/
| * Let the temp attachment module add a command to allow attaching without ↵Melanie2012-08-152-34/+77
| | | | | | | | permissions and add support for this (incomplete!) to LSL
| * Add support for the extra params to scene and the event managerMelanie2012-08-152-0/+62
| |
| * Fix and finish the extra parameters storage system for MySQLMelanie2012-08-151-1/+57
| |
* | Merge branch 'master' into careminsterMelanie2012-08-151-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MSSQL/MSSQLSimulationData.cs OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/Null/NullSimulationData.cs OpenSim/Data/SQLite/SQLiteSimulationData.cs OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs OpenSim/Services/Connectors/Simulation/SimulationDataService.cs OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
| * Add a skeleton for a name value storage associated with regionsMelanie2012-08-1510-0/+113
| |
| * Actually add the moduleMelanie2012-08-141-0/+234
| |
| * Allow the use of the region debug console found in recent viewers. This consoleMelanie2012-08-146-3/+60
| | | | | | | | | | | | | | will be available to estate owners and managers. If the user using the console had god privs, they can use "set console on" and "set console off" to switch on the actual region console. This allows console access from within the viewer. The region debug console can coexist with any other main console.
| * minor: Add Gryc Ueusp to CREDITS for commit 884edac amongst others, by request.Justin Clark-Casey (justincc)2012-08-141-0/+1
| |
* | Let the temp attachment module add a command to allow attaching without ↵Melanie2012-08-152-32/+60
| | | | | | | | permissions and add support for this (incomplete!) to LSL
* | Add support for the extra params to scene and the event managerMelanie2012-08-152-0/+62
| |
* | Fix and finish the extra parameters storage system for MySQLMelanie2012-08-151-1/+57
| |
* | Add a skeleton for a name value storage associated with regionsMelanie2012-08-1510-0/+116
| |
* | Remove NPC debug spamMelanie2012-08-141-7/+7
| |
* | Actually add the moduleMelanie2012-08-141-0/+234
| |
* | Allow the use of the region debug console found in recent viewers. This consoleMelanie2012-08-146-3/+60
| | | | | | | | | | | | | | will be available to estate owners and managers. If the user using the console had god privs, they can use "set console on" and "set console off" to switch on the actual region console. This allows console access from within the viewer. The region debug console can coexist with any other main console.
* | Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into ↵Melanie2012-08-143-46/+85
|\ \ | | | | | | | | | avination
| * \ Merge branch 'careminster' into avinationMelanie2012-08-143-46/+85
| |\ \ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| | * \ Merge branch 'master' into careminsterMelanie2012-08-142-38/+49
| | |\ \ | | | |/
| | | * Prevent race conditions when one thread removes an NPC SP before another ↵Justin Clark-Casey (justincc)2012-08-142-39/+50
| | | | | | | | | | | | | | | | thread has retreived it after checking whether the NPC exists.
| | * | Merge branch 'master' into careminsterMelanie2012-08-141-8/+36
| | |\ \ | | | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
generated by cgit v1.1 at 2024-12-27 13:01:31 +0000