aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World/NPC (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-01-261-0/+2
|\
| * minor: Call down to base OpenSimTestCase.SetUp() in NPCModuleTests to disable...Justin Clark-Casey (justincc)2013-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
|\ \ \ | |/ / |/| / | |/
| * Consistenly make NUnit test cases inherit from OpenSimTestCase which automati...Justin Clark-Casey (justincc)2012-11-241-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
|\ \ \ \ | | |_|/ | |/| |
| * | | Cleanup on region modules: gave short node id's to all of them.Diva Canto2012-11-121-1/+1
* | | | Merge branch 'master' into careminsterMelanie2012-11-121-46/+78
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | document & 80-character width terminal formattingSignpostMarv2012-11-111-49/+80
| * | converting NPC module to ISharedRegionModuleSignpostMarv2012-11-111-9/+22
* | | Merge branch 'master' into careminsterMelanie2012-10-301-0/+11
|\ \ \ | |/ /
| * | Fix memory leak where removing an NPC did not remove its circuits.Justin Clark-Casey (justincc)2012-10-291-0/+11
* | | Merge branch 'master' into careminsterMelanie2012-10-261-4/+6
|\ \ \ | |/ /
| * | Fix script error messages not showing up in viewer 3 and associated viewers.Justin Clark-Casey (justincc)2012-10-251-4/+6
* | | Merge branch 'master' into careminsterMelanie2012-10-071-1/+1
|\ \ \ | |/ /
| * | On receiving TaskInventoryAccepted with a destination folder in the binary bu...Justin Clark-Casey (justincc)2012-10-061-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
|\ \ \ | |/ / |/| / | |/
| * Add --force flag to "kick user" console command to allow bypassing of recent ...Justin Clark-Casey (justincc)2012-08-201-0/+5
* | 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
| |\ \ | | |/
| | * Prevent race conditions when one thread removes an NPC SP before another thre...Justin Clark-Casey (justincc)2012-08-141-34/+30
* | | 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
|\ \ | |/
| * Remove IClientAPI.GetClientEP() in favour of existing identical IClientAPI.Re...Justin Clark-Casey (justincc)2012-07-121-5/+0
* | Merge branch 'master' into careminsterMelanie2012-07-112-0/+57
|\ \ | |/
| * Mantis 6077 trim NPC chat on channel zero.Talun2012-07-061-0/+8
| * Mantis 6063 osNpcTouch.Talun2012-07-062-0/+49
* | Merge branch 'master' into careminsterMelanie2012-07-051-2/+2
|\ \ | |/
| * Add OSSL function osForceAttachToAvatarFromInventory()Justin Clark-Casey (justincc)2012-07-051-2/+2
* | Merge branch 'master' into careminsterMelanie2012-06-141-4/+0
|\ \ | |/
| * Remove long obsolete and unused IClientAPI.KillEndDone()Justin Clark-Casey (justincc)2012-06-131-4/+0
* | Merge branch 'avination' into careminsterMelanie2012-05-131-0/+1
|\ \
| * | ªTEST MESS* reduce animation packets send. Added onchangeanim event with par...UbitUmarov2012-05-121-0/+1
* | | Merge branch 'master' into careminsterMelanie2012-05-072-3/+4
|\ \ \ | | |/ | |/|
| * | remove default values from prior commit since mono cant deal with themdahlia2012-05-072-3/+3
| * | add OS_NPC_RUNNING option to osNpcMoveToTarget() to allow running speed for m...dahlia2012-05-061-1/+2
* | | Merge branch 'master' into careminsterMelanie2012-04-273-10/+56
|\ \ \ | |/ /
| * | Add regression test for teleporting an agent between separated regions on the...Justin Clark-Casey (justincc)2012-04-271-1/+1