aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-05-302-4/+4
|\
| * Update the money framework to allow sending the new style linden "serverside ...Melanie2013-05-252-4/+4
| * This is an experimental patch that adds support for comparing textureMic Bowman2013-05-242-33/+67
* | Merge branch 'master' into careminsterMelanie2013-05-241-1/+1
|\ \ | |/
| * To further help with tracking down the apperance of too much "Unknown User" i...Justin Clark-Casey (justincc)2013-05-211-1/+1
* | Merge branch 'master' into careminsterMelanie2013-05-113-3/+16
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-05-112-2/+16
| |\
| | * Implement delete key for local consoleJustin Clark-Casey (justincc)2013-05-091-0/+15
| | * remove pointless region handle paramter from IClientAPI.SendKillObject()Justin Clark-Casey (justincc)2013-05-091-2/+1
| * | Send up the part missing from the Avination Estate commit.Melanie2013-05-111-1/+33
| |/
* | Merge branch 'master' into careminsterMelanie2013-05-082-0/+50
|\ \ | |/
| * Adds an event and a method so that handling of the CachedTextureMic Bowman2013-05-082-0/+51
* | Merge branch 'master' into careminsterMelanie2013-05-081-0/+47
|\ \ | |/
| * Added AvatarPickerSearch capability handler.Diva Canto2013-05-071-0/+47
* | Merge branch 'master' into careminsterMelanie2013-05-041-1/+6
|\ \ | |/
| * On startup, start scenes after we're set up all local scenes, rather than sta...Justin Clark-Casey (justincc)2013-05-031-1/+6
* | Merge branch 'master' into careminsterMelanie2013-05-011-10/+10
|\ \ | |/
| * Update SmartThreadPool to latest version 2.2.3 with a major and minor change.Justin Clark-Casey (justincc)2013-05-011-10/+10
* | Merge branch 'master' into careminsterMelanie2013-04-251-1/+1
|\ \ | |/
| * Change EconomyDataRequest signature to use an IClientAPI rather than UUID. Th...Melanie2013-04-251-1/+1
| * Allow callers to set the invoice parameter for GenericMessageMelanie2013-04-221-2/+2
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-04-221-0/+5
|\ \
| * \ Merge branch 'master' into careminsterMelanie2013-04-101-0/+5
| |\ \ | | |/
| | * If OpenSimulator is writing a PID file and finds the file already present on ...Justin Clark-Casey (justincc)2013-04-091-0/+5
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-04-221-1/+1
|\ \ \ | |/ /
| * | Merge branch 'master' into careminsterMelanie2013-04-051-1/+1
| |\ \ | | |/
| | * * In between the fog, a moment of clarity. This fixes mantis 6570teravus2013-04-041-1/+1
| | * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-261-0/+15
* | | Allow callers to set the invoice parameter for GenericMessageMelanie2013-04-221-2/+2
|/ /
* | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-241-0/+15
* | Merge branch 'master' into careminsterMelanie2013-03-222-31/+51
|\ \ | |/
| * Prevent multiple instances of the same item ID being appended to an AvatarApp...Justin Clark-Casey (justincc)2013-03-191-30/+48
| * For the moment, disable the output of the 'scene' statistics in SimExtraStats...Robert Adams2013-03-191-1/+3
* | Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminsterMelanie2013-03-191-3/+14
|\ \ | |/
| * *Yet another HTTPServer update code changes in OpenSim Libs. * This fixes a c...teravus2013-03-161-3/+14
* | Merge branch 'master' into careminsterMelanie2013-03-153-1/+28
|\ \ | |/
| * Log same environment information to Robust log as is already done for simulat...Justin Clark-Casey (justincc)2013-03-142-11/+21
| * Add ILandChannel.GetLandObject(Vector3 position) as this is a very common inp...Justin Clark-Casey (justincc)2013-03-141-0/+7
* | Merge branch 'master' into careminsterMelanie2013-03-144-4/+102
|\ \ | |/
| * minor: Remove some mono compiler warnings in OpenSim.Framework.dllJustin Clark-Casey (justincc)2013-03-132-3/+3
| * Add prototype dynamic objects map for scene object partsJustin Clark-Casey (justincc)2013-03-132-1/+99
* | Merge branch 'avination' into careminsterMelanie2013-03-061-3/+2
|\ \
| * | Multiattach, part 1Melanie2013-03-051-3/+2
| * | Revert "Push updates from keyframe directly to the front of the output queue ...Melanie2013-02-121-2/+1
| * | Push updates from keyframe directly to the front of the output queue ratherMelanie2013-02-121-1/+2
* | | Merge branch 'master' into careminsterMelanie2013-03-053-1/+24
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2013-03-051-1/+16
| |\ \
| | * | * Add a Max Payload size property to the Websocket Server Handler. If you ...teravus2013-03-051-1/+16
| * | | Add method to remove JsonRpc Handlers from the serverBlueWall2013-03-032-0/+8
| |/ /
* | | Merge branch 'master' into careminsterMelanie2013-02-271-2/+5
|\ \ \ | |/ /
generated by cgit v1.1 at 2024-12-14 05:47:25 +0000