Commit Graph

10705 Commits (df976c9eb45fba8408c1877b399e3ab4ccd44883)

Author SHA1 Message Date
AlexRa 1ad12851d0 Migrations for SQLite converted to new format 2010-05-16 17:04:39 +03:00
AlexRa ee713cb253 Converted MySQL migration history to the new format
Replaced all NNN_StoreName.sql migration resources with a more
readable, single-file-per-store
2010-05-16 17:04:13 +03:00
AlexRa b49fb3db7c Added MySqlMigrations.cs (supports stored proc/funcs)
Uses MySqlScript class to correctly run proc/func definitions
that need delimiter change. Requires MySql.Data.dll 6.2 or later.
2010-05-16 16:25:08 +03:00
AlexRa 8b6a295874 Migration.cs supports single-file migration history format
Scans for migration resources in either old-style "scattered" (one file per version)
or new-style "integrated" format (single file "Resources/{StoreName}.migrations[.nnn]") with ":VERSION nnn" sections).
In the new-style migrations it also recognizes ':GO' separators for parts of the SQL script
that must be sent to the server separately.  The old-style migrations are loaded each in one piece
and don't support the ':GO' feature.

Status:  TESTED and works fine in all modes!
2010-05-16 16:22:38 +03:00
Teravus Ovares (Dan Olivares) a974146921 Merge branch 'master' of ssh://MyConnection/var/git/opensim 2010-05-16 01:48:28 -04:00
Teravus Ovares (Dan Olivares) d4192dcb2e * Revert last commit for now at Melanie_T's request.
* Additional ways of configuring opensim break with this
2010-05-16 01:47:53 -04:00
Diva Canto ff4f50396a Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2010-05-15 20:28:14 -07:00
Diva Canto e5e52e4072 This combination is working. It all points to not being able to use 127.0.0.1/localhost in testing HG situations. The login server must have the LAN IP address, and the regions must show ExternalHostname as SYSTEMIP. Working, but this needs more testing. 2010-05-15 20:27:25 -07:00
Teravus Ovares (Dan Olivares) 019925bb2f Merge branch 'master' of ssh://MyConnection/var/git/opensim 2010-05-15 23:22:07 -04:00
Teravus Ovares (Dan Olivares) dc1a3e9787 * Add User Friendly Configuration File Exists check. If OpenSim.ini and either StandaloneCommon.ini or GridCommon.ini don't exist in various casings then offer to copy the files for the user while warning them that they're missing out if they don't read the files. 2010-05-15 23:21:36 -04:00
Diva Canto 74b23ff9c6 Almost, but not quite. Commenting verification again, until I understand where 127.0.0.1 is being transformed to the local IP address. I suspect it's Adam's NAT snippets. 2010-05-15 19:58:30 -07:00
Diva Canto 2a1e45f657 Finalized the client's TCP IP address verification process for HG1.5. 2010-05-15 19:25:14 -07:00
unknown 9dbe90801b Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into slimupdates2 2010-05-15 02:20:47 -07:00
Dan Lake 36bcab5f07 Refactor scene presence list for lockless iteration. Lock contention will now only be for simultaneous add/removes of scene presences from the scene. 2010-05-15 02:20:23 -07:00
Justin Clark-Casey (justincc) 4b755c6d80 delete now unused MessageServerInfo 2010-05-15 02:17:10 +01:00
Justin Clark-Casey (justincc) 98f2b798ff Address symptom of Mantis 4588 (though not the cause) by moving the avatar dereference inside the exception catch 2010-05-15 01:07:45 +01:00
Justin Clark-Casey 3d72a73b22 Apply patch from http://opensimulator.org/mantis/bug_view_page.php?bug_id=4671
Fixes a bug where the viewer didn't recieve the uuid of a chat broadcasting object
Thanks crystalsgalicia!
2010-05-14 21:25:14 +01:00
unknown 231cc64709 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into slimupdates2 2010-05-13 14:23:16 -07:00
OpenSim Master 4c740e1717 Implements three new OSSL functions for parcel management: osParcelJoin joins parcels in an area, osParcelSubdivide splits parcels in an area, osParcelSetDetails sets parcel name, description, owner and group owner. Join and Subdivide methods in LandChannel are exposed. 2010-05-13 14:22:48 -07:00
Diva Canto 4e7013d5d5 Made fields consistently protected. 2010-05-13 07:59:30 -07:00
unknown 5d8638ed88 Minor tweak in ProcessEntityUpdates (mostly just confirming the git push is working) 2010-05-12 16:05:48 -07:00
unknown bf5c81d77e * Initial commit of the slimupdates2 rewrite. This pass maintains the original behavior of avatar update sending and has a simplified set of IClientAPI methods for sending avatar/prim updates 2010-05-12 15:59:48 -07:00
Diva Canto 739b5e2c08 Fixed a typo in the Friends packaging (Pricipal -> Principal) that was making offline friendship offers fail in grids. 2010-05-10 08:01:00 -07:00
Melanie 31dc77d8a1 Return agents when angle is PI
Fixes Mantis #4703
2010-05-10 04:02:56 +01:00
Melanie 3e8ceb3509 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-05-10 03:57:44 +01:00
Melanie 89c762209c Fix a null ref on region crossing 2010-05-10 03:57:17 +01:00
Diva Canto 6f2f0fa0ca OK, this really fixes it, I promise. 2010-05-09 14:12:59 -07:00
Diva Canto 9cf6b81256 Yey for unit tests. The previous commit had a couple of bugs on SQL statements. Fixed here. 2010-05-09 14:02:02 -07:00
Diva Canto b233a4b2ca * Fixed spamming the assets table with map tiles. The tile image ID is now stored in regionsettings. Upon generation of a new tile image, the old one is deleted. Tested for SQLite and MySql standalone.
* Fixed small bug with map search where the local sim regions weren't found.
2010-05-09 13:39:56 -07:00
Melanie bc6995f921 Add Delete handler to SQLite (NG) 2010-05-09 18:02:36 +01:00
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 9b22393cf3 Add a field asset_flags and a corresponding enum to the asset database. This
CHANGES THE ASSET SERVER PROTOCOL and means you CAN NOT MIX PRIOR VERSIONS
WITH LATER ONES. It may also eat your babies, yada, yada, yada.
The usual cautions for migrations to the assets table apply.
Coding: Can not guarantee nut free.
2010-05-09 17:02:22 +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
Diva Canto d72769930a More cleaning on presence. Friends online/offline works again. 2010-05-08 07:44:07 -07:00
Diva Canto bfb7a49990 Fixed Presence unit test. Removed unnecessary packing/unpacking of obsolete fields. 2010-05-07 21:56:14 -07:00
Diva Canto 15562017f2 These files are part of the GridUserService write-up. 2010-05-07 21:32:02 -07: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
dahlia eb6d63ab8e improve handling of undersize sculpt textures 2010-05-06 23:02:24 -07:00
dahlia 39c5ddc837 corrections for face numbering and uv mapping, mostly for spheres - sync with PrimMesher r56 2010-05-06 22:08:59 -07:00
dahlia 5d1e9947ed Sculpt meshing refactoring - improves mesh accuracy and UV mapping
Sync with PrimMesher r55
2010-05-06 21:36:27 -07:00
Melanie 6182d71326 Also remove sale and search flags on god owner change. 2010-05-07 00:52:52 +01:00
Melanie 907fce8406 Remove land that is being abandoned from search. This is now consistent with
sale and reclaim.
2010-05-07 00:50:26 +01:00
Melanie 9ecebcdf13 Revert "Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups"
Causes an exception within HttpServer, headers have already been sent.

