Commit Graph

20498 Commits (43cc38dfe1848be30536d4d2c86f14a991ab5b06)

Author SHA1 Message Date
Melanie 8c5445b774 Merge branch 'master' into careminster
Conflicts:
	ThirdParty/SmartThreadPool/SmartThreadPool.cs
2013-05-01 21:39:49 +01:00
Melanie c6d50cd431 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2013-05-01 21:37:17 +01:00
Melanie b26276c8c4 Fix the long standing bug of items being delivered to lost and found or trash when takig copy.
This bug was recently aggravated through the perms changes required for the
export permission.
2013-05-01 21:35:50 +01:00
Robert Adams fca4e4ec7c Merge branch 'master' into bulletsim4 2013-05-01 12:08:12 -07:00
Justin Clark-Casey (justincc) 81a90e30c6 Add in-code exaplanation for the change in cancellation signalling in STP 2.2.3. Remove left in Console.WriteLine accidentally inserted in recent 206fb306 2013-05-01 19:29:46 +01:00
Justin Clark-Casey (justincc) 206fb306a7 Update SmartThreadPool to latest version 2.2.3 with a major and minor change.
SmartThreadPool code comes from http://www.codeproject.com/Articles/7933/Smart-Thread-Pool
This version implements thread abort (via WorkItem.Cancel(true)), threadpool naming, max thread stack, etc. so we no longer need to manually patch those.
However, two changes have been made to stock 2.2.3.
Major change: WorkItem.Cancel(bool abortExecution) in our version does not succeed if the work item was in progress and thread abort was not specified.
This is to match previous behaviour where we handle co-operative termination via another mechanism rather than checking WorkItem.IsCanceled.
Minor change: Did not add STP's StopWatch implementation as this is only used WinCE and Silverlight and causes a build clash with System.Diagnostics.StopWatch
The reason for updating is to see if this improves http://opensimulator.org/mantis/view.php?id=6557 and http://opensimulator.org/mantis/view.php?id=6586
2013-05-01 19:01:43 +01:00
Melanie ac135c649c Fix CAPS to work like they should - do not send caps to the viewer if they're not in the requested caps list.
The previous wrong behavior caused the debug setting "UseHTTPInventory" to fail
on all viewers when turned off. UDB inventory would not be correctly used in
that case.
2013-04-30 23:50:23 +01:00
Melanie b89d18e6f4 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
2013-04-30 23:45:38 +01:00
Melanie 958a500692 Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current 2013-04-30 23:40:06 +02:00
Melanie 0af1d8fe19 Fix CAPS to work like they should - do not send caps to the viewer if they're not in the requested caps list.
The previous wrong behavior caused the debug setting "UseHTTPInventory" to fail
on all viewers when turned off. UDB inventory would not be correctly used in
that case.
2013-04-30 23:35:59 +02:00
Robert Adams 46ae84cfba BulletSim: fix error messages created while an avatar has no initial
collisions. Usually happens when logging in an avatar that had been
previously flying. Uninitialized variable.
2013-04-30 13:10:15 -07:00
Robert Adams 7cdb07b386 BulletSim: improvements to LinksetCompound and PrimDisplaced. Not all working yet. 2013-04-30 11:42:11 -07:00
Robert Adams d322625f90 BulletSim: Add non-static BSShape.GetReference for getting another reference
to an existing shape instance.
BSShapeNative rebuilds shape for all references.
BSShapeCompound returns another reference copy if the compound shape
already exists (for linksets).
2013-04-29 17:30:54 -07:00
Robert Adams 15a3f80e2e BulletSim: LinksetCompound work to disable collision for root and
child prims so compound shape can do all collisions.
Don't try to build a compound linkset for non-physical linksets.
Remove and replace root body when compound shape is added so collision
cache is rebuilt.
2013-04-29 17:30:38 -07:00
Justin Clark-Casey (justincc) 5a4cb539d2 Fix bug where an agent that declined an inventory offer and subsequently emptied their trash would make the item invalid in the giver's inventory
This was because the original item/folder ID was sent in the session slot of the offer IM rather than the copy.
2013-04-30 01:25:21 +01:00
Justin Clark-Casey (justincc) 3ce198165c minor: remove some mono compiler warnings in ServicesServerBase 2013-04-29 22:21:57 +01:00
Justin Clark-Casey (justincc) 537b243360 minor: Eliminate warning in LLimageManagerTests by properly calling through to OpenSimTestCase.SetUp() 2013-04-29 22:18:11 +01:00
Justin Clark-Casey (justincc) 67789201c3 Add TestRejectGivenFolder() and TestAcceptGivenFolder() regression tests 2013-04-29 22:14:13 +01:00
Justin Clark-Casey (justincc) 0beccf23c0 Add regression test for inventory item give, reject and subsequent trash folder purge by receiver.
This commit also actually adds the InventoryTransferModuleTests file which I previously forgot
2013-04-29 21:11:44 +01:00
Justin Clark-Casey (justincc) a7cbb9edc9 Add regression test for offer, accept and subsequent receiver delete of an item offered via instant message. 2013-04-29 20:50:49 +01:00
Justin Clark-Casey (justincc) 12054aaa9f Fix bug where an agent that declined an inventory offer and subsequently emptied their trash would make the item invalid in the giver's inventory
This was because the original item/folder ID was sent in the session slot of the offer IM rather than the copy.
2013-04-29 17:14:44 +01:00
Robert Adams 92ee288d66 BulletSim: remove trailing white space to make git happier. No functional changes. 2013-04-29 07:54:50 -07:00
Robert Adams ad1787770e BulletSim: rename variable 'PhysicsScene' to be either 'PhysScene' or 'm_physicsScene' to match coding conventions and reduce confusion. 2013-04-29 07:38:55 -07:00
Robert Adams 21ec434688 BulletSim: first cut at new linksetCompound shape building. 2013-04-29 07:38:51 -07:00
Robert Adams f2d408829b BulletSim: fix crash when creating new hull. 2013-04-29 07:38:47 -07:00
Robert Adams 2da8e60b6d BulletSim: code for creating the avatar capsule shape. 2013-04-29 07:38:44 -07:00
Robert Adams e5582939fd BulletSim: massive refactor of shape classes. Removed shape specific code from BSShapeCollection. Using BSShape* classes to hold references to shape. Simplified shape dependency callbacks. Remove 'PreferredShape' methods and have each class specify shape type. Disable compound shape linkset for a later commit that will simplify linkset implementation. 2013-04-29 07:38:40 -07:00
Robert Adams 890cb6a293 BulletSim: complete BSShape classes. 2013-04-29 07:38:35 -07:00
Melanie 3ff7391495 Some more pieces of Avination's ban system - if an avatar isn't allowed on any
parcel in the sim, keep them out entirely.
2013-04-29 00:55:34 +01:00
Melanie 7c729e1519 Merge branch 'master' into careminster 2013-04-29 00:38:20 +01:00
Melanie 4275d7a839 Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
Conflicts:
	bin/Regions/Regions.ini.example
