aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | BulletSim: complete BSShape classes.Robert Adams2013-04-293-19/+316
| | | | |
* | | | | Merge branch 'master' into careminsterMelanie2013-05-017-13/+26
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | Conflicts: ThirdParty/SmartThreadPool/SmartThreadPool.cs
| * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-05-014-9/+10
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Add in-code exaplanation for the change in cancellation signalling in STP ↵Justin Clark-Casey (justincc)2013-05-011-2/+0
| | | | | | | | | | | | | | | | | | | | 2.2.3. Remove left in Console.WriteLine accidentally inserted in recent 206fb306
| | * | | Update SmartThreadPool to latest version 2.2.3 with a major and minor change.Justin Clark-Casey (justincc)2013-05-014-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Fix the long standing bug of items being delivered to lost and found or ↵Melanie2013-05-011-2/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | trash when takig copy. This bug was recently aggravated through the perms changes required for the export permission.
| * | | Fix CAPS to work like they should - do not send caps to the viewer if ↵Melanie2013-04-302-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'master' into careminsterMelanie2013-04-304-86/+469
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | BulletSim: fix error messages created while an avatar has no initialRobert Adams2013-04-301-0/+3
| | | | | | | | | | | | | | | | | | | | collisions. Usually happens when logging in an avatar that had been previously flying. Uninitialized variable.
| * | | minor: Eliminate warning in LLimageManagerTests by properly calling through ↵Justin Clark-Casey (justincc)2013-04-291-0/+2
| | | | | | | | | | | | | | | | to OpenSimTestCase.SetUp()
| * | | Add TestRejectGivenFolder() and TestAcceptGivenFolder() regression testsJustin Clark-Casey (justincc)2013-04-292-5/+198
| | | |
| * | | Add regression test for inventory item give, reject and subsequent trash ↵Justin Clark-Casey (justincc)2013-04-291-0/+256
| | | | | | | | | | | | | | | | | | | | | | | | folder purge by receiver. This commit also actually adds the InventoryTransferModuleTests file which I previously forgot
| * | | Add regression test for offer, accept and subsequent receiver delete of an ↵Justin Clark-Casey (justincc)2013-04-291-80/+3
| | | | | | | | | | | | | | | | item offered via instant message.
| * | | Fix bug where an agent that declined an inventory offer and subsequently ↵Justin Clark-Casey (justincc)2013-04-291-2/+8
| |/ / | | | | | | | | | | | | | | | 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.
| * | Some more pieces of Avination's ban system - if an avatar isn't allowed on anyMelanie2013-04-291-7/+88
| |/ | | | | | | parcel in the sim, keep them out entirely.
* | Merge branch 'master' into careminsterMelanie2013-04-291-1/+1
|\ \ | |/
| * Unbreak the sample money moduleMelanie2013-04-271-0/+2
| |
| * Small oversight in EconomyDataRequest - this would have affected everyone ↵Melanie2013-04-271-2/+0
| | | | | | | | NOT using a money module.
* | Merge branch 'master' into careminsterMelanie2013-04-252-12/+7
|\ \ | |/
| * Change EconomyDataRequest signature to use an IClientAPI rather than UUID. ↵Melanie2013-04-252-12/+7
| | | | | | | | | | | | 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.
| * Change copyright notice on DynamicMenuModule to proper BSDMelanie2013-04-251-5/+26
| |
* | Merge branch 'master' into careminsterMelanie2013-04-254-2/+406
|\ \ | |/
| * UUIDGatherer now includes UUIDs which reference texture assets used as materialsdahlia2013-04-241-0/+66
| |
| * Make the kicked user's avie truly disappear when it's god-kicked.Diva Canto2013-04-241-2/+1
| |
| * Adding the dynamic menu module which allows registering new menu options in ↵Melanie2013-04-252-0/+339
| | | | | | | | compliant viewers
| * Commit Avination's God Kick feature.Melanie2013-04-251-62/+137
| |
| * Add Avination's support for parcel eject and freezeMelanie2013-04-252-15/+110
| |
* | Merge branch 'master' into careminsterMelanie2013-04-2512-85/+365
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-04-2410-77/+358
| |\
| | * BulletSim: partial addition of BSShape class code preparing forRobert Adams2013-04-242-52/+191
| | | | | | | | | | | | | | | different physical mesh representations (simplified convex meshes) and avatar mesh.
| | * BulletSim: update DLLs and SOs to they have no dependencies on newerRobert Adams2013-04-243-0/+44
| | | | | | | | | | | | | | | glibc (2.14) since that is not yet in some Linux distributions. Add unmanaged API calls and code for creating single convex hull shapes.
| | * BulletSim: improve avatar stair walking up. Add more parameters to control forceRobert Adams2013-04-235-25/+123
| | | | | | | | | | | | | | | of both position change and up force that move avatars over barrier. Default parameters are for steps up to 0.5m in height.
| * | Bug fix: compare tolower. This should fix the issue where HG visitors ↵Diva Canto2013-04-241-1/+1
| |/ | | | | | | currently in the region were not being found by the avatar picker window.
| * Fix issue in ConciergeModule where UpdateBroker was sending malformed XML if ↵Justin Clark-Casey (justincc)2013-04-231-2/+4
| | | | | | | | | | | | | | 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
| * BulletSim: fix crash when deleting llVolumeDetect enabled objects. Bullet's ↵Robert Adams2013-04-221-5/+2
| | | | | | | | 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.
| * Allow callers to set the invoice parameter for GenericMessageMelanie2013-04-224-8/+18
| |
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-04-2229-900/+2135
|\ \
| * \ Merge branch 'master' into careminsterMelanie2013-04-213-12/+620
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs bin/OpenMetaverse.StructuredData.XML bin/OpenMetaverse.XML bin/OpenMetaverseTypes.XML
| | * Materials persistence via SceneObjectPart.dynAttrs. This appears to work ↵dahlia2013-04-201-8/+154
| | | | | | | | | | | | 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.
| | * handle PUT verb for RenderMaterials Capdahlia2013-04-201-1/+5
| | |
| | * RenderMaterials POST Cap now return material entries when invoked with an ↵dahlia2013-04-191-61/+108
| | | | | | | | | | | | OSDArray of MaterialIDs
| | * Materials-capable viewers send ImageUpdate packets when updating materials ↵dahlia2013-04-191-11/+35
| | | | | | | | | | | | 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.
| | * remove default parameter value that apparently mono cant handledahlia2013-04-181-1/+1
| | |
| | * Initial experimental support for materials-capable viewers. This is in a ↵dahlia2013-04-181-0/+382
| | | | | | | | | | | | 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.
| | * amend previous commit, a line was left outdahlia2013-04-171-0/+1
| | |
| | * Thanks lkalif for a fix to SendRegionHandshake() which fixes a potential ↵dahlia2013-04-171-2/+6
| | | | | | | | | | | | crash with Server-side baking enabled viewers
| | * Allow changes to TextureEntry to propagate to viewers when MaterialID changesdahlia2013-04-171-0/+2
| | |
| * | Merge branch 'master' into careminsterMelanie2013-04-163-8/+14
| |\ \ | | |/
| | * refactor: Remove IClientNetworkServer.NetworkStop() in favour of existing ↵Justin Clark-Casey (justincc)2013-04-163-8/+14
| | | | | | | | | | | | | | | | | | | | | 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.
| * | Merge branch 'master' into careminsterMelanie2013-04-1023-880/+1501
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
generated by cgit v1.1 at 2024-12-26 23:36:54 +0000