aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-03-132-34/+168
|\
| * Add DisableInterRegionTeleportCancellation option in [EntityTransfer] section...Justin Clark-Casey (justincc)2013-03-121-1/+20
| * Improve teleport cancellation in some circumstances, though cancelling telepo...Justin Clark-Casey (justincc)2013-03-122-34/+149
* | Merge branch 'master' into careminsterMelanie2013-03-081-0/+4
|\ \ | |/
| * Add code for testing event queue messages recevied on region cross.Justin Clark-Casey (justincc)2013-03-061-0/+5
* | Merge branch 'master' into careminsterMelanie2013-03-051-2/+0
|\ \ | |/
| * minor: Fix mono compiler warning in MonitorModuleJustin Clark-Casey (justincc)2013-03-051-2/+0
* | Merge branch 'avination' into careminsterMelanie2013-03-032-21/+26
|\ \
| * | Revert "Allow TeleportCancel packets to reset the transfer state machine"Melanie2013-02-241-6/+0
| * | Fix an issue where the viewer would request the seed cap beforeMelanie2013-02-181-15/+26
* | | Merge branch 'master' into careminsterMelanie2013-02-281-2/+4
|\ \ \ | | |/ | |/|
| * | Switched to using the other Util function with a default value.Diva Canto2013-02-271-2/+4
| * | Moved the HG default variables out of [Startup] and into their own section [H...Diva Canto2013-02-271-2/+2
* | | Merge branch 'master' into careminsterMelanie2013-02-261-1/+47
|\ \ \ | |/ /
| * | Add StatsManager registration for region specific stats as collectedRobert Adams2013-02-241-1/+47
* | | Make sure state machine is reset if crossing is abortedMelanie2013-02-231-0/+6
* | | Merge branch 'master' into careminsterMelanie2013-02-232-48/+73
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-221-42/+81
| |\ \
| | * | Make reset of EntityTransferStateMachine for an avatar transfer always happen...Justin Clark-Casey (justincc)2013-02-221-42/+81
| * | | Added new Util function for reading config vars that's more generic than the ...Diva Canto2013-02-221-3/+4
| |/ /
* | | Merge branch 'master' into careminsterMelanie2013-02-222-6/+16
|\ \ \ | |/ /
| * | Simplification of HG configs: HomeURI and GatekeeperURI now are defined as de...Diva Canto2013-02-211-5/+4
| * | Add flush after write feature to LogWriterRobert Adams2013-02-201-1/+12
* | | Merge branch 'master' into careminsterMelanie2013-02-161-2/+2
|\ \ \ | |/ /
| * | Add regression test TestSaveNonRootFolderToIarJustin Clark-Casey (justincc)2013-02-161-2/+2
* | | Merge branch 'master' into careminsterMelanie2013-02-152-2/+2
|\ \ \ | |/ /
| * | * Handle null check on configs in module startup so that the the code can be ...teravus2013-02-141-1/+1
| * | minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2013-02-141-1/+1
* | | Merge branch 'master' into careminsterMelanie2013-02-051-0/+107
|\ \ \ | |/ /
| * | Merge branch 'dynamic-attributes2'Justin Clark-Casey (justincc)2013-02-051-0/+107
| |\ \
| | * | Disabled DAExampleModuleOren Hurvitz2013-01-251-5/+13
| | * | Changed DAMap to be the container of "data stores", which are OSDMaps. Store ...Oren Hurvitz2013-01-251-12/+13
| | * | Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting fr...Justin Clark-Casey (justincc)2013-01-251-1/+1
| | * | Add DAExampleModule to demonstrate dynamic attributesJustin Clark-Casey (justincc)2013-01-251-0/+98
* | | | Merge branch 'master' into careminsterMelanie2013-01-311-0/+4
|\ \ \ \ | |/ / /
| * | | Added option for UUID as command parameters. This lets the command handle the...Dan Lake2013-01-311-0/+4
| |/ /
* | | Merge branch 'avination' into careminsterMelanie2013-01-231-8/+15
|\ \ \ | | |/ | |/|
| * | EXPERIMENTAL - Comment out the check for the agent already being in transitMelanie2013-01-231-8/+9
| * | Allow TeleportCancel packets to reset the transfer state machineMelanie2013-01-211-0/+6
* | | 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