Commit Graph

202 Commits

Author SHA1 Message Date
Tom
66dec3b874 Resolve merge commits, stage 1 2011-09-04 07:06:36 -07: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
root
5f927dc104 Merge branch 'master' into careminster-presence-refactor 2011-06-30 00:26:03 +01:00
Justin Clark-Casey (justincc)
22f25fae38 Hack around with the NPC module to get osNpcCreate() partially working again.
This now creates an avatar but appearance is always cloudy.
Move doesn't work.
Really, creating an NPC should only involve a ScenePresence rather than doing anything with IClientAPI, since an NPC has no viewer to communicate with!
2011-06-29 00:28:22 +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)
de20f0603f Tell hypergridders when their teleports fail because of the 4096 limit rather than just saying "destination not found"
Instead of performing the 4096 check when the region is linked (and subsequently removing the link), leave the link in place and perform the check in the entity transfer module
This allows us to explicitly tell the hypergridder why the teleport failed (region out of range).
It also allows people on regions that are within range (on a large source grid) to teleport.
The Check4096 config parameter in the [GridService] section is replaced by a max_distance paramter in a new [EntityTransfer] section in OpenSimDefaults.ini
Since the parameter is in OpenSimDefaults.ini no action needs to be taken unless you want to increase this limit.  It could also be decreased.
The check is being made in the base entity transfer module, since I believe the viewer problem occurs both on extremely large grids and while hypergridding.
2011-06-24 19:49:05 +01:00
Melanie
326c46ba70 Merge branch 'master' into careminster-presence-refactor 2011-06-09 02:05:04 +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
Melanie
f02fbdbc68 Merge branch 'master' into careminster-presence-refactor 2011-05-27 01:10:02 +01:00
Justin Clark-Casey (justincc)
91ec1a572a improve help information for "appearance show"
at the moment, this just performs a baked avatar check for everybody in the region.  If the check returns 'corrupt' then a baked texture is missing and other avatars will continue to see the gas ball.
2011-05-26 02:48:47 +01:00
Melanie
be1996f121 Merge branch 'master' into careminster-presence-refactor 2011-05-22 20:23:25 +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
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