Commit Graph

20267 Commits (689f79feadc1ffb74650a43f226a2d0ba654e739)

Author SHA1 Message Date
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) 8d3250cee4 Add information about creating a PID file for robust to the Robust.ini and Robust.HG.ini example files 2013-05-01 19:15:05 +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
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) 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
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
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 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
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
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 6f3c905744 Add Avination's support for parcel eject and freeze 2013-04-25 00:24:48 +01:00
Robert Adams 1593d795ea BulletSim: version of libBulletSim.so for 32 bit systems that doesn't
crash on startup. Doesn't yet solve the new glibcxx dependencies.
2013-04-24 15:01:11 -07: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
dahlia ed22014646 revert CSJ2K.dll to version in use prior to commit d4fa2c69ed 2013-04-23 15:01:20 -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