aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-01-161-2/+2
|\
| * Changed a couple of debug messages at the request of osgrid.Diva Canto2013-01-161-2/+2
* | Merge branch 'master' into careminsterMelanie2012-12-162-3/+45
|\ \ | |/
| * HGAssetMapper: Get wasn't really working. It's true that some assets are copi...Diva Canto2012-12-091-3/+35
| * UserManagementModule: search the local cache for names too.Diva Canto2012-12-091-0/+10
* | Merge branch 'master' into careminsterMelanie2012-12-071-1/+3
|\ \ | |/
| * minor: Fix more compiler warnings in CoreModules tests by properly overriding...Justin Clark-Casey (justincc)2012-12-051-1/+3
* | 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 'master' into careminsterMelanie2012-11-131-0/+2
|\ \ | |/
| * Another 21 modules' directives moved out of .addin.xmlDiva Canto2012-11-131-0/+2
* | Merge branch 'master' into careminsterMelanie2012-11-136-0/+12
|\ \ | |/
| * More module cleanup: removed the CoreModules.Framework modules directives out...Diva Canto2012-11-126-0/+12
* | Merge branch 'master' into careminsterMelanie2012-11-132-2/+2
|\ \ | |/
| * Cleanup on region modules: gave short node id's to all of them.Diva Canto2012-11-122-2/+2
| * Fix mantis #6425Diva Canto2012-11-111-6/+0
* | Merge branch 'master' into careminsterMelanie2012-11-111-94/+117
|\ \ | |/
| * One more module converted: MonitorModule.Diva Canto2012-11-111-94/+117
* | Merge branch 'master' into careminsterMelanie2012-11-032-3/+5
|\ \ | |/
| * HG: flip all configs to HG2.0. PLEASE CHECK YOUR EXISTING HG CONFIGS AGAINST ...Diva Canto2012-11-022-3/+5
* | Merge branch 'master' into careminsterMelanie2012-10-261-12/+13
|\ \ | |/
| * Comment out InventoryTransferModule.NeedSceneCacheClear() and invocations sin...Justin Clark-Casey (justincc)2012-10-261-15/+16
* | Merge branch 'master' into careminsterMelanie2012-10-161-2/+6
|\ \ | |/
| * minor: Add/correct some doc messages associated with entity teleport.Justin Clark-Casey (justincc)2012-10-161-1/+6
* | Merge branch 'master' into careminsterMelanie2012-10-121-4/+4
|\ \ | |/
| * Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it eas...Justin Clark-Casey (justincc)2012-10-091-4/+4
* | Merge branch 'master' into careminsterMelanie2012-10-072-5/+18
|\ \ | |/
| * On receiving TaskInventoryAccepted with a destination folder in the binary bu...Justin Clark-Casey (justincc)2012-10-061-5/+17
| * Finally fix build break by allowing UserManagementModule (which constructs a ...Justin Clark-Casey (justincc)2012-10-051-0/+1
* | Merge branch 'master' into careminsterMelanie2012-10-041-2/+2
|\ \ | |/
| * Output monitor data in response to console command on MainConsole.Instance ra...Justin Clark-Casey (justincc)2012-10-041-2/+2
* | Merge branch 'master' into careminsterMelanie2012-10-031-161/+170
|\ \ | |/
| * Add Flush() method to LogWriter. Also correct line endings to Linux form.Robert Adams2012-10-021-161/+170
* | Merge branch 'avination' into careminsterMelanie2012-09-272-30/+29
|\ \
| * | add missing transactionID in SendInventoryItemCreateUpdate. and make useUbitUmarov2012-09-241-1/+1
| * | If an asset upload transaction doesn't exist for a CreateInventory request,Melanie2012-09-241-29/+28
| * | Change the close tmeout from 2 to 3 seconds on teleport. This mayMelanie2012-09-161-1/+1
* | | Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminsterMelanie2012-09-273-7/+11
|\ \ \ | | |/ | |/|
| * | Use GridUser properly for foreign users.Diva Canto2012-09-261-0/+2
| * | Show the user's home url too on the console command.Diva Canto2012-09-261-4/+3
| * | Not really a change, just added a reminder to fix something here.Diva Canto2012-09-261-0/+3
| * | Oops, that should be inside the curly bracket.Diva Canto2012-09-251-3/+3
* | | Merge commit '77355295dadaf3be54ac29d6b3d30901e95c0a32' into careminsterMelanie2012-09-271-2/+0
|\ \ \ | |/ /
| * | Deleted extraneous debug messageDiva Canto2012-09-251-2/+0
* | | Merge branch 'master' into careminsterMelanie2012-09-244-101/+72
|\ \ \ | |/ /
| * | HG Rez object: warn the user if the item or asset cannot be found.Diva Canto2012-09-221-2/+7
| * | This fixes HG attachments' missing assets (textures, etc).Diva Canto2012-09-211-0/+28
| * | Moved the small HGUuidGatherer class to the file where its parent class is. N...Diva Canto2012-09-212-74/+2
| * | Removed redundant asset fetches on HGAssetMapper. The UuidGatherer already do...Diva Canto2012-09-211-18/+24
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-211-2/+2
| |\ \