This reverts commit 8187fccd25.
2010-05-06 16:39:21 +01:00
Melanie 533bd1bd9b Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-05-06 16:08:24 +01:00
Melanie adc34c7129 Ensure the show in search flag is cleared on ownership change. Also, when
land is reclaimed, reset it's for sale flags so it can't be bought again right
away.
2010-05-06 16:07:15 +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
Teravus Ovares (Dan Olivares) 4183cef409 * Fixes LandDataSerializerTests on Windows by stripping CR from the serialization result since the reference serialization has LF only.
* Added a bool result and then an Assert.That(result) because resharper was having a hard time with the equality compare in Assert.That.
2010-05-05 21:22:29 -04:00
Melanie 8b4f729a21 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-05-05 23:58:14 +01:00
Diva Canto ebc3726d52 Added copying of Viewer field to the agent circuit data that is being passed on TPs and crossings.
(XmlRpcGroups files want to be committed too)
2010-05-05 16:54:48 -07:00
Melanie Thielker 2b48ed60ec Remove the m_Viewer variable and make the property a shortcut to the
proper field in AgentCircuitData instead
2010-05-05 23:41:57 +01:00
Melanie ad2039a8c4 Stab a test fail 2010-05-05 22:48:05 +01:00
Melanie Thielker e45f5ac126 Plumb Viewer version into ScenePresence for initial login. It's still not
carried along
2010-05-05 22:33:22 +01:00
Melanie Thielker 2ebe148266 Plumb the viewer version string through into AgentCircuitData. Now all that
is left os to figure out what black magic turns AgentCircuitData into
AgentData and then copy that into the ScenePresence, where m_Viewer is
already added with this commit and waits for the data.
2010-05-05 22:15:32 +01: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
Melanie Thielker 7aed89a8d0 Removed a test for a "can't happen" case. ParentGroup is never null anymore. 2010-05-05 18:51:01 +01:00
Melanie 8187fccd25 Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-05 16:12:52 +01:00
Teravus Ovares (Dan Olivares) a9db266d93 * Added an important comment to warn people not to use MockConsole for anything but testing. 2010-05-04 22:16:07 -04:00
Teravus Ovares (Dan Olivares) f005e570aa * This should fix the tests failing because of a MainConsole.Instance null reference
* Added a MockConsole that doesn't require a handle to System.Console
2010-05-04 22:13:25 -04:00
Melanie Thielker 34d882b70d Add perms check to the teleport home client command handlers. 2010-05-04 23:15:07 +01:00
Melanie Thielker 3761f79971 Strip estate message sending out from the estate management module and
the dialog module. Convert it to an event on the estate module interface.
The old implementation did the same as message to region, a button that
is right next to it on the UI. This implementation prevented people from
adding a more sane one in a module.
2010-05-04 21:26:10 +01:00
Melanie Thielker 5a4cef6b36 make the events more useful by providing the source region 2010-05-04 18:55:24 +01:00
Melanie 1d75450743 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-05-04 18:37:11 +01:00
Melanie Thielker d997fc7b76 Add events to the estate interface to let interested modules know of
changes to estate settings
2010-05-04 18:36:45 +01:00
Diva Canto 61ce4ca9c7 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2010-05-04 09:44:56 -07:00
Diva Canto 484584b83c Fixed: migration #2 for SQLite. Problem was that ATTACH cannot be done inside a transaction. 2010-05-04 09:44:30 -07:00
Melanie Thielker 9cf0077bf9 Add "reload estate" command to sims 2010-05-04 16:11:06 +01:00
Melanie Thielker 6eea0a3931 Allow reloading of estate settings into a running region. Move sun update
helper into Scene, since that is less evil than exposing m_storageManager
to the public.
2010-05-04 15:52:36 +01:00
Melanie Thielker 9635af61f0 Allow regions to get the list of the other regions in the estate 2010-05-04 15:52:29 +01:00
Melanie Thielker 23d7a942ea Refix the fix 2010-05-03 23:11:48 +01:00
Melanie Thielker 92dff5edb1 Add folder version incrementing to XInventoryService. Fixes offline give
for avatar->avatar
2010-05-03 23:11:37 +01:00
Melanie f61b879f2d Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-05-03 21:25:40 +01:00
Melanie Thielker 92561aef8d Store given items in correct parent folder. Fixes items given to offline avatars
not getting lost.
2010-05-03 21:25:02 +01:00
Diva Canto b10811a13b Assorted bug fixes in hypergrid linking. 2010-05-03 09:50:55 -07:00
Melanie 1494c84f56 Fix a bug in owner change notification 2010-05-03 02:40:52 +01:00
Melanie 75063e8f60 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-05-03 01:31:32 +01:00
Teravus Ovares (Dan Olivares) d6bfc490f7 Merge branch 'master' of ssh://MyConnection/var/git/opensim 2010-05-02 20:45:01 -04:00
Teravus Ovares (Dan Olivares) b836249926 * Untested Suggestion from lkalif to change
remoteClient.SendMapBlock(blocks, 0);
to
remoteClient.SendMapBlock(blocks, 2);
in OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
2010-05-02 20:44:34 -04:00
Melanie 7a8ad1ceb2 Make in-place sale send CHANGED_OWNER again 2010-05-03 01:30:57 +01:00
Melanie 45301d8a49 Defer sending of CHANGED_OWNER to make it work on rezzed objects and
attachments in addition to objects sold in place
2010-05-03 01:14:38 +01:00
Melanie af0ffb2a5a Add URL_REQUEST_* script constants 2010-05-03 00:15:55 +01:00
Melanie Thielker 7e74291176 Make the IUserAccountData properly unpack the god mode data, so grid gods
work again
2010-05-02 23:36:00 +01:00
Diva Canto cbb297bc79 Renamed HGInventoryBroker2 to HGInventoryBroker. 2010-05-02 10:37:57 -07:00
Diva Canto 052580ef44 Deleted HGInventoryBroker, so that the new one can take its name. 2010-05-02 10:32:47 -07: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 0c2ab54d41 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-04-30 21:13:31 +01:00
Justin Clark-Casey (justincc) f1164161b3 Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2010-04-30 22:22:40 +01:00
Justin Clark-Casey (justincc) f3662e3d15 minor: eliminate more debug Console.WriteLines, convert one to logging instead 2010-04-30 22:22:03 +01:00
Melanie Thielker d0accc0732 Allow retrieval if admin users in scope mode 2010-04-30 21:13:03 +01:00
Melanie Thielker 177048a651 Fix linking issue introduced in my earlier commit 2010-04-30 20:16:21 +01:00
Melanie 23282935f1 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-04-30 19:29:21 +01:00
Diva Canto 5fda81e6bb * XInventory fairly tested, including for HG. Almost ready to switch.
* Removed a few buglets and added better exception handling.
2010-04-30 11:39:02 -07:00
Melanie d1fcd22173 Fix a null ref from trying to access a dictionary that was never initialized. 2010-04-30 19:28:44 +01:00
Justin Clark-Casey (justincc) d921329799 take out some debug logging in the sqlite db adaptor 2010-04-30 18:18:21 +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
Melanie 0ea908291d Fix some symbol errors 2010-04-30 12:08:08 +01:00
Melanie 4cc06ff993 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-04-30 11:47:24 +01:00
Melanie 22b3217113 Fix link security issue 2010-04-30 11:46:50 +01:00
Diva Canto 638dc8d3c2 Simplified RemoteXInventoryServiceConnector and HGBroker (2) by a lot. 2010-04-29 20:09:11 -07:00
Diva Canto 6a4fae123a Started redoing HGInventoryBroker for XInventory and with multi-protocol in mind. Unfinished. 2010-04-29 11:39:13 -07:00
Melanie aba5db9ed4 Merge branch 'minor-stuff' 2010-04-28 19:38:29 +01:00
Diva Canto 2c595227b0 Commented verbose debug messages from XInventory handler. 2010-04-28 07:41:16 -07:00
AlexRa be1141f0f7 Refactoring in Migration.cs: "using()" instead of explicit Dispose()
This ensures that 'cmd' gets disposed on errors
2010-04-28 13:40:35 +03:00
AlexRa b49e9eff56 Fixed comments in Migration.cs: wrong argument order (no change to code) 2010-04-28 13:11:42 +03:00
unknown aa56953411 Compiler.cs contained method GetCompilerOutput which, apparently,
was not used, but exactly the same path was calculated inline.
This patch does some minor refactoring by replacing inline path
calculation with GetCompilerOutput. This doesn't actually affect anything,
just minor prettifying of the code
2010-04-28 12:52:36 +03:00
AlexRa 8b75302a1e Just a bit of spellchecking in the comments 2010-04-28 12:21:39 +03:00
unknown 806a2555f5 Spelling in FriendsModule.cs: "filed to load" -> "failed to load" 2010-04-28 11:49:53 +03:00
unknown fb7458be31 Minor spelling corrections in MiniModule: "RetreiveAsset" changed to
"RetrieveAsset" and 'm_rootSceene' to m_rootScene'.
2010-04-28 11:47:07 +03:00
AlexRa 423ff3b94b Removed unused var from InventoryService.cs (-1 warning) 2010-04-28 11:47:03 +03:00
Diva Canto c54bc5094d Putting it back to protected; Melanie doesn't like it to be public. 2010-04-27 18:52:15 -07:00
Diva Canto 044c1cf5f6 Changed GetToken from protected to public. This is not exposed at the interface. 2010-04-27 18:37:34 -07:00
John Hurliman e838776920 * Thanks cmickeyb, for a patch that sanity checks if the response from m_Database.GetAsset(assetID) is null in AssetService.cs 2010-04-27 17:13:54 -07:00
John Hurliman 59ac792e44 * Thanks cmickeyb, for a patch that corrects an invalid construction of Primitive.TextureEntry (a "blank" texture should be initialized with UUID.Zero, not null) 2010-04-27 17:11:24 -07:00
Diva Canto 3f9d38538e XInventory connector/handler showing signs of life. Tested, but needs more testing. 2010-04-27 11:01:56 -07:00
Melanie a92ca3c2c9 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-04-27 03:49:25 +01:00
Diva Canto 76e87181b2 RemoteXInventoryServiceConnector, the plugin region module. Not active in default configs yet. 2010-04-26 20:28:37 -07:00
Melanie 1e743eab6d Allow a client to pass a scope id to log into in the login XML / LLSD 2010-04-27 03:48:49 +01:00
Melanie edde0be0a0 Fix build break. 2010-04-27 01:11:14 +01:00
Melanie 6928ec0240 Add a parameter to prim inventory update to prevent event firing 2010-04-27 00:25:29 +01:00
Diva Canto 31d040dc1e Better error message. 2010-04-26 17:40:00 -07:00
Diva Canto 2ac00b7f96 * Commenting SQLiteNG out of prebuild.xml, because it's making compile fail in Windows. Justin: you forgot to add Mono.Sqlite.dll, and I can't figure out where to grab it from!
* IRegionModule.cs wants to be committed too -- EOF.
2010-04-26 14:52:22 -07: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
Justin Clark-Casey (justincc) 6e99e5b47a get region prim saving working properly in SQLiteNG
it wasn't working because of debug work that I'd forgotton to take out
2010-04-23 20:56:24 +01:00
Justin Clark-Casey (justincc) f313d57fa4 Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2010-04-23 20:11:26 +01:00
Justin Clark-Casey (justincc) 1b488c2581 dispose of the DbCommand used to execute migrations after we've finished with it rather than within the loop
disposing of it within the loop causes Mono.Data.Sqlite.dll to get upset, and it's the wrong behaviour anyway
2010-04-23 20:08:24 +01:00
dahlia b5ec101cc8 add a comment about deprecating IRegionModule 2010-04-23 12:06:32 -07:00
Justin Clark-Casey e78f874cfd put SQLiteNG classes in their own namespace to avoid confusion 2010-04-23 19:40:15 +01:00
Justin Clark-Casey (justincc) fcbac43114 minor: correct the assembly information for SQLiteNG 2010-04-23 19:14:43 +01:00
Justin Clark-Casey (justincc) 5ee77886ac Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2010-04-23 19:05:32 +01:00
Justin Clark-Casey (justincc) e84cc2f9db Change SQLiteNG to work with mono 2.6 and above using the Mono.Data.Sqlite.dll
Include the library so that Windows builds correctly
It appears that Windows is okay with either SQLite or SQLiteNG
Incorporate the latest fixes made by Diva to OpenSim.Data.SQLite
2010-04-23 18:56:50 +01:00
Justin Clark-Casey (justincc) a23bebdc0f Duplicate OpenSim.Data.SQLite into OpenSim.Data.SQLiteNG. SQLiteNG will shortly be changed to work under mono 2.6 and above 2010-04-23 17:17:15 +01:00
John Hurliman 8692ac53f5 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-04-22 18:56:06 -07:00
John Hurliman 67990ea7e4 * Better error logging for failed SimianGrid web service calls 2010-04-22 18:55:31 -07:00
Melanie ebcc9874d4 Insert a ROLLBACK command on migration step failure. This ensures that
updating the Migrations table will not occur in a partial transaction, which
would be auto-rolled-back later.
2010-04-22 17:45:03 +01:00
Diva Canto e33209fe5b Sanitized parsing of floats (x, y, z location) for Culture. 2010-04-22 08:47:47 -07:00
Melanie 459323a931 Make the detection cone in attachments face in the direction of the avatar,
not the relative rotation of the attachment towards the avatar.
2010-04-21 19:44:19 +01:00
Justin Clark-Casey (justincc) 50f327ef5c minor: change a comment and replace some magic numbers with the AssetType enum 2010-04-19 21:34:42 +01:00
Justin Clark-Casey (justincc) 6b963e73d9 Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2010-04-19 21:28:30 +01:00
Justin Clark-Casey (justincc) 524a2a9e26 Make the "notecard saved" text appear in the saver rather than the notecard owner, if the notecard is saved by a permitted group member
This means moving the alert up to a place where the IClientAPI is available.
One can also argue that such client messages shouldn't be sent directly from the scene data model
2010-04-19 21:25:59 +01:00
Justin Clark-Casey (justincc) da83ee28be If a transfer request is received for a task inventory item asset, then route the permissions request through the existing CanEditScript() and CanEditNotecard() methods.
This implements the 'share with group' flag for notecards and scripts in prim inventory since the PermissionsModule checks group membership and permissions.
Other than that, the code in PermissionsModule duplicates the checks in LLClientView so there should be no change other than allowing group members to edit embedded notecards and scripts.
For all other asset types, the permission checking code in LLClientView continues to be used, pending refactoring of suitable permissions code
This means that 'share with group' will not yet work for prim inventory items other than notecards and scripts
2010-04-19 21:02:36 +01:00
Justin Clark-Casey (justincc) 855eda844f log problems when an asset request through the UDP TransferRequest channel goes wrong 2010-04-19 20:06:55 +01:00
Melanie Thielker af3e477e4b Avoid duplicate script resumes. Move resume calls to more logical places 2010-04-19 17:28:43 +01:00
Melanie 3e63ce6d9d Make script asset fetches synchronous. Script instantiation synchronization
will not work if the instance is not created when the method returns.
2010-04-19 15:29:35 +01:00
Melanie a89208b465 Stopgap measure. Disable the recent script startup changes until I can cure the
race condition.
2010-04-19 14:14:31 +01:00
Melanie Thielker 689b647790 And some more rez modes that weren't covered before 2010-04-19 10:54:41 +01:00
Melanie b39db7e9e4 Also enable scripts rezzed into prims 2010-04-19 10:43:25 +01:00
Melanie 21cad5d3ac All scripts are now created suspended and are only unsuspended when the object
is fully rezzed and all scripts in it are instantiated. This ensures that link
messages will not be lost on rez/region crossing and makes heavily scripted
objects reliable.
2010-04-19 06:29:26 +01:00
Diva Canto 4e1cbd1bf3 One more bug fix in sqlite sql statements. 2010-04-16 18:04:20 -07:00
Diva Canto 2597a3406c Bug fix: UserAccounts in SQLite was missing the primary key constraint. 2010-04-16 17:43:15 -07:00
Diva Canto 930d374525 Expose Delete at IUserAccountData interface. It was there already. No changes in IUserAccountService, just the data layer. 2010-04-16 16:36:44 -07:00
Justin Clark-Casey (justincc) 26e3884237 refactor: move DeatchObject() into the AttachmentsModule 2010-04-17 00:00:45 +01:00
Justin Clark-Casey (justincc) ab3af43d5e refactor: remove now unused internal method SendAttachEvent() 2010-04-16 23:29:36 +01:00
Justin Clark-Casey (justincc) cac12eca79 Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2010-04-16 23:24:34 +01:00
Justin Clark-Casey (justincc) 57c293d604 refactor: crudely move DetachSingleAttachmentToGround() over to the AttachmentsModule 2010-04-16 23:15:13 +01:00
Diva Canto b3e9dd4fc2 Bug fix in SQLite/SQLiteUserAccountData.cs: Missing'(' in one of the SQL statements. 2010-04-16 15:10:57 -07:00
Justin Clark-Casey (justincc) 45563e20e0 minor: correctly print out missing item id when it can't be found rather than a NullReferenceException 2010-04-16 22:57:44 +01:00
Justin Clark-Casey (justincc) 17d023ba5b refactor: crudely move the RezMultipleAttachments() method into the AttachmentsModule 2010-04-16 22:54:25 +01:00
Justin Clark-Casey (justincc) e9926d13cf minor: use the static ascii and utf8 encodings instead of instantiating our own 2010-04-16 22:38:42 +01:00
Justin Clark-Casey (justincc) bf3956aeb0 Add --skip-assets option to load oar.
This allows you to load an oar without loading its assets.  This is useful if you know that the required assets are already in the asset service, since loading without assets is quicker.
This option will become more useful when the ability to save oars without assets is added, which should happen fairly soon.  At this point there will also be better documentation.
2010-04-16 22:29:11 +01:00
Justin Clark-Casey (justincc) cf46735856 add a missing initialization of the m_memoryCache in XmlRpcGroupsServicesConnectorModule
the lack of this caused me a NullReferenceException when calling some groups methods directly though in principle it would also fail in other situations
2010-04-16 21:39:27 +01:00
Justin Clark-Casey (justincc) 5459a90fc6 minor: stop irc bridge warning about not attached to regions if it's not been turned on in the first place 2010-04-16 21:23:01 +01:00
Justin Clark-Casey (justincc) 9131a0d4a4 minor: stop datasnapshot issuing a warning log message if it's disabled 2010-04-16 21:12:09 +01:00
Justin Clark-Casey (justincc) 48f3733963 Fix http://opensimulator.org/mantis/view.php?id=4657 where OpenSim.Grid.UserServer.exe fails on startup if no previous config
probably appears to occur because mono 2.4.2.3 (and possibly later) erroneously returns a value of 0 for BufferWidth and BufferHeight in some circumstances
2010-04-16 20:43:23 +01:00
John Hurliman a7449a82bc Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-04-14 19:49:02 -07:00
John Hurliman 8fa13e3871 Patch from mcortez to add basic caching to the groups module. This prevents database/network explosions when you have a significant number of group-owned prims in a scene 2010-04-14 19:48:40 -07:00
Diva Canto ff50a90a83 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2010-04-14 19:23:17 -07:00
Diva Canto 407b48f3bb The missing .csproj for the Robust 32 bit launcher 2010-04-14 19:22:48 -07:00
Justin Clark-Casey (justincc) e0f8362e7a minor: add some documentation around the asset udp request path and replace some magic numbers with libomv enums 2010-04-14 22:31:11 +01:00
John Hurliman 985faf4151 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-04-14 11:06:07 -07:00
John Hurliman 1e87fc8a26 Applying a patch from lkalif to fix a small bug in the previous patch 2010-04-14 11:05:28 -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
John Hurliman 6892fc41f7 Applying patch from lkalif to add support for inventory links to the SimianGrid connectors 2010-04-13 18:59:05 -07:00
Robert Adams 54a5b6f434 Reduce number of AvatarAnimations sent with large number of avatars 2010-04-13 18:50:08 -07:00
dahlia 3d0860ae61 thanks lkalif for Mantis #4676 - a patch that adds support for inventory links
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-04-12 17:10:51 -07:00
dahlia 56c176f0a3 minor - add some documentation to PrimitiveBaseShape constructor with OpenMetaverse.Primitive parameter 2010-04-09 19:59:58 -07:00
John Hurliman 3f6c4c150e * Adds IAssetService.GetCached() to allow asset fetching from the local cache only
* Adds GetTextureModule that implements the "GetTexture" capability, aka HTTP texture fetching. This is a significantly optimized path that does not require any server-side JPEG2000 decoding, texture priority queue, or UDP file transfer
* Sanity check for null reference in LLClientView.RefreshGroupMembership()
2010-04-08 12:31:44 -07:00
John Hurliman 542abb9c43 * Fixing incorrect documentation for the continuation passing style IAssetService.Get() method
* Changing the SimianGrid asset service connector to match the corrected documentation
2010-04-07 09:58:16 -07:00
Diva Canto 5fc9fe70af Added NullInventoryData for unit tests and quick try-outs of the services in 64-bit machines (no SQLite). 2010-04-06 19:38:01 -07: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
John Hurliman f302224caf * In the async asset fetch method, cache check before firing any async code. This should alleviate some "thread storm" issues when regions are starting up that hit Mono especially hard 2010-04-05 14:52:25 -07:00
Justin Clark-Casey (justincc) 48d2e8309a check group membership and powers with the groups module rather than just the client's active group id
this resolves the earlier issue where notecards/scripts shared with group could only be edited if the user had that group active
2010-04-05 20:44:19 +01:00
Justin Clark-Casey (justincc) 1be19c7f42 log exceptions that end up at the top of a asynchronous viewer packet method call rather than swallowing them 2010-04-05 19:46:43 +01:00
Justin Clark-Casey (justincc) 9ecad50419 Partially implement share with group option for object inventory items
If serverside permissions are off then this works as expected.  Previously, it was impossible for more than one person to edit such items even if permissions were off.
If serverside permissions are on then this works as expected if the object was created by an avatar who had the required group active.
However, if the group for the object is later set then the contained item is still not editable.  This may be linked to a wider bug where the object is still not modifiable by the group anyway
2010-04-05 19:37:02 +01:00
Melanie dc58c985e8 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-04-04 02:24:52 +01:00
Melanie 936e08e20e Patch from mcortez. This appears to be a huge change to the groups module
and I can't say if this is beneficial or destructive due to the way it
was delivered (zipfile). Pushing this on faith alone.
2010-04-04 02:23:53 +01:00
Diva Canto e6ed9b6747 * Guard against null in last commit 2010-04-03 18:12:03 -07:00
Diva Canto cfa941adc7 Last commit was too fast... must override. 2010-04-03 12:14:57 -07:00
Diva Canto 8f68edfe12 * Fail storing user accounts in the remote connector. 2010-04-03 12:11:54 -07:00
Diva Canto 6485c576a1 * Made UserAccountService handle UserLevel, UserFlags and UserTitle appropriately.
* Removed Store service from the UserAccount handler.
2010-04-03 12:03:34 -07:00
John Hurliman 35c82a31db Don't append ACKs to zerocoded packets. Although this should fine in theory, I'm seeing the viewer ignore or fail to parse ACKs appended to our zerocoded packets. This should cut down on viewer->sim resend traffic 2010-04-02 16:25:14 -07:00
John Hurliman a895de4414 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-04-02 13:32:40 -07:00
John Hurliman 4c9cc56624 * Better logging for Authenticate() failures
* Changed a warning message to debug when fetching user sessions
2010-04-02 13:32:30 -07:00
Melanie a004d88bf3 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-04-02 14:53:52 +01:00
Melanie 4b98d0db92 Adding the groups update (Mantis #4646)
Thanks, mcortez.
2010-04-02 14:53:33 +01:00
Justin Clark-Casey (justincc) e0eba26f7b Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2010-04-01 23:59:00 +01:00
Justin Clark-Casey (justincc) 938905df1e oops, add file missing from last commit
refactor out redundant method from GroupsMessagingModule
2010-04-01 22:45:01 +01:00
Justin Clark-Casey (justincc) c33b1de9df expose methods that allow region modules to send messages to groups 2010-04-01 22:37:20 +01:00
Diva Canto 08ba34da03 First attempt at fixing mantis #4641. It's better but there are now some issues with permissions.
(looks like my commit is going to touch CM files, I'm going to let it do it - eof only)
2010-03-31 21:30:44 -07:00
Justin Clark-Casey (justincc) 2bf1761ad8 When saving an oar/iar, don't attempt to write out the data byte array if it's empty
On Mono 2.6 (and probably before) this causes a non-obvious IOException
2010-03-31 19:51:17 +01:00
Melanie 21519d3311 Add missing licenses. Change relicensed LightShare module to proper BSD
licensing.
2010-03-31 13:33:18 +01:00
Melanie 19ae5e5dbb Adding the LightShare module and scripting API. This code was written by
TomMeta and was contributed by Meta7.
2010-03-31 04:23:51 +01:00
Melanie ec637e2b8c Committing the LightShare code, which was developed by TomMeta of Meta7.
This allows scripts to set WindLight parameters for clients connecting
to a region. Currently, this is only supported by the Meta7 viewer.
2010-03-31 04:20:20 +01:00
Justin Clark-Casey (justincc) 8cb81bdc9b minor: commented out code removal 2010-03-30 17:06:30 +01:00
Justin Clark-Casey (justincc) 696d711d15 Completely prevent full update packets being sent after kill object packets
If a full update is sent after the kill, the object remains as in the linden viewer but in an undeletable and unowned state until relog
This patch prevents this by recording kills in LLClientView
2010-03-30 17:04:26 +01:00
Justin Clark-Casey (justincc) 24fc4703d0 fix build break. First argument of GetGroupRecord is not a uuid 2010-03-29 22:02:02 +01:00
Melanie e7e56e0143 Remove a redundant method body 2010-03-29 19:50:24 +01:00
Melanie 607ed61ec2 Stab one bug. When joining an estate with a new region, make sure it's also
used on first run and not only later.
2010-03-28 23:18:25 +01:00
Diva Canto efc0916a01 May fix mantis #4613 2010-03-27 22:48:15 -07:00
John Hurliman 1430441cf3 Change the SimianGrid connector log messages to start with "[SIMIAN " to avoid configuration confusion 2010-03-26 15:13:55 -07:00
John Hurliman d6a64bf732 * Catch exceptions thrown when MySQLEstateData.LinkRegion() is called. This won't fix the bug I'm seeing with regions not realizing they are already part of an estate, but it will fix the OpenSim crash if that situation ever comes up 2010-03-26 13:50:25 -07:00
Diva Canto c6bbb48f2b Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2010-03-26 13:14:32 -07:00
Diva Canto 8ee0bdb86e Minor improvement on debug message. 2010-03-26 13:13:33 -07:00
unknown 9fb17e7ab2 Select Random Region if Home or Last cant be found 2010-03-26 13:06:26 -07:00
John Hurliman 05123c6bd5 * Fixed a dictionary value retrieval in GroupsModule 2010-03-26 12:39:22 -07:00
John Hurliman 3e8cb7a9a0 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-03-26 12:21:24 -07:00
John Hurliman 5a2315c68c * Fixed a bug with null value handling in WebUtil.BuildQueryString()
* Changed the null check back in estate manager setup but fixed the case for an existing account being found
* Implemented SetPassword() in the SimianGrid auth connector
2010-03-26 12:21:05 -07:00
Justin Clark-Casey (justincc) 4565e5dfbc change trunk version to 0.7.Dev 2010-03-26 18:56:05 +00:00
John Hurliman dd1c1b3bcd Fixed a backwards null check that was preventing estate owner from being set and a misleading error message (in grid mode it tries to get a user, not create one) 2010-03-26 11:08:14 -07:00
Justin Clark-Casey (justincc) 87fe96ae2c replace recent IModule.GetGroup() with better GetGroupRecord(string name) 2010-03-26 00:10:29 +00:00
Justin Clark-Casey (justincc) 857918d3b0 minor: some debugging information and spacing changes to group module 2010-03-25 23:53:05 +00:00
Justin Clark-Casey (justincc) f0703cad2c add get group by name method to IGroupsModule 2010-03-25 22:47:52 +00:00
Justin Clark-Casey (justincc) 19c659ca99 fix unit tests broken by commit dcf18689b9
can't prompt for estate owner in unit tests
2010-03-25 21:46:23 +00:00
Justin Clark-Casey (justincc) bfbf25c542 minor: Print out port that http servers are using
do this in callers so that we know who is setting up these things
2010-03-25 21:36:57 +00: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
Melanie 3fb73e4e26 UNTESTED SQLite code to enable estate setup in interactive confguration 2010-03-23 02:18:55 +00:00
Melanie dcf18689b9 First stage of the new interactive region creation. This will allow creation
of a region and joining it to an existing estate or creating a new estate,
as well as creating an estate owner if in standalone, and assigning estate
owners. In Grid mode, existing users must be used. MySQL ONLY!!!! so far, as
I can't develop or test for either SQLite or MSSQL.
2010-03-23 02:05:56 +00:00
Melanie 07a6b37001 Somehow the starting estate number in MySQL was lost. This adds a migration
to start estates at 100. Existing databases having autcreated estates below
100 will see a gap in estate numbering. Other database implementors need to
ensure that no estates with numbers less that 100 are autocreated, unless
they are prepared to deal with the viewer's built-in notions of
Linden Mainland
2010-03-22 20:38:27 +00:00
Melanie d378c758e1 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-03-22 18:51:07 +00:00
Melanie 70b0e07d1e Remove the reading of estate_settings.xml and the associated processing of
defaults. Adding code to facilitate estate creation / managemment as part of
first time start up
2010-03-22 18:49:56 +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 f020bd3206 Fix a nullref in permissions when returning objects via right-click 2010-03-20 15:49:39 +00:00
John Hurliman 5e65bef805 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-03-19 15:17:15 -07:00
Dan Lake 62e0b53ca4 Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, Scene and SceneGraph. This was the only change in this patch to keep it isolated from other recent changes to the same set of files. 2010-03-19 15:16:44 -07: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 e0289bb432 Flesh out the new permission method 2010-03-18 19:58:21 +00:00
Melanie 734b0416de Unify a previous refactor of object return with the older solution. We
really don't need two methods doing the same thing, but differently.
2010-03-18 18:57:29 +00:00
Dan Lake 73e9b0be72 Inconsistent locking of ScenePresence array in SceneGraph. Fixed by eliminating option to return the actual list. Callers can now either request a copy of the array as a new List or ask the SceneGraph to call a delegate function on every ScenePresence. Iteration and locking of the ScenePresences now takes place only within the SceneGraph class.
This patch also applies a fix to Combat/CombatModule.cs which had unlocked iteration of the ScenePresences and inconsistent try/catch around the use of those ScenePresences.
2010-03-17 11:21:27 -07:00
Justin Clark-Casey (justincc) a647f50087 minor logging changes to BaseHttpServer, OSHttpRequest 2010-03-16 22:58:12 +00:00
John Hurliman b51f40da8f Removed the unused use_async_when_possible config variable 2010-03-16 12:03:04 -07:00
John Hurliman b4dcdffb50 Fixed several unhandled exceptions and performance issues with PrimitiveBaseShape.Textures. This really should be moved from a property to a method if it is going to decode a byte[] into a TextureEntry each time 2010-03-16 11:50:22 -07:00
John Hurliman d722519b31 * Fixing the SimianGrid friend connector enabled detection since the friends module uses a different pattern in the .ini file 2010-03-16 10:40:15 -07:00
John Hurliman 3be2b592b2 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-03-15 20:54:57 -07:00
John Hurliman 65c1fbc14d Fixing line endings 2010-03-15 20:54:48 -07:00
John Hurliman cffe39b95f * Fixed a bug in Simian.IsSimianEnabled (since the default module strings follow the form OpenSim.Services.Connectors.dll:SimianGridServiceConnector instead of SimianGridServiceConnector) 2010-03-15 20:52:41 -07:00
Diva Canto 45ef3e9987 Get the local inner simulation service object to the handler so that there is no possibility of cascading requests when failures happen. 2010-03-15 20:32:36 -07:00
Diva Canto 76106e39d9 Restoring LoadPlugin as it was before. Justin's last change made it throw. 2010-03-15 19:34:14 -07:00
John Hurliman 4e180e84e2 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-03-15 15:38:55 -07:00
John Hurliman 84459d2bc2 Fixed Simian.IsSimianEnabled() to allow mixing and matching of connectors 2010-03-15 15:38:29 -07:00
John Hurliman 33f5d0d1e9 * UuidGatherer now tracks asset types for assets it discovers. The asset types are inferred from context
* OAR saving will attempt to correct unknown asset types before writing broken assets to the OAR file
2010-03-15 14:17:17 -07:00
dahlia 1e73e16fd0 flip UVs for profile faces 2010-03-13 18:41:36 -08:00
dahlia 2ebc4be99d add a null check in ScenePresence constructor 2010-03-13 12:04:49 -08:00
dahlia 41a98b902b correct some references which could produce erroneous prim face numbers 2010-03-12 22:05:22 -08:00
dahlia 1d14cf8c3f some improvements to sculptmap alpha handling and LOD 2010-03-12 21:21:28 -08:00
Justin Clark-Casey (justincc) 4b81393274 minor: remove some mono compiler warnings 2010-03-12 23:21:45 +00:00
Justin Clark-Casey (justincc) 315fa06c75 refactor: Move another RezSingleAttachment() from Scene.Inventory to AttachmentsModule 2010-03-12 23:20:38 +00:00
Justin Clark-Casey (justincc) 6828d8ecbe Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2010-03-12 22:49:16 +00:00
Justin Clark-Casey (justincc) 582375509c refactor: move RezSingleAttachmentFromInventory() from SceneGraph to AttachmentsModule 2010-03-12 22:48:49 +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 3ea9fdea8b Minor tweak to clean up SimianGrid asset service URLs 2010-03-12 14:39:51 -08:00
Justin Clark-Casey (justincc) b9f5cd75bc refactor: move client invoked AttachObject from SceneGraph to AttachmentsModule 2010-03-12 22:39:15 +00: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
John Hurliman 9e3cdc4da5 Fixing the previous patch to work correctly with standalone mode 2010-03-12 13:28:16 -08:00
John Hurliman 0b5141d45b Fixed SimianGrid connectors to gracefully exit if the required config sections are missing 2010-03-12 13:16:44 -08: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
Justin Clark-Casey (justincc) f2de50bb14 Fix tests broken in 88771aeed3
Adds MockUserAccountService and connects it up
Stops services being carried over between tests since this leads to hard to find bugs
Improves information and error reporting when loading plugins
2010-03-12 19:31:14 +00:00
John Hurliman 3fa4988810 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-03-12 10:19:57 -08:00
Diva Canto ed3288a8db Bug fix: "last location" login. 2010-03-12 10:16:21 -08:00
Justin Clark-Casey (justincc) db61d66e74 Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2010-03-12 17:58:25 +00:00
Justin Clark-Casey (justincc) 2313d14acb minor: add some more documentation for IHttpServer.AddHTTPHandler() to tell the caller that the best match for an incoming request URI is invoked 2010-03-11 23:33:55 +00:00
Justin Clark-Casey (justincc) a578feefba very minor spacing adjustment 2010-03-11 20:20:38 +00:00
John Hurliman 2040649871 Adding the SimianGrid connectors 2010-03-11 11:19:02 -08:00
Mikko Pallari 265c24ec33 Changed some properties and methods from private to protected in LLLoginResponse and LLLoginService so they could be inherited better. 2010-03-11 07:56:44 -08:00
John Hurliman b18ca2fee6 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-03-10 14:06:12 -08:00
John Hurliman 2af97b46ec * Cleaned up and commented the messy SendInventoryUpdate, fixed a broken debug line, and commented the debug line out since it can quickly become noisy 2010-03-10 14:05:49 -08:00
Melanie 04a6b1caf8 Reintroduce a check that was dropped from permissions 2010-03-10 05:31:34 +00:00
Jeff Ames f58a0394ed Formatting cleanup. Add copyright notices. 2010-03-10 13:15:36 +09:00
Diva Canto c5bb51b443 Changed a cryptic debug message and a wrong comment 2010-03-09 17:33:31 -08:00
Diva Canto dbb2edf1a6 Fixed caching of user accounts. 2010-03-09 17:09:44 -08:00
Melanie 88771aeed3 Cache UserLevel in ScenePresence on SP creation. Change IsAdministrator
to use that stored value.
2010-03-09 23:11:28 +00:00
Melanie c7590bfd50 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-03-09 22:44:14 +00:00
unknown 98f91a252c - parcel blocking, region crossing blocking, teleport blocking
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-09 22:43:55 +00:00
John Hurliman 4b8af2e1aa Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-03-09 12:19:11 -08:00
John Hurliman 01218093a6 * Typo fixes
* Performance improvement in the expensive GenerateClientFlags()
2010-03-09 12:06:53 -08:00
unknown c135235000 MSSQL tweaks for latest ROBUST - friends handling fixed, GridUserData placeholder added.
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-09 18:37:08 +00:00
Melanie 9ea6509a1c Comment a debug message that is a tad too spammy 2010-03-08 21:08:48 +00:00
Melanie 2362da2ad0 Add config option for switching between CSJ2K and BuggyJPEG. 2010-03-08 20:29:26 +00:00
John Hurliman fa38cf3ee8 * Added code to support either CSJ2K or OpenJPEG texture decoding. Currently hardcoded to CSJ2K (so no functional change) but this could easily be switched to a config option 2010-03-07 17:03:56 -08: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 6367bdc696 Bug fix: correct name of methods in user accounts connector. 2010-03-07 11:35:25 -08:00
Melanie 89a739b45f Small consistency change 2010-03-07 16:05:24 +00:00
Melanie 2e5f7ec926 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-03-06 20:05:33 +00:00
unknown 2dcf73dd93 - supporting llTextBox
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-06 20:05:11 +00:00
Diva Canto f4c165afe7 Bug fix: store correct position information upon logout. Fixes mantis #4608 2010-03-06 08:21:54 -08:00
Melanie 9fa9cfd215 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-03-06 11:58:19 +00:00
unknown c0bc25059c - implementing server 1.38 functions
Signed-off-by: Melanie <melanie@t-data.com>
2010-03-06 11:52:59 +00:00
Diva Canto 6aed4323a3 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2010-03-05 21:37:18 -08:00
Diva Canto 5171464ac1 Justin, I must have been dyslexic when I wrote UserGridService as the name for it. GridUserService makes more sense; it's the user of the grid, "grid user". I changed it everywhere. 2010-03-05 21:36:45 -08:00
John Hurliman 27b8d13057 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-03-05 17:05:15 -08:00
John Hurliman 36afd0bfd1 * Cache packed throttle data to avoid repeated allocations in CheckForSignificantMovement()
* Removed a lock on "return m_neighbours.Count" in GetInaccurateNeighborCount(). Dictionary<>.Count by itself does not benefit from locking
2010-03-05 17:04:20 -08:00
John Hurliman cde3c20ba3 * Fixed an order of operations bug in CheckForSignificantMovement() that was causing a flood of child updates to neighbors on login
* Removed an unnecessary call to the presence service
2010-03-05 17:01:31 -08:00
Justin Clark-Casey (justincc) 395f343498 refactor: Move DetachSingleAttachmentToInv to region module
need to rationalize method names later
2010-03-06 00:07:47 +00:00
Justin Clark-Casey (justincc) e7422fe9b2 Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2010-03-05 23:37:49 +00:00
Justin Clark-Casey (justincc) 71797af540 refactor: move another AttachObject method 2010-03-05 23:35:49 +00:00
Justin Clark-Casey (justincc) b72c2dc6e8 refactor: move user inventory side of RezSingleAttachment to module 2010-03-05 23:29:24 +00:00
Justin Clark-Casey (justincc) 60553e62a3 refactor: begin to move attachments code into a region module 2010-03-05 23:18:47 +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 463d775261 Bug fix on user account creation -- ServiceURLs field now properly filled out. 2010-03-04 21:02:35 -08:00
Justin Clark-Casey (justincc) e39fc95659 Fix LocalPresenceServiceConnector test now that the hardcoded test data has been removed from Data.Null.NullPresenceData
Unfortunately, this meant publicly exposing the underlying service for the connector.
The other solution would be to create alternative initializers for services and connectors where objects could be given directly rather than loaded indirectly through config.
Unfortunately, this would require a lot of work in this case but might be the better way forward.
2010-03-05 00:54:46 +00:00
Justin Clark-Casey (justincc) 8bd114b4df Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2010-03-05 00:27:24 +00:00
Justin Clark-Casey (justincc) 82cccdeb94 minor: comment out a forgotton debug log line 2010-03-04 22:50:02 +00:00
Justin Clark-Casey (justincc) a1643c78be remove test presence from NullPresenceData since this appears to stop existing sessions with home locations from being picked up
only tested for a single user so this may still fail for multiple users
this may well be all academic anyway since standalone need to persistently store home location in presence data in some way
2010-03-04 22:43:30 +00:00
Justin Clark-Casey (justincc) e07548d703 move linden notecard parsing from LSL_Api.cs to SLUtil so that region modules can use it 2010-03-04 20:08:25 +00:00
Melanie 31f7e06c25 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-03-04 10:43:12 +00:00
Melanie 5d2f854288 Remove a superfluous array creation 2010-03-04 10:38:03 +00:00
Justin Clark-Casey (justincc) 716e6f20e1 compiler warnings revealed that public PlaySoundSlavePrims properties were changing the wrong protected fields.
correcting these may resolve the sound problems seen recently on the mailing list, though not guaranteed.
2010-03-03 23:40:32 +00:00
Justin Clark-Casey (justincc) c4ba2e5dfb minor: remove some compiler warnings 2010-03-03 23:35:23 +00:00
Justin Clark-Casey (justincc) 8305e6af07 refactor: push sog.SendPartFullUpdate() down into sop where it better belongs
no functional changes
2010-03-03 23:29:09 +00:00
Justin Clark-Casey (justincc) 60fde0c83a minor: remove a couple of compiler warnings 2010-03-03 23:03:41 +00:00
Justin Clark-Casey (justincc) a0b22a9adc Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2010-03-03 22:48:41 +00:00
John Hurliman 61a63ff851 * Added three new helper utility files to OpenSim.Framework. MultipartForm is used for constructing multipart/form-data requests. UntrustedWebRequest places sanity checks and policy on requests to HTTP endpoints that are not in the same trust domain (useful for Hypergrid, OpenID, etc). WebUtil contains misc. functions for managing URLs and network streams 2010-03-03 14:38:00 -08: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
John Hurliman fc233d4e1e * Adjusted the significant movement magic value from 0.5m to 2.0m and added an explanation of what it does 2010-03-03 12:34:21 -08:00
John Hurliman 13a8d11c46 Removing the sLLVector3 dinosaur 2010-03-03 12:12:32 -08:00
John Hurliman 94a3e60bd0 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-03-03 11:03:56 -08:00
John Hurliman a6e23a3275 * Fixed bad start position clamping in MakeRootAgent() 2010-03-03 10:59:05 -08:00
Justin Clark-Casey (justincc) 660ebe52cf Actually make EventManager.OnAttach() fire when an object is attached. Previously, only detach was firing! 2010-03-03 18:40:33 +00:00
Justin Clark-Casey (justincc) 296c68a9de Make the service loader pump out the error to the log (in red) and include the dll/interface/args that caused the problem
This gives people more of a fighting chance of finding out what went wrong
2010-03-03 18:28:30 +00:00
Justin Clark-Casey (justincc) 1c68ad2bba remove references to OpenSim.Framework.Commuications.Tests.dll since all relevant test code has been obsoleted
this allows the tests to pass on my local system
2010-03-03 17:50:05 +00:00
Diva Canto aee887afaf Added empty service URLs upon account creation. 2010-03-03 09:16:21 -08:00
Diva Canto 9fda5c51ac More debug. 2010-03-02 22:20:44 -08:00
Diva Canto d167686adb Better error handling on PasswordAuthenticationService 2010-03-02 21:12:53 -08: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
Diva Canto 14073831d2 Fixes Region.Framework tests. Although these tests don't fail, they need to be rewritten, because they are doing agent manipulations in the wrong way, so they're fairly meaningless. 2010-03-02 07:53:52 -08:00
Diva Canto 763285aaf1 Fixed SQL tests. 2010-03-02 07:29:41 -08:00
Diva Canto cb6c371a85 Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor 2010-03-01 22:23:52 -08:00
Diva Canto 00e6739b7d Offline friendship offers now working. 2010-03-01 22:21:33 -08:00
Diva Canto 53a8286468 Changed the query in GetFriends in SQLite to match the one in MySql. 2010-03-01 21:35:46 -08:00
Diva Canto c6a5ff26ff Friends rights under control. 2010-03-01 21:32:55 -08:00
Melanie 581056eaf3 Merge branch 'master' into presence-refactor 2010-03-02 04:43:36 +00:00
Diva Canto cfaf087b89 More work on GrantRights. Still not right. 2010-03-01 09:23:33 -08:00
Jeff Ames 780ee4f991 Fix a few compiler warnings. 2010-03-01 23:04:45 +09:00
Melanie b8d89ac6da Fix -1 checks for login case 2010-03-01 02:57:25 +00:00
Melanie dc22e74033 Small tweak 2010-03-01 02:54:18 +00:00
Melanie 38ea1dd5c8 Merge branch 'master' into presence-refactor 2010-03-01 01:01:32 +00:00
Melanie 65fadd2f67 Should have things the right way around, better that way 2010-03-01 00:20:34 +00:00
Melanie bfcc57c071 Change friends to handle offers as it was originally designed. This may
need to be changed in SQLite & MSSQL as well
2010-03-01 00:02:14 +00:00
Melanie 18727235a0 Merge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensim into presence-refactor 2010-02-28 23:26:38 +00:00
Diva Canto 774958bbbf Added FriendsData to both Null storage and SQLite. Untested. 2010-02-28 16:09:06 -08:00
Melanie adb9cc2af9 Implement rights changes locall (UNTESTED) 2010-02-28 23:26:13 +00:00
Melanie 86c621fdc7 Change the signature of SendChangeUserRights, because we have to send
this to both parties
2010-02-28 22:56:31 +00:00
Melanie 44e7224b86 Add missing ChangeUserRights packet sender 2010-02-28 22:47:31 +00:00
Diva Canto 5c5966545d Initial Online friends notification seems to be working reliably now. All this needs more testing, but everything is there. 2010-02-28 12:07:38 -08:00
Diva Canto db24e57cab Friends connectors finished. Status notification working across the board. One last bug: friends online upon login are not being sent to the user. 2010-02-28 08:36:13 -08:00
Diva Canto 1daabc3473 Status notification (online/offline) working for same sim. 2010-02-27 18:16:31 -08:00
Diva Canto 593fd54fc7 Update the local cache upon friendship acceptance. Logout notifications working. 2010-02-27 11:23:31 -08:00
Diva Canto a234672db8 * Finished implementation of FriendsService.Delete
* Deny now working
2010-02-27 10:57:57 -08:00
Diva Canto 3906a14857 Friends online notifications upon friendship now working (same sim only). 2010-02-27 10:24:55 -08:00
Melanie a4472ceeac Implement the requestonlinenotification method 2010-02-27 15:50:41 +00:00
Melanie 0ab65899e4 Move requestonlinenotification generic message to presence module 2010-02-27 15:37:00 +00:00
Melanie 6f770af5fb Implement a handler for requestonlinenotification generic message 2010-02-27 15:25:51 +00:00
Diva Canto de5c2801e8 Friendships established. 2010-02-27 08:14:37 -08:00
Diva Canto 25870e8049 * Friendship offers starting to work in the same sim. Not quite right yet.
* Added skeleton for out Connectors/Friends/FriendsSimConnector.cs
* Moved request handler to its own file
2010-02-26 20:35:45 -08:00
Diva Canto dc88dc2c3d More flesh to FriendsModule. Still incomplete. 2010-02-26 17:33:08 -08:00
Melanie dfc17a531f Add the client message handlers. The calling card handlers that are part of
the old friends module are omitted intentionally, as I believe those should
be in a calling card module, not bundled with friends.
2010-02-26 21:37:07 +00:00
Diva Canto 2c6606cee4 Removed unnecessary debug message 2010-02-26 10:46:13 -08:00
Diva Canto bbb43f9bde Now showing friends online upon grid login. 2010-02-26 10:35:23 -08:00
Justin Clark-Casey (justincc) 93967d4a1c fix bug where region settings loaded via an oar (water height, terrain textures, etc.) were not being persisted to the database
this meant that the loaded settings would disappear after a restart
2010-02-26 18:30:05 +00:00
Diva Canto 2af7577fab Flags on Store(Friend) are supposed to be MyFlags. 2010-02-26 09:01:59 -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
Melanie 12432b1751 Merge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensim into presence-refactor 2010-02-25 23:34:58 +00:00
Diva Canto ba38b3b2df Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor 2010-02-25 16:11:28 -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 1a3ad3ae80 Implement local online/offline notifications 2010-02-25 23:32:38 +00:00
Melanie 161d16405d Check flags on initial login 2010-02-25 23:04:05 +00:00
Melanie 44d5b2910f Implement initial online notifications 2010-02-25 04:22:51 +00:00
Melanie f2b36f8e76 Implement friend perms 2010-02-25 04:02:03 +00:00
Melanie b97f3860cb Begin tracking users and friends 2010-02-25 03:55:21 +00:00
Melanie e776bf9316 Grab the presence module and load the friends connector into the friends module 2010-02-25 03:07:46 +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
Melanie 92029dc171 Remove some obsolete files from MSSQL. Fix a missing constructor arg that
was introdiced by the latest jhurlipatch
2010-02-24 16:00:06 +00:00
StrawberryFride 2fa5694ec9 MSSQL Additions for Presence Refactor branch. Most functionality tested and works, some outstanding issues around login location and border crossings on y axis.
Signed-off-by: Melanie <melanie@t-data.com>
2010-02-24 15:50:44 +00:00
Diva Canto 267f3b8147 Fixed typo that was affecting the BasicInventoryAccessModule 2010-02-24 08:03:30 -08:00
Melanie 4aa37e995d Remove the overlooked remnants of core profile support 2010-02-24 06:28:16 +00:00
John Hurliman c6dd670d58 Streamlined error logging for malformed packets and fixed a bug when printing the hex dump 2010-02-23 14:58:36 -08:00
John Hurliman d506449f67 * Removed the unused GridRegion.getInternalEndPointPort() (just use InternalEndPoint.Port). This class is complex enough as it is
* Changed the failed to inform neighbor message from a warning to info, since this will fire for every empty neighbor space
* Made the EnableSimulator/EstablishAgentCommunication log message more verbose and more clear about what is happening
2010-02-23 00:59:24 -08:00
John Hurliman 3437605da6 * Removed the broken and unused GridRegion.ExternalEndPoint setter 2010-02-22 16:13:14 -08:00
John Hurliman df76e95aa2 Changed asset CreatorID to a string 2010-02-22 14:18:59 -08:00
John Hurliman 71c6559a91 Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor 2010-02-22 14:10:19 -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
dahlia e635570cf3 minor formatting tweak - try to trigger a build on panda 2010-02-22 02:13:01 -08:00
dahlia 03706e3f08 add a constructor for PrimitiveBaseShape from a OpenMetaverse Primitive 2010-02-22 01:15:12 -08:00
Jeff Ames 300f4c58a6 Separate PhysX classes into separate files. 2010-02-22 13:16:40 +09:00
Jeff Ames 2dea162073 Formatting cleanup. 2010-02-22 12:25:59 +09:00
Melanie 1f45e6c649 Merge branch 'master' into presence-refactor
This brings presence-refactor up to master again
2010-02-22 03:00:59 +00:00
Diva Canto 2e7aa387f7 One more test running. 2010-02-21 19:11:48 -08:00
Diva Canto 70de6956ff Small bug fixes for making tests work. 2010-02-21 18:56:44 -08:00