Commit Graph

1074 Commits (7871dd606eb8c827101ee4ee3c64d00139e1a0b4)

Author SHA1 Message Date
Melanie 60357d3778 Implement the "delete" path for assets. Adds a new option to allow remote asset deletion in robust handler. 2010-05-09 17:56:52 +01:00
Melanie 4e0d62547d Merge branch 'master' into careminster-presence-refactor 2010-05-09 17:04:23 +01:00
Diva Canto c1fe07b022 * Added missing loggout notification to home grid upon agents logging out in foreign grids.
* Added missing config in StandaloneHypergrid.ini
2010-05-08 12:21:17 -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 11971fb302 Merge branch 'master' into careminster-presence-refactor 2010-05-06 16:09:36 +01:00
Diva Canto 53594e599e * Fixes Library bugs in grid mode. Partly a missing check and partly a missing configuration.
* Made previous Robust config changes consistent in Robust.HG.ini.example
2010-05-05 21:12:13 -07:00
Melanie Thielker 65775b87e5 Add a XMLRPC method to remotely set the login level for the LLLoginService.
This requires a special XMLRPC call, which has to supply the credentials of
a god user (User level >= 200). Disabled by default. Also Adds a configuration
option to set the initial permitted login level.
2010-05-05 23:06:36 +02:00
Melanie Thielker fe8399d1bf Add a XMLRPC method to remotely set the login level for the LLLoginService.
This requires a special XMLRPC call, which has to supply the credentials of
a god user (User level >= 200). Disabled by default. Also Adds a configuration
option to set the initial permitted login level.
2010-05-05 20:46:53 +01:00
unknown 91cfce3758 back port groups changes
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-05 16:11:00 +01:00
unknown 8a69070b51 back port groups changes 2010-05-05 16:09:53 +01:00
Melanie 9f8acbfe3e Merge branch 'master' into careminster-presence-refactor 2010-05-03 01:40:24 +01:00
Diva Canto bd49985afa Switched everything to XInventory by default. The old Inventory is still there for now, in case bugs pop up with XInventory. 2010-05-02 10:31:35 -07:00
Melanie 9bc5098dd8 Merge branch 'master' into careminster-presence-refactor 2010-04-30 20:15:19 +01:00
Justin Clark-Casey (justincc) 89e79c1133 Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2010-04-30 17:54:00 +01:00
Justin Clark-Casey (justincc) cc67de5b86 rename SQLiteNG to SQLite and SQLite to SQLiteLegacy
this seems the least evil way forward since mono 2.6 and later will see increasing usage, and this only works with what was SQLiteNG
MAC USERS WILL NEED TO CHANGE REFERENCES TO "OpenSim.Data.SQLite.dll" to "OpenSim.Data.SQLiteLegacy.dll" in OpenSim.ini and config-include/StandaloneCommon.ini (if using standalone)
See the OpenSim.ini.example and StandaloneCommon.ini.example files for more details
This commit also temporarily changes unsigned ParentEstateID values in the OpenSim.Data.Tests to signed temporarily, since the new plugin enforces creation of signed fields in the database (which is what the SQL actually specifies).  And change data columns in sqlite is a pita.
2010-04-30 17:45:00 +01:00
Justin Clark-Casey (justincc) 60dbc3c6ce Make SQLiteNG the default since it actually does work with Mono 2.4 on Linux.
I know this is tough on Mac OSX users (since SQLiteNG requires the export of the sqlite3_column_origin_name symbol and this isn't present for the Mac OSX sqlite3 system library)
Unfortunately, I need to shaft somebody (as it were)
2010-04-30 17:01:50 +01:00
Melanie 08ebcdb0b8 Merge branch 'master' into careminster-presence-refactor 2010-04-29 23:33:26 +01:00
justincc 6d05ea2a75 update Mono.Data.Sqlite.dll to the one that shipped with Mono 2.6.3, which is the one known to work in Windows
Thanks for the initial library inclusion, Diva.  I had it all queued up on my windows test machine but forgot to add it!
2010-04-27 20:44:04 +01:00
Melanie bbffe16f13 Merge branch 'master' into careminster-presence-refactor 2010-04-27 00:27:05 +01:00
Diva Canto 2686573b1c Uncommenting SQLiteNG project again. I found a Mono.Data.Sqlite.dll that makes the compilation in Windows happy again. Not sure if this is the right dll, Justin -- I grabbed it somewhere from mono 2.4.6 for Windows. 2010-04-26 15:03:47 -07:00
Justin Clark-Casey (justincc) 15d42d2111 Add instructions for using SQLiteNG to OpenSim.ini and config-include/StandaloneCommon.ini
Unfortunately, database settings need to be changed in two places.
2010-04-23 22:06:02 +01:00
Justin Clark-Casey (justincc) 847cc4fceb remove [DatabaseService] section from OpenSim.ini since this is always present in included configuration files 2010-04-23 21:31:08 +01:00
Justin Clark-Casey (justincc) 10e18f465e minor: eliminate configuration section handling deprecation of OpenSim.DataStore.MonoSqlite.dll, since this hasn't exist for a long, long time 2010-04-23 21:29:09 +01:00
Diva Canto c9da66728a Renamed OpenSim.Server.exe to Robust.exe and corresponding .ini's and config. 2010-04-22 07:25:32 -07:00
Melanie 98cb4f74b2 Merge branch 'master' into careminster-presence-refactor 2010-04-19 07:00:40 +01:00
Melanie f8d49e0a30 Merge branch '0.6.9-post-fixes' into careminster 2010-04-19 06:32:29 +01:00
Justin Clark-Casey (justincc) b7457a0a5d Update OpenMetaverse libraries to those used in master as of commit 9a781e7
This removes Mono.Security.dll which might help with Mono 2.6.3 compatability issues (notwithstanding the sqlite problem)
2010-04-18 19:16:41 +01:00
Diva Canto a7aab6af0c This version of the launcher exe works. 2010-04-14 19:39:27 -07:00
Diva Canto bdc03dbff9 * Added 32bitLauncher for Robust. Still need to test it on a 64 bit machine.
* PrimitiveBaseShape wants to be be committed too -- EOF.
2010-04-14 10:36:03 -07:00
Melanie fe034dc3e4 Merge branch 'master' into careminster-presence-refactor 2010-04-05 18:12:29 +01:00
unknown ee198eaa11 Updates to config files for groups
Signed-off-by: Melanie <melanie@t-data.com>
2010-04-04 21:56:57 +01:00
Melanie d315fce2ff Adding the configuration example 2010-03-31 04:22:51 +01:00
Melanie 7d917e7c5c Rename Meta7Windlight to LightShare 2010-03-30 23:29:03 +01:00
Melanie 5693870fe2 Merge branch 'master' into careminster-presence-refactor 2010-03-30 21:34:27 +01:00
Diva Canto f55dd3704d Hippos with bin/Newtonsoft.Json.XML 2010-03-26 13:14:13 -07:00
Justin Clark-Casey (justincc) 6ad85dc259 put out full exception stack if something reaches top of base http server OnRequest() on both mono and .net
replace Newtonsoft.Json.XML since the updated copy got accidentally reverted by another commit
2010-03-25 20:33:46 +00:00
John Hurliman 9a781e793a * Updated libomv libraries to fix JSON (LLSD) decoding errors on null values and remove the unused OpenMetaverse.Http.dll and Mono.Security.dll
* Fixed a password hash comparison error in SimianAuthenticationServiceConnector.Authenticate()
2010-03-20 19:21:58 -07:00
Melanie 4c2a51b1b5 Merge branch 'master' into careminster-presence-refactor 2010-03-18 20:09:04 +00:00
John Hurliman b51f40da8f Removed the unused use_async_when_possible config variable 2010-03-16 12:03:04 -07:00
John Hurliman 28e4302eb6 Fixed a bad module name in SimianGrid.ini 2010-03-15 22:07:28 -07:00
Melanie d3f33acc1a Merge branch 'master' into careminster-presence-refactor 2010-03-15 17:23:35 +00:00
John Hurliman 5beb08be31 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-03-12 14:40:21 -08:00
John Hurliman 3036aba875 * Added a better check to the SimianGrid connectors to test if they are enabled or not. This method should work equally well with standalone or robust mode
* Applying #4602 from Misterblu to add collision detection to BulletDotNET
2010-03-12 14:28:31 -08:00
Justin Clark-Casey (justincc) 19b4770fe7 start laoding griduser local connector, though it isn't invoked by anything yet 2010-03-12 22:18:48 +00:00
Justin Clark-Casey (justincc) aad17e7513 Simplify database setup and remove migration problems by moving all sqlite config-include settings to a separate file for standalone
Update information in StandaloneCommon.ini.example to reflect this
Remove ISharedRegionModule interfaces from all SimianGrid connector classes temporarily since this stopped standalone from working (due to absence of AssetURI settings, etc.).
Solution here may be to create separate region module connectors as done by local/grid/hypergrid so that loading can be controlled via include files
Or otherwise work out how to stop these modules from being loaded for all OpenSim invocations
2010-03-12 20:29:17 +00:00
Justin Clark-Casey (justincc) 7d738156fa Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2010-03-12 20:06:40 +00:00
John Hurliman 8b1e33eb2d Fixed SimianGrid.ini to use GridCommon.ini(.example) 2010-03-12 10:31:43 -08:00
Justin Clark-Casey (justincc) e844524b41 Upgrade Newtonsoft.Json.dll from 1.3 to 3.5r6
Actually using the one built against Net 2.0 (labelled Newtonsoft.Json.Net20.dll) since the 3.5 build is not compatible with Mono 2.4 (though it is with Mono 2.6)
2010-03-11 21:04:56 +00:00
John Hurliman 2040649871 Adding the SimianGrid connectors 2010-03-11 11:19:02 -08:00
Melanie 40873504dc Merge branch 'master' into careminster-presence-refactor 2010-03-09 22:46:17 +00:00
Justin Clark-Casey (justincc) 4423630f1e remove milliseconds from console log again 2010-03-09 18:56:32 +00:00
Justin Clark-Casey (justincc) 5caae0293a Fix bug where approximately half the time, attachments would rez only their root prim until right clicked (or otherwise updated).
The root cause of this problem was that multiple ObjectUpdates were being sent on attachment which differed enough to confuse the client.
Sometimes these would eliminate each other and sometimes not, depending on whether the scheduler looked at the queued updates.
The solution here is to only schedule the ObjectUpdate once the attachment code has done all it needs to do.

Backport from head.
2010-03-09 18:53:04 +00:00
Melanie 2362da2ad0 Add config option for switching between CSJ2K and BuggyJPEG. 2010-03-08 20:29:26 +00:00
John Hurliman d71ed7081b Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-03-07 16:05:12 -08:00
John Hurliman 3ecccbb77d * Updated to libomv r3268 which fixes the mapping for OpenJPEG on 64-bit systems and adds protocol support for Viewer 2.0 (still needs work in OpenSim to get things fully functional) 2010-03-07 16:03:15 -08:00
Diva Canto 38b8c52762 Removed obsolete configs. 2010-03-07 10:01:23 -08:00
Melanie 8180c72cbc Merge branch 'master' into careminster-presence-refactor 2010-03-06 12:37:24 +00:00
Melanie 1f7a0cf892 Merge branch '0.6.9-post-fixes' into careminster 2010-03-06 12:24:09 +00:00
Justin Clark-Casey (justincc) b88259db7d revert accidental Standalone.ini change 2010-03-05 23:19:22 +00:00
Justin Clark-Casey (justincc) e906dd3d28 add initial UserGrid service classes as per diva's direction
this will initially store home location data instead of the presence service
compiles but not enough to actually test yet
2010-03-05 22:29:51 +00:00
Diva Canto f5a088c9cc Replaced BclExtras.dll with a newer version compiled for .NET 3.5. This solves the compilation errors that have been affecting build on Windows for the past day. Thanks lkalif for noticing the conflict. 2010-03-04 08:33:01 -08:00
Melanie 107a0a4905 Merge branch 'master' into careminster-presence-refactor 2010-03-04 11:02:01 +00:00
Justin Clark-Casey (justincc) e97ba57788 reset the accidental local configuration changes 2010-03-03 22:20:06 +00:00
Justin Clark-Casey (justincc) edb176447b Fix bug where approximately half the time, attachments would rez only their root prim until right clicked (or otherwise updated).
The root cause of this problem was that multiple ObjectUpdates were being sent on attachment which differed enough to confuse the client.
Sometimes these would eliminate each other and sometimes not, depending on whether the scheduler looked at the queued updates.
The solution here is to only schedule the ObjectUpdate once the attachment code has done all it needs to do.
2010-03-03 22:14:06 +00:00
Diva Canto 13f0e4a718 * Better debug message on login problems.
* Moved GridInfoService config to OpenSim.Server.ini
2010-03-02 20:17:25 -08:00
Melanie 7ec1a3fcad Merge branch 'master' into careminster-presence-refactor 2010-03-03 03:18:19 +00: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
Melanie 38ea1dd5c8 Merge branch 'master' into presence-refactor 2010-03-01 01:01:32 +00:00
Diva Canto 774958bbbf Added FriendsData to both Null storage and SQLite. Untested. 2010-02-28 16:09:06 -08:00
Diva Canto cc05bdf6ab * Friends out connector completed. Grid login retrieves friends correctly.
* Added friends configs to grid .inis
2010-02-26 08:46:30 -08:00
Diva Canto c745df007d Added server-side Friends in connector. Untested. 2010-02-25 17:42:51 -08:00
Diva Canto 679ad95750 List of friends now retrieved upon login. Configured and tested in standalone only. 2010-02-25 16:11:04 -08:00
Melanie 0b73ee3cd8 Add part of the needed config examples 2010-02-25 03:14:23 +00:00
Melanie c7b1e76eb5 Add the stream handler/listener and requisite methods to the friends module
for the friends interregion comms.
2010-02-25 01:46:34 +00:00
Diva Canto 0d85f4f861 Deleted duplicate [GridService] section. 2010-02-22 09:56:03 -08:00
Jeff Ames e6c869ddfc Minor formatting cleanup. 2010-02-22 13:18:11 +09:00
Diva Canto 552e9e8c78 * Added SQlite connector for AvatarData. Tested -- works.
* Small bug fix in debug message
* Set default standalone configs to use SQLite across the board
2010-02-21 09:09:35 -08:00
Diva Canto 0ab6aac052 Added UserAccountData and auth to the SQLite connector. Compiles, runs, but access to these tables doesn't work. 2010-02-20 17:52:38 -08:00
Diva Canto dc19785672 Added UserAccount, Avatar and Authentication to Data.Null, so that OpenSim can run out-of-the-box. #WaitingForSQLite 2010-02-14 16:57:02 -08:00
Melanie 9f5b39300a Add InventoryService to default standalone config 2010-02-08 20:26:47 +00:00
Melanie baaf660511 Merge branch 'master' into presence-refactor
This was a large, heavily conflicted merge and things MAY have got broken.
Please check!
2010-02-08 15:53:38 +00:00
Diva Canto b18e95b3a2 Added missing configs to Standalone.ini 2010-02-08 07:49:14 -08:00
Diva Canto df3ab04e0c Removed useless config. 2010-02-02 16:54:55 -08:00
Diva Canto 35a245b67a Assorted bug fixes related to hyperlinking 2010-01-31 22:35:23 -08:00
Diva Canto 0b89afd3e5 * Simplified the configuration by having [DatabaseService] in it
* Fixed configuration issue for HGInventoryServerInConnector
* Corrected typos in debug messages
2010-01-31 14:37:22 -08:00
Diva Canto a6b50c2436 In HG, add asset service handlers to 8002, to make it even easier. 2010-01-31 14:07:26 -08:00
Diva Canto af758ea164 * More config cleanup
* Added different ports (8002 and 8003) to the many services in OpenSim.Server.ini.example
* Added a separate OpenSim.Server.HG.ini.example to make it easier to run
2010-01-31 14:01:47 -08:00
Diva Canto 823b9607e2 Can't comment [Network] even if it's not used. 2010-01-31 13:19:03 -08:00
Diva Canto 67b0fcf806 * Added OpenSim.Server.HG.ini as an add-on to OpenSim.Server.ini
* Cleaned up standalone configs
2010-01-31 13:07:13 -08:00
Diva Canto 041594ed07 Cleaned up configuration. 'gridmode' and 'hypergrid' are gone, as well as lots of other obsolete configs. 2010-01-31 13:01:23 -08:00
Diva Canto 40d8e91008 * Added a few files that were missing in the repo.
* New HGInventoryService which allows restricted access to inventory while outside
2010-01-31 11:10:57 -08:00
Diva Canto a2096f58ce Updated gridhypergrid config. 2010-01-30 17:41:01 -08:00
Diva Canto 42f978a478 * HGScene is no more.
* Moved a few key inventory access methods from Scene.Inventory to an IInventoryAccessModule module
2010-01-30 09:23:07 -08:00
Diva Canto 5001f61c08 * HGGridConnector is no longer necessary.
* Handle logout properly. This needed an addition to IClientAPI, because of how the logout packet is currently being handled -- the agent is being removed from the scene before the different event handlers are executed, which is broken.
2010-01-29 18:59:41 -08:00
Diva Canto 0c81966c0a Works for grid login. 2010-01-29 09:12:22 -08:00
Diva Canto c9e64d578d Fixed broken dll name. 2010-01-28 19:36:42 -08:00
Diva Canto c99f40fc53 Config for grid login. Untested. 2010-01-28 19:32:23 -08:00
Diva Canto 00f7d622cb HG 1.5 is in place. Tested in standalone only. 2010-01-28 19:19:42 -08:00
Melanie 5b9ca6e35f Merge branch 'master' into careminster 2010-01-28 14:38:46 +00:00