Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'a1f05a289dd845edb7e3d163b84ceecc85374427' into bigmerge | Melanie | 2011-10-25 | 1 | -21/+41 |
|\ | |||||
| * | RemoteAdmin - Added optional terrain loading on region create using ↵ | Michelle Argus | 2011-10-21 | 1 | -21/+41 |
| | | | | | | | | parameter heightmap_file to specify the terrain file to be loaded | ||||
* | | Merge commit '29660fe175ef3b49ff649a26bd9bcf4c9eb7c6dd' into bigmerge | Melanie | 2011-10-12 | 1 | -39/+1 |
|\ \ | |/ | |||||
| * | Remove the inconsistently applied now pointless FailIfRemoteAdminDisabled() ↵ | Justin Clark-Casey (justincc) | 2011-10-08 | 1 | -39/+1 |
| | | | | | | | | | | | | check on XMLRPC RemoteAdmin handlers. If admin is disabled then the XMLRPC handlers are never registered, which means that they cannot be called anyway. | ||||
* | | Merge commit '71d29decc87952790b3f5264ad4a29da171b1689' into bigmerge | Melanie | 2011-10-12 | 1 | -5/+5 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | ||||
| * | replace List used by m_accessIP in RemoteAdminPlugin with the more efficient ↵ | Justin Clark-Casey (justincc) | 2011-10-08 | 1 | -5/+4 |
| | | | | | | | | HashSet | ||||
* | | Merge commit '4073cd6ced525cb36e4335e79e3f94ad4872b263' into bigmerge | Melanie | 2011-10-12 | 1 | -124/+116 |
|\ \ | |/ | |||||
| * | Add option to allow only explicitly listed IPs to access RemoteAdmin facilities. | Justin Clark-Casey (justincc) | 2011-10-08 | 1 | -124/+116 |
| | | | | | | | | | | | | Also adds password check to some functions where this was missing and fixes some parameter checking. This is a patch from http://opensimulator.org/mantis/view.php?id=5715 with a few small unrelated spacing tweaks from me. Thanks Michelle Argus. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-10-04 | 1 | -1/+1 |
| |\ | |||||
* | \ | Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | When creating a new user on the comand line, give the option of allowing a ↵ | Justin Clark-Casey (justincc) | 2011-10-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | UUID to be specified to override the randomly generated one. This can be useful in some migration cases where recreating user accounts with known IDs will preserve region scene object ownership. | ||||
* | | | Merge commit 'b229a72a5fb929d4886117f39ed6bd17a6d56aef' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | |||||
| * | | Turn off keepalives when commands are specified | Mic Bowman | 2011-10-04 | 1 | -1/+1 |
| |/ | |||||
* | | Merge commit 'a1875ec7600758087f6c06ccaf625507362e215c' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+8 |
|\ \ | |/ | |||||
| * | Add ability to pass in the permissions option (perm) to save oar via RemoteAdmin | Justin Clark-Casey (justincc) | 2011-10-01 | 1 | -1/+8 |
| | | | | | | | | | | Applies patch in http://opensimulator.org/mantis/view.php?id=5686 Thanks Michelle Argus! | ||||
* | | Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmerge | Melanie | 2011-10-11 | 1 | -4/+13 |
|\ \ | |/ | |||||
| * | Reattaching a region was failing if the estate name had not changed (issue ↵ | Kevin Houlihan | 2011-09-16 | 1 | -4/+13 |
| | | | | | | | | | | | | 5035). Using the RemoteAdmin API to close then recreate a region would fail if the estate name had not changed. If the estate name /was/ changed then the existing estate would be renamed rather than a new one being created. The problem really arose from a lack of distinction in the data storage layer between creating new estates and loading existing ones. | ||||
* | | Bring us up to date. | Tom | 2011-09-14 | 1 | -0/+13 |
|\ \ | |/ | |||||
| * | Added a check to the CreateRegion method of the RemoteAdmin module that the ↵ | Kevin Houlihan | 2011-09-09 | 1 | -0/+13 |
| | | | | | | | | | | | | specified user exists. A meaningful exception message is returned if the user is not found. Previously it was returning "Object not set..." | ||||
* | | Merge branch 'master' into careminster-presence-refactor | root | 2011-07-05 | 1 | -2/+39 |
|\ \ | |/ | |||||
| * | Add profile, merge, noassets and skip-assets options for loading/saving oars ↵ | Justin Clark-Casey (justincc) | 2011-07-02 | 1 | -2/+39 |
| | | | | | | | | | | | | | | via RemoteAdmin This is http://opensimulator.org/mantis/view.php?id=5453 Thanks Michelle Argus! | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-17 | 1 | -0/+56 |
|\ \ | |/ | |||||
| * | Mantis #5442: Add admin_save_heightmap | Melanie | 2011-04-17 | 1 | -0/+56 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-17 | 1 | -89/+107 |
|\ \ | |/ | |||||
| * | Make remote admin error messages more helpful on windows. | Justin Clark-Casey (justincc) | 2011-04-15 | 1 | -88/+73 |
| | | | | | | | | Also, make log messages conform more with convention. | ||||
| * | Thanks Snoopy for a patch that allows setting of perms on items given to new ↵ | BlueWall | 2011-04-15 | 1 | -1/+34 |
| | | | | | | | | avatars | ||||
* | | Fix status responses in remote admin | Melanie | 2010-12-03 | 1 | -2/+2 |
| | | |||||
* | | Improve health reporting | Melanie | 2010-12-03 | 1 | -1/+5 |
| | | |||||
* | | Fix a bug caused by leftover code | Melanie | 2010-11-25 | 1 | -4/+0 |
| | | |||||
* | | Fix up remote controller. | Melanie | 2010-11-25 | 1 | -8/+29 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-25 | 1 | -42/+17 |
|\ \ | |/ | |||||
| * | Change all restarting to use the restart module. Remove hardcoded behavior | Melanie | 2010-11-25 | 1 | -5/+12 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-22 | 1 | -1/+5 |
|\ \ | |/ | |||||
| * | Added creator info across the board -- TaskInventoryItems and InventoryItems ↵ | Diva Canto | 2010-11-21 | 1 | -1/+5 |
| | | | | | | | | | | | | themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being. New migration in inventory table in order to make CreatorID varchar(255). | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-09 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Formatting cleanup. | Jeff Ames | 2010-11-08 | 1 | -1/+1 |
| | | |||||
| * | Change the default of the new bind_ip_address RemoteAdmin option to 0.0.0.0 | Melanie | 2010-11-03 | 1 | -1/+1 |
| | | | | | | | | | | | | so it reflects the prior default. We are not in the habot of changing default behavior without good reason and making localhost the default would break most current use cases. | ||||
| * | Admin Server can now bind to a private ip address | mores | 2010-11-03 | 1 | -1/+3 |
| | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Change the default of the new bind_ip_address RemoteAdmin option to 0.0.0.0 | Melanie | 2010-11-03 | 1 | -1/+1 |
| | | | | | | | | | | | | so it reflects the prior default. We are not in the habot of changing default behavior without good reason and making localhost the default would break most current use cases. | ||||
* | | Admin Server can now bind to a private ip address | mores | 2010-11-03 | 1 | -1/+3 |
| | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-02 | 1 | -10/+8 |
|\ \ | |/ | |||||
| * | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE. | Melanie | 2010-10-30 | 1 | -10/+8 |
| | | | | | | | | | | | | | | | | | | It contains a major interface version bump and will NOT work with earlier grid services. This is preliminary work that will lead to layers support. Rest appearance services are commented out completely, they will have to be adapted by someone who actually uses them. Remote admin is working, but has no layers support. There is no layers support in the database. Login likely won't work. You have been warned. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-29 | 1 | -4/+4 |
|\ \ | |/ | |||||
| * | First attempt to get multiple attachments working to support viewer2. | Master ScienceSim | 2010-10-21 | 1 | -4/+4 |
| | | | | | | | | | | | | | | The attachment code appears to work correctly for 1.23 viewers so, in spite of some big changes in the internal representation, there don't appear to be regressions. That being said, I still can't get a viewer2 avatar to show correctly. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-29 | 1 | -18/+10 |
|\ \ | |/ | |||||
| * | Major refactoring of appearance handling. | Master ScienceSim | 2010-10-20 | 1 | -18/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AvatarService -- add two new methods, GetAppearance and SetAppearance to get around the lossy encoding in AvatarData. Preseve the old functions to avoid changing the behavior for ROBUST services. AvatarAppearance -- major refactor, moved the various encoding methods used by AgentCircuitData, ClientAgentUpdate and ScenePresence into one location. Changed initialization. AvatarAttachments -- added a class specifically to handle attachments in preparation for additional functionality that will be needed for viewer 2. AvatarFactory -- removed a number of unused or methods duplicated in other locations. Moved in all appearance event handling from ScenePresence. Required a change to IClientAPI that propogated throughout all the IClientAPI implementations. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-16 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Made OARs use the new serialization procedure. (TPs/crossings still on the ↵ | Diva Canto | 2010-10-15 | 1 | -1/+1 |
| | | | | | | | | old one) Added an options argument down the pipeline. For the time being it takes --old-guids as an option to produce <Guid> instead of <UUID>. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 1 | -6/+6 |
|\ \ | |/ | | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on. | ||||
| * | * Added ISimulationDataService and IEstateDataService | John Hurliman | 2010-09-12 | 1 | -6/+6 |
| | | | | | | | | | | * Removed StorageManager * CONFIG CHANGE: There are no more database settings in OpenSim.ini. Check the config-include configuration files for region store and estate store database settings |