2013-04-28 19:03:39 +02:00
Diva Canto a517e597f5 Fix wrong sql statement in offline im. 2013-04-28 09:03:09 -07:00
Diva Canto a49c5291dc Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-04-27 21:24:07 -07:00
Diva Canto 222f530411 Added an interface to an external ban service. With this commit, the interface is used only in Hypergrided worlds (Gatekeeper), although in those, it applies to both local and foreign users. The Ban service itself is not in core; it is to be provided externally. 2013-04-27 21:23:29 -07:00
Diva Canto 90a6891a7d Better error reporting 2013-04-27 10:34:23 -07:00
Diva Canto f675d465b2 Make method virtual 2013-04-27 10:34:13 -07:00
Melanie 12599c34e2 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2013-04-27 17:57:22 +01:00
Melanie cbb3bb62da Unbreak the sample money module 2013-04-27 17:56:39 +01:00
Melanie ef08ab68a7 Small oversight in EconomyDataRequest - this would have affected everyone NOT using a money module. 2013-04-27 17:42:54 +01:00
Melanie 3fcac2ba7b Controller module for dynamic floaters (WIP) 2013-04-27 01:20:03 +02:00
Diva Canto 2262b13048 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-04-25 17:02:32 -07:00
Diva Canto 0e162511cf Groups: make some methods protected. 2013-04-25 17:01:57 -07:00
Melanie 40036ca05f Change EconomyDataRequest signature to use an IClientAPI rather than UUID. This is needed because recent LL viewer codebases call this earlier in login when the client is not yet established in the sim and can't be found by UUID.
Sending the reply requires having the IClientAPI.
2013-04-25 21:37:40 +01:00
Melanie fb8aa22084 Merge branch 'master' into careminster 2013-04-25 21:37:25 +01:00
Melanie 03c9d8ae4f Change EconomyDataRequest signature to use an IClientAPI rather than UUID. This is needed because recent LL viewer codebases call this earlier in login when the client is not yet established in the sim and can't be found by UUID.
Sending the reply requires having the IClientAPI.
2013-04-25 21:35:18 +01:00
Melanie 5d0a8ff391 Change copyright notice on DynamicMenuModule to proper BSD 2013-04-25 20:48:12 +01:00
Melanie c6628b1c76 Merge branch 'master' into careminster 2013-04-25 20:47:55 +01:00
Diva Canto 3bc8017464 Recover a lost "virtual". Downstream projects need this. 2013-04-25 09:23:15 -07:00
dahlia c10405330d UUIDGatherer now includes UUIDs which reference texture assets used as materials 2013-04-24 20:43:15 -07:00
Diva Canto 0e22021c65 Make the kicked user's avie truly disappear when it's god-kicked. 2013-04-24 19:00:41 -07:00
Diva Canto 2093d87e20 Make the kicked user's avie truly disappear when it's god-kicked. 2013-04-25 02:48:49 +01:00
Melanie ec4f981f1d Adding the dynamic menu module which allows registering new menu options in compliant viewers 2013-04-25 01:52:34 +01:00
Melanie 5cd77a460c Commit Avination's God Kick feature. 2013-04-25 00:51:57 +01:00
Melanie 3934b779b8 Adding the dynamic menu module which allows registering new menu options in compliant viewers 2013-04-25 01:39:22 +02:00
Melanie e39156c656 Send 503 when throttling textures 2013-04-25 01:38:21 +02:00
Melanie 51e05dcb5b Gods module cleanup 2013-04-25 01:37:18 +02:00
Melanie 6f3c905744 Add Avination's support for parcel eject and freeze 2013-04-25 00:24:48 +01:00
Melanie d36a52ea55 Merge branch 'master' into careminster 2013-04-25 00:22:28 +01:00
Diva Canto 1868680848 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-04-24 12:46:23 -07:00
Diva Canto 70081a40a4 Bug fix: compare tolower. This should fix the issue where HG visitors currently in the region were not being found by the avatar picker window. 2013-04-24 12:45:19 -07:00
Robert Adams c22a2ab7d2 BulletSim: partial addition of BSShape class code preparing for
different physical mesh representations (simplified convex meshes)
and avatar mesh.
2013-04-24 08:05:42 -07:00
Robert Adams e324f6f3f0 BulletSim: update DLLs and SOs to they have no dependencies on newer
glibc (2.14) since that is not yet in some Linux distributions.
Add unmanaged API calls and code for creating single convex hull shapes.
2013-04-24 08:03:45 -07:00
Robert Adams 522ab85045 BulletSim: improve avatar stair walking up. Add more parameters to control force
of both position change and up force that move avatars over barrier.
Default parameters are for steps up to 0.5m in height.
2013-04-23 18:31:12 -07:00
Justin Clark-Casey (justincc) 115e0aaf83 Fix issue in ConciergeModule where UpdateBroker was sending malformed XML if any number of avatars other than 1 was in the region.
I don't know how well the rest of ConiergeModule works since I've practically never looked at this code.
Addresses http://opensimulator.org/mantis/view.php?id=6605
2013-04-23 21:55:51 +01:00
Robert Adams e1ac683154 BulletSim: fix crash when deleting llVolumeDetect enabled objects. Bullet's check for an object being linked into the world does not work for Bullet's ghost objects so BulletSim was deleting the object while it was still linked into the physical world structures. 2013-04-22 16:50:06 -07:00
Melanie 293a024c14 Allow callers to set the invoice parameter for GenericMessage 2013-04-22 22:39:08 +01:00
Melanie 671a97ef76 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2013-04-22 22:28:41 +02:00
Melanie a7a92e7339 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2013-04-22 22:26:04 +02:00
Melanie 6571e7ead2 Allow callers to set the invoice parameter for GenericMessage 2013-04-22 22:24:41 +02:00
Melanie 231c298ca5 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	bin/OpenMetaverse.StructuredData.XML
	bin/OpenMetaverse.XML
	bin/OpenMetaverseTypes.XML
2013-04-21 14:11:39 +01:00
dahlia 69f07fdb34 Materials persistence via SceneObjectPart.dynAttrs. This appears to work across region restarts and taking objects into inventory, but probably will not work across archiving via OAR or IAR as materials texture assets may not be adequately referenced to trigger archiving. 2013-04-20 23:39:07 -07:00
dahlia 233f761779 handle PUT verb for RenderMaterials Cap 2013-04-20 02:08:22 -07:00
dahlia 258804cc04 RenderMaterials POST Cap now return material entries when invoked with an OSDArray of MaterialIDs 2013-04-19 22:19:57 -07:00
dahlia 9ae24cac2f Materials-capable viewers send ImageUpdate packets when updating materials that are normally sent via RenderMaterials CAP. This can cause a race condition for updating TextureEntry fields. Therefore filter any TextureEntry updates so they only update if something actually changed. 2013-04-19 00:35:06 -07:00
dahlia 06829c4082 remove default parameter value that apparently mono cant handle 2013-04-18 01:29:50 -07:00
dahlia d5419f0a46 Initial experimental support for materials-capable viewers. This is in a very early stage and this module is disabled by default and should only be used by developers for testing as this module could cause data corruption and/or viewer crashes. No materials are persisted yet. 2013-04-18 01:03:19 -07:00
dahlia 7c839f176f amend previous commit, a line was left out 2013-04-17 23:14:28 -07:00
dahlia 53122fad40 Thanks lkalif for a fix to SendRegionHandshake() which fixes a potential crash with Server-side baking enabled viewers 2013-04-17 23:10:02 -07:00
dahlia ce043c5141 Allow changes to TextureEntry to propagate to viewers when MaterialID changes 2013-04-17 22:41:12 -07:00
Melanie d3f288e27b Merge branch 'master' into careminster 2013-04-16 22:37:47 +01:00
Justin Clark-Casey (justincc) c5de9840b0 refactor: Remove IClientNetworkServer.NetworkStop() in favour of existing Stop().
This was an undocumented interface which I think was for long defunct region load balancing experiments.
Also adds method doc for some IClientNetworkServer methods.
2013-04-16 21:58:24 +01:00
Melanie 7cf377fff0 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Data/MySQL/MySQLAssetData.cs
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
2013-04-10 13:20:55 +01:00
Robert Adams 5f2cbfc0fd BulletSim: fixing problems with llMoveToTarget. Not all fixed yet. 2013-04-09 18:00:29 -07:00
Robert Adams b53713cdda BulletSim: some formatting changes. 2013-04-09 18:00:27 -07:00
Vegaslon 9cc41d5118 Another algorithm for AngularVerticalAttraction. This one Takes into account all rotations before it and makes the corrections more close to the time that sl does.
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-04-09 18:00:25 -07:00
Robert Adams 59135c9a31 BulletSim: add Bullet HACD library invocation. Turned off by default as not
totally debugged. Updated DLLs and SOs with more debugged HACD library code.
2013-04-09 18:00:23 -07:00
Robert Adams 17fd075f39 BulletSim: fix problem where large sets of mega-regions weren't registering
all the terrain with the base region.
2013-04-09 18:00:20 -07:00
Justin Clark-Casey (justincc) 148e46563f minor: fix mono compiler warning in ScriptsHttpRequests.cs 2013-04-10 00:07:58 +01:00
Justin Clark-Casey (justincc) 29e28f4b84 minor: remove mono compiler warnings in InventoryAccessModule 2013-04-10 00:05:03 +01:00
Justin Clark-Casey (justincc) e20b0d5695 minor: Make exceptions thrown by MySQLAssetData more consistent. 2013-04-10 00:03:37 +01:00
Justin Clark-Casey (justincc) 06068444e2 Comment out rez perms logging I accidentally left in at 7f07023 (Sat Apr 6 02:34:51 2013) 2013-04-09 23:21:13 +01:00
Justin Clark-Casey (justincc) 8690a08881 minor: Log an exception if we aren't able to delete a script state file rather than simply ignoring it.
This should never normally happen but if it does then it can be valuable diagonstic information.
2013-04-09 23:02:11 +01:00
Justin Clark-Casey (justincc) aab2b032aa Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-04-09 22:45:00 +01:00
Justin Clark-Casey (justincc) 8e04c752fc If OpenSimulator is writing a PID file and finds the file already present on startup, logging an error since this is commonly due to an unclean shutdown.
Unclean shutdown can cause constantly moving objects to disappear if an OAR has just been loaded and they have not reached persistence time threshold, among other problems.
2013-04-09 22:38:47 +01:00
Robert Adams 99f39836a1 BulletSim: moving comments around. No functional change. 2013-04-08 06:27:45 -07:00
Robert Adams a7a1b8b7e9 BulletSim: clean up actor code so routines use the same coding pattern.
Fix a few enabling problems.
2013-04-08 06:27:44 -07:00
Robert Adams fe16dc09da BulletSim: complete movement of physical object action code out of the
physical object and into actors for setForce, setTorque, hover, lock
axis and avatar move.
2013-04-08 06:27:43 -07:00
Mic Bowman c7cd077e55 Optimize the number of Simian calls to get the initial presence
information for the friends list. This is a pretty big performance
improvement on login. Note that you must upgrade simian to incorporate
the corresponding GetSessions call.
2013-04-07 17:31:44 -07:00
Justin Clark-Casey (justincc) 7f070236f7 Fix taking (and rezzing) of coalesced objects in the non-root subregions of megaregions.
This fixes the combined bounding box location for regions bigger than 256x256.
It also fixes the position on taking coalesced objects in the non-root regions, where position checks are properly done on rez instead.
It also fixes the megaregion land channel to return null if the land does not exist, which should probably also be done for the ordinary land channels rather than returning a dummy region.
Inspiration from Garmin's commit in http://opensimulator.org/mantis/view.php?id=6595.  Thanks!
2013-04-06 02:34:51 +01:00
Justin Clark-Casey (justincc) 0f008d5f7d When rezzing a coalesced object, check adjust position of all components. 2013-04-06 01:44:06 +01:00
teravus d2367968e4 * In between the fog, a moment of clarity. This fixes mantis 6570 2013-04-04 19:10:23 -04:00
Melanie c6b0942f97 Merge branch 'master' into careminster 2013-04-05 00:03:33 +01:00
Melanie 6a5f6ac04e Merge branch 'master' into careminster 2013-04-04 03:17:57 +01:00
Melanie b16a560b77 Merge commit '94d44142e37a9191162a426f28dd23f40b0cf4aa' into careminster 2013-04-04 03:17:38 +01:00
Justin Clark-Casey (justincc) f064075a85 Fix XmlRpcAdmin admin_exists_user call so that it actually returns the last user login time rather than serializing the DateTime directly which generates a set of unexpected fields.
lastlogin return is in unix timestamp format.
2013-04-04 01:06:57 +01:00
Justin Clark-Casey (justincc) f281a994e8 refactor: Simplify ScriptsHttpRequests.GetNextCompletedRequest to more simply iterate through pending requests without unnecessary checks. 2013-04-04 00:49:07 +01:00
Justin Clark-Casey (justincc) 831e4c3850 Fix bug where outstanding llHTTPRequests for scripts were not being aborted when they were deleted.
This was because AsyncCommandManager was handing an item ID to IHttpRequestModule.StopHttpRequest() rather than the expected request ID.
This commit also makes the http request asynchronous using BeginGetResponse() rather than doing this by launching a new thread
so that we can more safely abort it via HttpWebRequest.Abort() rather than aborting the thread itself.
This also renames StopHttpRequest() to StopHttpRequestsForScript() since any outstanding requests are now aborted and/or removed.
2013-04-04 00:36:15 +01:00
Justin Clark-Casey (justincc) 94d44142e3 minor: Stop falsely logging that a teleport was being aborted on client logout even when no teleport was active. 2013-04-03 00:48:36 +01:00
Justin Clark-Casey (justincc) 7bf1986e91 Fix minor race condition in SOP.SitTargetOrientationLL where inconsistent values could be returned if the sit orientation was changed whilst the property was being fetched. 2013-04-03 00:24:33 +01:00
Justin Clark-Casey (justincc) 97f0c9da84 Use consistent GroupPosition value Make SOP.UpdateGroupPosition() rather than one that could change whilst the method is being executed. 2013-04-03 00:23:20 +01:00
Justin Clark-Casey (justincc) c0319daa40 fix minor race condition in SOP.SitTargetPositionLL where inconsistency could occur if the sit target position changed whilst the property was fetched 2013-04-03 00:09:28 +01:00
Justin Clark-Casey (justincc) 3332af4060 minor: Make SOP.UpdateOffset() more consistent by checking against the same old OffsetPosition rather than one which may vary if it simultaneously changes. 2013-04-03 00:01:06 +01:00
Melanie 4bc5a7aa19 Merge branch 'master' into careminster 2013-04-02 23:53:23 +01:00
Justin Clark-Casey (justincc) a3c723ee30 Fix minor race condition where SOP.GetGeometricCenter() and GetCenterOfMass() could return results which were never the case if these values were changed whilst the method was running
No need to create new Vector3s since these are structs.
2013-04-02 23:48:55 +01:00
Melanie c10331c8c2 Merge branch 'master' into careminster 2013-04-02 23:48:01 +01:00
Melanie 41a652f6bd Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-04-02 23:47:19 +01:00
Robert Adams 68c8633ba1 BulletSim: create axis lock constraint with proper orientation and
enable axis lock functionality.
2013-04-02 06:40:12 -07:00
Robert Adams 17aef1c883 BulletSim: update unmanaged API for HACD parameter passing. Bullet HACD
mesh to hull conversion calls in place but code not working. Update
BulletSim DLLs and SOs for new API and HACD code.
2013-04-01 18:03:11 -07:00
Robert Adams ebc1209fc9 BulletSim: rearrange mega-region terrain code to make the thread flow
a little clearer.
2013-04-01 18:03:09 -07:00
Justin Clark-Casey (justincc) 2bfe60e2fb Use Output instead of OutputFormat in appropriate places of XEngine status reporting. 2013-04-02 01:28:16 +01:00
Justin Clark-Casey (justincc) 69bc37acd6 minor: Remove unnecessary call to GetAttachments() in AttachmentsModule.UpdateUserInventoryWithAttachment() 2013-04-02 01:00:55 +01:00
Justin Clark-Casey (justincc) 0dce496499 Fix what appears to be a bug in HGUserManagementModule where it enables on the base.Name rather than its own Name. 2013-04-02 00:55:00 +01:00
Justin Clark-Casey (justincc) 600087ab49 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-04-02 00:46:53 +01:00
Justin Clark-Casey (justincc) 4153cfbf14 Change recent MSSQL migrations to drop COLUMN from ALTER TABLE which is either not syntactical or unnecessary.
May fix http://opensimulator.org/mantis/view.php?id=6593
2013-04-02 00:45:29 +01:00
Robert Adams 84eb25da23 BulletSim: stop an avatar from moving if standing on a stationary
object. This will stop avatars from sliding down steep terrains
or objects while still allowing an avatar to be moved if standing
on a moving object.
2013-03-31 22:19:44 -07:00
Robert Adams 933ac60746 BulletSim: not quite functional axis lock code. 2013-03-31 22:19:43 -07:00
Robert Adams 7d50015a74 BulletSim: start the renaming of local variables to m_ form to match the OpenSim coding conventions. 2013-03-31 22:19:42 -07:00
Robert Adams 75b8cf428e BulletSim: fix line endings in BSActor* 2013-03-31 22:19:42 -07:00
Robert Adams 747ece59d2 BulletSim: convert BSDynamic to a BSActor and change BSPrim to set
up the vehicle actor.
2013-03-31 22:19:41 -07:00
Robert Adams 2c581cae2a BulletSim: Add physical 'actors' that operate on the physical object.
Add first 'actor' for locked axis.
2013-03-31 22:19:41 -07:00
Melanie 9b83e53b28 Export permission, part two. Setting export perms for textures and clothing works. Setting perms for prims also works but they don't propagate correctly yet.
NOT FOR PRODUCTIN USE. Your database will need to be updated before you can use this!
2013-03-31 21:59:44 +01:00
Melanie ae833af3a9 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2013-03-31 20:56:13 +01:00
Melanie f142e1f394 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2013-03-31 20:27:46 +02:00
Melanie 4bf9c4bbb8 Export permission, part two. Setting export perms for textures and clothing works. Setting perms for prims also works but they don't propagate correctly yet.
NOT FOR PRODUCTIN USE. Your database will need to be updated before you can use this!
2013-03-31 20:25:32 +02:00
Melanie 64a56059b1 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-30 21:19:10 +00:00
Justin Clark-Casey (justincc) 9fee431cc8 In the flotasm asset cache, if we get a request for a file that we're actively writing, simply return null instead of first logging an exception. 2013-03-30 01:21:16 +00:00
Justin Clark-Casey (justincc) f8785b5f47 refactor: rename ETM.InformClientToInitateTeleportToLocationDelegate to InformClientToInitiateTeleportToLocationDelegate to correct spelling and bring into line with other ETM Initiate methods 2013-03-30 00:29:52 +00:00
Justin Clark-Casey (justincc) 76629289f0 refactor: move the append magic number processing for attachments back up into RezSingleAttachmentFromInventory from RezSingleAttachmentFromInventoryInternal() done in commit 023faa2 2013-03-29 23:59:21 +00:00
Kevin Cozens cbc9ae898c Added missing functionality (mainly custom headers) to llHTTPRequest. 2013-03-29 23:32:11 +00:00
Melanie d5d6a274a7 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-03-29 23:28:47 +00:00
Justin Clark-Casey (justincc) 023faa227e Check viewer 2/3 attachment calls against avatar appearance attachment data rather than actually attached objects
By checking against the grid's Avatar data, we can ignore viewer side attachments but still initiate these calls simulator-side.
Initiating simulator-side is always necessary for version 1 viewers.
This is a further commit to resolve http://opensimulator.org/mantis/view.php?id=6581
2013-03-29 23:10:28 +00:00
Melanie f2f8248178 Merge commit '23ae4c0a4d813763bcc39db7693850a21727d7f2' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-29 02:42:47 +00:00
Justin Clark-Casey (justincc) 23ae4c0a4d Fix bug where CHANGED_REGION and/or CHANGED_TELEPORT weren't firing for scripts in attachments.
This was because the script resumption in AttachmentsModule was firing the attach event instead.
Had to reinstate the code in 285bd3a do we can resume the scripts there instead, though the bug existed before its removal.
This is to resolve http://opensimulator.org/mantis/view.php?id=6578
2013-03-29 02:21:38 +00:00
Melanie e9eb837347 Merge commit 'e89bcf4f773d95492b168376599f7530a6044e8f' into careminster 2013-03-29 02:21:20 +00:00
Melanie 3696a668a8 Merge commit '4dfffa1df325c4b27a79e995585696cc20b6d905' into careminster 2013-03-29 02:21:06 +00:00
Melanie 7d466d36a3 Merge commit 'd87ddf50fcd674fbd9aa8b8556bf57f2d285a3ba' into careminster 2013-03-29 02:20:47 +00:00
Melanie e7d76c91c2 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-03-29 02:19:12 +00:00
Melanie 05810e48b0 Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
	OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
	OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
2013-03-29 02:15:47 +00:00
Melanie c93f67b632 Merge commit '2b142f2f9e888d5cb7317cc51c12ac7152c54459' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-29 01:58:57 +00:00
Melanie 73710413cd Merge commit 'feffc8081dc5ab2889a7ea4b96b2befaed0c3f95' into careminster 2013-03-29 01:52:58 +00:00
Melanie 7d5eadf753 Merge commit '03e421bf3d796bf3498f4f3311c59ce04fb1fea1' into careminster 2013-03-29 01:52:45 +00:00
Melanie 6954024fb2 Merge commit '4ad9b275302ee109937512963eab095ff542a0c7' into careminster 2013-03-29 01:52:29 +00:00
Melanie abe885b3fe Merge commit '3b377f16b29a6395d73af1cc987cb9abf9935376' into careminster 2013-03-29 01:52:18 +00:00
Melanie 120903efb6 Merge commit 'c2093ccce16cd5210c8e0759f23b5b4bd205b7af' into careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-03-29 01:50:34 +00:00
Justin Clark-Casey (justincc) e89bcf4f77 Revert "Try eliminating the pause before auto-reteleporting for a megaregion now that we're telepoting in a different way."
Unfortunately fails on Nebadon's system right now.  Needs investigation.  May put in a temproary option for experimentation soon.

This reverts commit d87ddf50fc.
2013-03-29 01:34:31 +00:00
Justin Clark-Casey (justincc) 4dfffa1df3 Add Location (relative), Rotation (Relative) and Rotation (World) to "show part" and other related console commands 2013-03-29 01:31:37 +00:00
Justin Clark-Casey (justincc) d87ddf50fc Try eliminating the pause before auto-reteleporting for a megaregion now that we're telepoting in a different way.
On my own system, I can now eliminate the pause entirely and the reteleport happens whilst the teleport screen is still up.
Trying this change to see if this is true for other people.
2013-03-29 01:16:29 +00:00
Melanie 4cb8967f0a Merge commit '6a9630d2bdc27ed702936f4c44e6978f728a9ef0' into careminster 2013-03-29 01:08:33 +00:00
Justin Clark-Casey (justincc) 285bd3abc8 Eliminate code which tries to restart attachment scripts in ScenePresence.MakeRootAgent(), since this is already done in AttachmentsModule 2013-03-29 00:49:55 +00:00
Justin Clark-Casey (justincc) c92654fb43 Stop attempts to update/add existing attachments in user inventory when teleporting between regions.
This appears to resolve issues on teleport where attachments disappear or become labelled as invalid within user inventory.
2013-03-28 23:57:35 +00:00
Justin Clark-Casey (justincc) 2b142f2f9e Add "debug attachments" console command to allow highly verbose attachment logging to be switched on and off.
Default is off.
2013-03-28 23:09:35 +00:00
Justin Clark-Casey (justincc) feffc8081d minor: remove some mono compiler warnings from EntityTransferModule 2013-03-28 22:56:30 +00:00
Justin Clark-Casey (justincc) 03e421bf3d minor: comment out unused Scene.AgentCrossing() to reduce code complexity 2013-03-28 22:55:13 +00:00
Justin Clark-Casey (justincc) 4ad9b27530 If the viewer has already rezzed any attachments itself, then ignore the simulator-side rez attachments call.
This is a further effort to reduce v3 viewer race conditions where this call may clash with the viewer signalling attachment wearing from its current outfit folder.
2013-03-28 22:51:59 +00:00
Justin Clark-Casey (justincc) 3b377f16b2 Fix regression tests by making a new NPC always trigger simulator side attachment code when created.
Regression from previous commit c2093ccc.  Failed because NPCs don't set the ViaLogin flag
2013-03-28 22:44:59 +00:00
Justin Clark-Casey (justincc) e97567e227 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-03-28 22:35:24 +00:00
Justin Clark-Casey (justincc) c2093ccce1 Move the simulator-side RezAttachments call on login to SP.MakeRootAgent with the other attachments code, using TeleportFlags.ViaLogin check to fire if necessary.
This is to simplify the code (no tricky 'wasChild' signalling required)
and to reduce the risk of a thread clash between simulator-side attaching (necessary for v1 viewers)
and the viewer-side attaching the v3 viewers perform.
2013-03-28 22:07:58 +00:00
Robert Adams 6a9630d2bd BulletSim: fix race condition when creating very large mega-regions.
The symptom was exceptions while creating physical terrain.
Reduce default terrain mesh magnification to 2 from 3 because the
higher resolution uses a lot of memory and doesn't solve the terrain
smoothness for vehicles.
Added comments here and there and improved some debugging log messages.
2013-03-28 10:59:18 -07:00
Robert Adams 3f9b274180 BulletSim: tweaks to terrain boundry computation. No functional changes. 2013-03-28 10:59:16 -07:00
Justin Clark-Casey (justincc) 9ca54d00d8 Add back a log message when we attempt a megaregion auto-reteleport 2013-03-28 02:29:34 +00:00
Melanie f548a41fb8 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
2013-03-28 02:29:07 +00:00
Justin Clark-Casey (justincc) afd0d6af07 minor: Only try to deregister stats in EntityTransferModule.RemoveRegion() if module was enabled. 2013-03-28 02:23:09 +00:00
Justin Clark-Casey (justincc) d9c049fd9f Fix a bug in HGEntityTransferModule to call base.RemoveRegion() when a region is removed rather than base.AddRegion() 2013-03-28 02:20:43 +00:00
Justin Clark-Casey (justincc) b05ed4ffa6 Instead of going via GodLikeRequestTeleport, auto-teleport the agent directly in a megaregion, in the same manner at the "teleport user" console command.
This is to bypass an issue with the HGLureModule which stops the auto-teleport from happening.
2013-03-28 02:17:32 +00:00
Justin Clark-Casey (justincc) 506d5e41bf On the North and East sides of a megaregion, only consider regions within 256m to be neighbours rather than regions up to 512 distant.
This looks like an off-by-one bug since the view distance was already only 256 on the west and south sides.
This reduces the number of child agents being logged into regions neighbouring a megaregion.
2013-03-28 01:54:11 +00:00
Justin Clark-Casey (justincc) 617637c788 minor: Fix usage error message for "debug eq" console command 2013-03-28 01:41:41 +00:00
Justin Clark-Casey (justincc) b5b01e5bb5 Make HGLureModule track god like lures as well as normal lures, to see if this fixes issues where second megaregion auto-teleport hangs on black teleport screen when HG is active. 2013-03-28 01:37:52 +00:00
Justin Clark-Casey (justincc) 876d0d310f Add "show eq" console command to show numbers of messages in agent event queues.
For debugging purposes.
2013-03-28 01:36:34 +00:00
Justin Clark-Casey (justincc) f32027f3b5 Remove some Console.WriteLines accidentally left in last commit cfb20f09 2013-03-28 01:08:47 +00:00
Justin Clark-Casey (justincc) cfb20f09a9 refactor: combine the checks for megaregion view range into a single place. 2013-03-28 00:57:43 +00:00
Justin Clark-Casey (justincc) dd7d7683c9 Fix problem with megaregions where teleporting into a different region which already had a child agent would stop the eq working for the agent in the new region.
This was because the calculation as to whether a new agent was needed in the receiving region did not take megaregions into account,
unlike the original calculation when the user first teleported into the region.
This meant that on teleport, entity transfer would create a new CAP but this would be ignored by the viewer and receiving region, meaning that the EQ could no longer be used.
This would prevent subsequent teleport, amongst other things.
Currently, regions up to 512m from a megaregion are considered neighbours.
2013-03-28 00:12:48 +00:00
Melanie 46b765d28e Merge branch 'master' into careminster 2013-03-28 00:10:51 +00:00
Melanie e320046683 Merge branch 'master' into careminster 2013-03-27 01:17:59 +00:00
Justin Clark-Casey (justincc) da5dbaf1d0 Add admin_get_agents xmlrpc method.
This allows one to retrieve information about agents from a particular region (name, id, position, etc.)
Similar to output from "show users"
See http://opensimulator.org/wiki/Remoteadmin:admin_get_agents for more details
2013-03-26 23:02:13 +00:00
Justin Clark-Casey (justincc) 3072f257f5 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-03-26 23:00:51 +00:00
Robert Adams abde0d4efb BulletSim: prevent asset fetching loop when the fetched asset fails to mesh.
Check for the case where the fetched mesh asset fails meshing (degenerate
triangles or no physical mesh). In this case, the asset is marked 'failed'
and BulletSim doesn't keep trying to fetch over-and-over trying to get a
good asset.
2013-03-26 15:02:10 -07:00
Justin Clark-Casey (justincc) 13170ca627 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-03-26 20:32:22 +00:00
Justin Clark-Casey (justincc) 3f0f313a76 Make llGetLinkPrimitiveParams() and llGetPrimitiveParams() work for avatars in a linkset.
llGetPrimitiveParams() works through PRIM_LINK_TARGET
Setting via llSetLinkPrimitiveParams(), etc. not yet implemented
2013-03-26 20:25:58 +00:00
Melanie 4365daa8e1 Merge branch 'master' into careminster 2013-03-26 19:06:44 +00:00
Melanie e82fab34d7 Implement a pref to turn on the simulator ExportSupported feature entry.
This tells the viewer to enable the UI for export permissions.
WARNING: If your inventory store contains invalid flags data, this will result
in items becoming exportable! Don't turn this on in production until it's complete!
2013-03-26 19:00:30 +00:00
Melanie 5f4c4df227 Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
2013-03-26 03:40:06 +00:00
Melanie 36c57bac8e Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2013-03-26 03:26:28 +00:00
Melanie 95d0a7d4fa Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
2013-03-26 03:26:02 +00:00
Robert Adams 285dc554ec BulletSim: new algorithm for vertical attraction which uses quaternion
arithmetic to compute the shortest path between the current tilt
and vertical.
2013-03-25 15:40:46 -07:00
Robert Adams c96a6f1de6 BulletSim: small tweaks and formatting in the parameter fetching code. 2013-03-25 15:40:44 -07:00
Robert Adams 953090fd62 BulletSim: fix possible race condition where an prim's asset can be requested quicker than the asset fetcher returns and thus falsely reporting that an asset was not fetched and defaulting the assset to a bounding box. 2013-03-25 15:40:43 -07:00
Robert Adams f783b9169f BulletSim: parameterize C# HACD hull creation. Add feature of reducing max hull count for simple (non-cut prims) meshes. 2013-03-25 15:40:41 -07:00
Justin Clark-Casey (justincc) 128c72a234 Start recording inter-region teleport attempts, aborts, cancels and failures in statistics for monitoring/debugging purposes
These are recorded as 'entitytransfer' stats as seen by the "show stats entitytransfer" console command.
2013-03-25 21:53:27 +00:00
Melanie c341664c1b Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
2013-03-24 18:56:28 +01:00
Melanie 6ce9ed1a64 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-03-23 23:01:55 +00:00
Melanie 8669586e18 Merge branch 'avination' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
2013-03-23 11:45:52 +00:00
Melanie Thielker aba66c7112 Make sharing errors not spew and let the cache retry the files 2013-03-23 13:12:41 +01:00
Melanie 8bc43ea773 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2013-03-23 11:31:34 +01:00
Justin Clark-Casey (justincc) 01636ca900 Fix teleporting into the non-SW 256x256 corner of a megaregion, though currently with a 10 second delay before auto-reteleport to the correct location.
This now does a check for border crossing (required to trigger the teleport) immediately in SP.MakeRootAgent().
If left any later, it looks like the physics scene changes the position and stops the cross happening.
If done any earlier, nothing happens because the cross-code currently requires a PhysicsActor to be in place, thuogh it's probably not necessary for this case.
2013-03-23 00:47:59 +00:00
Justin Clark-Casey (justincc) 93206ef0fa Add "show borders" command to show the borders of a region.
This is relevant to mega-regions where the borders are very different to a regular region.
Also adds some method doc and other code comments.
2013-03-23 00:45:21 +00:00
Justin Clark-Casey (justincc) c4d9a23f26 Following on from 476a7d3e (which wasn't enough), make chat across regions on different simulators work.
Also resolves an issue of multiple chatting if the originating simulators had more than one region and they were neighbours
2013-03-22 01:43:18 +00:00
Justin Clark-Casey (justincc) 1f17ef6d3c Take out a testing sleep I accidentally left in the teleport code from last commit 7471bc7 2013-03-22 01:06:56 +00:00
Melanie d5e5c13f3b Merge branch 'master' into careminster 2013-03-22 01:02:17 +00:00
Melanie 68b910c1ff Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
2013-03-22 01:01:24 +00:00
Justin Clark-Casey (justincc) 7471bc7775 At strategic points in the teleport process, if the client has simultaneously logged out then do not continue.
This aims to reduce any side effects if the process tries to complete after the client has logged back in (e.g. it was delayed due to a slow destination region response).
This introduces a new Aborting entity transfer state which signals that the teleport should be stopped but no compensating actions performed.
2013-03-22 01:00:13 +00:00
Justin Clark-Casey (justincc) 476a7d3eee Implement chat across region borders since we can tell if avatars in neighbouring regions are in range. 2013-03-22 00:03:10 +00:00
Justin Clark-Casey (justincc) e23a0dcc5d minor: On teleport, signal a child agent before we send the viewer TeleportFinish in order to avoid a theoretical race condition when teleporting to a neighbour.
If we do this after TeleportFinish, then it's possible for a neighbour destination to request the source to create a child agent whilst its still treated as root.
This closes the original presence which we don't really want to do.
This is probably okay (albeit with warnings on the console) but afaics there's no reason not to move the child agent signal.
2013-03-21 23:37:23 +00:00
Justin Clark-Casey (justincc) 46c833810c On a teleport, lock m_agentsInTransit whilst we grab the value to check for completion just to be sure we're not using a thread cached version. 2013-03-21 00:46:08 +00:00
Melanie cc504eb0d1 Fix SceneManager to use the new automatic property throughout. 2013-03-21 01:44:09 +01:00
Justin Clark-Casey (justincc) 4de530af45 minor: disable logging on regression TestCrossOnSameSimulator() that I accidentally left on a few commits ago. 2013-03-20 23:13:12 +00:00
Justin Clark-Casey (justincc) b1cd1d917e minor: don't bother with the pause before rezzing attachments if we are running regression tests (fire and forget calls launched on the same thread).
Also adds code comments as to why this pause exists.
2013-03-20 23:12:13 +00:00
Justin Clark-Casey (justincc) 16af5b87f8 Add file missing from last commit 36651be 2013-03-20 23:08:35 +00:00
Justin Clark-Casey (justincc) 36651bed71 On the later forms of teleport failure, tell the user if this was because viewer couldn't/didn't connect with destination or if destination didn't signal teleport completion.
Also adds regression test for the case where the viewer couldn't connect with the destination region.
Also refactoring of regression test support code associated with entity transfer in order to make this test possible and the code less obscure.
2013-03-20 23:01:16 +00:00
Justin Clark-Casey (justincc) 8de933ab07 Insert a short delay on the simulator side rezzing of attachments in order to fix viewer 3 issues if its own rezzing actions on login collide with the simulator side actions.
This resolves issues (at least in my tests with LL 3.3.4) where this can make attachments invisible until one zooms in on the avatar.
This doesn't affect version 1 viewers since this delay is shorter than the login delay.
This doesn't increase the login time since this part of the process was already being performed asynchronously.
This may be a temporary solution.
2013-03-20 02:09:25 +00:00
Justin Clark-Casey (justincc) c0ff5635ba Fix "show attachments" command probably broken in commit addab12 (Wed Jan 2 21:38:00 2013)
This break was not connected with the recent attachment code changes.
2013-03-20 02:00:56 +00:00
Justin Clark-Casey (justincc) 3cb1c23554 Force a viewer object update for attachments at the end of the final Scene.CompleteMovement() in order to make all multi-attachments appear on the destination region.
For some reason, sending updates before this will not have this effect.
This may be something related to some viewers (e.g. LL 3.3.4) or something OpenSimulator isn't getting quite right.
2013-03-20 01:46:50 +00:00
Justin Clark-Casey (justincc) 9151b9d233 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-03-20 01:36:28 +00:00
Robert Adams 90b9121e66 BulletSim: change 'degenerate mesh' message from Error to Debug because there
seem to be lots of sculpties with this problem while the condition really doesn't
change region operation.
2013-03-19 17:15:24 -07:00
Justin Clark-Casey (justincc) 3648164219 Prevent multiple instances of the same item ID being appended to an AvatarAppearance
It looks like this was happening when AttachmentsModule.RezAttachments was doing a secondary set of each attachment to update with the asset ID (initially they only have the inventory ID).
However, with multi-attach this was appending a second copy of the same attachment rather than updating the data that was already there.
This commit requires both simulator and service to be updated.
2013-03-19 21:49:29 +00:00
Robert Adams c2e4f8aed5 For the moment, disable the output of the 'scene' statistics in SimExtraStatsCollector
and thus for the command 'show stats' because it is ugly and most of the information
is already output in the formatted printout that appears before.
2013-03-19 12:37:44 -07:00
Robert Adams 1dd2d432f1 For those people collecting and comparing logfiles from servers scattered
around the world, change LogWriter to use DateTime.UtcNow rather than
DateTime.Now.
2013-03-19 11:40:10 -07:00
Robert Adams 8360223fed BulletSim: code to generate a higher resolution terrain mesh. Parameter
TerrainMeshMagnification controls number of vertices generated per
heightmap point. Default is 3.
2013-03-19 00:00:03 -07:00
Robert Adams 8510f57ad4 BulletSim: add terrain contact processing threshold parameter. Initialize contact processing threshold for static object as well as mesh terrain. 2013-03-19 00:00:02 -07:00
Melanie 8d9bfda727 Merge branch 'avination' into careminster 2013-03-19 01:24:14 +00:00
Melanie 566ab7ccf9 Fix merge artefacts 2013-03-19 01:19:33 +00:00
Melanie 8553a37881 Merge commit '3611d33b00650ccc71994b331e4c6595f95d3131' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-19 01:00:09 +00:00
Melanie 5b950ca36a Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminster 2013-03-19 00:54:23 +00:00
Justin Clark-Casey (justincc) 397379cd3f Process default attachment point in AttachObjectInternal before we check whether a worn object needs to displace an existing attachment on the same point if we are not using multi-attach. 2013-03-19 00:39:58 +00:00
Melanie 55ab6f015a Fix tests for multiattach 2013-03-18 23:48:03 +00:00
Melanie 5e1f651e21 Merge branch 'master' into newmultiattach
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-18 23:31:27 +00:00
Melanie 0635d9d174 Merge commit 'ccd6f443e1092cb410f565e921f7cf4dd8cd2dac' into newmultiattach
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-18 23:21:01 +00:00
Melanie e4a70b9f9a Limit each attachment point to 5 items as per spec 2013-03-18 22:56:26 +00:00
Melanie d07943c262 Multiattach, part 2 2013-03-18 22:56:17 +00:00
Melanie fcecfc81bb Multiattach, part 1
Conflicts:

	OpenSim/Framework/AvatarAppearance.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
	OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-03-18 22:56:03 +00:00
Justin Clark-Casey (justincc) 3611d33b00 Improve rejection of any attempt to reattach an object that is already attached.
This also adds/extends regression tests for wearing attachments directly for the scene and attempting to reattach/rewear already attached objects.
2013-03-18 22:04:27 +00:00
Justin Clark-Casey (justincc) a7a9a8a614 Fix recent regression where an item worn to an attachment point that was already occupied did not remove the previous attachment (current behaviour)
Regression was commit ccd6f4 (Tue Mar 5 23:47:36 2013)
Added regression test for this case.
2013-03-18 20:48:50 +00:00
Melanie 46a81b3527 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2013-03-17 23:07:12 +00:00
Robert Adams 464201b41d BulletSim: add INI parameter for angular banking timescale fudge parameter. 2013-03-16 15:34:07 -07:00
Vegaslon fc84ebb819 BulletSim: Working Implementation of Angular Banking for Vehicles (Not SL Grade, Other features when implemented should slow it down for now be Strong with Vertical Angular attraction setting and conservative with Angular Velocity on X axis)
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-03-16 15:13:40 -07:00
teravus 455da9dd20 * Ignores VolumeDetect enabled prim in the camera raycast call. Note: The SceneRaycast call doesn't have a filter option in the interface and physics will use the lower level one for all sorts of goodies so it wouldn't be appropriate to ignore it at the physics layer yet.. though that would be better once the API has filters. 2013-03-16 11:09:49 -04:00
teravus 6e1b3f9951 *Yet another HTTPServer update code changes in OpenSim Libs. * This fixes a connection close issue by getting rid of the socket references * This adds a connection timeout checker to shutdown poor or evil connections and combats DOS attempts that just connect and make no complete requests and just wait. It also actually implements KeepAlive... instead of just understanding the connection header in the request... you can test by connecting and requesting a keepalive header and sending another request on the same connection. The new timeout checker closes expired keepalive sessions, just make sure you send the request within 70 seconds of connecting or the timeout checker will timeout the connection. 2013-03-16 03:14:11 -04:00
root f081b7e9ef Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into avination 2013-03-16 01:48:04 +01:00
root 1dcdea6ac4 Fix case where the string member of a LSL_String in a list is null 2013-03-16 01:47:26 +01:00
Justin Clark-Casey (justincc) 03075359b5 Finally remove the 'REST' ApplicationPlugins code which has been non-functional and largely commented out for many years. 2013-03-15 23:48:40 +00:00
Melanie 7e5d553781 Make the LSL memory functions virtual so script engines can override them if they have different memory management. 2013-03-15 23:46:49 +00:00