c6d50cd431
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-05-01 21:37:17 +01:00
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
fca4e4ec7c
Merge branch 'master' into bulletsim4
2013-05-01 12:08:12 -07:00
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
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
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
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
b89d18e6f4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2013-04-30 23:45:38 +01:00
958a500692
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
2013-04-30 23:40:06 +02:00
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
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
7cdb07b386
BulletSim: improvements to LinksetCompound and PrimDisplaced. Not all working yet.
2013-04-30 11:42:11 -07:00
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
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
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
3ce198165c
minor: remove some mono compiler warnings in ServicesServerBase
2013-04-29 22:21:57 +01:00
537b243360
minor: Eliminate warning in LLimageManagerTests by properly calling through to OpenSimTestCase.SetUp()
2013-04-29 22:18:11 +01:00
67789201c3
Add TestRejectGivenFolder() and TestAcceptGivenFolder() regression tests
2013-04-29 22:14:13 +01:00
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
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
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
92ee288d66
BulletSim: remove trailing white space to make git happier. No functional changes.
2013-04-29 07:54:50 -07:00
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
21ec434688
BulletSim: first cut at new linksetCompound shape building.
2013-04-29 07:38:51 -07:00
f2d408829b
BulletSim: fix crash when creating new hull.
2013-04-29 07:38:47 -07:00
2da8e60b6d
BulletSim: code for creating the avatar capsule shape.
2013-04-29 07:38:44 -07:00
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
890cb6a293
BulletSim: complete BSShape classes.
2013-04-29 07:38:35 -07:00
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
7c729e1519
Merge branch 'master' into careminster
2013-04-29 00:38:20 +01:00
14f78c2e66
Merge branch 'ubitwork' into avination-current
2013-04-28 19:04:01 +02:00
61ea7ee5a9
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
...
Conflicts:
bin/Regions/Regions.ini.example
2013-04-28 20:40:11 +02:00
7000b52aeb
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-04-28 19:46:57 +02:00
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
a517e597f5
Fix wrong sql statement in offline im.
2013-04-28 09:03:09 -07:00
a49c5291dc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-04-27 21:24:07 -07:00
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
90a6891a7d
Better error reporting
2013-04-27 10:34:23 -07:00
f675d465b2
Make method virtual
2013-04-27 10:34:13 -07:00
12599c34e2
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-04-27 17:57:22 +01:00
cbb3bb62da
Unbreak the sample money module
2013-04-27 17:56:39 +01:00
ef08ab68a7
Small oversight in EconomyDataRequest - this would have affected everyone NOT using a money module.
2013-04-27 17:42:54 +01:00
3fcac2ba7b
Controller module for dynamic floaters (WIP)
2013-04-27 01:20:03 +02:00
2262b13048
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-04-25 17:02:32 -07:00
0e162511cf
Groups: make some methods protected.
2013-04-25 17:01:57 -07:00
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
fb8aa22084
Merge branch 'master' into careminster
2013-04-25 21:37:25 +01:00
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
38bbf79e10
Merge branch 'master' into careminster
2013-04-25 20:48:41 +01:00
5d0a8ff391
Change copyright notice on DynamicMenuModule to proper BSD
2013-04-25 20:48:12 +01:00
Melanie