aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/ServiceConnectorsOut (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminsterMelanie2012-09-272-8/+57
|\
| * Use GridUser properly for foreign users.Diva Canto2012-09-261-3/+3
| * TOS module. WARNING: migration in GridUser table.Diva Canto2012-09-252-5/+54
* | Merge branch 'master' into careminsterMelanie2012-09-242-11/+20
|\ \ | |/
| * Minor: may avoid crashes of sims that still don't have this configuration sec...Diva Canto2012-09-211-1/+1
| * HG 2.0: added asset import/export policies at the sim too.Diva Canto2012-09-211-8/+15
| * Correctly override and call base OpenSimTestCase.SetUp() method in GridConnec...Justin Clark-Casey (justincc)2012-09-191-3/+5
* | Merge branch 'master' into careminsterMelanie2012-09-162-2/+141
|\ \ | |/
| * Add basic asset connector tests to check behaviour for normal, local and temp...Justin Clark-Casey (justincc)2012-09-152-2/+141
* | Merge branch 'master' into careminsterMelanie2012-09-071-1/+1
|\ \ | |/
| * If reusing dynamic textures, do not reuse small data length textures that fal...Justin Clark-Casey (justincc)2012-09-061-1/+1
* | Merge branch 'avination' into careminsterMelanie2012-08-311-0/+1
|\ \
| * | fix vs2010 buildUbitUmarov2012-08-161-0/+1
* | | Merge branch 'master' into careminsterMelanie2012-08-231-1/+5
|\ \ \ | |/ / |/| / | |/
| * Add --force flag to "kick user" console command to allow bypassing of recent ...Justin Clark-Casey (justincc)2012-08-201-1/+1
* | Add a real_id field to the login response if impersonation is used. The wrapperMelanie2012-08-151-0/+6
* | Merge branch 'master' into careminsterMelanie2012-07-282-7/+2
|\ \ | |/
| * Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.Justin Clark-Casey (justincc)2012-07-251-1/+1
| * Make SceneManager.OnRegionsReadyStatusChange event available.Justin Clark-Casey (justincc)2012-07-251-6/+1
* | Merge branch 'master' into careminsterMelanie2012-07-191-17/+2
|\ \ | |/
| * Establish EventManager.OnRegionReady event. This will only be triggerred onc...Justin Clark-Casey (justincc)2012-07-181-8/+2
| * Pass entire scene object in OnLoginsEnabled event rather than just the region...Justin Clark-Casey (justincc)2012-07-181-11/+2
* | Merge branch 'master' into careminsterMelanie2012-07-132-17/+24
|\ \ | |/
| * Remove a callstack print out I accidentally left in 2 commits ago in 9ccb578Justin Clark-Casey (justincc)2012-07-131-1/+0
| * Rather than instantiating a UTF8 encoding everywhere when we want to supress ...Justin Clark-Casey (justincc)2012-07-131-1/+1
| * Don't cache regions data on the other unused LocalGridServiceConnector that t...Justin Clark-Casey (justincc)2012-07-133-17/+25
* | Merge branch 'master' into careminsterMelanie2012-07-012-26/+1
|\ \ | |/
| * Removing unused handling of incoming create object by userID and itemID only.Justin Clark-Casey (justincc)2012-06-302-26/+1
* | Merge branch 'master' into careminsterMelanie2012-06-122-34/+7
|\ \ | |/
| * OnConnectionClosed listeners, retrieve data from IClientAPI.SceneAgent rather...Justin Clark-Casey (justincc)2012-06-122-23/+7
| * In PresenceDetector.OnConnectionClose(), use the IsChildAgent check already a...Justin Clark-Casey (justincc)2012-06-121-12/+1
* | Merge branch 'master' into careminsterMelanie2012-05-273-111/+109
|\ \ | |/
| * Resolve some mono compiler warnings.Justin Clark-Casey (justincc)2012-05-251-1/+1
| * Fix bug where a failed QueryAccess to a remove region would always have the r...Justin Clark-Casey (justincc)2012-05-251-2/+1
| * Make ISimulationScene.GetScene() used the more efficient region id for lookup...Justin Clark-Casey (justincc)2012-05-242-8/+16
| * If an agent is still registered as 'in transit' by the source region, don't a...Justin Clark-Casey (justincc)2012-05-241-91/+95
* | Merge branch 'master' into careminsterMelanie2012-05-051-2/+2
|\ \ | |/
| * minor: resolve some mono compiler warningsJustin Clark-Casey (justincc)2012-05-031-2/+2
* | Merge branch 'master' into careminsterMelanie2012-04-271-3/+12
|\ \ | |/
| * MapImageService: changed the event at which the map tiles are uploaded, becau...Diva Canto2012-04-271-3/+12
* | Merge branch 'master' into careminsterMelanie2012-04-271-5/+5
|\ \ | |/
| * Tweak log messages on local region to region teleport path to help with probl...Justin Clark-Casey (justincc)2012-04-261-5/+5
* | Merge branch 'master' into careminsterMelanie2012-04-073-12/+97
|\ \ | |/
| * Finish the implementation of GetUserInventory, even though it's still not used.Diva Canto2012-04-063-12/+97
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-03-311-8/+11
|\ \
| * | Allow the map tile module to be enabled without also eabling refreshMelanie2012-03-291-8/+11
* | | Merge branch 'master' into careminsterMelanie2012-03-311-6/+3
|\ \ \ | |/ / |/| / | |/
| * Add simple login test with online friends. Add IFriendsModule.GrantRights() ...Justin Clark-Casey (justincc)2012-03-301-6/+3
* | Merge branch 'master' into careminsterMelanie2012-03-271-1/+1
|\ \ | |/
| * Let grided simulators retrieve the user's inventory skeletonDiva Canto2012-03-271-1/+1