Commit Graph

19087 Commits (ee6333f89b1faef389abaeb2bd9a0c6e9eabc754)

Author SHA1 Message Date
Diva Canto 608444c9f7 Another 21 modules' directives moved out of .addin.xml 2012-11-13 08:27:51 -08:00
Melanie af01a2320a Merge branch 'master' into careminster 2012-11-13 10:49:24 +00:00
Diva Canto d73aa8c1a6 Moved the WindModule and its own plugins out of .addin.xml 2012-11-12 21:27:23 -08:00
Diva Canto 99ccd4ea44 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-11-12 21:15:35 -08:00
Diva Canto 31177d9259 Another 10 modules' directives moved from .addin.xml 2012-11-12 21:14:58 -08:00
Justin Clark-Casey (justincc) 2fd36653b9 minor: Add some explanative method doc to SceneHelpers.SetupSceneModules() 2012-11-13 04:34:03 +00:00
Justin Clark-Casey (justincc) f605a62427 Disable code to get server-side to move given items to a destination folder on TaskInventoryAccepted.
This is because the fixes to inventory versioning (so that they better match viewer expections)
now appear to allow the viewer to execute #RLV moves, as happens on the LL grid.
Doing it again server-side now wrongly creates another child #RLV folder underneath the root one.
As per http://opensimulator.org/mantis/view.php?id=6311
2012-11-13 04:15:21 +00:00
Melanie 29bfd9e46c Merge branch 'master' into careminster 2012-11-13 02:28:40 +00:00
Diva Canto 48577af325 More module cleanup: removed the CoreModules.Framework modules directives out of .addin.xml. 2012-11-12 18:23:20 -08:00
Melanie 9a5679876e Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
	OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
2012-11-13 02:10:09 +00:00
Diva Canto 335ff4359c Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-11-12 18:08:27 -08:00
Diva Canto 86903f23dd Cleanup on region modules: gave short node id's to all of them. 2012-11-12 18:08:02 -08:00
Melanie 3398999149 Merge branch 'master' into careminster 2012-11-13 01:57:11 +00:00
Melanie 40d5148bbc Update ScriptModuleComms name space to CoreModules 2012-11-13 01:56:32 +00:00
Melanie 2e0ce70e63 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/Application/OpenSimBase.cs
	OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
	OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
	OpenSim/Region/Framework/ModuleLoader.cs
	OpenSim/Region/Framework/Scenes/SceneManager.cs
2012-11-12 23:27:47 +00:00
Melanie 4edaa4e41a Completely remove the IRegionModule interface 2012-11-12 22:56:59 +00:00
Melanie faca755995 Stop closing old style modules 2012-11-12 22:51:24 +00:00
Melanie 8c130bcaf5 Remove the old style module loader and all references to it 2012-11-12 22:50:28 +00:00
Melanie e41374dd01 Remove IRegionModule support from the test setup helper 2012-11-12 22:25:35 +00:00
Melanie 0d15a6a01f Remove any mention of IRegionModule from region names and comments to aid
grepping for remaining uses
2012-11-12 19:18:20 +00:00
Melanie d9b149b375 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
	OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
	OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
