Commit Graph

447 Commits (1d75220fccb511fa2b3e8da118e9a91fac8e1fc3)

Author SHA1 Message Date
Kevin Houlihan 7cafc2e46e Added a check to the CreateRegion method of the RemoteAdmin module that the specified user exists.
A meaningful exception message is returned if the user is not found. Previously it was returning "Object not set..."
2011-09-09 22:59:00 +01:00
Tom 66dec3b874 Resolve merge commits, stage 1 2011-09-04 07:06:36 -07:00
Justin Clark-Casey (justincc) 5d6c9644fa early code to allow scripts to force npcs not to fly when moving to target
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.
2011-08-10 01:47:37 +01:00
Justin Clark-Casey (justincc) a333c60f28 refactor: rename the move to position methods to move to target to be consistent with terminology used by scene object part and elsewhere 2011-08-03 22:34:05 +01:00
Justin Clark-Casey (justincc) 2964467708 get rid of vestigal move to parameters 2011-08-03 22:11:05 +01:00
Justin Clark-Casey (justincc) c122489e09 Partially fix autopilot/go here
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.
2011-08-02 23:41:12 +01:00
Justin Clark-Casey (justincc) b6ac1c46cd Get rid of AvatarAppearance.Owner to simplify the code.
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.
2011-08-02 00:13:04 +01:00
root 47cf9c8fe0 Merge branch 'master' into careminster-presence-refactor 2011-07-05 04:01:59 +01:00
Justin Clark-Casey (justincc) bb4cb16512 Add profile, merge, noassets and skip-assets options for loading/saving oars via RemoteAdmin
This is http://opensimulator.org/mantis/view.php?id=5453
Thanks Michelle Argus!
2011-07-02 01:05:03 +01:00
Melanie 0e3580066b Merge branch 'master' into careminster-presence-refactor 2011-04-17 21:46:27 +01:00
Melanie 03e725ad87 Mantis #5442: Add admin_save_heightmap 2011-04-17 21:43:16 +01:00
Melanie 474910c9d6 Merge branch 'master' into careminster-presence-refactor 2011-04-17 18:48:53 +01:00
Justin Clark-Casey (justincc) ed74be6599 Make remote admin error messages more helpful on windows.
Also, make log messages conform more with convention.
2011-04-15 23:54:30 +01:00
BlueWall fc365f2a31 Thanks Snoopy for a patch that allows setting of perms on items given to new avatars 2011-04-15 18:23:37 -04:00
Melanie a62b435a39 Merge branch 'master' into careminster-presence-refactor 2011-03-27 21:41:54 +01:00
Justin Clark-Casey (justincc) d8e1c380e6 minor: make it clearer in the log where we're loading region config files and not the regions themselves 2011-03-25 23:36:58 +00:00
Melanie e4f143fb1c Merge branch 'master' into careminster-presence-refactor 2011-03-21 07:57:56 +00:00
BlueWall a3651eb5d0 Thanks Kevin Cozens for a patch that:
Fixes several spelling mistakes
2011-03-17 05:48:42 -04:00
Melanie ccd6e5d071 Merge branch 'master' into careminster-presence-refactor 2011-02-16 02:41:49 +00:00
Justin Clark-Casey (justincc) 03d82a5a85 Fix bug where "My estate" name was always used even if the user entered a 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.
2011-02-12 01:08:56 +00:00
Melanie 3889e68c54 Merge branch 'master' into careminster-presence-refactor
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
2011-02-07 22:08:53 +00:00
Justin Clark-Casey (justincc) 1ffd70cef7 minor: remove some mono compiler warnings 2011-02-04 23:20:10 +00:00
Melanie 89fec4ff5b Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-12-04 04:25:08 +00:00
Melanie ea17b262a3 Convert the agent asset transactions module to a new style module.
Refactor to remove the property "MyScene" and the pointless circular
refs to the managing classes. Converted the module to a non-shared module.
Reformatted source for 80 columns. Removed the special role the module
had in the old loader.
2010-12-04 04:24:55 +00:00
Melanie 349767f8a2 Merge branch 'master' into careminster-presence-refactor 2010-12-04 04:25:39 +00:00
Melanie da91a2ab7e Convert the agent asset transactions module to a new style module.
Refactor to remove the property "MyScene" and the pointless circular
refs to the managing classes. Converted the module to a non-shared module.
Reformatted source for 80 columns. Removed the special role the module
had in the old loader.
2010-12-04 04:33:14 +01:00
Justin Clark-Casey (justincc) 510b55c7f0 refactor some common code in RegionModulesControllerPlugin
also some minor doc changes in BareBonesNonSharedModule
2010-12-04 02:38:26 +00:00
Melanie 4407c4700f Fix status responses in remote admin 2010-12-03 19:02:42 +01:00
Melanie b940925173 Improve health reporting 2010-12-03 07:27:29 +01:00
Melanie 57c4def254 Change all restarting to use the restart module. Remove hardcoded behavior 2010-11-25 03:16:52 +00:00
Melanie efb03f6f99 Fix a bug caused by leftover code 2010-11-25 03:59:57 +01:00
Melanie e74b0deb4e Fix up remote controller. 2010-11-25 03:43:23 +00:00
Melanie 6c3eb21440 Merge branch 'master' into careminster-presence-refactor 2010-11-25 03:27:35 +00:00
Melanie 22ff06ba17 Merge branch 'master' into careminster-presence-refactor 2010-11-22 01:09:26 +00:00
Diva Canto c617d658dd Added creator info across the board -- TaskInventoryItems and InventoryItems 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).
2010-11-21 17:19:24 -08:00
Melanie ee85a530f6 Merge branch 'master' into careminster-presence-refactor 2010-11-09 22:16:48 +00:00
Jeff Ames ae9c4a4d11 Formatting cleanup. 2010-11-08 07:48:35 -05:00
Melanie c25f84e31c Change the default of the new bind_ip_address RemoteAdmin option to 0.0.0.0
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.
2010-11-03 01:13:01 +00:00
mores 1f77f05f02 Admin Server can now bind to a private ip address
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-03 01:12:48 +00:00
Melanie 636ca6218d Change the default of the new bind_ip_address RemoteAdmin option to 0.0.0.0
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.
2010-11-03 01:11:04 +00:00
mores d5d0e81df2 Admin Server can now bind to a private ip address
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-03 01:09:38 +00:00
Melanie 26f12f479f Merge branch 'master' into careminster-presence-refactor 2010-11-02 22:58:33 +00:00
Melanie 818ed2032a READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.
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.
2010-10-30 00:41:36 +01:00
Melanie 69c1e0b2f7 Merge branch 'master' into careminster-presence-refactor 2010-10-29 21:22:35 +01:00
Melanie 9331898c32 Merge branch 'master' into careminster-presence-refactor 2010-10-29 20:40:48 +01:00
Master ScienceSim 267f18925d First attempt to get multiple attachments working to support viewer2.
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.
2010-10-21 16:48:58 -07:00
Master ScienceSim b1c8d05888 Major refactoring of appearance handling.
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.
2010-10-20 16:17:54 -07:00
Melanie 46e5c8e919 Merge branch 'master' into careminster-presence-refactor 2010-10-16 10:52:56 +01:00
Diva Canto 1499607215 Made OARs use the new serialization procedure. (TPs/crossings still on the 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>. 2010-10-15 17:27:19 -07:00
Melanie 6a1ce17cdb Merge branch 'master' into careminster-presence-refactor
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.
2010-09-13 16:17:38 +01:00
John Hurliman c03b24cbfd Merged 2010-09-12 14:21:51 -07:00
John Hurliman 0db1ed0b5a * Added ISimulationDataService and IEstateDataService
* 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
2010-09-12 14:20:26 -07:00
Jeff Ames f1f0bc23f4 Formatting cleanup. 2010-09-12 13:43:49 -04:00
Melanie e4c2b44e5c Merge branch 'master' into careminster-presence-refactor 2010-09-05 15:06:00 +01:00
Justin Clark-Casey (justincc) 1e8e98a07f Move code that allows llGiveInvetory() to move item into appropriate system folder up from connectors into Scene.Inventory.cs
This fixes the problem for all architectures (hg as well as local and grid) and means we don't have to dupe code between connectors.
Not ideal in that it becomes non-modular, but methods in Scene.Inventory.cs should eventually be modularized anyway.
2010-09-04 01:36:26 +01:00
Justin Clark-Casey (justincc) b8da15c104 In RemoveAdminPlugin, use a .ini file template in XmlRpcCreateRegionMethod rather than an older XML one
This is a patch from http://opensimulator.org/mantis/view.php?id=4973.  Thanks randomhuman
2010-09-03 22:38:40 +01:00
Melanie e74809ff4c Merge branch 'master' into careminster-presence-refactor 2010-08-18 00:59:20 +01:00
randomhuman 8eeb3f2fd2 Updated the create_region command in the RemoteAdmin plugin to properly support estates without seeking further input on the console. 2010-08-13 23:29:01 +01:00
Melanie 5f94b98cb2 Merge branch 'master' into careminster-presence-refactor 2010-08-01 18:00:04 +01:00
randomhuman 5e759338ca Renamed variables in RemoteAdmin plugin to be closer to the coding standards. 2010-08-01 17:20:09 +01:00
randomhuman 93532a9cd2 Changed all method names in the RemoteAdmin plugin to use the correct capitalization. 2010-08-01 17:20:09 +01:00
Melanie fdf648bcf3 Merge branch 'master' into careminster-presence-refactor 2010-06-14 02:49:15 +01:00
Melanie 9069114d0f Fox my changes to radmin 2010-06-13 21:57:56 +01:00
Melanie 14c587bea1 Thank you, Snoopy2, for a patch to fix RemoteAdmin. Committed with the following
changes:
- Start location is NOT optional. The signature was defined with it being mandataory and there is no reason to change it
- Adjusted comments to remove misleading or no longer true comments. Default
is neuter, according to the code, not male, as the comment stated.
2010-06-13 21:45:39 +01:00
Melanie 542e6b8af4 Merge branch 'master' into careminster-presence-refactor 2010-05-28 21:56:42 +01:00
Justin Clark-Casey (justincc) 1042ce7283 comment out large chunks of appearance/inventory region access services to eliminate warnings that this code is unused 2010-05-28 18:42:25 +01:00
Melanie Thielker 55f124745f Allow remote admin to be used on a different port from the main region port 2010-05-18 19:25:40 +02:00
Melanie Thielker 3e1f2ddb8e Allow remote admin to be used on a different port from the main region port 2010-05-18 17:01:44 +01:00
Melanie 4e0d62547d Merge branch 'master' into careminster-presence-refactor 2010-05-09 17:04:23 +01:00
Diva Canto d72769930a More cleaning on presence. Friends online/offline works again. 2010-05-08 07:44:07 -07:00
Melanie 14fcc2510e Merge branch 'master' into careminster-presence-refactor 2010-05-08 13:31:36 +01:00
Diva Canto a58859a0d4 GridUserService in place. Replaces the contrived concept of storing user's home and position info in the presence service. WARNING: I violated a taboo by deleting 2 migration files and simplifying the original table creation for Presence. This should not cause any problems to anyone, though. Things will work with the new simplified table, as well as with the previous contrived one. If there are any problems, solving them is as easy as dropping the presence table and deleting its row in the migrations table. The presence info only exists during a user's session anyway.
BTW, the Meshing files want to be committed too -- EOFs.
2010-05-07 21:29:56 -07:00
Melanie 98cb4f74b2 Merge branch 'master' into careminster-presence-refactor 2010-04-19 07:00:40 +01:00
Diva Canto 80346ad2e2 * May fix mantis #4603.
* My local git wants to commit the groups files for line endings, I'm gonna let it do it.
2010-04-05 19:56:03 -07:00
Melanie 5693870fe2 Merge branch 'master' into careminster-presence-refactor 2010-03-30 21:34:27 +01:00
Dan Lake 859bc717a4 Cleaned up access to scenepresences in scenegraph. GetScenePresences and GetAvatars have been removed to consolidate locking and iteration within SceneGraph. All callers which used these to then iterate over presences have been refactored to instead pass their delegates to Scene.ForEachScenePresence(Action<ScenePresence>). 2010-03-19 15:16:35 -07:00
Melanie 028a87fe37 Merge branch 'master' into careminster-presence-refactor
This brings careminster on the level of master. To be tested
2010-03-03 02:07:03 +00:00
John Hurliman df76e95aa2 Changed asset CreatorID to a string 2010-02-22 14:18:59 -08:00
John Hurliman 7665aad002 * Adds CreatorID to asset metadata. This is just the plumbing to support CreatorID, it doesn't modify database backends or OAR files to support storing/loading it 2010-02-22 13:27:17 -08:00
Melanie c033223c63 Merge branch 'master' into presence-refactor 2010-02-15 00:20:48 +00:00
Melanie 2084e08ad7 Merge branch 'master' into careminster 2010-02-14 22:27:39 +00:00
Justin Clark-Casey (justincc) 00800c59d3 Apply last two patches from http://opensimulator.org/mantis/view.php?id=3522
These patch should allow people using systems that do not have their locale set to En_US or similar to use OpenSim without suffering effects such as being a million miles up in the air on login.
The problem was caused by parsing strings without forcing that parse to be En_US (hence different decimal and digit group symbols were causing problems).
Thanks very much to VikingErik for doing the legwork on this fix and phacelia for spotting it in the first place.
2010-02-12 23:13:35 +00:00
Melanie a87a247f05 Revert "Updates all IRegionModules to the new style region modules."
This reverts commit ec3c31e61e.
2010-01-29 07:21:06 +00:00
Melanie cfca9e1e81 Revert "Updates all IRegionModules to the new style region modules."
This reverts commit ec3c31e61e.
2010-01-29 07:20:13 +00:00
Melanie b80ea00265 Merge branch 'master' into careminster 2010-01-26 14:53:14 +00:00
Revolution ec3c31e61e Updates all IRegionModules to the new style region modules.
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-23 15:18:52 +00:00
Diva Canto 77e43f4801 Fixed a couple of bugs with Appearance. Appearance is all good now. 2010-01-11 17:30:05 -08:00
Diva Canto 4e7c449c5a This fixes the problem that region modules (new style) weren't being recognized. 2010-01-11 14:39:15 -08:00
Diva Canto c5ea783526 OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted. 2010-01-11 07:51:33 -08:00
Melanie ca75ad6743 Remove CreateCommsManagerPlugin 2010-01-11 05:13:47 +00:00
Melanie bfddd75ca8 Refactor. Instantiate sim status handlers in opensim base, not in a plugin 2010-01-11 05:12:01 +00:00
Melanie 15a11e9745 Refactor. Move MainServer init to a place with greener grass 2010-01-11 05:03:56 +00:00
Diva Canto 7e6980b20d dust 2010-01-10 21:43:41 -08:00
Diva Canto 751e70af78 NetworkServersInfo removed from CommsManager. 2010-01-10 21:37:36 -08:00
Diva Canto cddd48aeea Some more unnecessary things deleted in Framework.Communications. 2010-01-10 21:00:03 -08:00
Diva Canto dc4bbf6065 All Framework.Communications.Clients and Framework.Communications.Services deleted, including old LoginService. 2010-01-10 20:29:09 -08:00
Diva Canto 49618dc102 Moved GridInfo service from where it was to Handlers/Grid 2010-01-10 19:19:34 -08:00
Diva Canto 53e83e5dbb * Starting to clean the house...
* Fixed circular dependency
2010-01-10 16:20:59 -08:00
Diva Canto c0642bf7e0 Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor 2010-01-10 15:35:15 -08:00
Diva Canto 4dd523b45d * Changed IPresenceService Logout, so that it takes a position and a lookat
* CommsManager.AvatarService rerouted
2010-01-10 15:34:56 -08:00