Commit Graph

225 Commits (0fd17c08ae642fac17b24dfad06c61cfe5739483)

Author SHA1 Message Date
Melanie b18b1b1d70 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-03-27 23:14:43 +01:00
Snoopy Pfeffer 19837ff4dd Two new scripting functions osInviteToGroup(userID) and osEjectFromGroup(userID) that invite/eject users to/from groups the object containing the script is set to. These functions also work for closed groups. 2012-03-27 22:30:02 +02:00
Snoopy Pfeffer 7223b63563 User level based restrictions for HyperGrid teleports, asset uploads, group creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users. 2012-03-27 22:09:58 +02:00
Melanie 272ba5a741 Merge branch 'master' into careminster 2012-02-15 01:11:17 +00:00
Mic Bowman a9e8bd59a3 Fix a race condition in the simian groups connector. When requests were
too slow they would circumvent the cache (piling up on the network service
and making the problem even worse). This condition happens frequently
during permission checks.
2012-02-13 19:38:22 -08:00
Melanie 428407c5e4 Merge branch 'master' into careminster 2012-01-28 01:01:23 +00:00
Melanie 7352aea9ac Remove IClientAPI from the money module. It was only used to pass in the
agent id anyway
2012-01-28 00:18:12 +00:00
Melanie 2b4ebe657c Merge branch 'master' into careminster 2011-12-19 23:16:20 +00:00
Justin Clark-Casey (justincc) 87a2d8d51b Move HandleObjectGroupUpdate() from GroupsModule to Scene.PacketHandlers.cs as this is updating SOG/SOP.GroupID, which is arguably generic. 2011-12-19 23:03:45 +00:00
Melanie 759f1d2dbe Merge branch 'master' into careminster 2011-12-18 10:49:45 +00:00
Justin Clark-Casey (justincc) 684482352c Fix bug where objects couldn't be set back to the "none" group.
This is handled by treating UUID.Zero as a special case.
Currently, asking for the "none" group returns nothing because XMLRPC groups, at least, is not properly handling this case.
It may be better in the future to have GroupsModule return an appropriate GroupsData structure instead or require the underlying services to behave appropriately.
This is a further component of http://opensimulator.org/mantis/view.php?id=5588
2011-12-17 02:35:08 +00:00
Justin Clark-Casey (justincc) f9137c923b Fix bug where objects could not be set to a new group if the group had been created in that client session, or if no other action has been performed on the object.
There were two problems here:
1) On object group update, we looked for the group is the IClientAPI group cache rather than in the groups service.  This fails to groups created newly in that session
2) On object group update, we weren't setting the HasGroupChanged flag.  This meant that the change was not persisted unless some other action set this flag.
This commit fixes these issues and hopefully addresses http://opensimulator.org/mantis/view.php?id=5588
This commit also moves HandleObjectGroupUpdate() to the GroupsModule from the Scene.PacketHandlers.cs file
2011-12-17 02:23:24 +00:00
Justin Clark-Casey (justincc) a9b39d6e5d Tunnel [GroupsModule] DebugEnabled setting down into XmlRpcGroupsServicesConnectorModule so that we can record cache misses 2011-12-16 20:53:50 +00:00
Melanie 08fcf958c2 Port the Avination offline messaging system to Core 2011-11-02 23:50:47 +00:00
Dan Lake 272bf71279 Removed use of 'is' operator and casting to find the root ScenePresence in MessageTransfer modules and Groups module. 2011-10-27 02:26:37 -07:00
Melanie ca74088d94 Change default groups messaging module in hardcode to the empty string.
Modules should not assume thet they are the one and only, but only be
enabled when explicitly configured.
2011-10-12 09:21:46 +01:00
Justin Clark-Casey (justincc) dad1d6df18 rename TestHelper => TestHelpers for consistency 2011-08-06 00:31:03 +01:00
Justin Clark-Casey (justincc) bda1a4be45 rename test SceneSetupHelpers -> SceneHelpers for consistency 2011-08-06 00:26:37 +01:00
Makopoppo 7545692f32 Changed actual default values of 'ServiceConnectorModule' and 'MessagingModule' in [Groups] section in accordance with OpenSim.ini.example descriptions 2011-06-24 22:40:21 +01:00
Justin Clark-Casey (justincc) a3e0895f12 a few minor formatting tweaks 2011-06-01 20:55:03 +01:00
James Stallings aka Hiro Protagonist c43ad8a0e7 A final couple of tweaks to GroupsModule.cs. Remove unneeded delegate, and prettify codeing style/formatting 2011-06-01 20:51:52 +01:00
Justin Clark-Casey (justincc) 8bacf56e46 revert the prematurely included groups patch, yet again 2011-06-01 20:51:38 +01:00
Justin Clark-Casey (justincc) 8129e64e2a Fill in the new OwnerData field in the LLUDP ScriptDialog message.
If we don't do this then viewer 2.8 crashes.
Resolves http://opensimulator.org/mantis/view.php?id=5510
2011-05-31 19:25:01 +01:00
Justin Clark-Casey (justincc) 392d270264 revert the patch that accidentally got added in the last commit 2011-05-31 18:49:38 +01:00
Justin Clark-Casey (justincc) c4b265aeae update libomv libraries to 0.9.0
this is a prerequisite to fixing llDialog issues for the latest Linden viewers, since they are now making use of a new OwnerData field in the ScriptDialog message
2011-05-31 18:47:13 +01:00
Justin Clark-Casey (justincc) bb9b317f15 Get rid of OpenSim.Tests.Common.Setup subpackage in favour of just OpenSim.Tests.Common instead 2011-05-21 01:05:20 +01:00
Diva Canto 3e79842312 Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll 2011-04-30 11:03:22 -07:00
Diva Canto d8ee0cbe1c First stab at cleaning up Caps. Compiles. Untested. 2011-04-30 09:24:15 -07:00
Justin Clark-Casey (justincc) 4f56c732bc Comment out some startup logging lines to make up for the one I added earlier on.
Most of these are where the region modules are telling us they are disabled.  Convention is only to log when enabled (even that is really noisy)
2011-04-02 02:29:42 +01:00
Justin Clark-Casey (justincc) 9456bb77fb Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately.
This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement.
2011-03-09 23:25:24 +00:00
Justin Clark-Casey (justincc) 8efb01b3df minor: remove some mono compiler warnings 2011-03-05 01:15:27 +00:00
Justin Clark-Casey (justincc) 0898be5750 Change SimianGroupsServicesConnectorModule.GetAgentGroupMembership() so that it returns null if the user isn't a member of the group.
This matches the behaviour of the same method for Flotsam Groups.  This is the behaviour assumed by existing code.
Method doc also added to IGroupsServicesConnector to the make the contract clear.
2011-01-31 22:54:36 +00:00
Justin Clark-Casey (justincc) 4ac58093bf Make the default for the very verbose XMLRPC groups debug setting false rather than true! 2011-01-04 23:23:42 +00:00
Justin Clark-Casey (justincc) 81bccd6d13 Start implementing a test for 'share with group' object functionality. Not yet complete.
While implementing this, a bug was fixed in scene setup helpers where module RegionLoaded() was called immediately after AddRegion() instead of waiting for all AddRegions() to complete.
Also, XmlRpcGroupsModule non-message functionality will now work without a message transfer module (as indicated in the comments but with a contradictory implementation)
2010-12-14 23:36:34 +00:00
Justin Clark-Casey (justincc) 42c9c30e4c Add mock group services connector and use this in tests 2010-12-14 22:57:36 +00:00
Justin Clark-Casey (justincc) c620e4c822 add infrastructure for groups module tests 2010-12-14 22:25:01 +00:00
Mic Bowman 541a7660e0 Refactor appearance and avatar data sending code. Paritioning the routines into "one-to-many" and "many-to-one" makes it possible to call the right function on presence creation (both child and root) and when a child agent is promoted to root. This brings the total number of appearance sends down to one or two on login.
Cleaned up the avatar update calls in the groups code. Cleaned up
some commented and debugging code, and a few formating fixes.
2010-11-27 01:14:36 +00:00
Jeff Ames a331fd4e24 Formatting cleanup. 2010-10-27 00:01:03 -04:00
Justin Clark-Casey (justincc) 478b44f231 Pass in requesting agent ID when GetGroupMembers is called in the XMLRPC groups module
This allows the groups xmlrpc server to act appropriately if the requesting agent has permission to see all group members
Not sure why this wasn't being done before...
2010-10-19 02:04:23 +01:00
Justin Clark-Casey (justincc) b9bef50852 Display more information when xmlrpcgroupsserver comms fails
Improve debugging messages
2010-10-19 02:04:14 +01:00
Justin Clark-Casey (justincc) b1ab3ea5d9 For all Flotasm group module XMLRPC calls, correct parameter requestingAgentID to RequestingAgentID
This was stopping the get group member roles call from working, and may have affected other things
2010-09-17 23:48:44 +01:00
Jeff Ames f1f0bc23f4 Formatting cleanup. 2010-09-12 13:43:49 -04:00
John Hurliman a8c0b131f9 * Changed a few OSD.FromBinary() calls to the more accurate OSD.FromULong() to fix the build 2010-08-17 13:50:04 -07:00
Melanie Thielker e15f6905a5 Clean up IMoneyModule and adjust the other modules to the changes 2010-07-02 06:13:58 +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
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 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
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
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 80346ad2e2 * May fix mantis #4603.
* My local git wants to commit the groups files for line endings, I'm gonna let it do it.
2010-04-05 19:56:03 -07:00
Melanie 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 6485c576a1 * Made UserAccountService handle UserLevel, UserFlags and UserTitle appropriately.
* Removed Store service from the UserAccount handler.
2010-04-03 12:03:34 -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) 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
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
John Hurliman 05123c6bd5 * Fixed a dictionary value retrieval in GroupsModule 2010-03-26 12:39:22 -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
Diva Canto 751e70af78 NetworkServersInfo removed from CommsManager. 2010-01-10 21:37:36 -08:00
Diva Canto b63405c1a7 Inching ahead... This compiles, but very likely does not run. 2010-01-08 10:43:34 -08:00
Justin Clark-Casey (justincc) de054bc583 minor: remove mono compiler warning due to unreachable code in GroupsModule 2009-11-17 15:21:29 +00:00
John Hurliman 2c34619aea * Changed various modules to not initialize timers unless the module is initialized. Ideally, the timers would not initialize unless the module was actually enabled, but Melanie's work on configuring module loading from a config file should make that unnecessary
* Wrapped the Bitmap class used to generate the world map tile in a using statement to dispose of it after the JPEG2000 data is created
2009-10-23 14:22:21 -07:00
Melanie 8dd15fd5a5 Patch by mcortez: Remove lock from scene presence updating in groups module 2009-10-21 18:45:37 +01:00
Michael Cortez d4a6d9191a Make sure that keys exist in arrays before trying to access them. 2009-10-05 20:47:00 +01:00
Michael Cortez 544675d0f0 Ensure the specified imSessionID exists in the DroppedSession collection before attempting to access it. 2009-10-05 20:47:00 +01:00
Jeff Ames 606e831ff5 Formatting cleanup. 2009-10-01 09:38:36 +09:00
Jeff Ames ee205e7e81 Formatting cleanup. 2009-10-01 01:17:47 +09:00
Jeff Ames f00126dc2d Add copyright header. Formatting cleanup. 2009-09-29 08:32:59 +09:00
Michael Cortez 4eb07232e0 Group Membership information is sent out from two different locations, refactored out the filtered membership list code and used it in both locations. 2009-09-18 20:54:03 +01:00
Michael Cortez 65b9084c65 Add a little debugging for filtered groups lists based on requester 2009-09-18 20:54:01 +01:00
Michael Cortez 3b511d5138 Try to filter the groups list returns for User A, when sending to User B, based on User A's preferences for ShowInProfile. 2009-09-18 20:53:58 +01:00
Michael Cortez 247fdd1a4d Add additional instrumentation so that when there is an xmlrpc call failure, the actual xml that was returned from the groups service can be logged. 2009-09-18 20:53:56 +01:00
Michael Cortez 841cd69af7 Remove debug messages from some areas that have been highly tested, and debug info is no longer nessesary. 2009-09-18 20:53:53 +01:00
Michael Cortez 0e07a7ef10 Adding additional debug to output the group powers specified when updating a group role. This will be used to solve some issues with the Group Powers enum. 2009-09-18 20:53:50 +01:00
Michael Cortez 61699275ed Add additional debugging to help track down bug with notices not going to group owner/founder. 2009-09-18 20:53:47 +01:00
Michael Cortez 0cb012aae5 Revert "Thank you, mcortez, for a patch to address showing users in group list"
This reverts commit 69ef95693a.
2009-09-18 20:53:44 +01:00
Melanie 69ef95693a Thank you, mcortez, for a patch to address showing users in group list
Removed patch 0005, which was unrelated and likely accidental, and further
didn't apply.
2009-09-17 15:38:17 +01:00
Teravus Ovares (Dan Olivares) dc925416d7 * fix missing lock on XMLRPC GroupsModule 2009-09-14 16:30:14 -04:00
Melanie eba23048ca Replace the Replaceable modules name 2009-08-10 23:08:22 +01:00
Jeff Ames bc6ec3b564 Formatting cleanup. 2009-08-09 00:43:13 +09:00
Michael Cortez 6244b8c384 Fixing comments re: INI file. 2009-08-06 09:34:30 -07:00
Michael Cortez c73a6ab7e0 Continue with renaming of Groups module components 2009-08-05 14:56:48 -07:00
Michael Cortez 6c65b990a2 Fixes mono Add-In references for the OptionalModules add-in so that groups doesn't throw errors, and so that the add-in is correctly reported as "OptionalModules" rather then as "SampleMoney" 2009-08-05 13:20:46 -07:00
Michael Cortez 989517725d Begin refactoring XmlRpcGroups to a more generic Groups module that allows for replaceable Groups Service Connectors. 2009-08-05 11:15:53 -07:00
Justin Clarke Casey a7c8948292 * Apply http://opensimulator.org/mantis/view.php?id=3855
* Prevent session crashes when something goes wrong with group invite.
* Thanks mcortez.
2009-07-24 20:08:26 +00:00
Jeff Ames a133e83f3a Formatting cleanup. 2009-07-23 15:32:11 +00:00
Melanie Thielker 7c747035ff Thank you, MarcelEdward, for a patch to add paying group join fees.
Applied with changes (original patch would not compile)
Whitespace changes removed
Fixes Mantis #3926
2009-07-21 23:57:56 +00:00
Melanie Thielker 8ecfc9a717 Committing the interface change and the addition to the modules to get
the ball rolling on replacable modules. No user functionality yet
2009-07-10 20:17:13 +00:00
Arthur Valadares f243dddc04 * Corrected CAPS namespaces
* "luke, use the sed"
2009-06-18 14:33:35 +00:00
Jeff Ames a23d64dec1 Formatting cleanup. 2009-06-10 04:28:56 +00:00
Jeff Ames 840de6c036 Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt. 2009-06-01 06:37:14 +00:00
Melanie Thielker 786ff98f6d Remove all messages from the groups module that would be output when it is
NOT enabled.
2009-05-14 21:38:17 +00:00
Melanie Thielker 9248300596 Remove a misleading event that was only used internally 2009-05-14 21:28:02 +00:00
Melanie Thielker fca73f3ae4 Add more group notify glue 2009-05-12 15:52:28 +00:00
Melanie Thielker 1b7d0a6c93 Paving the way for syncing group permissions across a grid 2009-05-12 14:59:11 +00:00
Melanie Thielker 93d54d7652 Prevent normal (Text) IM from being logged by the group message module in
debug mode.
Fixes Mantis #3609
2009-05-09 17:02:03 +00:00
Charles Krinke 47640aca22 Thank you kindly, MCortez for a patch that solves:
Different people using Hippo 0.5.1 report that trying 
to send group instant messages crashes the viewer 
(Hippo 0.5.1). This is the case even for empty groups 
or if all group members are online.
2009-05-02 16:16:27 +00:00
Charles Krinke 8944ab910c Thank you kindly, MCortez for a patch that:
The attached patch provides the necessary infrastructure to support 
security and authentication features of the xmlrpc server.
* Read/Write keys for accessing a Group's xmlrpc service.
* Requiring user session verification for write operations.
2009-04-29 22:31:00 +00:00
Justin Clarke Casey 10415c579b * Correct log message format
* Fix XmlRpcGroupData.XmlRpcCall() to correctly handle response
2009-04-29 19:38:20 +00:00
Justin Clarke Casey 1bf0bc8bb3 * Apply further groups xmlrpc to stop an exception in the exception handler
* Thanks mcortez
2009-04-29 18:52:10 +00:00
Justin Clarke Casey 517a454086 * Apply http://opensimulator.org/mantis/view.php?id=3557
* Stops XmlRpcGroups crashing client sessions if there is an XMLRPC failure
* Thanks mcortez
2009-04-29 18:22:49 +00:00
Justin Clarke Casey 978f98fe7e * Apply http://opensimulator.org/mantis/view.php?id=3554
* Stop converting serviceURL to all lower case.
* Thanks mcortez
2009-04-29 18:14:34 +00:00
Justin Clarke Casey c320dca2db * minor: remove some mono compiler warnings 2009-04-29 18:11:41 +00:00
Jeff Ames 8dbcfc70bf Add copyright headers. Formatting cleanup. 2009-04-27 05:22:44 +00:00
Homer Horwitz ac3154e6b7 - Setting groups-messaging module to by disabled by default (groups module already is).
- Make sure it really is Close()d when the configuration isn't sane.
2009-04-26 18:26:01 +00:00
Melanie Thielker 647368f53f Thank you, mcortez, for a patch to fix group notice delivery 2009-04-26 18:19:14 +00:00
Charles Krinke c17a125445 Thank you kindly, MCortez for a patch that:
The attached patch fixes a few problems that people were 
having with the Messaging provided by the XmlRpcGroups 
optional module, namely:
* Fixes 2x echo in group messaging
* Fixes problems with cross instance, non-neighbor, messaging
2009-04-25 18:58:18 +00:00
Jeff Ames 8afeee9ff6 Update svn properties, add copyright headers, formatting cleanup. 2009-04-24 00:58:48 +00:00
Dr Scofield d455d579d0 more cleanup 2009-04-22 18:00:59 +00:00
Dr Scofield 956be49238 further cleanup (lower casing non-public vars and local vars) 2009-04-22 10:03:38 +00:00
Dr Scofield 458f7eb9b3 cleaning up, fixing warnings 2009-04-22 09:42:44 +00:00
Jeff Ames 6aa5d3904d Add copyright headers. Formatting cleanup. 2009-04-22 00:48:56 +00:00
Charles Krinke 5ea4faa6f2 Thank you kindly, MCortez, for a patch that:
* Refactors the xmlrpc calls to a single location to 
make it easier to debug and include alternative 
xmlrpc call mechanisms
* Includes an alternative xmlrpc call mechanism that 
sets HTTP Keep-Alive to false which solves nearly all 
System.Net exceptions on some windows environments
2009-04-21 20:44:17 +00:00
Jeff Ames 13f5dd5f35 Update svn properties. 2009-04-21 15:30:03 +00:00
Melanie Thielker 3340217320 Also make GroupsMessaging quit trying to run and reduce it's debug
spamming somewhat
2009-04-20 13:59:18 +00:00
Melanie Thielker 489758f68a Make sure that the groups module is really disabled when it's not configured.
Fixes an issue where the presence of any groups section will make XmlRpcGroups
think it should hook client events.
2009-04-20 13:39:41 +00:00
Charles Krinke 088ed68562 Fixes Mantis#3489. Thank you kindly, MCortez for a patch that:
Group profile page is showing an empty dropdown for titles and
this patch fixes this.
2009-04-19 16:22:26 +00:00
Charles Krinke a416e75ddb Thank you kindly, MCortez, for a patch that:
This hooks up the LandManagementModule to handle the DeedParcelToGroup 
packet. Now people can start testing land assigned to and owned by groups.
Also fixes a viewer crash issue when searching for and then joining a group 
with an agent that is not already being tracked by groups server.
2009-04-19 00:11:14 +00:00
diva 5ae8ad55cd Little bug fix on the Groups module to get over an exception upon login. 2009-04-18 22:31:38 +00:00
Charles Krinke 659b55905d Thank you kindly, MCortez, for a patch that:
Added is a patch that adds a rough Groups implementation. This patch allows 
the creation, adding and maintaining Groups, Roles and Members. Work has begun 
on a very naive implementation of messaging, and minimal support for notifications 
{no attachments yet}. Proposals are not yet supported, but are on the to-do list.
This implementation is not active by default, and must be configured in 
OpenSim.ini to become active.
2009-04-18 21:33:48 +00:00