Commit Graph

7731 Commits (beed74096cbe7df35b2a8036a89af398f908544d)

Author SHA1 Message Date
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
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 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
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
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
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
Diva Canto 3f9d38538e XInventory connector/handler showing signs of life. Tested, but needs more testing. 2010-04-27 11:01:56 -07:00
Diva Canto 76e87181b2 RemoteXInventoryServiceConnector, the plugin region module. Not active in default configs yet. 2010-04-26 20:28:37 -07: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 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
dahlia b5ec101cc8 add a comment about deprecating IRegionModule 2010-04-23 12:06:32 -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
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) 57c293d604 refactor: crudely move DetachSingleAttachmentToGround() over to the AttachmentsModule 2010-04-16 23:15:13 +01: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
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
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
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
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
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
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 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
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
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 05123c6bd5 * Fixed a dictionary value retrieval in GroupsModule 2010-03-26 12:39:22 -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
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
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 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
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