8c5445b774
Merge branch 'master' into careminster
...
Conflicts:
ThirdParty/SmartThreadPool/SmartThreadPool.cs
2013-05-01 21:39:49 +01:00
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
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
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
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
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
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
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
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
c6628b1c76
Merge branch 'master' into careminster
2013-04-25 20:47:55 +01:00
3bc8017464
Recover a lost "virtual". Downstream projects need this.
2013-04-25 09:23:15 -07:00
c10405330d
UUIDGatherer now includes UUIDs which reference texture assets used as materials
2013-04-24 20:43:15 -07:00
0e22021c65
Make the kicked user's avie truly disappear when it's god-kicked.
2013-04-24 19:00:41 -07:00
ec4f981f1d
Adding the dynamic menu module which allows registering new menu options in compliant viewers
2013-04-25 01:52:34 +01:00
c7a0ce0865
Merge branch 'master' into careminster
2013-04-25 00:52:29 +01:00
5cd77a460c
Commit Avination's God Kick feature.
2013-04-25 00:51:57 +01:00
9b67027841
Merge branch 'master' into careminster
2013-04-25 00:25:09 +01:00
6f3c905744
Add Avination's support for parcel eject and freeze
2013-04-25 00:24:48 +01:00
d36a52ea55
Merge branch 'master' into careminster
2013-04-25 00:22:28 +01:00
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
1868680848
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-04-24 12:46:23 -07:00
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
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
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
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
ed22014646
revert CSJ2K.dll to version in use prior to commit d4fa2c69ed
2013-04-23 15:01:20 -07:00
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
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