aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World/NPC (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge of ubitworkvarnew with opensim/master as of 20150905.Robert Adams2015-09-081-1/+0
|\
| * Deleted OpenSim.Framework.Communications. Moved its two remaining files to Op...Diva Canto2015-09-041-1/+0
* | seems to compile ( tests comented out)UbitUmarov2015-09-022-8/+0
* | bad merge?UbitUmarov2015-09-013-37/+82
|\ \ | |/ |/|
| * delay terrain sending if land queue is 2 busyUbitUmarov2015-08-221-0/+5
| * Track selected objects per clientMelanie Thielker2015-08-151-0/+2
| * scale ChildAgentThrottles with distance (internal to child server and notUbitUmarov2014-11-061-0/+5
| * add method to get a category throttle rateUbitUmarov2014-08-291-0/+5
| * add a direct sendpartfullUpdate to send a full object update to a part,UbitUmarov2014-08-211-0/+4
| * add a estimator of client ping time, and painfully make it visible in showUbitUmarov2014-08-141-0/+2
| * dont fire a thread on npc creation keeping the main one just waitingUbitUmarov2014-08-021-5/+6
| * Intermediate commit. Sill errors.Melanie2014-01-051-9/+7
| |\
| * \ Merge branch 'master' into careminsterMelanie2013-10-061-6/+21
| |\ \
| * \ \ Merge branch 'master' into careminsterMelanie2013-10-041-9/+11
| |\ \ \
| * \ \ \ Merge branch 'master' into careminsterMelanie2013-08-131-1/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-291-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-241-1/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-241-2/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-05-301-6/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-05-111-1/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-05-081-0/+6
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Allow callers to set the invoice parameter for GenericMessageMelanie2013-04-221-2/+2
| * | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-01-261-0/+2
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2013-01-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | * Partial Commit for Avatar Appearance to include the functionality of Cached...teravus2012-12-211-1/+1
| * | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-11-251-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'avination' into careminsterMelanie2012-11-201-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | * Plumbing and basic setting of the GetMesh Cap Throttler.teravus2012-11-171-0/+6
| | * | | | | | | | | | | | | Revert "Merge master into teravuswork", it should have been avination, not ma...teravus2012-11-152-22/+7
| | * | | | | | | | | | | | | Merge master into teravusworkteravus2012-11-152-7/+22
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-11-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | Pipe Throttle Update Event to EventManager, client --> ScenePresence --> Even...teravus2012-11-041-1/+1
| * | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-11-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-11-121-46/+78
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-10-301-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-10-261-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-10-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-09-271-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | add missing transactionID in SendInventoryItemCreateUpdate. and make useUbitUmarov2012-09-241-0/+4
| * | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-08-231-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Remove NPC debug spamMelanie2012-08-141-7/+7
| * | | | | | | | | | | | | | | | | | | Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into avina...Melanie2012-08-141-33/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-08-141-33/+29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Removed more spammy NPC crapMelanie2012-08-141-1/+1
| * | | | | | | | | | | | | | | | | | | | | Comment spammy debugMelanie2012-08-141-3/+3
| |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | Fix slow loading of task inventoryMelanie2012-07-191-1/+1
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-07-131-5/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-07-112-0/+57
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-07-051-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-06-141-4/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \