aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-10-121-2/+20
|\
| * Fix build breakMelanie2012-10-081-1/+1
| * Add a ServiceList section to Robust .ini to get rid of the long stringMelanie2012-10-081-0/+18
| * Allow other whitespace characters than spaces in Robust connection stringMelanie2012-10-081-2/+2
* | Merge branch 'avination' into careminsterMelanie2012-09-271-1/+9
|\ \
| * | Make agent creation at destination asynchronous. Failures here are prettyMelanie2012-09-161-1/+9
* | | Merge branch 'master' into careminsterMelanie2012-09-161-0/+18
|\ \ \ | | |/ | |/|
| * | Don't store the unnecessary VERSIONMIN. VERSIONMAX, METHOD or UserID (present...Justin Clark-Casey (justincc)2012-09-141-0/+18
* | | Merge branch 'master' into careminsterMelanie2012-09-071-0/+41
|\ \ \ | |/ / | | / | |/ |/|
| * pasting in show uptime codeSignpostMarv2012-09-061-0/+41
* | Merge branch 'master' into careminsterMelanie2012-07-139-74/+61
|\ \ | |/
| * Rather than instantiating a UTF8 encoding everywhere when we want to supress ...Justin Clark-Casey (justincc)2012-07-139-74/+61
* | Merge branch 'master' into careminsterMelanie2012-07-121-4/+4
|\ \ | |/
| * Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than c...Justin Clark-Casey (justincc)2012-07-111-4/+4
* | Merge branch 'avination' into careminsterMelanie2012-07-111-1/+14
|\ \
| * | Address map lag issue seen with non-avination viewersMelanie2012-07-081-1/+14
* | | Merge branch 'master' into careminsterMelanie2012-07-012-51/+1
|\ \ \ | | |/ | |/|
| * | Remove some mono compiler warningsJustin Clark-Casey (justincc)2012-06-301-3/+1
| * | Removing unused handling of incoming create object by userID and itemID only.Justin Clark-Casey (justincc)2012-06-301-48/+0
* | | Merge branch 'master' into careminsterMelanie2012-06-152-82/+31
|\ \ \ | |/ /
| * | Make the "debug http" command available for robust as well as the simulator. ...Justin Clark-Casey (justincc)2012-06-152-74/+30
| * | Add main instance to internal MainServer.m_Servers list to simplify internal ...Justin Clark-Casey (justincc)2012-06-151-10/+3
* | | Merge branch 'master' into careminsterMelanie2012-05-272-5/+8
|\ \ \ | |/ /
| * | In remote QueryAccess, also receive the actual status (true|false) instead of...Justin Clark-Casey (justincc)2012-05-251-2/+5
| * | Make ISimulationScene.GetScene() used the more efficient region id for lookup...Justin Clark-Casey (justincc)2012-05-242-3/+3
* | | Merge branch 'master' into careminsterMelanie2012-05-101-3/+3
|\ \ \ | |/ /
| * | Escape and unescape xml element names if necessary in ServerUtils.BuildXmlDat...Justin Clark-Casey (justincc)2012-05-091-3/+3
* | | Merge branch 'master' into careminsterMelanie2012-05-054-4/+7
|\ \ \ | |/ /
| * | Remove the somewhat misleading logging of the string length of some unknown r...Justin Clark-Casey (justincc)2012-05-033-4/+5
| * | Implement optional name and description on http stream handlers so that we ca...Justin Clark-Casey (justincc)2012-05-031-0/+2
* | | Merge branch 'master' into careminsterMelanie2012-04-271-5/+74
|\ \ \ | |/ /
| * | MapImageService: changed the event at which the map tiles are uploaded, becau...Diva Canto2012-04-271-2/+2
| * | MapImage security issue. Compare strings instead of IPAddresses.Diva Canto2012-04-271-1/+1
| * | MapImage security issue: better error messagesDiva Canto2012-04-271-3/+5
| * | Amend to last commit: account for the existence of proxies.Diva Canto2012-04-271-3/+32
| * | MapImageService: added an additional security check for OSGrid and other grid...Diva Canto2012-04-271-5/+43
* | | Merge branch 'master' into careminsterMelanie2012-04-251-1/+4
|\ \ \ | |/ / | | / | |/ |/|
| * Minor improvements to loggingOren Hurvitz2012-04-241-1/+4
* | Merge branch 'master' into careminsterMelanie2012-04-071-13/+59
|\ \ | |/
| * Finish the implementation of GetUserInventory, even though it's still not used.Diva Canto2012-04-061-13/+59
* | Merge branch 'master' into careminsterMelanie2012-03-272-2/+2
|\ \ | |/
| * Send the config section name up to the service classes themselves (XInventory...Diva Canto2012-03-272-2/+2
* | Merge branch 'master' into careminsterMelanie2012-03-231-11/+13
|\ \ | |/
| * Comment out login parameters debug output accidentally included with c4b2d24Justin Clark-Casey (justincc)2012-03-221-11/+13
* | Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminsterMelanie2012-03-222-1/+12
|\ \ | |/
| * Add llGiveInventory() test from object to object where both objects are owned...Justin Clark-Casey (justincc)2012-03-222-1/+12
* | Merge branch 'master' into careminsterMelanie2012-03-222-1/+57
|\ \ | |/
| * HG Friends: reroute the status notifications to the HGFriends service, so tha...Diva Canto2012-03-212-0/+57
| * Removed extraneous debug messageDiva Canto2012-03-211-1/+0
* | Merge branch 'master' into careminsterMelanie2012-03-213-59/+163
|\ \ | |/