aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-06-112-7/+9
|\
| * Add port numbers to poll service thread names so that we can tell which belon...Justin Clark-Casey (justincc)2013-06-101-2/+2
| * Reinstate explicit starting and stopping of PollServiceRequestManager added i...Justin Clark-Casey (justincc)2013-06-102-4/+7
| * Supply proper type information for the various types of requestsMelanie2013-06-071-3/+1
| * Adding Avination's PollService to round out the HTTP inventory changesMelanie2013-06-075-228/+211
| * Port Avination's inventory send throttlingMelanie2013-06-051-0/+108
* | Merge branch 'avination-current' into careminsterMelanie2013-06-061-1/+1
|\ \
| * | Update the money framework to allow sending the new style linden "serverside ...Melanie2013-05-252-4/+4
| * | Change EconomyDataRequest signature to use an IClientAPI rather than UUID. Th...Melanie2013-04-251-1/+1
| * | Send 503 when throttling texturesMelanie2013-04-251-1/+1
* | | Merge branch 'master' into careminsterMelanie2013-06-042-0/+137
|\ \ \ | | |/ | |/|
| * | Adding standard OpenSim header to source filesBlueWall2013-05-311-0/+27
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2013-05-301-0/+90
| |\ \
| | * | UserProfilesBlueWall2013-05-301-0/+90
| * | | Add methods to Animation and AnimationSet for easier manipulation andRobert Adams2013-05-301-0/+20
| |/ /
* | | 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