2012-11-12 15:46:45 +00:00
Diva Canto 152d5dc2a7 Fix mantis #6425 2012-11-11 21:13:14 -08:00
Diva Canto db418bff2b Fix issues with the DynamicTextureModule and corresponding unit tests. 2012-11-11 19:39:21 -08:00
Diva Canto 113a9704f2 One more module converted: WebStatsModule. 2012-11-11 17:02:22 -08:00
Diva Canto 64fad2f80e Two more modules converted: XmlRpcGridRouterModule and XmlRpcRouterModule. 2012-11-11 16:44:59 -08:00
Diva Canto 4e8c8b2cd8 One more module converted: MRMModule. 2012-11-11 16:18:47 -08:00
Diva Canto abef034d1b One more module converted: IRCStackModule. 2012-11-11 16:10:47 -08:00
Diva Canto ba2318bd61 One more module converted: PermissionsModule. 2012-11-11 15:59:09 -08:00
Diva Canto 571f6a0300 One more module converted: XMLRPCModule. Removed it from the special loading at start. 2012-11-11 15:29:25 -08:00
Diva Canto 4de8915ddd One more module converted: VectorRenderModule. 2012-11-11 15:04:02 -08:00
Diva Canto 9f45198516 One more module: DynamicTextureModule. Removed it from the special load in the beginning. 2012-11-11 14:54:40 -08:00
Diva Canto 6759ed1013 One more module converted: LoadImageURLModule. Also removed it from its hard-coded instantiation (I think I understood what the problem was, and that I've done it right). 2012-11-11 14:46:22 -08:00
Diva Canto 963b1e861c One more module converted: ScriptsHttpRequests. 2012-11-11 14:22:06 -08:00
Diva Canto 84be90e5f8 One more module converted: EmailModule. 2012-11-11 14:00:58 -08:00
SignpostMarv f560d581bb document & 80-character width terminal formatting
Signed-off-by: Diva Canto <diva@metaverseink.com>
2012-11-11 13:50:38 -08:00
SignpostMarv 23605cf93d converting NPC module to ISharedRegionModule
Signed-off-by: Diva Canto <diva@metaverseink.com>
2012-11-11 13:50:38 -08:00
Diva Canto c60e1a1ae6 J2KDecoderModule: move the code out of PostInitialise() 2012-11-11 13:49:07 -08:00
Melanie d84de8c9b6 Merge branch 'master' into careminster 2012-11-11 21:16:58 +00:00
Melanie 3c48b44b68 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2012-11-11 21:16:29 +00:00
Melanie b9f602cc77 Prevent datasnapshot from crashing the simulator 2012-11-11 21:16:07 +00:00
Melanie 1a478f868e Prevent datasnapshot from crashing the simulator 2012-11-11 21:15:39 +00:00
PixelTomsen 37c9700904 moving windlight-sources to correct namespace-named folder (world); add LightShare as Interface
Signed-off-by: Diva Canto <diva@metaverseink.com>
2012-11-11 11:17:40 -08:00
Diva Canto 6cf90e5516 One more module converted: LightShareModule. 2012-11-11 08:38:39 -08:00
Melanie 389077345f Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
	OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
	OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
2012-11-11 16:31:01 +00:00
Diva Canto d589a8bc04 Deleted 2 obsolete modules: OGSRadmin and OpenGridProtocol. They were still IRegionModule's and they have been dead for a very long time, so no need to drag them along in this revamping of region modules. 2012-11-11 08:14:58 -08:00
Diva Canto f85d054bc6 One more module converted: MonitorModule. 2012-11-11 07:46:12 -08:00
Diva Canto 79d51c27bb One more module converted: InventoryArchiverModule. 2012-11-11 07:31:25 -08:00
Diva Canto 09deaa890d One more module converted: GroupsModule. 2012-11-10 17:56:25 -08:00
Diva Canto 2ef0062664 One more module converted: XferModule. 2012-11-10 17:48:04 -08:00
Diva Canto 562c585bc6 One more module converted: GodsModule. 2012-11-10 17:34:42 -08:00
Diva Canto cdcb67a952 One more module converted: GesturesModule. 2012-11-10 17:21:09 -08:00
SignpostMarv d5f9f5c9c3 document, 80-character width terminal formatting converting comments to documentation for IDE & doxygen goodness
Signed-off-by: Diva Canto <diva@metaverseink.com>
2012-11-10 17:09:47 -08:00
SignpostMarv b3dddd7447 document & 80-character width terminal formatting
Signed-off-by: Diva Canto <diva@metaverseink.com>
2012-11-10 17:09:47 -08:00
SignpostMarv a87c4c7d89 Converting WorldCommModule to INonSharedRegionModule
Signed-off-by: Diva Canto <diva@metaverseink.com>
2012-11-10 17:09:46 -08:00
Diva Canto fe2fa70c74 One more module converted: Combat/CombatModule. 2012-11-10 16:42:52 -08:00
Diva Canto 74dd38db70 One more module converted: AvatarFactoryModule. 2012-11-10 16:24:15 -08:00
Diva Canto 5fb5758103 Cleaning up some confusion with Addin names introduced in a prior commit. Also the Flotsam cache module was being given a different Addin name, I removed that. 2012-11-10 15:54:11 -08:00
Diva Canto e10d61ea8c One more module converted: CloudModule. 2012-11-10 11:59:08 -08:00
Diva Canto b3574d23e4 One more module converted: DataSnapshot. 2012-11-10 11:26:03 -08:00
Diva Canto 3a5e317f65 One more module converted: ObjectAdd. 2012-11-10 10:35:27 -08:00
Diva Canto 26a94610fc Fix Unit tests -- the module contract was not being honored in the set up of scenes. 2012-11-10 10:21:37 -08:00
Diva Canto 4ac857f902 One more module: EventQueueGetModule. Also making it non-optional for this dll. 2012-11-10 08:48:31 -08:00
SignpostMarv fb7bbe167a formatting DialogModule for 80-character width terminal 2012-11-10 08:12:31 -08:00
SignpostMarv 5cba04e2d6 Converting DialogModule to INonSharedRegionModule 2012-11-10 08:12:31 -08:00
SignpostMarv d0742cea3e 80 character-width terminal formatting of IDialogModule interface, removing superfluous whitespace & line-endings. 2012-11-10 08:12:30 -08:00
SignpostMarv ee3d06220e Documenting parameters of methods on the IDialogModule interface 2012-11-10 08:12:30 -08:00
Diva Canto 791c4d5b9f One more module converted: J2KDecoderModule. 2012-11-10 08:10:43 -08:00
Diva Canto 86b22604fa One more more converted: IPBanModule. 2012-11-09 22:21:11 -08:00
Diva Canto a4fee98352 One more module converted: TreePopulator. 2012-11-09 22:09:08 -08:00
Diva Canto bbff036944 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-11-09 21:59:01 -08:00
Diva Canto 492515cf3f One more module converted: Vegetation. 2012-11-09 21:58:39 -08:00
Justin Clark-Casey (justincc) 12c62d30e1 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-11-10 05:44:50 +00:00
Justin Clark-Casey (justincc) c94240ba5b Uncomment SceneObjectBasicTests.TestDeleteSceneObjectAsyncToUserInventory() and make it compile again
Not currently in test suite since not yet working.
Also add method doc to Scene.DeRezObjects()
2012-11-10 05:43:57 +00:00
teravus cda127e30f * Prep work switching the GetMeshModule over to a poll service.
* This still has the image throttler in it..  as is...  so it's not suitable for live yet.... The throttler keeps track of the task throttle but doesn't balance the UDP throttle yet.
2012-11-09 23:55:30 -05:00
Diva Canto 4f98259617 Minor improvement in the MapSearchModule. Stop blocking the client thread if the search takes too long. 2012-11-09 20:39:55 -08:00
Diva Canto 2540132a54 MapSearchModule also converted to new region module interface (37 to go). 2012-11-09 16:40:55 -08:00
Diva Canto 19aab3e6fe Converted the WindModule to the new region module interface (38 to go). Also added both the WindModule and the SunModule to the Plugin manifest. 2012-11-09 16:28:30 -08:00
Diva Canto 7dfd1468cc Converted the SunModule to the new region module interface. (39 to go...) 2012-11-09 15:38:10 -08:00
Melanie 415b89f434 Merge branch 'master' into careminster 2012-11-09 22:58:42 +00:00
PixelTomsen 64c80aec64 llSetLinkCamera implementation
wiki: http://wiki.secondlife.com/wiki/LlSetLinkCamera

mantis: http://opensimulator.org/mantis/view.php?id=6397
2012-11-09 14:31:56 -08:00
SignpostMarv 5bff741544 marking IRegionModule interface as obsolete via System.ObsoleteAttribute, intentionally triggering a bunch of warnings in compiler output in hopes of encouraging other developers to refactor built-in modules when they have free time. 2012-11-09 14:20:24 -08:00
Justin Clark-Casey (justincc) 61b816ebba minor: Adjust method doc on IXInventoryData MoveItem() and MoveFolder() to make it clear we're moving to an existing folder. 2012-11-09 01:18:11 +00:00
Justin Clark-Casey (justincc) 75c880a6f3 Update parent inventory folder version numbers when folders are moved/created/deleted to match version numbers cached by viewers.
This is done in the way that one would expect (e.g. moving a folder increments version number on both source and destination parent folders).
This should hopefully improve viewer reuse of its cached inventory information.
Currently MySQL only but will be implement for SQLite/MSSQL if there are no issues.
2012-11-09 01:13:19 +00:00
Dan Lake 9bc0419679 ODECharacter overrides TargetVelocity. No change to existing behavior 2012-11-08 01:18:25 -08:00
Melanie b3e99a4d48 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
2012-11-08 04:51:00 +00:00
Diva Canto a407eb287f Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-11-07 20:05:30 -08:00
Diva Canto eb273b808e HG: Hopefully this fixes the issues with port 80 once and for all. 2012-11-07 19:59:54 -08:00
Robert Adams 3666518319 BulletSim: add skeleton classes for shape objectification. This will eventually replace all the if's and switches in ShapeCollection with polymorphism. 2012-11-07 15:29:51 -08:00
Robert Adams 67d5dbbb49 BulletSim: add classes for physics motors. Eventually these will replace the manual code for vehicles and add PID functionality to avatar movement. 2012-11-07 15:28:06 -08:00
Robert Adams ee00c5c885 BulletSim: many changes to tune vehicles for BulletSim.
The problem left is that the vehicle sitting on something needs
to press down for gravity and what its sitting on pushes up
so the vehicle does not penetrate. The effect is Bullet calculates
a lot of random angular motion for the vehicle. Various schemes
of damping and zeroing has not resolved the problem.
2012-11-06 18:16:47 -08:00
Robert Adams 76cc303031 BulletSim: Add ZeroAngularMotion method to physical objects. Add inTaint flag to ZeroMotion method. Update the references to those functions. 2012-11-06 18:16:35 -08:00
Robert Adams e2130817e5 BulletSim: remove limit on taints that can happen before a step. Remove some debugging code (detail log flushing). 2012-11-06 18:16:23 -08:00
Robert Adams f70a3099b5 BulletSim: recalculate the compound shape bounding box when built. 2012-11-06 18:16:12 -08:00
Robert Adams 702fd1e094 BulletSim: only compute linkset mass when membership changes rather than everytime someone asks for it. 2012-11-06 18:16:00 -08:00
Robert Adams 36d77fe27c BulletSim: Add separate linear and angular damping function calls. Add function for recalculating compound shape bounding box. 2012-11-06 18:15:48 -08:00
teravus b2dfa6f022 To keep things consistent allowing an UnregisterModuleInterface... Force the GodModule to request the dialog module interface on a kickuser call and not to use the 'in memory cached one'. Thanks Ar3s for locating the offending inconsistency. 2012-11-06 19:03:41 -05:00
Justin Clark-Casey (justincc) bf469819a6 Update folder version numbers when moving items and making the Delete(string[], string[]) call (not just string, string).
This is to stop viewer inventory cache version numbers becoming out of sync with grid stored numbers when viewer performs these actions.
If there are no problems with these changes, they will be propogated to SQLite (and MSSQL if that's simple enough).
May also need to do the same on folder store/create/delete and maybe propogate version increments up the folder hierarchy, but that requires investigation.
2012-11-06 23:44:52 +00:00
Justin Clark-Casey (justincc) a8424490ae Increment version number of a folder when an object it contains is deleted.
Not doing this was allowing the viewer inventory cache to become out of sync if an item was directly deleted.
2012-11-06 23:40:33 +00:00
Melanie 5cbf7b3997 Merge branch 'ubitwork' into avination 2012-11-06 11:32:53 +01:00
teravus 182b487243 This implements the Caps throttler. After some testing, the system seemed to be OK with me specifying allowing 1 oversized image per 70,000b/sec with at least one. Try it out, start with a low bandwidth setting and then, set your bandwidth setting middle/high and see the difference.
Tested with Two Clients on a region with 1800 textures all visible at once.
2012-11-05 22:05:10 -05:00
teravus b7b96a5e4f Another step in the chain. Pipe the throttle update to the appropriate PollServiceTextureEventArgs. Each poll service having it's own throttle member is more consistent with the model then the region module keeping track of all of them globally and better for locking too. The Poll Services object is not set static to handle multiple nearby regions on the same simulator.
Next step is hooking it up to HasEvents
2012-11-05 13:10:00 -05:00
teravus 4fa088bafb Pipe Throttle Update Event to EventManager, client --> ScenePresence --> EventManager, so that modules can know when throttles are updated. The event contains no client specific data to preserve the possibility of 'multiple clients' and you must still call ControllingClient.GetThrottlesPacked(f) to see what the throttles actually are once the event fires. Hook EventManager.OnUpdateThrottle to GetTextureModule. 2012-11-04 22:57:24 -05:00
Melanie 236cc1f268 Change user message on TeskInventoryAccepted to let the viewer format it
properly
2012-11-05 00:05:01 +00:00
Melanie 006d70582b Merge branch 'master' into careminster 2012-11-04 23:29:18 +00:00
Diva Canto 08b37efc32 Prevent IMs being sent to prims when avies decline inventory offers from them. 2012-11-04 23:28:05 +00:00
Diva Canto 89322aaf94 Prevent IMs being sent to prims when avies decline inventory offers from them. 2012-11-04 15:17:47 -08:00
Melanie c623e35805 Merge branch 'master' into careminster 2012-11-04 22:44:42 +00:00
Melanie f391d028de Add a method to query all registered script constants to allow non-XEngine
script engines to use them.
2012-11-04 22:39:15 +00:00
Melanie dd416298f1 Merge branch 'avination' into careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
2012-11-04 22:37:28 +00:00
Melanie 7e91a787fb Add a method to query all registered script constants to allow non-XEngine
script engines to use them.
2012-11-04 22:01:34 +01:00
ubit 4737839b3a Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-11-04 16:00:41 +01:00
UbitUmarov 1090ff7278 removed potencial null refs and rearrange code a bit 2012-11-04 14:57:27 +00:00
Robert Adams 79f7c466a1 BulletSim: fix compound linkset crash by not freeing shape of child prims.
Remove all compilation warnings (mostly 'protected' in sealed classes.)
Add the dynamicAabbEnable parameter to creation of compound shapes.
2012-11-03 21:16:02 -07:00
Robert Adams 894bb4893b BulletSim: search the mesh and hull lists to find shapes if type is not known. This makes sure the correct accounting is done for the particular shape. 2012-11-03 21:15:54 -07:00
Robert Adams 498ea76e63 BulletSim: Move construction of compound linkset from ShapeCollection
into LinksetCompound where it should be.
Create meshes for native shapes when part of a compound linkset because
    scale is currently per object and not per collision shape.
Don't schedule a LinksetCompound refresh if just changing properties.
2012-11-03 21:15:46 -07:00
Robert Adams 1dc23b2b97 BulletSim: parameterize selection of linkset implementation 2012-11-03 21:15:39 -07:00
Robert Adams b0eccd5044 BulletSim: debugging of compound shape implementation of linksets.
Add compound shape creation and freeing in shape manager.
Add optional taint-time execution method and update code to use it.
Add API2 linkage for more compound shape methods (get num, get/remove by index, ...)
Modify perferred shape return so linkset children can have differet shapes than root.
Add Position and Orientation calls to linksets so children can be moved around by
    the linkset by its own calculation. Allows for very general linkset implementations.
2012-11-03 21:15:30 -07:00
Robert Adams f53b4e7a21 BulletSim: Add RawPosition and RawOrientation to BSPhysObject and rename MassRaw to RawMass. Fix BSShapeCollection to use Raw* for creating the body to eliminate exception from referencing the physical body before it has been created. 2012-11-03 21:15:22 -07:00
Robert Adams 39c02dcc8c BulletSim: Remove use of shapeData in ShapeCollection and rely on the available BSPhysObject varaiables. Fix line endings in BSLinksetCompound. 2012-11-03 21:15:14 -07:00
Robert Adams 364a7c3088 BulletSim: rename BSBody and BSShape to PhysBody and PhysShape. Add skeleton of BSLinksetCompound. 2012-11-03 21:15:06 -07:00
Robert Adams 28e2cd3fa2 BulletSim: vehicle tweeking.
Add AddTorque() method to BSPrim. Remove some manual motor actions
in computing angular force (will eventually be replaced with motor class).
Remove some experimental changes.
2012-11-03 21:14:58 -07:00
Robert Adams 52be581f71 BulletSim: remove center-of-mass setting for linksets because it causes the constraint calculation to pull the objects together. 2012-11-03 21:14:49 -07:00
Robert Adams 93fe384cce BulletSim: Use the PostTaints operation to build the linkset once before the next simulation step. This eliminates the management of children vs taintChildren and simplifies the constratin creation code. 2012-11-03 21:14:41 -07:00
Robert Adams 42d65840c8 BulletSim: Add gravity force to vehicle. Some debugging additions. 2012-11-03 21:14:33 -07:00
Robert Adams dae038a117 BulletSim: fix problem with multiple linksets stepping on each other if they are built at the same time. 2012-11-03 21:14:25 -07:00
Robert Adams 4cfa3be4ef BulletSim: add definitions for linkset collision mask 2012-11-03 21:14:16 -07:00
Robert Adams bc43c7007d BulletSim: code rearrangement 2012-11-03 21:14:08 -07:00
Robert Adams 8c9e4c1f7b BulletSim: Use Refresh/PostTaints to cause recomputing of constraint variables before the simulation step. Update logging and messages to properly name LinksetConstraints. Use UpdatePhysicalMassProperties to put the whole linkset mass into all the physical linkset members so they have the inertia to move the whole linkset. 2012-11-03 21:14:00 -07:00
Robert Adams 9568f24c26 BulletSim: add post taint taints and post step taints. The post taints operation is most useful and is used by linksets to build and rebuild only once before the simulation step. 2012-11-03 21:13:52 -07:00
Robert Adams 2f25f70316 BulletSim: remove unneeded parameter from Refresh(). 2012-11-03 21:13:44 -07:00
Robert Adams e20bad12cc BulletSim: centralize mass/inertia computation with UpdatePhysicalMassProperties() function. Didn't add setMassRaw because assignment with side effect is dirty. 2012-11-03 21:13:35 -07:00
Robert Adams 7af28724ac BulletSim: rename constraint classes so they show up together alphabetically. 2012-11-03 21:13:27 -07:00
Robert Adams 92d3c611e5 BulletSim: many small changes for vehicles simulation. 2012-11-03 21:13:19 -07:00
Robert Adams 2b75035aef BulletSim: add ForEachMember(action) call for linkset. 2012-11-03 21:13:11 -07:00
Robert Adams 8fa83cf430 BulletSim: Add activations after vehicle properties change. Problem was the vehicle was going to sleep while waiting for commands. Make AddAngularForce work the same way as AddForce -- accumulates values and pushes them once into Bullet. 2012-11-03 21:13:03 -07:00
Robert Adams b83449ae9a BulletSim: correct spelling of Bullet call. It's 'swept' not 'sweep'. 2012-11-03 21:12:54 -07:00
Robert Adams 804b332d45 BulletSim: Add banking and other new code to vechile dynamics. Add third party license and contributor in for for Aurora-Sim project for physics code. 2012-11-03 21:12:46 -07:00
Melanie 9eb39406ad Prevent a null client from crashing windlight. 2012-11-03 20:35:09 +01:00
Diva Canto 783443705d HG Suitcase Inventory: if RootFolder type doesn't work, look for any folder with parentID=UUID.Zero 2012-11-03 12:03:47 -07:00
Melanie d0473b73da Merge branch 'master' into careminster 2012-11-03 15:38:47 +00:00
ubit b30ae054dd Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-11-02 18:51:50 +01:00
UbitUmarov e642b80a79 actually remove the use of random on persist timmings 2012-11-02 17:49:54 +00:00
UbitUmarov b8c19fe1a9 Create a new random when needed using normal time based seed instead of
reusing a shared one than may not be valid
2012-11-02 17:40:17 +00:00
Melanie fd2bee8da1 Squash reporting HelloNeighbor exception - it simply means the other sim
is down, no need for yellow ink.
2012-11-02 16:43:38 +01:00
Diva Canto 7412795a0b HG: flip all configs to HG2.0. PLEASE CHECK YOUR EXISTING HG CONFIGS AGAINST THESE. 2012-11-02 08:05:56 -07:00
ubit 458e00e204 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-11-02 15:05:26 +01:00
UbitUmarov e36a700eb0 add debug position on bad primmesh error 2012-11-02 14:02:57 +00:00
ubit 4565f05301 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-11-02 11:21:25 +01:00
UbitUmarov c2639bef8e lock unique and uniqueReleased in same order when both locks are needed 2012-11-02 10:14:08 +00:00
Dan Lake 2e106cd5de Change to earlier commit for TargetVelocity to support distributed physics. 2012-11-02 03:09:04 -07:00
Melanie d383bcc0dc Merge branch 'ubitwork' into avination 2012-11-02 10:59:04 +01:00
Justin Clark-Casey (justincc) ce7beb6f20 Add [AssetService] AllowRemoteDeleteAllTypes (default false).
This allows a closed grid to delete asset types other than maptile remotely.
Only operational if AllowRemoteDelete = true also.
Defaults to false - do not enable if anybody other than you can make asset service requests.
2012-11-02 01:41:38 +00:00
Justin Clark-Casey (justincc) 462ad336dc Move check to allow only deletion of maptiles up to AssetServerDeleteHandler from AssetService.
This allows us to use a common check for both AssetService and XAssetService.
It also allows future console commands to delete an asset.
As before, deletion of maptile assets is not allowed remotely unless this is explicitly configured.
2012-11-02 00:02:10 +00:00
Melanie cbe43c15ec Merge branch 'ubitwork' into avination 2012-11-01 22:25:29 +01:00
Melanie e7a6328ea4 Merge branch 'master' into careminster 2012-11-01 15:52:32 +00:00
Justin Clark-Casey (justincc) 8dfe59d7b8 Comment out checks not to overwrite existing IAR/OAR files for now on "save iar/oar" since this causes problems for some backup systems.
Needs more thought, maybe an explicit --force/--overwrite switch
Comments on http://opensimulator.org/mantis/view.php?id=6389
2012-11-01 03:42:15 +00:00
Dan Lake ffe4d738fb Add TargetVelocity to PhysicsActor interface to support distributed physics. No change to existing functions. 2012-10-31 17:13:18 -07:00
Melanie a2c6094324 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Framework/TaskInventoryItem.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2012-10-31 21:42:06 +00:00
Justin Clark-Casey (justincc) 566aaef1f4 Also add the additional ScriptException constructor necessary to get [Serializable] to work. 2012-10-31 00:56:41 +00:00
Justin Clark-Casey (justincc) b3072cf343 Mark ScriptException as [Serializable] for when it has to cross AppDomains 2012-10-31 00:46:07 +00:00
Justin Clark-Casey (justincc) 4ba48151b2 Handle UUIDGroupName and ObjectGroup viewer UDP requests asynchronously rather than synchronously.
This is to avoid the entire scene loop being held up when the group service is slow to respond.
There's no obvious reason for these queries to be sync rather than async.
2012-10-31 00:39:45 +00:00
Justin Clark-Casey (justincc) 6235d16c31 Make "show object part" command correctly display script status.
Uses new IEntityInventory.TryGetScriptInstanceRunning()
Makes it clearer that TaskInventoryItem.ScriptRunning cannot be used as it is temporary and not updated.
2012-10-31 00:31:18 +00:00
Melanie 28a4ea73ea Merge branch 'master' into careminster
Conflicts:
	OpenSim/Framework/ChildAgentDataUpdate.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-10-31 00:13:33 +00:00
Melanie 3388534ff5 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2012-10-30 23:14:06 +00:00
Melanie fd9cb3cb68 Store and send the current movement animation state to a new sim on crossing 2012-10-30 23:08:22 +00:00
Melanie 9e05067a4f Add AnimState to CADU 2012-10-30 22:11:02 +00:00
Melanie ff61d59e60 Add AnimState to CADU 2012-10-30 21:45:39 +01:00
Melanie 5328808b18 Make sure we're not accessing a physics scene if we're not in one yet. 2012-10-30 21:19:00 +01:00
UbitUmarov e6c8eca504 Merge branch 'avination' into ubitwork 2012-10-30 19:42:32 +00:00
Justin Clark-Casey (justincc) 984faf24df Only create a new list to check if objects have reached targets if there actually are any targets. 2012-10-30 01:48:05 +00:00
Justin Clark-Casey (justincc) ff6c69000e Log warning if mesh/sculpt asset couldn't be found by ODEPrim.MeshAssetReceived() callback.
Presumably this is now more useful if the false positive from the old method of loading mesh assets have been eliminated.
2012-10-30 01:40:59 +00:00
Melanie 4eaa64d863 Merge branch 'avination' into careminster 2012-10-30 01:29:51 +00:00
Melanie d15d71a7ef Put back the collision sound shim into SOP 2012-10-30 01:28:03 +00:00
Justin Clark-Casey (justincc) 9bc4dc6c5f Add method doc to IAssetService.Get(string, object, AssetRetrieved) outlining the situations in which AssetRetrieved may be called back with a null AssetBase.
These situations include asset not found and remote service not responding.
2012-10-30 01:19:32 +00:00
Justin Clark-Casey (justincc) cccf695327 Add asset != null check to ODEPrim.MeshAssetReceived instead of throwing exception.
In some cases (such as failure to receive response from asset service), it is possible for a null to be returned from IAssetService.Get(string, object, AssetRetrieved).
2012-10-30 01:14:48 +00:00
Justin Clark-Casey (justincc) 37de965233 Make MeshAssetReceived private.
Keep methods private unless they need to be opened up to external callers.  Reduces analysis complexity.
2012-10-30 01:08:00 +00:00
Justin Clark-Casey (justincc) aeeed29d62 correct ODEPrim.MeshAssetReveived -> MeshAssetReceived 2012-10-30 01:07:14 +00:00
Melanie 48569e856a Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-10-30 01:02:20 +00:00
SignpostMarv a09cba6da3 refactoring to use assembly:classname style of configuration 2012-10-29 23:39:01 +00:00
SignpostMarv a16ddbee41 Renaming module back to SoundModule as the hypothetical plan was to make another module using the shared region module interface, but this was pointed out by Melanie_T to be mostly pointless. 2012-10-29 23:39:01 +00:00
SignpostMarv e308841de9 SianaGearz notes stop sound flag is 1 << 5, so using that for ISoundModule.StopSound rather than setting gain to zero 2012-10-29 23:39:01 +00:00
SignpostMarv e0b5a3cd90 tweaking configuration logic so that the INonSharedRegionModule will load by default 2012-10-29 23:39:01 +00:00
SignpostMarv 2bb0419251 documenting some params on ISoundModule methods 2012-10-29 23:39:01 +00:00
SignpostMarv dcac2a7f71 refactoring llCollisionSound to use new KeyOrName method 2012-10-29 23:39:01 +00:00
SignpostMarv a9999a9676 Refactoring llTriggerSoundLimited with a new method on ISoundModule, as the LL Wiki spec for llTriggerSoundLimited states an axis-aligned bounding box, not radial constraint 2012-10-29 23:39:01 +00:00
SignpostMarv 56965dd959 fixing poorly-formatted xml doc string for Util.IsInsideBox 2012-10-29 23:39:00 +00:00
SignpostMarv ef15711089 refactoring llTriggerSoundLimited to not use the LSL methods, since that will cause unnecessary calls to m_host.AddScriptLPS(1) 2012-10-29 23:39:00 +00:00
SignpostMarv af9dc483e9 refactoring llGetPos() to take advantage of implicit converter 2012-10-29 23:39:00 +00:00
SignpostMarv f9923d4423 shifting from two instances of typecasting to one instance of typecasting in llTriggerSoundLimited 2012-10-29 23:39:00 +00:00
SignpostMarv c796f7861e 80-character width terminal formatting of recent commits to llPlaySound, llPlaySoundSlave, llTriggerSound and llTriggerSoundLimited 2012-10-29 23:39:00 +00:00
SignpostMarv c5af16aef8 shuffling code around so that the interface for ISoundModule.SendSound() specifies a UUID rather than a string 2012-10-29 23:39:00 +00:00
SignpostMarv 5abcecc735 moving SendSound from SceneObjectPart to ISoundModule 2012-10-29 23:39:00 +00:00
SignpostMarv af39af1cc4 fixing a bug in SceneObjectPart.SendSound where sounds would always come from the root prim rather than the source prim 2012-10-29 23:39:00 +00:00
SignpostMarv 57940087d1 Factoring out a superfluous local variable & repeated assignment in SceneObjectPart.SendSound as linksets are only meant to have a single owner 2012-10-29 23:38:59 +00:00
SignpostMarv e75596524a Formatting SoundModuleNonShared.LoopSound, consistent indentation 2012-10-29 23:38:59 +00:00
SignpostMarv 9df510157e deduplicating code into a single LoopSound method 2012-10-29 23:38:59 +00:00
SignpostMarv 22693304fb removing superfluous lines from SceneObjectPart.SendSound 2012-10-29 23:38:59 +00:00
SignpostMarv 3d8f59aac3 refactoring StopSound into a private static method to skip repeating m_scene.TryGetSceneObjectPart 2012-10-29 23:38:59 +00:00
SignpostMarv e5df8cafb8 Removing a locked iteration over SceneObjectGroup.LoopSoundSlavePrims as the SL Wiki spec does not state that slaves are set to match master values 2012-10-29 23:38:59 +00:00
SignpostMarv d7ffcace8f adjusting parameter order of PreloadSound to be more logical 2012-10-29 23:38:59 +00:00
SignpostMarv 29a8ae48b5 transposing LoopSoundMaster to Sound Module 2012-10-29 23:38:59 +00:00
SignpostMarv a68e2fe169 transposing preload sound onto sound module 2012-10-29 23:38:58 +00:00
SignpostMarv 8763a637b5 transposing stop sound into sound module 2012-10-29 23:38:58 +00:00
SignpostMarv 206a694c6b moving comment for llStopSound inside the method block prior to transposition to sound module 2012-10-29 23:38:58 +00:00
SignpostMarv b9e0f1cd2b documenting ISoundModule methods & fields 2012-10-29 23:38:58 +00:00
SignpostMarv d4034271eb formatting ISoundModule prior to documentation 2012-10-29 23:38:58 +00:00
SignpostMarv 1c618843b8 formatting changes to SceneObjectPart.SendSound; consistent indentation 2012-10-29 23:38:58 +00:00
SignpostMarv 32db725dd7 SceneObjectPart.SendSound can exit early if a sound module was not found. 2012-10-29 23:38:58 +00:00
SignpostMarv f4fe8763ad Changing the logic order in the TaskInventory iterator of ScenObjectPart.SendSound, since we can currently have non-unique object inventory names so we should check the asset type first. 2012-10-29 23:38:58 +00:00
SignpostMarv b42cfe49a2 Replacing double-if block in SceneObjectPart.SendSound with Util.Clip 2012-10-29 23:38:57 +00:00
SignpostMarv 6440892788 TryGetScenePresence in TriggerSound is probably meant to be using the ownerID, not the objectID 2012-10-29 23:38:57 +00:00
SignpostMarv 516ee244b4 swapping GetSceneObjectPart for TryGetSceneObjectPart in PlayAttachedSound to imply why we're doing an early return. 2012-10-29 23:38:57 +00:00
SignpostMarv 1d47bcb6b6 stripping whitespace from ISoundModule, formatting SoundModuleNonShared.cs 2012-10-29 23:38:57 +00:00
SignpostMarv 20be6a4b48 refactoring thisSpGain in PlayAttachedSound as it was previously using two typecasts in the assignment and had the assignment on a separate line to the declaration 2012-10-29 23:38:57 +00:00
SignpostMarv 6bd1f0f209 Factoring out an if-else block in PlayAttachedSound as it was using the previously hard-coded max distance value. 2012-10-29 23:38:57 +00:00
SignpostMarv 375fb66589 making the max distance for sounds to be heard from their origin a configurable option exposed via a public field on ISoundModule (with private setter in the implementation) 2012-10-29 23:38:57 +00:00
SignpostMarv ed162a10be Converting the ISoundModule implementation from an IRegionModule to an INonSharedRegionModule 2012-10-29 23:38:57 +00:00
SignpostMarv 7560010f34 Immediately setting gain to zero as a workaround for code not stopping sound started by llPlaySound 2012-10-29 23:38:56 +00:00
Justin Clark-Casey (justincc) 09f4e72d6a Fix memory leak where removing an NPC did not remove its circuits.
This was because we were removing by circuitcode where NPCs have no code.
Now removing by agent ID instead.
This commit also fixes the "show circuits" console command to work properly where the circuit has no associated IP address.
2012-10-29 23:22:40 +00:00
Justin Clark-Casey (justincc) 5681e812a5 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-10-29 23:19:06 +00:00
Justin Clark-Casey (justincc) c97890ca69 Add "force gc" region console command which manually invokes garbage collection.
For debugging purposes.
2012-10-29 22:53:06 +00:00
Melanie 5b0fc60296 Merge branch 'avination' into careminster
Conflicts:
	OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
2012-10-28 18:58:43 +00:00
Melanie 502efdb894 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
2012-10-28 18:43:28 +00:00
Melanie 5a96ef52cb Deep copy the collection of at_target objects so it can't be modified while
it's being iterated
2012-10-28 18:41:47 +00:00
Melanie dc2c198e5d Set the script state to new rez when a scriptis saved, rather than region start.
Prevents CHANGED_REGION_RESTART being sent to scripts when saving.
2012-10-28 19:09:14 +01:00
Melanie 1a34f42426 Add a property to determine if a link set is stored in the database. Also, fix
a bug where "Force object permissive" god action would fail to reset child prim
permissions.
2012-10-28 18:34:57 +01:00
Melanie 0d00b97aec Deep copy the collection of at_target objects so it can't be modified while
it's being iterated
2012-10-28 18:45:16 +00:00
ubit 707fa2bdb9 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-28 15:42:51 +01:00
UbitUmarov db7f4074b5 revert last change 2012-10-28 14:39:04 +00:00
ubit 1bcecdaf30 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-28 15:34:54 +01:00
UbitUmarov fbe4ec8ee0 fix ode timing 2012-10-28 14:32:55 +00:00
ubit c513a3db59 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-28 15:05:39 +01:00
UbitUmarov dd0323d89e minor change 2012-10-28 14:04:39 +00:00
ubit 42479590f0 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-28 12:56:09 +01:00
UbitUmarov 8bb2905416 test limit ode exec time by time not number of loops done 2012-10-28 11:55:11 +00:00
ubit e0510203f9 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-28 11:26:31 +01:00
UbitUmarov ad7f273d95 more debug 2012-10-28 10:25:58 +00:00
ubit 3aff65e9a6 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-28 10:58:58 +01:00
UbitUmarov e297e90bda remove pre physics build testing 2012-10-28 09:57:41 +00:00
ubit 3ac8461d3f Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-28 10:54:40 +01:00
UbitUmarov aa97014ee4 Add some extra debug on scene close 2012-10-28 09:51:27 +00:00
Melanie 42cd27c46a Merge branch 'master' into careminster 2012-10-28 00:30:55 +01:00
Justin Clark-Casey (justincc) 3531f29a6a minor: Fix verbose IAR save message to make it a bit clearer that item data is being saved at that point, not asset data. 2012-10-27 00:24:25 +01:00
Justin Clark-Casey (justincc) cc204497e0 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-10-26 23:10:52 +01:00
Justin Clark-Casey (justincc) 67432fcbf2 Fix "save iar" hanging permanently if the asset request phase times out.
Unlike "save oar", this was happening on the same thread as the original request.
The timeout happens on another so the original thread is never aborted.
On "save oar" this leaves the thread hanging (still bad) but on "save iar" it left the console thread hanging.
Temporary fix is to make "save iar" do asset request on a separate thread, like "save oar".
Longer term fix will be to restructure asset save to use a ManualResetEvent rather than a separate timeout timer.
2012-10-26 23:08:59 +01:00
Melanie f3f794a122 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-10-26 21:47:41 +01:00
Melanie 1c5f6e48b8 Separate LSL's notion of the default anim from the actually playing anims. 2012-10-26 21:23:20 +01:00
Melanie de6f147d3c Revert "Fix for Mantis 0006376: Avatar no longer show Walking animation when any AO hud is"
This reverts commit fa484c3494.
2012-10-26 21:16:27 +01:00
Melanie 26cc57b6ca Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
2012-10-26 21:13:01 +01:00
Justin Clark-Casey (justincc) 16809bd0ea minor: Make the error thrown logged when a simulator in grid mode is trying to set estate owner to a user that doesn't exist a little more obvious. 2012-10-26 02:36:58 +01:00
SignpostMarv 80dcc13af2 refactoring IWorldCommListenerInfo.GetRegexBitfield() method to be a field with a private setter 2012-10-26 02:08:00 +01:00
SignpostMarv e977761071 adding ability for listeners to be filtered by regular expressions and a general-purpose function to see if a given string matches a given regex 2012-10-26 02:08:00 +01:00
SignpostMarv 18b1ee6f37 Formatting and casing correction in WorldCommModule, trailing new line in OSSL to get git diff to not complain 2012-10-26 02:08:00 +01:00
Justin Clark-Casey (justincc) 1b3b7a61ac minor: Add comment as to why we are pulcking plain old ints out of the LSL_List when converting values from LSL for modInvoke() 2012-10-26 01:50:46 +01:00
SignpostMarv ecdb88679e Removing the apparently superfluous explicit namespace reference so that the if-else-if-else block in ConvertFromLSL can have a consistent appearance 2012-10-26 01:43:54 +01:00
SignpostMarv 01972cc9e8 system ints can end up in LSL lists, which can cause counter-intuitive unknown list element type errors in ConvertFromLSL (via modInvoke) 2012-10-26 01:43:53 +01:00
Justin Clark-Casey (justincc) 2fb89b5aac Comment out InventoryTransferModule.NeedSceneCacheClear() and invocations since the call itself does nothing and the return value is ignored by all callers.
This is a very old method (+4 years) so is probably confusing code cruft.
2012-10-26 01:15:16 +01:00
Oren Hurvitz 85c909c0b5 Fixed saving non-square multi-region OARs 2012-10-26 00:06:44 +01:00
Justin Clark-Casey (justincc) dc17cee044 minor: if a scene is already shutting down on Scene.Close(), warn and exit instead of attempting to run another shutdown concurrently.
Thanks to Oren Hurvitz for this change.
2012-10-25 23:47:55 +01:00
Oren Hurvitz b4923da334 Changed "course" to "coarse" in several places 2012-10-25 23:32:37 +01:00
Justin Clark-Casey (justincc) 0482758e96 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-10-25 23:17:07 +01:00
Justin Clark-Casey (justincc) 22e216fd12 In Scene.Close(), dispose of the physics scene after base.Close() since script events can still access Physics scene until the script engine shuts down (triggered off base.Close())
XEngine listeners to EventManager.OnShutdown which is triggered from base.Close().
Possibly it could listen for the earlier OnSceneShuttingDown instead, but the easier solution right now is to relocate disposal of the physics scene.
This bug has existed since c150320 (Thu Jul 26 15:27:18 2012) and was in 0.7.4
2012-10-25 22:55:29 +01:00
nebadon fa484c3494 Fix for Mantis 0006376: Avatar no longer show Walking animation when any AO hud is
loaded.  Thank you tglion
2012-10-25 11:31:25 -07:00
Justin Clark-Casey (justincc) c13a99dc5c Fix script error messages not showing up in viewer 3 and associated viewers.
Viewer 3 will discard such a message if the chat message owner does not match the avatar.
We were filling the ownerID with the primID, so this never matched, hence viewer 3 did not see any script error messages.
This commit fills the ownerID in with the prim ownerID so the script owner will receive script error messages.
This does not affect viewer 1 and associated viewers which continue to process script errors as normal.
2012-10-25 03:26:12 +01:00
Justin Clark-Casey (justincc) 8af8319b95 Get osNpcCreate() and osNpcLoadAppearance() to generate a script error if appearance notecard does not exist, rather than returning UUID.Zero or silently failing. 2012-10-25 03:02:00 +01:00
Justin Clark-Casey (justincc) d9aaf51561 When scripts generate expected exceptions (e.g. due to checked bad parameter) throw ScriptException instead of just a plain old exception.
This is to make it easier to distinguish these exceptions from unexpected OpenSimulator problems internally and in regression tests.
No functional changes.
2012-10-25 02:52:20 +01:00
Justin Clark-Casey (justincc) ae662b54ea Make osNpcCreate() return UUID.Zero instead of throwing an exception if notecard name is invalid. Make osNpcLoadAppearance() fail silently in same circumstance rather than throwing exception. 2012-10-25 01:07:06 +01:00
Justin Clark-Casey (justincc) 5d4ac5a90f Add TestOsNpcLoadAppearance() 2012-10-25 00:59:27 +01:00
Justin Clark-Casey (justincc) 1743fe5d62 Move npc creation tests involving appearance from OSSL_ApiAppearanceTest to OSSL_ApiNpcTests
This is a more intuitive location.
2012-10-25 00:29:50 +01:00
Justin Clark-Casey (justincc) 81aeecc907 Allow "show object", "show part", "dump object" and "delete object" to accept a local ID as well as a UUID.
This means that the sub-commands are now id rather than uuid, e.g. show object id
2012-10-24 04:10:22 +01:00
Justin Clark-Casey (justincc) f76dceb90b Get "save oar" and "save iar" to tell you in a more friendly manner if the filename to save already exists, rather than exception throwing.
Also changes ConsoleUtil.CheckFileExists to CheckFileDoesNotExist() since this is more meaningful in the context, even though it does result in double negatives.
2012-10-24 03:08:58 +01:00
Justin Clark-Casey (justincc) 73db057fa1 Add "dump object uuid" console command. This allows any object in the scene to be serialized and dumped to XML for debug purposes. 2012-10-24 02:05:28 +01:00
Justin Clark-Casey (justincc) 326f1507fa Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-10-24 02:04:26 +01:00
Justin Clark-Casey (justincc) 938fa96b9f minor: Move co-ordinate related help to object commands to common ConsoleUtil.CoordHelp 2012-10-24 01:33:21 +01:00
Robert Adams b6fc5bad00 BulletSim: fix problem with avatars sinking into the ground.
Change terrain activation state to DISABLE_SIMULATION for better performance.
2012-10-23 17:30:43 -07:00
Melanie 484eca323b Merge branch 'master' into careminster 2012-10-23 17:25:40 +01:00
Melanie 13cef0b16a Merge branch 'master' into careminster
Conflicts:
	OpenSim/Framework/LandData.cs
2012-10-23 17:23:36 +01:00
Robert Adams b49f8a377b BulletSim: minor change to insure avatar body recreation when shape changes. 2012-10-23 08:02:26 -07:00
Robert Adams 36bfd3667c BulletSim: remove chatty debug message. 2012-10-22 22:25:06 -07:00
Robert Adams 14eeb8b31b BulletSim: fix bug that caused error (and a crash on 32 bit Linux) when mesh assets weren't already in the cache. Comment cleanups. 2012-10-22 22:24:59 -07:00
Robert Adams 7272a4cae8 BulletSim: fix problem of not rebuilding shape by clearing last rebuild failed flag in BSPrim.ForceBodyShapeRebuild() 2012-10-22 22:24:51 -07:00
Robert Adams 65c131c4a3 BulletSim: remove trailing spaces to make git happy. 2012-10-22 22:24:44 -07:00
Robert Adams c245178eee BulletSim: encorporate UBit's suggestion to save a copy of mesh raw data. 2012-10-22 22:24:37 -07:00
Robert Adams a61f20ac74 BulletSim: Create LinkSet abstract class and sparate constraint based linksets into own subclass. Will eventually add manual movement linkset subclass. 2012-10-22 22:24:30 -07:00
Justin Clark-Casey (justincc) 319ebaca06 Make it possible to turn the base UDP object packet pools on and off whilst running via the "debug lludp pool <on|off>" console command. For debug purposes.
This does not currently apply to the higher LLUDP packetpool.
2012-10-23 02:44:15 +01:00
Justin Clark-Casey (justincc) 4578ff74fe Add object count stats for new IncomingPacket and UDPPacketBuffer pools if they are enabled. Add count stats for existing LLUDP pool.
This introduces a pull stat type in addition to the push stat type.
A pull stat takes a method on construction which knows how to update the stat on request.
In this way, special interfaces for pull stat collection are not necessary.
2012-10-23 01:52:10 +01:00
Justin Clark-Casey (justincc) 2206132ab9 minor: Get content type handler logger to log "unset" for the content type instead of blank if no content type was set. 2012-10-23 00:44:47 +01:00
Justin Clark-Casey (justincc) 542d075376 minor: Use LogIncomingToContentTypeHandler() method for incoming HTTP data where this wasn't already used.
This allows log level 5 (log sample or large part of incoming post data) to operate and removes copy/paste.
2012-10-23 00:39:59 +01:00
Melanie efae7c6fc2 Refactor: Move Dwell reply to a module that can be disabled. The prior,
hardcoded approach disabled the use of non-core dwell tracking modules.
2012-10-21 21:12:34 +01:00
PixelTomsen 20eac8d6d0 SQLite DB: some values of land data will be not saved / loaded
http://opensimulator.org/mantis/view.php?id=6370

Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-10-21 10:41:23 -04:00
ubit 3212bcff59 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-20 18:55:44 +02:00
UbitUmarov 3b51cae958 bug fix 2012-10-20 17:53:33 +01:00
PixelTomsen d7fa4cacb3 Fix: invinite loading for Viewer3 : parcelinfo request of traffic-value (implementation of dwell-value in LandData + eventhandler, return always 0); source-formatting of LandData
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-10-20 05:06:46 -04:00
BlueWall af9cd7d30c Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-10-20 04:32:45 -04:00
BlueWall 2aac113ac1 Add CLICK_ACTION_ZOOM
Add support for V2/3 CLICK_ACTION_ZOOM to llSetClickAction
2012-10-20 04:32:04 -04:00
Justin Clark-Casey (justincc) 5bc07a15f5 minor: remove unnecessary bit of method doc from OdePrim.BadMeshAssetCollideBits that monodevelop inserted automatically 2012-10-20 02:52:38 +01:00
Justin Clark-Casey (justincc) d2b19f00da Fix minor issues from commit 28483150
Fix spelling of collide, change to more self-documenting property BadMeshAssetCollideBits, add method doc, change to private to reduce code analysis complexity
2012-10-20 02:49:16 +01:00
Justin Clark-Casey (justincc) d55f72f3df minor: Rename assetCache constructor param in UUIDGatherer to assetService which is what it is. 2012-10-20 02:35:39 +01:00
Melanie 6ad8d3c43f Merge branch 'master' into careminster 2012-10-20 02:33:24 +01:00
Justin Clark-Casey (justincc) ac037dfe21 Add method doc for IPresenceService 2012-10-20 02:26:08 +01:00