aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-05-305-31/+37
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-284-18/+13
| |\
| | * Update the money framework to allow sending the new style linden "serverside ...Melanie2013-05-254-17/+12
| | * This is an experimental patch that adds support for comparing textureMic Bowman2013-05-241-1/+1
| * | First change in Vivox for ages! -- added a lock to serialize calls to vivox s...Diva Canto2013-05-281-14/+25
| |/
* | Merge branch 'master' into careminsterMelanie2013-05-112-2/+2
|\ \ | |/
| * remove pointless region handle paramter from IClientAPI.SendKillObject()Justin Clark-Casey (justincc)2013-05-092-2/+2
* | Merge branch 'master' into careminsterMelanie2013-05-082-0/+12
|\ \ | |/
| * Adds an event and a method so that handling of the CachedTextureMic Bowman2013-05-082-0/+12
* | 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 NOT...Melanie2013-04-271-2/+0
* | Merge branch 'master' into careminsterMelanie2013-04-251-11/+6
|\ \ | |/
| * Change EconomyDataRequest signature to use an IClientAPI rather than UUID. Th...Melanie2013-04-251-11/+6
| * Change copyright notice on DynamicMenuModule to proper BSDMelanie2013-04-251-5/+26
* | Merge branch 'master' into careminsterMelanie2013-04-251-0/+282
|\ \ | |/
| * Adding the dynamic menu module which allows registering new menu options in c...Melanie2013-04-251-0/+282
* | Merge branch 'master' into careminsterMelanie2013-04-251-2/+4
|\ \ | |/
| * Fix issue in ConciergeModule where UpdateBroker was sending malformed XML if ...Justin Clark-Casey (justincc)2013-04-231-2/+4
| * Allow callers to set the invoice parameter for GenericMessageMelanie2013-04-222-4/+4
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-04-221-0/+579
|\ \
| * \ Merge branch 'master' into careminsterMelanie2013-04-211-0/+579
| |\ \ | | |/
| | * Materials persistence via SceneObjectPart.dynAttrs. This appears to work acro...dahlia2013-04-201-8/+154
| | * handle PUT verb for RenderMaterials Capdahlia2013-04-201-1/+5
| | * RenderMaterials POST Cap now return material entries when invoked with an OSD...dahlia2013-04-191-61/+108
| | * remove default parameter value that apparently mono cant handledahlia2013-04-181-1/+1
| | * Initial experimental support for materials-capable viewers. This is in a very...dahlia2013-04-181-0/+382
* | | Allow callers to set the invoice parameter for GenericMessageMelanie2013-04-222-4/+4
|/ /
* | Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminsterMelanie2013-03-291-1/+1
|\ \ | |/
| * Stop attempts to update/add existing attachments in user inventory when telep...Justin Clark-Casey (justincc)2013-03-281-1/+1
| * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-262-1/+3
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2013-03-262-1/+3
|\ \
| * | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-242-1/+3
* | | Merge branch 'master' into careminsterMelanie2013-03-231-0/+31
|\ \ \ | |/ / |/| / | |/
| * Add "show borders" command to show the borders of a region.Justin Clark-Casey (justincc)2013-03-231-0/+31
* | Merge branch 'master' into careminsterMelanie2013-03-221-10/+7
|\ \ | |/
| * Fix "show attachments" command probably broken in commit addab12 (Wed Jan 2 2...Justin Clark-Casey (justincc)2013-03-201-10/+7
| * Merge branch 'master' into newmultiattachMelanie2013-03-185-49/+156
| |\
| * | Multiattach, part 1Melanie2013-03-181-1/+1
* | | Merge branch 'master' into careminsterMelanie2013-03-151-15/+26
|\ \ \ | | |/ | |/|
| * | Fix server statistics always reporting zero for total network bytes in/out.Robert Adams2013-03-151-15/+26
* | | Merge branch 'master' into careminsterMelanie2013-03-084-34/+130
|\ \ \ | |/ /
| * | Per discussions with justincc... split the JsonStore typeMic Bowman2013-03-054-34/+130
| |/
* | Merge branch 'avination' into careminsterMelanie2013-03-061-1/+1
|\ \
| * | Multiattach, part 1Melanie2013-03-051-1/+1
| * | Revert "Output some additional data on Vivox connection errors", this logs pa...Melanie2013-02-241-1/+1
| * | Output some additional data on Vivox connection errorsMelanie2013-02-241-1/+1
* | | Merge branch 'master' into careminsterMelanie2013-03-052-7/+8
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-03-021-6/+7
| |\ \
| | * | minor: Quieten down the parts of the WebSocketEcho module logging for now whe...Justin Clark-Casey (justincc)2013-03-021-6/+7