Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge of ubitworkvarnew with opensim/master as of 20150905. | Robert Adams | 2015-09-08 | 1 | -1/+0 |
|\ | |||||
| * | Deleted OpenSim.Framework.Communications. Moved its two remaining files to Op... | Diva Canto | 2015-09-04 | 1 | -1/+0 |
* | | add lost admin_reset_land method | UbitUmarov | 2015-09-06 | 1 | -0/+47 |
* | | bad merge? | UbitUmarov | 2015-09-01 | 1 | -52/+236 |
|\ \ | |/ |/| | |||||
| * | try to implement core load oar options | UbitUmarov | 2015-08-24 | 1 | -1/+4 |
| * | rename ImapTileModule as IMAPImageUploadModule to match core | UbitUmarov | 2015-08-24 | 1 | -1/+1 |
| * | Merge branch 'mbworkvar2' into ubitvar | UbitUmarov | 2015-08-19 | 1 | -3/+3 |
| |\ | |||||
| | * | varregion: remove use of Constants.RegionSize is various places. | Robert Adams | 2015-03-28 | 1 | -3/+3 |
| * | | Make log output of remote admin's restart region call reflect restart cancell... | Melanie Thielker | 2015-03-23 | 1 | -2/+4 |
| |/ | |||||
| * | Make the maptile uploader in remote admin fire and forget so the controlling ... | Melanie Thielker | 2015-03-07 | 1 | -1/+4 |
| * | Add an XmlRpc method to get a region's root agent count. This is intended | Melanie Thielker | 2014-11-21 | 1 | -0/+26 |
| * | Merge branch 'avination-current' | Melanie Thielker | 2014-08-23 | 1 | -0/+27 |
| |\ | |||||
| | * | Add an admin message to refesh a region's map tile. Will be used to periodically | Melanie Thielker | 2014-08-23 | 1 | -0/+27 |
| * | | put back a check for null foldedperms | UbitUmarov | 2014-08-05 | 1 | -1/+1 |
| * | | Merge branch 'master' into careminster | Melanie | 2014-01-28 | 1 | -7/+5 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into careminster | Melanie | 2013-11-23 | 1 | -4/+150 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-08-17 | 1 | -15/+30 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-05-11 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-05-06 | 1 | -0/+17 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-05-04 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2013-04-04 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into careminster | Melanie | 2013-03-27 | 1 | -0/+66 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask | Melanie | 2013-03-24 | 1 | -0/+1 |
| * | | | | | | | | | Implement get version RemoteAdmin call | Melanie | 2013-01-23 | 1 | -0/+16 |
| * | | | | | | | | | Add admin_refresh_search command to RemoteAdmin | Melanie | 2013-01-16 | 1 | -0/+29 |
| * | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-11-17 | 1 | -4/+0 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-09-29 | 1 | -5/+5 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-09-24 | 1 | -74/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-09-16 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | When regions are set to shut down the instance, always send notifications to | Melanie | 2012-06-03 | 1 | -6/+30 |
| * | | | | | | | | | | | | | If a region is not found on a simulator, make the health query return | Melanie | 2012-05-28 | 1 | -4/+13 |
| * | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-02-04 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Add the ability to abort a pending restart using the viewer UI or a | Melanie | 2012-01-28 | 1 | -1/+19 |
| * | | | | | | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-01-06 | 1 | -210/+190 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2011-12-19 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | Remove spammy log messages when querying sim health | Melanie | 2011-12-12 | 1 | -8/+0 |
| * | | | | | | | | | | | | | | | | Remove superfluous try block | Melanie | 2011-12-08 | 1 | -27/+14 |
| * | | | | | | | | | | | | | | | | Merge branch 'master' into bigmerge | Melanie | 2011-12-08 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | Adapt to justincc's remote admin refactor | Melanie | 2011-12-08 | 1 | -1744/+1394 |
| * | | | | | | | | | | | | | | | | | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge | Melanie | 2011-12-08 | 1 | -0/+113 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'a1f05a289dd845edb7e3d163b84ceecc85374427' into bigmerge | Melanie | 2011-10-25 | 1 | -21/+41 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit '29660fe175ef3b49ff649a26bd9bcf4c9eb7c6dd' into bigmerge | Melanie | 2011-10-12 | 1 | -39/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit '71d29decc87952790b3f5264ad4a29da171b1689' into bigmerge | Melanie | 2011-10-12 | 1 | -5/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit '4073cd6ced525cb36e4335e79e3f94ad4872b263' into bigmerge | Melanie | 2011-10-12 | 1 | -124/+116 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'b229a72a5fb929d4886117f39ed6bd17a6d56aef' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'a1875ec7600758087f6c06ccaf625507362e215c' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+8 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmerge | Melanie | 2011-10-11 | 1 | -4/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Bring us up to date. | Tom | 2011-09-14 | 1 | -0/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | root | 2011-07-05 | 1 | -2/+39 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |