Commit Graph

20830 Commits (fd20ef5c91f5db119d17b1974805b6d4fc2abad3)

Author SHA1 Message Date
UbitUmarov f9a318380b let setLinkPrimParams terminate even if there are no more parts. 2012-08-16 22:14:56 +01:00
UbitUmarov db3f0a3748 fix vs2010 build 2012-08-16 15:26:16 +01:00
Melanie 90ad98370a Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-16 02:46:48 +01:00
Melanie 9995421df1 Do a proper null check to avoid the overloaded operator == trap 2012-08-16 02:35:03 +01:00
Melanie bbac8f76fa Remove AreUpdatesSuspended flag because it does nothing 2012-08-16 01:18:32 +02:00
Melanie b97053269b Change case of areUpdatesSuspended to upper case as is proper for a property 2012-08-16 01:02:20 +02:00
Melanie 4e5c19595c Fix casts and calls for link primitive param setting for avatars 2012-08-16 01:01:03 +02:00
Melanie 5ac77316e0 Remove XML debug spam from vivox voice 2012-08-16 00:59:58 +02:00
Melanie e286a95d76 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2012-08-15 22:59:31 +01:00
Melanie 684f8208d9 Do a proper null check to avoid the overloaded operator == trap 2012-08-15 23:58:39 +02:00
SignpostMarv 0aa1f1cc3f Implementing PRIM_LINK_TARGET in a non-recursive fashion 2012-08-15 22:58:33 +01:00
Justin Clark-Casey (justincc) 5a1b6fdf06 Don't enable the thread watchdog until all regions are ready.
This is to avoid false positives when the machine is under heavy load whilst starting up.
2012-08-15 22:43:32 +01:00
Melanie c313de630f Add a real_id field to the login response if impersonation is used. The wrapper
script needs this for proper logging.
2012-08-15 23:31:38 +02:00
SignpostMarv 8cd4042f9e Implementing PRIM_LINK_TARGET in a non-recursive fashion 2012-08-15 23:51:43 +01:00
SignpostMarv 7679384829 adding ATTACH_*_PEC constants 2012-08-15 22:06:20 +01:00
Robert Adams 9f83f4bfa3 BulletSim: update DLLs and SOs 2012-08-15 12:08:29 -07:00
Robert Adams 2b982ab212 BulletSim: add physics logging parameters to OpenSimDefaults.ini. Remove trailing semis from some the of the value definitions. 2012-08-15 12:08:25 -07:00
Robert Adams dd10cf01e7 BulletSim: add hinge constraint.
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.
2012-08-15 12:08:21 -07:00
Robert Adams 9efe7bf7ba BulletSim: add locking to constraintCollection and rename some of the public method variables to reduce confusion between a physics scene and the real scene. 2012-08-15 12:08:17 -07:00
Robert Adams 68f112888b BulletSim: clean up detail logging by adding many more debug log statements and then commenting out most of the additions. 2012-08-15 12:08:13 -07:00
Robert Adams b05a2fc4ed BulletSim: don't recreate mesh unless it needs it when rebuilding the hull. Make sure the collisionCollection is reallocated each tick to fix race condition of it being cleared while still in use. 2012-08-15 12:08:09 -07:00
Robert Adams 257446889b BulletSim: fix problem of a null reference exception on shutdown if there were linksets in the region. 2012-08-15 12:08:05 -07:00
Robert Adams 77a7758cf5 BulletSim: Refactor BSConstraintCollection to add a new RemoveAndDestroyConstraint(BSConstraint xx) 2012-08-15 12:08:01 -07:00
Robert Adams c1c1d48af1 BulletSim: add BSConstraint.RecomputConstraintVariables for the recomputation after linksets changed, etc 2012-08-15 12:07:57 -07:00
Robert Adams 6f1f299619 BulletSim: Add the class BSCharacter to the DetailLog output 2012-08-15 12:07:53 -07:00
Robert Adams 11a4b9ec1d BulletSim: rework physics FPS calculation to make a more realistic number. 2012-08-15 12:07:49 -07:00
Melanie 3e946094a1 Merge branch 'master' into careminster 2012-08-15 19:37:38 +01:00
Melanie ebbf349c6a Let the temp attachment module add a command to allow attaching without permissions and add support for this (incomplete!) to LSL 2012-08-15 19:37:16 +01:00
Melanie c27ff70d5c Add support for the extra params to scene and the event manager 2012-08-15 18:58:39 +01:00
Melanie c7f2debd38 Fix and finish the extra parameters storage system for MySQL 2012-08-15 18:58:32 +01:00
Melanie 90e4c3fece Merge branch 'master' into careminster
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
2012-08-15 18:58:15 +01:00
Melanie 44dc138d8b Let the temp attachment module add a command to allow attaching without permissions and add support for this (incomplete!) to LSL 2012-08-15 18:22:52 +02:00
Melanie da0f6b926f Add support for the extra params to scene and the event manager 2012-08-15 18:22:16 +02:00
Melanie de21929426 Fix and finish the extra parameters storage system for MySQL 2012-08-15 18:21:28 +02:00
Melanie dc82ad0f7a Add a skeleton for a name value storage associated with regions 2012-08-15 02:06:22 +01:00
Melanie 7d1bec00d5 Add a skeleton for a name value storage associated with regions 2012-08-15 01:08:30 +02:00
Melanie f6562e2269 Actually add the module 2012-08-14 22:22:25 +01:00
Melanie faa710aee1 Allow the use of the region debug console found in recent viewers. This console
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.
2012-08-14 22:22:20 +01:00
Justin Clark-Casey (justincc) d8125fb1f7 minor: Add Gryc Ueusp to CREDITS for commit 884edac amongst others, by request. 2012-08-14 21:56:31 +01:00
Justin Clark-Casey (justincc) c42fe6c159 Prevent race conditions when one thread removes an NPC SP before another thread has retreived it after checking whether the NPC exists. 2012-08-14 21:44:06 +01:00
Melanie 4a969b45bd Remove NPC debug spam 2012-08-14 22:02:40 +02:00
Melanie f21fdff4f9 Actually add the module 2012-08-14 21:58:07 +02:00
Melanie 195b69d1ea Allow the use of the region debug console found in recent viewers. This console
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.
2012-08-14 21:54:47 +02:00
Melanie 5546757931 Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into avination 2012-08-14 21:37:30 +02:00
Melanie 66de4a1389 Merge branch 'careminster' into avination
Conflicts:
	OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
2012-08-14 21:44:25 +01:00
Melanie 9ec35d09f8 Merge branch 'master' into careminster 2012-08-14 21:43:23 +01:00
Melanie e81e26498b Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
2012-08-14 16:51:47 +01:00
Melanie a5b6492223 Perform ownership transfer and permission propagation as well as needed
updates on the new temp attachment.
2012-08-14 13:40:13 +01:00
Melanie 1be072f19e Move inititalization to RegionLoaded to avoid a module loading order issue 2012-08-14 09:55:44 +01:00
Melanie 053e7279ca Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-14 02:11:13 +01:00