aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/RemoteController (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
* | add lost admin_reset_land methodUbitUmarov2015-09-061-0/+47
* | bad merge?UbitUmarov2015-09-011-52/+236
|\ \ | |/ |/|
| * try to implement core load oar optionsUbitUmarov2015-08-241-1/+4
| * rename ImapTileModule as IMAPImageUploadModule to match coreUbitUmarov2015-08-241-1/+1
| * Merge branch 'mbworkvar2' into ubitvarUbitUmarov2015-08-191-3/+3
| |\
| | * varregion: remove use of Constants.RegionSize is various places.Robert Adams2015-03-281-3/+3
| * | Make log output of remote admin's restart region call reflect restart cancell...Melanie Thielker2015-03-231-2/+4
| |/
| * Make the maptile uploader in remote admin fire and forget so the controlling ...Melanie Thielker2015-03-071-1/+4
| * Add an XmlRpc method to get a region's root agent count. This is intendedMelanie Thielker2014-11-211-0/+26
| * Merge branch 'avination-current'Melanie Thielker2014-08-231-0/+27
| |\
| | * Add an admin message to refesh a region's map tile. Will be used to periodicallyMelanie Thielker2014-08-231-0/+27
| * | put back a check for null foldedpermsUbitUmarov2014-08-051-1/+1
| * | Merge branch 'master' into careminsterMelanie2014-01-281-7/+5
| |\ \
| * \ \ Merge branch 'master' into careminsterMelanie2013-11-231-4/+150
| |\ \ \
| * \ \ \ Merge branch 'master' into careminsterMelanie2013-10-061-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2013-08-171-15/+30
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-05-111-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-05-061-0/+17
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-05-041-0/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-04-041-1/+1
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge branch 'master' into careminsterMelanie2013-03-271-0/+66
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-241-0/+1
| * | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-02-221-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Implement get version RemoteAdmin callMelanie2013-01-231-0/+16
| * | | | | | | | | | | | Add admin_refresh_search command to RemoteAdminMelanie2013-01-161-0/+29
| * | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-11-171-4/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-11-151-0/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-09-291-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-09-241-74/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-09-161-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | When regions are set to shut down the instance, always send notifications toMelanie2012-06-031-6/+30
| * | | | | | | | | | | | | | | | | If a region is not found on a simulator, make the health query returnMelanie2012-05-281-4/+13
| * | | | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-02-041-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Add the ability to abort a pending restart using the viewer UI or aMelanie2012-01-281-1/+19
| * | | | | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-01-061-210/+190
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2011-12-191-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Remove spammy log messages when querying sim healthMelanie2011-12-121-8/+0
| * | | | | | | | | | | | | | | | | | | | Remove superfluous try blockMelanie2011-12-081-27/+14
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' into bigmergeMelanie2011-12-081-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Adapt to justincc's remote admin refactorMelanie2011-12-081-1744/+1394
| * | | | | | | | | | | | | | | | | | | | | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmergeMelanie2011-12-081-0/+113
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'a1f05a289dd845edb7e3d163b84ceecc85374427' into bigmergeMelanie2011-10-251-21/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '29660fe175ef3b49ff649a26bd9bcf4c9eb7c6dd' into bigmergeMelanie2011-10-121-39/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '71d29decc87952790b3f5264ad4a29da171b1689' into bigmergeMelanie2011-10-121-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '4073cd6ced525cb36e4335e79e3f94ad4872b263' into bigmergeMelanie2011-10-121-124/+116
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmergeMelanie2011-10-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit 'b229a72a5fb929d4886117f39ed6bd17a6d56aef' into bigmergeMelanie2011-10-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \