Commit Graph

20801 Commits (4ff7891506877fcb13f214dd8651966357d24fe7)

Author SHA1 Message Date
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
Melanie 20b66cf654 Removed more spammy NPC crap 2012-08-14 03:02:43 +02:00
Melanie 4bbdcfb5ee Implement the temp attachments. UNTESTED 2012-08-14 01:45:02 +01:00
Melanie 12a329eb85 Comment spammy debug 2012-08-14 02:28:23 +02:00
Melanie 9b014a7167 Merge branch 'careminster' into avination
Conflicts:
	OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
2012-08-14 02:34:03 +01:00
Melanie 9bd2c1b88a As per lindn spec, disable detach and drop for temp attachments 2012-08-14 01:12:27 +01:00
Melanie 62acfabec4 Add the skeleton for the temp attachments module 2012-08-14 00:54:12 +01:00
Melanie 50db8649aa Exclude temp attachemnts from being sent to the avatar service 2012-08-14 00:29:39 +01:00
Melanie fe4c3a37c0 Lay some groundwork for temp attachments. Decouple attachments from inventory. 2012-08-14 00:12:15 +01:00
Melanie 2a5077ef7e Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-13 19:20:47 +01:00
SignpostMarv 58c630c18e attempt at replicating behaviour of llList2thing functions in SL
Committed with changes. Please don't sign comments with your name. Please
don't use your own coding style, use the OpenSim project style. Please
don't modify unrelated whitespace.

Signed-off-by: Melanie <melanie@t-data.com>
2012-08-13 19:17:19 +01:00
Melanie 93e3ab3ebd Merge branch 'master' into careminster 2012-08-11 17:32:30 +01:00
Robert Adams 3ecd39068c Merge branch 'bulletsim7' 2012-08-10 16:35:00 -07:00
Robert Adams 3a55d5b123 BulletSim: actually update the DLLs and SOs 2012-08-10 16:34:22 -07:00
Robert Adams 0c7ce4fc98 BulletSim: many, many detailed logging messages for physical linkset
debugging.
Linkset bugs fixed where accounting of children would get lost.
Moved scene based vehicle tracking logic from prim to the scene.
Added GetCollisionFlags2 method to BulletSimAPI.
Updated DLLs and SOs.
2012-08-10 16:22:44 -07:00
Robert Adams 3ca770cd2c BulletSim: Add module names to DetailLog output. Fix some problems with linksets that were caused by checking data structures that are changed regularly from taint time code -- resulted in linksets not being unlinked properly. 2012-08-10 08:33:09 -07:00
Robert Adams 320982cae3 BulletSim: add an identifier to the TaintObject call so exceptions that happen when the taint is invoked can be debugged 2012-08-09 15:17:19 -07:00
Robert Adams 38e79b80a8 BulletSim: separate out the constraints by type. The linksets use
6dof constraint but eventually others will be exposed so future
features can use all the Bullet capabilities.
Force children to generate a position update when unlinked.
2012-08-09 15:01:05 -07:00
Melanie 6ed3761147 Merge branch 'master' into careminster 2012-08-09 02:37:49 +01:00
Robert Adams 5ab151c2d6 BulletSim: add avatar code to keep avatars from ending up trapped under the terrain 2012-08-08 13:48:49 -07:00
Robert Adams 19417fca41 BulletSim: Added avatar capsule scaling for size of avatar.
This also fixes computation of avatar mass.
Added parameter MaxPersistantManifoldPoolSize.
Fixed a parameter setting bug which caused crashes of there were
  more than 400 or so physical objects. I tested up to 5000.
Updated BulletSim DLLs and SOs.
2012-08-07 17:15:06 -07:00
UbitUmarov fef07b807d Merge branch 'avination' into ubitwork 2012-08-07 21:59:21 +01:00
Melanie 96922543b4 Merge branch 'avination' of ssh://melanie@3dhosting.de/var/git/careminster into avination 2012-08-07 20:49:49 +01:00
Melanie 1c51ae662c Release http-in URLs when llResetScript is called 2012-08-07 20:49:26 +01:00
Melanie d85c49c98b Merge branch 'master' into careminster 2012-08-07 20:48:57 +01:00
Melanie 926c0b90a1 Release http-in URLs when llResetScript is called 2012-08-07 20:48:22 +01:00
Melanie 85b4eab005 Merge branch 'master' into careminster 2012-08-07 20:20:28 +01:00
UbitUmarov eef6bb97c0 use a bit more complex mesh key identifier, plus a bug fix 2012-08-07 17:42:29 +01:00
Robert Adams 4adb3471ac BulletSim: update SOs and DLLs to run on more Linux versions. Correct multiple buoyancy settings when character flying. Remove chatty log message on prim destruction. 2012-08-06 12:55:52 -07:00
UbitUmarov df2f9b1885 *** TESTTTTT ** downgrade from .net 4.0 to .net3.5 2012-08-06 11:04:29 +01:00