3c540f0d33
Avoid another null ref opportunity.
2013-07-30 22:07:33 -07:00
e4ecbc2b10
Fix null ref.
2013-07-30 21:38:41 -07:00
fd050fca7c
Doing the HG Map / SimulatorFeatures "the right way": moved it to HGMapModule, hooking on to SimulatorFeatures.OnSimulatorFeaturesRequest event (similar to what the DynamicMenuModule does).
...
Only HG Visitors get this var, to avoid spamming local users.
The config var is now called MapTileURL, to be consistent with the login one, and its being picked up from either [LoginService], [HGWorldMap] or [SimulatorFeatures], just because I have a bad memory.
2013-07-30 21:10:00 -07:00
590a8b0315
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-30 17:27:32 -07:00
2b54199271
After talking to lkalif on the IRC: SimulatorFeatures response: renamed the OSDMap GridServices to OpenSimExtras, normalized the url keys under it, and moved ExportEnabled to under it too. Melanie: change your viewer code accordingly.
...
Documentation at http://opensimulator.org/wiki/SimulatorFeatures_Extras
2013-07-30 17:26:56 -07:00
0d189165a8
BulletSim: distribute vehicle physical settings to all members of
...
a linkset. Enables constraint based linksets.
Rename some internal variables to clarify whether values world or
vehicle relative.
2013-07-30 15:23:33 -07:00
6ad577d32b
BulletSim: test method for debugging of extended physics script operations.
2013-07-30 15:22:32 -07:00
5a7784a0e6
BulletSim: make density display and return value consistant with how
...
the simulator expects it (scaled to 100kg/m^3).
2013-07-30 07:22:43 -07:00
1416c90932
minor: Add timeout secs to connection timeout message. Change message to reflect it is a timeout due to no data received rather than an ack issue.
2013-07-29 23:53:59 +01:00
8004e6f31c
Fix issue just introduced in 8efe4bfc2e where I accidentally left in a test line to force very quick client unack
2013-07-29 23:38:54 +01:00
8efe4bfc2e
Make "abnormal thread terminations" into "ClientLogoutsDueToNoReceives" and add this to the StatsManager
...
This reflects the actual use of this stat - it hasn't recorded general exceptions for some time.
Make the sim extra stats collector draw the data from the stats manager rather than maintaing this data itself.
2013-07-29 23:18:29 +01:00
7eee9eb312
Groups: Better warning messages to the user.
2013-07-28 20:47:15 -07:00
1b94de8e58
Group chat: prevent a situation where dupe IMs could occur.
2013-07-28 19:31:17 -07:00
1d4bf06fe7
Group chat: guard against duplicate sends
2013-07-28 18:49:10 -07:00
33b54807a1
Changing the visibility test in groups service to be UUID.Zero.ToString() instead of "all" because some paths in the code assume there's a UUI in the RequestingAgent string.
2013-07-28 18:08:50 -07:00
bf283208df
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2013-07-29 02:08:05 +01:00
468ddd2373
Same issue.
2013-07-28 17:12:14 -07:00
c442ef346e
Same issue as previous commit.
2013-07-28 16:44:31 -07:00
698b2135ee
Fix an issue where HG members of groups weren't seeing the entire membership for group chat.
2013-07-28 15:59:24 -07:00
63f6c8f27c
Removed commented lines and useless debug message
2013-07-28 13:53:47 -07:00
7b0b5c9d97
Added BasicSearchModule.cs which handles OnDirFindQuery events. Removed that handler from both Groups modules in core, and replaced them with an operation on IGroupsModule.
2013-07-28 13:49:58 -07:00
6be614ba84
This makes people search work.
2013-07-28 09:54:34 -07:00
170a6f0563
This makes group search work (Groups V2).
2013-07-28 09:00:28 -07:00
8dff05a897
More on group chat: only root agents should subscribe to OnInstantMessage, or else they'll see an echo of their own messages after teleporting.
2013-07-27 20:30:00 -07:00
9cbbb7eddf
Clarification on docs of .ini.examples for Groups (again)
2013-07-27 19:16:48 -07:00
18eca40af3
More bug fixes on group chat
2013-07-27 19:12:47 -07:00
69975763d2
Several major improvements to group (V2) chat. Specifically: handle join/drop appropriately, invitechatboxes.
...
The major departure from flotsam is to send only one message per destination region, as opposed to one message per group member. This reduces messaging considerably in large groups that have clusters of members in certain regions.
2013-07-27 15:38:56 -07:00
1572e91b5f
Clarifications on documentation of Group configs
2013-07-27 08:04:48 -07:00
3dac92f345
Increased the rate of the PollServiceRequestManager to 0.5 secs (it was 1sec). Group chat is going over the EQ... Hopefully this won't increase CPU when there's nothing going on, but we need to watch for that.
2013-07-26 21:40:04 -07:00
85428c49bb
Trying to decrease the lag on group chat. (Groups V2 only)
2013-07-26 21:27:00 -07:00
428916a64d
Commented out ChatSessionRequest capability in Vivox and Freeswitch. We aren't processing it in any meaningful way, and it seems to get invoked everytime someone types a message in group chat.
2013-07-26 21:14:21 -07:00
ba9daf849e
Fix regression from 056a6ee7 because the RemoteSimulationConnector uses a copy of the LocalSimulationConnector but never initializes it (hence ServiceVersion was never set)
2013-07-26 22:52:08 +01:00
840be97e40
Fix failure in TestCreateDuplicateRootScenePresence().
...
This is a test setup failure since code paths when adding a duplicate root scene presence now require the EntityTransferModule to be present.
Test fixed by adding this module to test setup
2013-07-26 20:52:30 +01:00
c245365484
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-26 19:23:12 +01:00
056a6ee765
Fix regression tests relating to agent transfer by making simulator use last week's SIMULATOR/0.1 protocol for now.
2013-07-26 19:22:30 +01:00
9038a503eb
Add Aleric to Contributors list, thanks Aleric!!
2013-07-26 14:17:36 -04:00
d27cc62458
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-26 14:13:02 -04:00
ad2ebd2f3d
Force map tiler to save Water.jpg as an actual jpeg format it seems even though we specified jpg extention it was actually a png and thus confusing the viewer silently.
2013-07-26 14:11:42 -04:00
a08f01fa83
Fix NPC regression test failures.
...
These were genuine failures caused by ScenePresence.CompleteMovement() waiting for an UpdateAgent from NPC introduction that would never come.
Instead, we do not wait if the agent is an NPC.
2013-07-26 18:43:15 +01:00
dd2c211e62
Comment debug message
2013-07-26 07:40:55 -07:00
d5367a219d
Slight improvement: no need to delay the removal of the queues in EQ, because DisableSimulator is now being sent via UDP
2013-07-26 07:39:57 -07:00
878ce1e6b2
This should fix all issues with teleports. One should be able to TP as fast as needed. (Although sometimes Justin's state machine kicks in and doesn't let you) The EventQueues are a hairy mess, and it's very easy to mess things up. But it looks like this commit makes them work right. Here's what's going on:
...
- Child and root agents are only closed after 15 sec, maybe
- If the user comes back, they aren't closed, and everything is reused
- On the receiving side, clients and scene presences are reused if they already exist
- Caps are always recreated (this is where I spent most of my time!). It turns out that, because the agents carry the seeds around, the seed gets the same URL, except for the root agent coming back to a far away region, which gets a new seed (because we don't know what was its seed in the departing region, and we can't send it back to the client when the agent returns there).
2013-07-25 23:44:58 -07:00
4cd03d8c31
Return Simulator/0.1 (V1) entity transfer behaviour to waiting only 2 seconds before closing root agent after 15.
...
This is because a returning viewer by teleport before 15 seconds are up will be disrupted by the close.
The 2 second delay is within the scope where a normal viewer would not allow a teleport back anyway.
Simulator/0.2 (V2) protocol will continue with the longer delay since this is actually the behaviour viewers get from the ll grid
and an early close causes other issues (avatar being sent to infinite locations temporarily, etc.)
2013-07-26 01:40:56 +01:00
72ed49af5f
Reset DoNotClose scene presence teleport flag before pausing. Rename DoNotClose to DoNotCloseAfterTeleport
2013-07-26 01:38:04 +01:00
1fabdcc43c
If a returning teleport starts to reuse a downgraded child connection that was a previous root agent, do not close that child agent at the end of the 15 sec teleport timer.
...
This prevents an issue if the user teleports back to the neighbour simulator of a source before 15 seconds have elapsed.
This more closely emulates observed linden behaviour, though the timeout there is 50 secs and applies to all the pre-teleport agents.
Currently sticks a DoNotClose flag on ScenePresence though this may be temporary as possibly it could be incorporated into the ETM state machine
2013-07-26 01:04:16 +01:00
7914eaa357
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
bin/OpenSimDefaults.ini
2013-07-25 16:55:23 +01:00
20b989e048
Increased the wait time to 15 secs. In a 0.7.5 standalone where the effect was always present, this seems to have fixed it.
2013-07-24 17:10:26 -07:00
cac37e298c
Deleted all [ZZZ] debug messages.
2013-07-24 14:31:30 -07:00
f0320f5652
The previous commit did fix the infinity problem! I'm putting the same time on TP_V1 and adding a big red warning on top of those lines.
2013-07-24 14:31:18 -07:00
46d017b197
Today's wild shot at the infinity problem. Wait on the child agent left behind.
2013-07-24 14:31:03 -07:00
Diva Canto