Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | minor: Eliminate warning in LLimageManagerTests by properly calling through ↵ | Justin Clark-Casey (justincc) | 2013-04-29 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | to OpenSimTestCase.SetUp() | |||||
| * | | | Add TestRejectGivenFolder() and TestAcceptGivenFolder() regression tests | Justin Clark-Casey (justincc) | 2013-04-29 | 4 | -10/+262 | |
| | | | | ||||||
| * | | | Add regression test for inventory item give, reject and subsequent trash ↵ | Justin Clark-Casey (justincc) | 2013-04-29 | 2 | -1/+259 | |
| | | | | | | | | | | | | | | | | | | | | | | | | 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-29 | 2 | -80/+15 | |
| | | | | | | | | | | | | | | | | item offered via instant message. | |||||
| * | | | Fix bug where an agent that declined an inventory offer and subsequently ↵ | Justin Clark-Casey (justincc) | 2013-04-29 | 1 | -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 any | Melanie | 2013-04-29 | 1 | -7/+88 | |
| |/ | | | | | | | parcel in the sim, keep them out entirely. | |||||
* | | Merge branch 'master' into careminster | Melanie | 2013-04-29 | 7 | -18/+81 | |
|\ \ | |/ | ||||||
| * | Fix wrong sql statement in offline im. | Diva Canto | 2013-04-28 | 1 | -5/+2 | |
| | | ||||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-04-27 | 1 | -1/+1 | |
| |\ | ||||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2013-04-27 | 2 | -1/+2 | |
| | |\ | ||||||
| | * | | Unbreak the sample money module | Melanie | 2013-04-27 | 1 | -0/+2 | |
| | | | | ||||||
| | * | | Small oversight in EconomyDataRequest - this would have affected everyone ↵ | Melanie | 2013-04-27 | 1 | -2/+0 | |
| | | | | | | | | | | | | | | | | NOT using a money module. | |||||
| * | | | Added an interface to an external ban service. With this commit, the ↵ | Diva Canto | 2013-04-27 | 2 | -4/+69 | |
| | |/ | |/| | | | | | | | 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. | |||||
| * | | Better error reporting | Diva Canto | 2013-04-27 | 1 | -0/+1 | |
| | | | ||||||
| * | | Make method virtual | Diva Canto | 2013-04-27 | 1 | -1/+1 | |
| |/ | ||||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-04-25 | 4 | -18/+34 | |
| |\ | ||||||
| * | | Groups: make some methods protected. | Diva Canto | 2013-04-25 | 1 | -7/+7 | |
| | | | ||||||
* | | | Merge branch 'master' into careminster | Melanie | 2013-04-25 | 3 | -13/+8 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Change EconomyDataRequest signature to use an IClientAPI rather than UUID. ↵ | Melanie | 2013-04-25 | 3 | -13/+8 | |
| | | | | | | | | | | | | | | | | | | 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 BSD | Melanie | 2013-04-25 | 1 | -5/+26 | |
| |/ | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2013-04-25 | 4 | -2/+406 | |
|\ \ | |/ | ||||||
| * | Recover a lost "virtual". Downstream projects need this. | Diva Canto | 2013-04-25 | 1 | -1/+1 | |
| | | ||||||
| * | UUIDGatherer now includes UUIDs which reference texture assets used as materials | dahlia | 2013-04-24 | 1 | -0/+66 | |
| | | ||||||
| * | Make the kicked user's avie truly disappear when it's god-kicked. | Diva Canto | 2013-04-24 | 1 | -2/+1 | |
| | | ||||||
| * | Adding the dynamic menu module which allows registering new menu options in ↵ | Melanie | 2013-04-25 | 2 | -0/+339 | |
| | | | | | | | | compliant viewers | |||||
| * | Commit Avination's God Kick feature. | Melanie | 2013-04-25 | 1 | -62/+137 | |
| | | ||||||
| * | Add Avination's support for parcel eject and freeze | Melanie | 2013-04-25 | 2 | -15/+110 | |
| | | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2013-04-25 | 12 | -85/+365 | |
|\ \ | |/ | ||||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-04-24 | 10 | -77/+358 | |
| |\ | ||||||
| | * | BulletSim: partial addition of BSShape class code preparing for | Robert Adams | 2013-04-24 | 2 | -52/+191 | |
| | | | | | | | | | | | | | | | different physical mesh representations (simplified convex meshes) and avatar mesh. | |||||
| | * | BulletSim: update DLLs and SOs to they have no dependencies on newer | Robert Adams | 2013-04-24 | 3 | -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 force | Robert Adams | 2013-04-23 | 5 | -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 Canto | 2013-04-24 | 1 | -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-23 | 1 | -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 Adams | 2013-04-22 | 1 | -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 GenericMessage | Melanie | 2013-04-22 | 6 | -12/+22 | |
| | | ||||||
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2013-04-22 | 32 | -1018/+2237 | |
|\ \ | ||||||
| * \ | Merge branch 'master' into careminster | Melanie | 2013-04-21 | 3 | -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 ↵ | dahlia | 2013-04-20 | 1 | -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 Cap | dahlia | 2013-04-20 | 1 | -1/+5 | |
| | | | ||||||
| | * | RenderMaterials POST Cap now return material entries when invoked with an ↵ | dahlia | 2013-04-19 | 1 | -61/+108 | |
| | | | | | | | | | | | | OSDArray of MaterialIDs | |||||
| | * | Materials-capable viewers send ImageUpdate packets when updating materials ↵ | dahlia | 2013-04-19 | 1 | -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 handle | dahlia | 2013-04-18 | 1 | -1/+1 | |
| | | | ||||||
| | * | Initial experimental support for materials-capable viewers. This is in a ↵ | dahlia | 2013-04-18 | 1 | -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 out | dahlia | 2013-04-17 | 1 | -0/+1 | |
| | | | ||||||
| | * | Thanks lkalif for a fix to SendRegionHandshake() which fixes a potential ↵ | dahlia | 2013-04-17 | 1 | -2/+6 | |
| | | | | | | | | | | | | crash with Server-side baking enabled viewers | |||||
| | * | Allow changes to TextureEntry to propagate to viewers when MaterialID changes | dahlia | 2013-04-17 | 1 | -0/+2 | |
| | | | ||||||
| * | | Merge branch 'master' into careminster | Melanie | 2013-04-16 | 3 | -8/+14 | |
| |\ \ | | |/ | ||||||
| | * | refactor: Remove IClientNetworkServer.NetworkStop() in favour of existing ↵ | Justin Clark-Casey (justincc) | 2013-04-16 | 3 | -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 careminster | Melanie | 2013-04-10 | 26 | -998/+1603 | |
| |\ \ | | |/ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs |