aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-11-172-1/+33
|\
| * Remove unnecessary ability to directly set InventoryItemBase.CreatorIdAsUuidJustin Clark-Casey (justincc)2012-11-171-1/+0
| * The last few AssemblyInfos. Finished!Diva Canto2012-11-141-0/+33
* | Merge branch 'master' into careminsterMelanie2012-11-137-7/+7
|\ \ | |/
| * Cleanup on region modules: gave short node id's to all of them.Diva Canto2012-11-127-7/+7
* | Merge branch 'master' into careminsterMelanie2012-11-091-1/+1
|\ \ | |/
| * HG: Hopefully this fixes the issues with port 80 once and for all.Diva Canto2012-11-071-1/+1
* | Merge branch 'avination' into careminsterMelanie2012-11-041-4/+4
|\ \
| * | Squash reporting HelloNeighbor exception - it simply means the other simMelanie2012-11-021-4/+4
* | | Merge branch 'master' into careminsterMelanie2012-10-201-2/+2
|\ \ \ | | |/ | |/|
| * | Improve efficiency of friends notification by only make one PresenceService c...Justin Clark-Casey (justincc)2012-10-201-2/+2
* | | Merge branch 'master' into careminsterMelanie2012-10-161-1/+1
|\ \ \ | |/ /
| * | minor: Comment out log message on every FRIENDS SIM CONNECTOR request for now.Justin Clark-Casey (justincc)2012-10-161-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-10-121-2/+2
|\ \ \ | |/ /
| * | Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it eas...Justin Clark-Casey (justincc)2012-10-091-2/+2
* | | Merge branch 'avination' into careminsterMelanie2012-10-071-16/+21
|\ \ \ | | |/ | |/|
| * | Fix threading in remote asset connectorMelanie2012-10-051-16/+21
* | | Merge branch 'master' into careminsterMelanie2012-10-072-4/+15
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-10-041-3/+8
| |\ \
| | * | Make the asset retrieval concurrency a config switch. The current valueMic Bowman2012-10-041-3/+8
| * | | One more abstraction for GridUser so that it can be overridden in a sub-class.Diva Canto2012-10-041-2/+7
| |/ /
| * | Allow setting max connections for an endpointMelanie2012-09-301-3/+3
| * | Revert "Added request.Proxy=null everywhere, as discussed in http://stackover...Diva Canto2012-09-305-9/+1
| * | Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com...Diva Canto2012-09-305-1/+9
* | | Merge branch 'avination' into careminsterMelanie2012-09-271-37/+67
|\ \ \ | | |/ | |/|
| * | Sequence/throttle asset retrievals.Melanie2012-09-141-37/+67
* | | Merge branch 'avination' into careminsterMelanie2012-09-161-2/+2
|\ \ \ | |/ /
| * | Allow setting max connections for an endpointMelanie2012-09-141-2/+2
* | | Merge branch 'avination' into careminsterMelanie2012-09-103-43/+51
|\ \ \ | |/ /
| * | Prevent double slashes, try #4UbitUmarov2012-09-061-1/+1
| * | Prevent double slashes, try #3Melanie2012-09-061-0/+3
| * | Revert "Change string concatenation to Path.Combine to eliminate extra slashes."Melanie2012-09-061-8/+6
| * | Merge branch 'ubitwork' into avinationMelanie2012-09-061-6/+8
| |\ \
| | * | Change string concatenation to Path.Combine to eliminate extra slashes.Melanie2012-09-061-6/+8
| | * | Revert " remove extra '/' in assets url"Melanie2012-09-061-13/+6
| | * | remove extra '/' in assets urlUbitUmarov2012-09-061-6/+13
| * | | Make friend notifies and closing child agents async because both canMelanie2012-09-042-42/+47
| |/ /
* | | Merge branch 'master' into careminsterMelanie2012-09-091-2/+2
|\ \ \ | |/ / |/| / | |/
| * 4096 is used in various places as the maximum height of a region, refactoring...SignpostMarv2012-09-081-2/+2
| * Add a skeleton for a name value storage associated with regionsMelanie2012-08-151-0/+14
* | fix vs2010 buildUbitUmarov2012-08-161-0/+1
* | Add a real_id field to the login response if impersonation is used. The wrapperMelanie2012-08-152-0/+12
* | Add a skeleton for a name value storage associated with regionsMelanie2012-08-151-0/+15
* | Add a reason message for a code path that lacks oneMelanie2012-08-031-0/+1
* | Merge branch 'master' into careminsterMelanie2012-08-011-9/+8
|\ \ | |/
| * Change exception log messages in XInventoryService connector to error rather ...Justin Clark-Casey (justincc)2012-08-011-9/+8
* | Merge branch 'master' into careminsterMelanie2012-08-011-1/+1
|\ \ | |/
| * If we're fetching active gestures via the XInventoryServiceConnector, then pr...Justin Clark-Casey (justincc)2012-07-301-1/+1
* | Merge branch 'avination' into careminsterMelanie2012-07-161-5/+29
|\ \
| * | be paranoic (?)UbitUmarov2012-07-111-0/+6