aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-04-309-97/+549
|\ | | | | | | | | 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: remove some mono compiler warnings in ServicesServerBaseJustin Clark-Casey (justincc)2013-04-291-5/+0
| |
| * 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-294-10/+262
| |
| * Add regression test for inventory item give, reject and subsequent trash ↵Justin Clark-Casey (justincc)2013-04-292-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-293-80/+16
| | | | | | | | 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-297-18/+81
|\ \ | |/
| * Fix wrong sql statement in offline im.Diva Canto2013-04-281-5/+2
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-04-271-1/+1
| |\
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-04-272-1/+2
| | |\
| | * | 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.
| * | | Added an interface to an external ban service. With this commit, the ↵Diva Canto2013-04-272-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 reportingDiva Canto2013-04-271-0/+1
| | |
| * | Make method virtualDiva Canto2013-04-271-1/+1
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-04-254-18/+34
| |\
| * | Groups: make some methods protected.Diva Canto2013-04-251-7/+7
| | |
* | | Merge branch 'master' into careminsterMelanie2013-04-253-13/+8
|\ \ \ | | |/ | |/|
| * | Change EconomyDataRequest signature to use an IClientAPI rather than UUID. ↵Melanie2013-04-253-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.
* | | Merge branch 'master' into careminsterMelanie2013-04-250-0/+0
|\ \ \ | |/ /
| * | Change copyright notice on DynamicMenuModule to proper BSDMelanie2013-04-251-5/+26
| |/
* | Merge branch 'master' into careminsterMelanie2013-04-254-2/+406
|\ \ | |/
| * Recover a lost "virtual". Downstream projects need this.Diva Canto2013-04-251-1/+1
| |
| * 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
* | Merge branch 'master' into careminsterMelanie2013-04-250-0/+0
|\ \ | |/
| * Commit Avination's God Kick feature.Melanie2013-04-251-62/+137
| |
* | Merge branch 'master' into careminsterMelanie2013-04-250-0/+0
|\ \ | |/
| * Add Avination's support for parcel eject and freezeMelanie2013-04-252-15/+110
| |
* | Merge branch 'master' into careminsterMelanie2013-04-2517-85/+365
|\ \ | |/
| * BulletSim: version of libBulletSim.so for 32 bit systems that doesn'tRobert Adams2013-04-241-0/+0
| | | | | | | | crash on startup. Doesn't yet solve the new glibcxx dependencies.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-04-2414-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-247-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.
| * revert CSJ2K.dll to version in use prior to commit ↵dahlia2013-04-231-0/+0
| | | | | | | | d4fa2c69ed2895dcab76e0df1b26252246883c07
| * 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-226-12/+22
| |
* | Merge branch 'master' into careminsterMelanie2013-04-222-9/+10
|\ \ | |/
| * Clean up unused config and config comments.Diva Canto2013-04-212-9/+10
| |
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-04-2253-19182/+20056
|\ \
| * \ Merge branch 'master' into careminsterMelanie2013-04-2116-18176/+18431
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs bin/OpenMetaverse.StructuredData.XML bin/OpenMetaverse.XML bin/OpenMetaverseTypes.XML
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimdahlia2013-04-212-3/+3
| | |\
| | | * Fix spellingBlueWall2013-04-201-2/+2
| | | |
generated by cgit v1.1 at 2024-12-18 10:40:51 +0000