ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-31 22:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
16,129 Commits 5 Branches 88 Tags
75d4956ee58340adca06d2ad602e2cd87b2e5943
Commit Graph

184 Commits

Author SHA1 Message Date
Melanie
b451cc1ebb Merge branch 'master' into careminster-presence-refactor 2011-05-08 20:23:06 +01:00
Justin Clark-Casey (justincc)
d4fcba08af Add module with "appearance show" command. 
At the moment, this command just asks the AvatarFactory to perform the existing baked texture check for each avatar in the simulator and returns "OK" or "corrupt".
This is for debugging purposes
 2011-05-07 01:06:55 +01:00
Melanie
4beb0c9b9b Merge branch 'master' into careminster-presence-refactor 2011-05-05 09:49:10 +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
Melanie
0c68fbdb1a Merge branch 'master' into careminster-presence-refactor 2011-04-21 23:06:01 +01:00
Justin Clark-Casey (justincc)
60685c3517 Adjust freeswitch logging to be somewhat less noisy. However, there is still quite a large amount of logging present for debug purposes. 2011-04-21 19:17:38 +01:00
Melanie
09b6d717bf Merge branch 'master' into careminster-presence-refactor 2011-04-21 16:28:29 +01:00
Justin Clark-Casey (justincc)
ccc26f7443 Get Viewer 2 voice working with OpenSim. 
See http://opensimulator.org/mantis/view.php?id=5336
It turns out that viewer 2 was upset by the lack of a response to viv_watcher.php.  This would send it into a continuous login loop.
Viewer 1 was quite happy to ignore the lack of response.
This commit puts in the bare minimum 'OK' message in response to viv_watcher.php.  This allows viewer 2 voice to connect and appears to work.
However, at some point we need to fill out the watcher response, whatever that is.
 2011-04-20 01:02:40 +01:00
Justin Clark-Casey (justincc)
2fa210243b Clean up freeswitch config to what is currently required. Add explanation to config parameters. Clean up some log messages. 2011-04-19 21:54:26 +01:00
Melanie
15e0b55e66 Merge branch 'master' into careminster-presence-refactor 2011-04-03 14:16:28 +01: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
Melanie
5ef490b5ad Switching vivox to https for production use 2011-03-25 01:10:41 +01:00
Melanie
9165a5207d Merge branch 'master' into careminster-presence-refactor 2011-03-10 07:14:03 +00: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
Melanie
3889e68c54 Merge branch 'master' into careminster-presence-refactor 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
	OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
	OpenSim/Services/GridService/HypergridLinker.cs
 2011-02-07 22:08:53 +00:00
Justin Clark-Casey (justincc)
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
Melanie
de4eaab584 Merge branch 'master' into careminster-presence-refactor 2011-01-06 19:08:15 +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
Melanie
aebc011f7b Remove some spam from FreeSwitchModule 2010-12-16 20:12:18 +01: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
Melanie
04ce7de5ed Fix the build break 2010-11-29 01:15:30 +00:00
Melanie
5aeb83125a Remove the most spammy XML dumps from the FS voice module 2010-11-28 23:30:55 +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
Melanie
d2aebbe066 Fox case on a method 2010-11-22 14:27:45 +00:00
Melanie
4e0a289a8d Change FS Voice module to a shared module to avoid gratuitious server handler 
registrations. Add the missing bits to drive the local connector's HTTP
requests. This makes standalones work.
 2010-11-22 14:13:27 +00:00
Melanie
ddf08276f1 Fox the buglets in Freeswitch. Grid mode works now and there is no reason why standalone should not. 2010-11-22 00:46:23 +00:00
Melanie
2105842513 Finish the standalone mode freeswitch work and add config examples 2010-11-21 23:24:39 +00:00
Melanie
6fa24f4671 Convert the Freeswitch module to new style 2010-11-21 22:40:03 +00:00
Melanie
e6c52f38c5 Strip the dialplan and directory methods from the region module 2010-11-21 22:25:50 +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
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
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