Melanie
598f63e984
Make atachment state load work again
2013-08-02 00:06:39 +01:00
Justin Clark-Casey (justincc)
c9695a0a59
Move experimental attachments throttling further down the chain so that multiple attachments changes (e.g. change outfit) are also throttled
2013-08-02 00:00:00 +01:00
Melanie
6fc03c7e6e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-08-01 23:42:19 +01:00
Justin Clark-Casey (justincc)
7a5d11f8a7
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-01 23:17:21 +01:00
Justin Clark-Casey (justincc)
68b98a8003
minor: Add name to debug lludp packet level feedback on console
2013-08-01 23:16:41 +01:00
teravus
7b9a50721d
* Thanks Plugh for pointing out that the constructor that takes a ulong regionhandle and saves it to to X,Y vars in the OpenSim.Framework.Location object was inverting the X and Y resulting in X and Y confusion. The test also used 256x256 in the uint,uint constructor so it was unable to determine if the X and Y components swapped. I don't expect much upheaval from this commit, not a lot of features were using the ulong Location object constructor. The database never stores the ulong regionhandle... the prims are loaded by region Guid. LLUDPServer used it to determine regions that it handled in a service definition where there was simply a X == X test which has the same logical result un-switched as it did switched. Again, thanks LibOMV for the regionhandle code.
2013-08-01 16:32:36 -05:00
Melanie
bdc48e3e0f
Make attachment state load work again
2013-08-01 23:30:32 +02:00
Justin Clark-Casey (justincc)
216e785ca9
Add experimental "debug attachments throttle <ms>" setting (command line) and ThrottlePer100PrimsRezzed in [Attachments] in config
...
This is an experimental setting to control cpu spikes when an attachment heavy avatar logs in or avatars with medium attachments lgoin simultaneously.
It inserts a ms sleep specified in terms of attachments prims after each rez when an avatar logs in.
Default is 0 (no throttling).
"debug attachments <level>" changes to "debug attachments log <level>" which controls logging. A logging level of 1 will show the throttling performed if applicable.
Also adds "debug attachments status" command to show current throttle and debug logging levels.
2013-08-01 21:16:53 +01:00
Justin Clark-Casey (justincc)
0c4c084bed
Try a different approach to slow terrain update by always cycling the loop immediately if any data was sent, rather than waiting.
...
What I believe is happening is that on initial terrain send, this is done one packet at a time.
With WaitOne, the outbound loop has enough time to loop and wait again after the first packet before the second, leading to a slower send.
This approach instead does not wait if a packet was just sent but instead loops again, which appears to lead to a quicker send without losing the cpu benefit of not continually looping when there is no outbound data.
2013-08-01 18:12:28 +01:00
Justin Clark-Casey (justincc)
932c382737
Revert "Issue: painfully slow terrain loading. The cause is commit d9d995914c
(r/23185) -- the WaitOne on the UDPServer. Putting it back to how it was done solves the issue. But this may impact CPU usage, so I'm pushing it to test if it does."
...
This reverts commit 59b461ac0e
.
2013-08-01 18:11:50 +01:00
Diva Canto
59b461ac0e
Issue: painfully slow terrain loading. The cause is commit d9d995914c
(r/23185) -- the WaitOne on the UDPServer. Putting it back to how it was done solves the issue. But this may impact CPU usage, so I'm pushing it to test if it does.
2013-08-01 09:27:44 -07:00
Melanie
21f5e67030
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
2013-08-01 01:23:24 +01:00
Justin Clark-Casey (justincc)
9f05a7ac7b
Include missing reference that probably stops windows build from commit 1299592405
2013-08-01 00:25:59 +01:00
Mic Bowman
1299592405
Experimental comment to eneralize the handling of Linden caps when the
...
cap is something other than "localhost". A new interface for handling
external caps is supported with an example implemented for Simian. The
only linden cap supporting this interface right now is the GetTexture
cap.
2013-07-31 15:37:15 -07:00
Mic Bowman
d82126b651
Add the Simian service config to the GridCommon example
2013-07-31 11:42:22 -07:00
Mic Bowman
48ee440983
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-31 11:31:03 -07:00
Mic Bowman
64f2dc778a
A pretty major restructuring of the simian method invocations in order to
...
service access capabilities. In conjunction with the corresponding Simian
updates, this enables explicit per-simulator capability-based access to
grid services. That enables grid owners to add or revoke access to the grid
on a simulator by simulator basis.
2013-07-31 11:27:35 -07:00
Diva Canto
ac2ad9690d
HGWorldMapModule: unregister event on RemoveRegion
2013-07-31 11:20:27 -07:00
Diva Canto
87fcff9fc3
HGWorldMapModule: check whether it's enabled or not.
2013-07-31 11:13:55 -07:00
Diva Canto
3c540f0d33
Avoid another null ref opportunity.
2013-07-30 22:07:33 -07:00
Diva Canto
e4ecbc2b10
Fix null ref.
2013-07-30 21:38:41 -07:00
Diva Canto
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
Diva Canto
590a8b0315
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-30 17:27:32 -07:00
Diva Canto
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
Robert Adams
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
Robert Adams
6ad577d32b
BulletSim: test method for debugging of extended physics script operations.
2013-07-30 15:22:32 -07:00
Robert Adams
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Diva Canto
7eee9eb312
Groups: Better warning messages to the user.
2013-07-28 20:47:15 -07:00
Diva Canto
1b94de8e58
Group chat: prevent a situation where dupe IMs could occur.
2013-07-28 19:31:17 -07:00
Diva Canto
1d4bf06fe7
Group chat: guard against duplicate sends
2013-07-28 18:49:10 -07:00
Diva Canto
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
Melanie
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
Diva Canto
468ddd2373
Same issue.
2013-07-28 17:12:14 -07:00
Diva Canto
c442ef346e
Same issue as previous commit.
2013-07-28 16:44:31 -07:00
Diva Canto
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
Diva Canto
63f6c8f27c
Removed commented lines and useless debug message
2013-07-28 13:53:47 -07:00
Diva Canto
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
Diva Canto
6be614ba84
This makes people search work.
2013-07-28 09:54:34 -07:00
Diva Canto
170a6f0563
This makes group search work (Groups V2).
2013-07-28 09:00:28 -07:00
Diva Canto
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
Diva Canto
9cbbb7eddf
Clarification on docs of .ini.examples for Groups (again)
2013-07-27 19:16:48 -07:00
Diva Canto
18eca40af3
More bug fixes on group chat
2013-07-27 19:12:47 -07:00
Diva Canto
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
Diva Canto
1572e91b5f
Clarifications on documentation of Group configs
2013-07-27 08:04:48 -07:00
Diva Canto
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
Diva Canto
85428c49bb
Trying to decrease the lag on group chat. (Groups V2 only)
2013-07-26 21:27:00 -07:00
Diva Canto
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