| 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 'fe484ab331871e1419ee78afefca7c8856e2dfb4' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Slightly change log message in LoadRegionsPlugin | Justin Clark-Casey (justincc) | 2011-10-19 | 1 | -1/+1 |
| | | | |||||
| * | | Merge commit '178b8d0926a53d82f54d60c088f36c7bad13dc87' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+13 |
| |\ \ | |/ | |||||
| | * | Region-UUID - can not be zero-uuid | Pixel Tomsen | 2011-10-19 | 1 | -1/+13 |
| | | | | | | | | | http://opensimulator.org/mantis/view.php?id=3426 | ||||
| * | | 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 'e789ab659c8a35a32f4edfc8f79f367b9a993721' into bigmerge | Melanie | 2011-10-11 | 1 | -30/+0 |
| |\ \ | |/ | |||||
| | * | Removed uncalled region load method. | Kevin Houlihan | 2011-09-24 | 1 | -30/+0 |
| | | | | | | | | | The method LoadRegionsPlugin.LoadRegionFromConfig was no longer being referenced from anywhere, so I removed it. It's function has apparently been taken on by the PostInitialise of that module. | ||||
| * | | Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Reinstate option to land an npc when it reaches a target. | Justin Clark-Casey (justincc) | 2011-09-22 | 1 | -1/+1 |
| | | | | | | | | | This is moved into ScenePresence for now as a general facility | ||||
| * | | 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..." | ||||
| * | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 2 | -9/+9 |
| |\ \ | |/ | |||||
| | * | early code to allow scripts to force npcs not to fly when moving to target | Justin Clark-Casey (justincc) | 2011-08-10 | 1 | -1/+1 |
| | | | | | | | | | | | this is to allow walking on prims. it will be up to the script writer to be sure that there is a continuous path. currently implemented in osNpcMoveToTarget(), but none of this is final. | ||||
| | * | refactor: rename the move to position methods to move to target to be ↵ | Justin Clark-Casey (justincc) | 2011-08-03 | 1 | -1/+1 |
| | | | | | | | | | consistent with terminology used by scene object part and elsewhere | ||||
| | * | get rid of vestigal move to parameters | Justin Clark-Casey (justincc) | 2011-08-03 | 1 | -2/+2 |
| | | | |||||
| | * | Partially fix autopilot/go here | Justin Clark-Casey (justincc) | 2011-08-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | This now works again except that it requires a click or avatar mvmt to get going This is because the ScenePresence.HandleAgentUpdate() method doesn't trigger until the client does something significant, at which point autopilot takes over. Even clicking is enough to trigger. This will be improved presently. | ||||
| | * | Get rid of AvatarAppearance.Owner to simplify the code. | Justin Clark-Casey (justincc) | 2011-08-02 | 1 | -7/+7 |
| | | | | | | | | | This is not used for anything - appearances are always properties of objects with ids (ScenePresence, AgentCircuitData) and just has the potential to get out of sync when the appearance is cloned. | ||||
| * | | 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 | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-27 | 1 | -15/+13 |
| |\ \ | |/ | |||||
| | * | minor: make it clearer in the log where we're loading region config files ↵ | Justin Clark-Casey (justincc) | 2011-03-25 | 1 | -15/+13 |
| | | | | | | | | | and not the regions themselves | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-21 | 1 | -3/+3 |
| |\ \ | |/ | |||||
| | * | Thanks Kevin Cozens for a patch that: | BlueWall | 2011-03-17 | 1 | -3/+3 |
| | | | | | | | | | Fixes several spelling mistakes | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-16 | 1 | -0/+2 |
| |\ \ | |/ | |||||
| | * | Fix bug where "My estate" name was always used even if the user entered a ↵ | Justin Clark-Casey (justincc) | 2011-02-12 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | different name on initial setup. Turns out we had stopped saving estate settings immediately after the name change. The scene constructor then reloade the settings and oblitereted the different name. This code could be more efficient since there's no reason for scene to reload the settings when they are already known to be valid. Thanks to Thoneve for the spot on this. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-07 | 2 | -5/+5 |
| |\ \ | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs OpenSim/Services/GridService/HypergridLinker.cs | ||||
| | * | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-02-04 | 2 | -5/+5 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-04 | 1 | -55/+45 |
| |\ \ | |/ | |||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-12-04 | 1 | -55/+45 |
| | |\ | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |