Justin Clark-Casey (justincc)
ac198068ab
Add "debug threadpool status" console command to show min/max/current worker/iocp threadpool numbers
2013-08-06 00:00:12 +01:00
Justin Clark-Casey (justincc)
4581bdd929
Add "debug comms status" command to show current debug comms settings
2013-08-05 23:49:33 +01:00
Justin Clark-Casey (justincc)
9bcf072795
Make it possible to switch whether we serialize osd requests per endpoint or not, either via config (SerializeOSDRequests in [Network]) or via the "debug comms set" console command.
...
For debug purposes to assess what impact this has on network response in a heavy test environment.
2013-08-05 23:44:48 +01:00
Justin Clark-Casey (justincc)
f9dc5815c4
For LLImageManagerTests, make tests execute under synchronous fire and forget conditions.
...
I generally prefer this approach for regression tests because of the complexity of accounting for different threading conditions.
2013-08-05 23:15:30 +01:00
Justin Clark-Casey (justincc)
139dcf1246
minor: move "threads abort" and "force gc" console commands into debug category - these are not things one needs to do in normal operation
2013-08-05 23:06:17 +01:00
Justin Clark-Casey (justincc)
76e778fe2c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-05 23:05:12 +01:00
Justin Clark-Casey (justincc)
160659f683
Make it possible to set worker/iocp min/max threadpool limits on the fly with the console command "debug threadpool set"
2013-08-05 23:04:36 +01:00
Diva Canto
2d3ac2b1ec
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-05 14:21:39 -07:00
Diva Canto
946b370966
Child agent updates: remove the dependency on the root agent's camera position. That was a complete overkill that is unnecessary at this point.
2013-08-05 14:21:17 -07:00
Justin Clark-Casey (justincc)
24dcf3cf6a
Comment out debug log lines about script modules comms for now.
...
If this is an issue, could change log4net config instead to allow re-enablement
2013-08-05 20:51:40 +01:00
Justin Clark-Casey (justincc)
b8612e005a
At OpenSimulator startup, print out default min built-in threadpool threads as well as max.
...
Make it clear that we only try to adjust max, and log at warn level if this fails.
Other minor logging cleanup.
2013-08-05 20:47:47 +01:00
Justin Clark-Casey (justincc)
151a8ca0cc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-05 20:37:27 +01:00
Justin Clark-Casey (justincc)
7f0d9ad644
Make test AssetsClient print out more information about any failure to set thread numbers and immediate post config thread numbers
2013-08-05 20:36:46 +01:00
Mic Bowman
03698121ed
Remove some debugging from simian connectors.
2013-08-05 12:34:53 -07:00
Justin Clark-Casey (justincc)
976514d39a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-05 19:25:51 +01:00
Justin Clark-Casey (justincc)
76bd3de2fd
Add checks monitoring framework to provide alerts if certain conditions do not hold.
...
Not yet in use.
2013-08-05 19:22:47 +01:00
Diva Canto
05012bb0df
Group notices bug fix: use a new IM for each member of the group, otherwise the fields get messed up because the transfer is async
2013-08-05 08:09:30 -07:00
Diva Canto
5b4b349776
Fix the failing TestSendImage. J2K decoding is async.
2013-08-03 21:27:32 -07:00
Diva Canto
09cb2a37dd
More on HG inventory and OutboundPermission: disallowing giving inventory to foreigners if OutboundPermission is false
2013-08-03 20:36:30 -07:00
Diva Canto
dcfeb95e98
HG: If OutboundPermission is set to false, let's enforce stricter permissions by not allowing objects to be taken to inventory.
2013-08-03 20:13:44 -07:00
Diva Canto
b857353fc9
Making the J2KDecoderModule decoder function async. Could this be the cause of sim freeze? -- HandleRequestImage in LLClientView is now sync, which means that it cannot take too long to complete. However, its execution path may end up in J2KDecoderModule.Decode, which is heavy and could stop the packet processing thread while it's at it.
2013-08-03 15:42:25 -07:00
Diva Canto
847c01f406
Amend Justin's last commit regarding the new config var ServiceVersion. The section may not exist at all.
2013-08-02 17:38:08 -07:00
Diva Canto
fdfc951744
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-02 17:00:34 -07:00
Diva Canto
5198df3aa0
Issue: 10 simultaneous TPs, many not making it. Now bypassing the per-url lock -- we should be "ok" (or, more "ok") now that we have increased the connection limit on the http library. But this is a sensitive part of the code, so it may need reverting.
2013-08-02 17:00:18 -07:00
Justin Clark-Casey (justincc)
4ff3757f86
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-08-02 23:17:20 +01:00
Justin Clark-Casey (justincc)
54b1071556
Allow older teleport ConnectorProtocolVersion of "SIMULATION/0.1" to be manually forced in a new [SimulationService] config setting.
...
This is for testing and debugging purposes to help determine whether a particular issue may be teleport related or not
"SIMULATION/0.2" (the newer teleport protocol) remains the default. If the source simulator only implements "SIMULATION/0.1" this will correctly allow fallback to the older protocol.
Specifying "SIMULATION/0.1" will force the older, less efficient protocol to always be used.
2013-08-02 23:12:54 +01:00
Robert Adams
5bdfd55ace
BulletSim: When converting linkset types, don't try to change the list
...
of linkset children while iterating through the list.
2013-08-02 10:32:43 -07:00
Robert Adams
24df15dab7
BulletSim: add implementation of 'physSetLinksetType' and 'physGetLinksetType'
...
and processing routines in BulletSim.
Add linkset rebuild/conversion routine in BSLinkset.
2013-08-02 09:47:12 -07:00
Robert Adams
5bcccfc305
BulletSim: add BSLinkInfo structure to remember link specific information
...
for each link in a linkset.
Extend BSLinksetConstraint to create and use BSLinkInfo with the default
static constraint.
2013-08-02 09:47:11 -07:00
Robert Adams
87ee0c395e
Fix problem with modInvoke defined integer constants being build into
...
scripts as boxed integers rather than proper reference to a new LSLInteger.
This fixes an exception when using a registered integer constant in
a script.
2013-08-02 09:44:01 -07:00
Diva Canto
07e4958b19
Turn off edit beams when object is derezed while being edited. (mantis #6722 )
2013-08-01 20:40:13 -07:00
Justin Clark-Casey (justincc)
d4c506e453
minor: replace veclist.Add(new Vector3(0,0,0)) with Vector3.Zero in InventoryAccessModules.RezObject() - structs are passed by value
2013-08-02 00:08:14 +01:00
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
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
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
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
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
c245365484
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-26 19:23:12 +01:00
Justin Clark-Casey (justincc)
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
nebadon
d27cc62458
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-26 14:13:02 -04:00
nebadon
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
Justin Clark-Casey (justincc)
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
Diva Canto
dd2c211e62
Comment debug message
2013-07-26 07:40:55 -07:00
Diva Canto
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
Diva Canto
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
72ed49af5f
Reset DoNotClose scene presence teleport flag before pausing. Rename DoNotClose to DoNotCloseAfterTeleport
2013-07-26 01:38:04 +01:00
Justin Clark-Casey (justincc)
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
Melanie
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
Diva Canto
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
Diva Canto
cac37e298c
Deleted all [ZZZ] debug messages.
2013-07-24 14:31:30 -07:00
Diva Canto
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
Diva Canto
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
4e5c7bdeb3
Moved TriggerOnMakeRootAgent back to the end of MakeRootAgent, to see if that eliminates the temporary placement at infinity upon TPs
2013-07-24 14:30:13 -07:00
Diva Canto
e6a0f6e428
One more thing to test in order to let CompleteMovement go up the stack.
2013-07-24 14:29:51 -07:00
Diva Canto
14530b2607
Minor adjustment on timings of waits.
2013-07-24 14:29:37 -07:00
Diva Canto
c0433d5e4c
Changed the RegionHandshake packet to the Unknown queue, so that it is sent with high priority and hopefully gets to the client before AgentMovementComplete
2013-07-24 14:29:15 -07:00
Diva Canto
879cbb4575
This commit message intentionally left blank (last commit was idiotic)
2013-07-24 14:28:55 -07:00
Diva Canto
261512606d
Improve the opening test in CompleteMovement, to account for multiple flags besides ViaLogin.
2013-07-24 14:28:41 -07:00
Diva Canto
d7984ef775
More on putting TP V1 as it was
2013-07-24 14:28:27 -07:00
Diva Canto
aaee63af82
Minor improvements on TP V1 trying to make it exactly as it was before.
2013-07-24 14:28:14 -07:00
Diva Canto
3891a8946b
New Teleport protocol (V2), still compatible with V1 and older. (version of the destination is being checked)
...
In this new protocol, and as committed before, the viewer is not sent EnableSimulator/EstablishChildCommunication for the destination. Instead, it is sent TeleportFinish directly. TeleportFinish, in turn, makes the viewer send a UserCircuitCode packet followed by CompleteMovementIntoRegion packet. These 2 packets tend to occur one after the other almost immediately to the point that when CMIR arrives the client is not even connected yet and that packet is ignored (there might have been some race conditions here before); then the viewer sends CMIR again within 5-8 secs. But the delay between them may be higher in busier regions, which may lead to race conditions.
This commit improves the process so there are are no race conditions at the destination. CompleteMovement (triggered by the viewer) waits until Update has been sent from the origin. Update, in turn, waits until there is a *root* scene presence -- so making sure CompleteMovement has run MakeRoot. In other words, there are two threadlets at the destination, one from the viewer and one from the origin region, waiting for each other to do the right thing. That makes it safe to close the agent at the origin upon return of the Update call without having to wait for callback, because we are absolutely sure that the viewer knows it is in th new region.
Note also that in the V1 protocol, the destination was getting UseCircuitCode from the viewer twice -- once on EstablishAgentCommunication and then again on TeleportFinish. The second UCC was being ignored, but it shows how we were not following the expected steps...
2013-07-24 14:27:58 -07:00
Diva Canto
aae29c0ee2
Further tweaks on TPs: not sending the callback URL and instead waiting 15sec before closing the agent. This seems to be working fairly well. The viewer seems to have an 8 sec delay between UseCircuitCode and CompleteMovement.
...
Also added back the position on UpdateAgent, because it's needed for TPing between neighboring regions.
2013-07-24 14:27:37 -07:00
Diva Canto
9ab78d412c
EXPERIMENTAL: yet another variation of ES/EAC/TPFinish
2013-07-24 14:27:22 -07:00
Diva Canto
00d4a26eef
Amend previous commit.
2013-07-24 12:49:30 -07:00
Diva Canto
665fb66686
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-24 11:26:30 -07:00
Diva Canto
e103e34f1d
Added config var that we all thought was already there: see_into_region. (Note: different from the defunct see_into_neighboring_sim, which used to control the process from the other end). This enables child agents in neighbors for which the root agent doesn't have permission to be in.
2013-07-24 11:25:41 -07:00
Diva Canto
d8a6eb5641
Decreased the time of group cache to 1 min, because it was getting on my nerves that it takes so long to let go of old info.
2013-07-24 11:25:24 -07:00
Melanie
e82d4154a2
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Physics/Manager/PhysicsActor.cs
OpenSim/Region/Physics/Manager/PhysicsScene.cs
2013-07-24 04:45:07 +01:00
Melanie
a7eb1b5b85
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2013-07-24 03:50:09 +01:00
Justin Clark-Casey (justincc)
feef9d64a4
For unknown user issue, bump GUN7 to GUN8 and UMMAU3 to UMMAU4 to assess what looks like a very significant reducing in GUN occurrances
2013-07-23 23:42:34 +01:00
Justin Clark-Casey (justincc)
fa2653c8e1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-23 23:32:24 +01:00
Justin Clark-Casey (justincc)
9a4a513b5e
Correct issue where the last instance of a sampled stat was shown 3x larger than it should have been (though internal use was correct)
2013-07-23 23:31:35 +01:00
Diva Canto
516062ae1f
Don't touch the Current Outfit folder also on coming back home
2013-07-23 15:05:32 -07:00
Diva Canto
901bdfed40
Restoring landing on prims, which had been affected by the edit beams commit.
2013-07-23 14:31:16 -07:00
Diva Canto
744276dd50
In renaming the folders for hypergriding, don't rename the Current Outfit folder. The viewer doesn't like that.
2013-07-23 14:31:03 -07:00
Diva Canto
42e52f544d
Improvement of fetching name in groups
2013-07-23 14:30:50 -07:00
Diva Canto
7c1eb86c7d
Don't post Link asset types back to the home grid
2013-07-23 14:28:53 -07:00
Justin Clark-Casey (justincc)
76e46d0158
Improve spacing between data and units on console stats display
2013-07-23 17:23:16 +01:00
Robert Adams
aec8d1e6be
BulletSim: Turn on center-of-mass calculation by default.
...
Reduce object density by factor of 100 to bring physical mass computations
into a range better suited for Bullet.
2013-07-23 09:09:25 -07:00
Robert Adams
f499b328c4
Revert "Revert "BulletSim: Add logic to linksets to change physical properties for""
...
Found that the vehicle movement problem was not caused by these physics changes.
This reverts commit 84d0699761
.
2013-07-23 08:14:20 -07:00
Robert Adams
75686e0e49
Revert "Revert "BulletSim: change BSDynamics to expect to be passed a BSPrimLinkable""
...
Found that the vehicle movement problem was not caused by these physics changes.
This reverts commit 7b187deb19
.
2013-07-23 08:13:56 -07:00
Robert Adams
b14156aa63
Revert "Revert "BulletSim: only create vehicle prim actor when vehicles are enabled.""
...
Found that the vehicle movement problem was not caused by these physics changes.
This reverts commit 5f7b2ea81b
.
2013-07-23 08:13:29 -07:00
Robert Adams
aec8852af7
Revert "Revert "BulletSim: move collision processing for linksets from BSPrimLinkable""
...
Found that the vehicle movement problem was not caused by these physics changes.
This reverts commit c45659863d
.
2013-07-23 08:13:01 -07:00
Robert Adams
401c2e2f2e
Revert "Revert "Add experimental stubs for an extension function interface on both""
...
Found that the vehicle movement problem was not caused by these physics changes.
This reverts commit 89857378ce
.
2013-07-23 08:12:34 -07:00
Robert Adams
af9deed135
Revert "Revert "BulletSim: freshen up the code for constraint based linksets.""
...
Found that the vehicle movement problem was not caused by these physics changes.
This reverts commit 44543ebe63
.
2013-07-23 08:11:21 -07:00
Justin Clark-Casey (justincc)
90528c23d9
For stats which can show average change over time, show the last sample as well as the average.
...
This is somewhat cryptic at the moment, need to improve documentation.
2013-07-23 01:13:13 +01:00
Justin Clark-Casey (justincc)
a57a472ab8
Add proper method doc and comments to m_dataPresentEvent (from d9d9959
)
2013-07-23 00:51:59 +01:00
Justin Clark-Casey (justincc)
9fb9da1b6c
Add clientstack.InboxPacketsCount stat. This records the number of packets waiting to be processed at the second stage (after initial UDP processing)
...
If this consistently increases then this is a problem since it means the simulator is receiving more requests than it can distribute to other parts of the code.
2013-07-23 00:35:41 +01:00
Justin Clark-Casey (justincc)
60732c96ef
Add clientstack.OutgoingUDPSendsCount stat to show number of outbound UDP packets sent by a region per second
2013-07-23 00:35:34 +01:00
Justin Clark-Casey (justincc)
8396f1bd42
Record raw number of UDP receives as clientstack.IncomingUDPReceivesCount
2013-07-23 00:35:23 +01:00
Justin Clark-Casey (justincc)
bf517899a7
Add AverageUDPProcessTime stat to try and get a handle on how long we're taking on the initial processing of a UDP packet.
...
If we're not receiving packets with multiple threads (m_asyncPacketHandling) then this is critical since it will limit the number of incoming UDP requests that the region can handle and affects packet loss.
If m_asyncPacketHandling then this is less critical though a long process will increase the scope for threads to race.
This is an experimental stat which may be changed.
2013-07-23 00:35:09 +01:00
Robert Adams
e6b6af62dd
Added check for user movement specification before discarding an incoming
...
AgentUpdate packet. This fixes the problem with vehicles not moving forward
after the first up-arrow.
Code to fix a potential exception when using different IClientAPIs.
2013-07-22 15:41:14 -07:00
Robert Adams
44543ebe63
Revert "BulletSim: freshen up the code for constraint based linksets."
...
The changes don't seem to be ready for prime time.
This reverts commit 803632f8f3
.
2013-07-22 12:10:23 -07:00
Robert Adams
89857378ce
Revert "Add experimental stubs for an extension function interface on both"
...
The changes don't seem to be ready for prime time.
This reverts commit 13a4a80b38
.
2013-07-22 12:09:55 -07:00
Robert Adams
c45659863d
Revert "BulletSim: move collision processing for linksets from BSPrimLinkable"
...
The changes don't seem to be ready for prime time.
This reverts commit b4c3a791aa
.
2013-07-22 12:09:17 -07:00
Robert Adams
5f7b2ea81b
Revert "BulletSim: only create vehicle prim actor when vehicles are enabled."
...
The changes don't seem to be ready for prime time.
This reverts commit acb7b4a09a
.
2013-07-22 12:08:49 -07:00
Robert Adams
7b187deb19
Revert "BulletSim: change BSDynamics to expect to be passed a BSPrimLinkable"
...
The changes don't seem to be ready for prime time.
This reverts commit d0d654e218
.
2013-07-22 12:08:25 -07:00
Robert Adams
84d0699761
Revert "BulletSim: Add logic to linksets to change physical properties for"
...
The changes don't seem to be ready for prime time.
This reverts commit b44f0e1a00
.
2013-07-22 12:07:42 -07:00
Robert Adams
b44f0e1a00
BulletSim: Add logic to linksets to change physical properties for
...
whole linkset.
Override physical property setting for BSLinksetCompound as there are
not children to the compound spape.
2013-07-22 10:27:24 -07:00
Robert Adams
d0d654e218
BulletSim: change BSDynamics to expect to be passed a BSPrimLinkable
...
and start changing the logic to handle the base prim as a complex
object (ie, a linkset).
2013-07-22 10:27:21 -07:00
Robert Adams
acb7b4a09a
BulletSim: only create vehicle prim actor when vehicles are enabled.
2013-07-22 10:27:18 -07:00
Robert Adams
b4c3a791aa
BulletSim: move collision processing for linksets from BSPrimLinkable
...
into the linkset implementation classes.
Add HasSomeCollision attribute that remembers of any component of
a linkset has a collision.
Update vehicle code (BSDynamic) to use the HasSomeCollision in place of
IsColliding to make constraint based linksets properly notice the ground.
Add linkset functions to change physical attributes of all the members
of a linkset.
2013-07-22 10:27:15 -07:00
Robert Adams
13a4a80b38
Add experimental stubs for an extension function interface on both
...
PhysicsScene and PhysicsActor.
2013-07-22 10:27:09 -07:00
Robert Adams
803632f8f3
BulletSim: freshen up the code for constraint based linksets.
2013-07-22 10:27:06 -07:00
Diva Canto
df63bfafef
Better version of previous commit
2013-07-21 15:42:22 -07:00
Diva Canto
f81e289a1b
Add the Current Outfit folder as an available folder in the SuitcaseInventory.
2013-07-21 15:42:05 -07:00
Diva Canto
99a727600b
Minor cosmetic changes.
2013-07-21 10:07:35 -07:00
Diva Canto
8d18ad2f6f
Minor aesthetic change to make things more clear.
2013-07-21 09:02:56 -07:00
Diva Canto
116a449d89
The quaternion delta was a bit to high, now that the head rotation is out of the equation. (head rotation was the problematic one)
2013-07-21 09:01:57 -07:00
Diva Canto
b5ab0698d6
EDIT BEAMS!!! They had been missing from OpenSim since ever. Thanks to lkalif for telling me how to route the information. The viewer effect is under the distance filter, so only avatars with cameras < 10m away see the beams.
2013-07-21 09:01:44 -07:00
Diva Canto
032c637c10
Filter certain viewer effects depending on distance between the avatar that is generating the effect and the cameras of the observers. In particular, this applies to LookAt (which is really verbose and occurs every time users move the mouse) and Beam (which doesn't occur that often, but that can be extremely noisy (10.sec) when it happens)
2013-07-21 09:01:09 -07:00
Diva Canto
3919c80505
A couple of small optimizations over the previous commit
2013-07-21 09:00:57 -07:00
Diva Canto
d5a1779465
Manage AgentUpdates more sanely:
...
- The existing event to scene has been split into 2: OnAgentUpdate and OnAgentCameraUpdate, to better reflect the two types of updates that the viewer sends. We can run one without the other, which is what happens when the avie is still but the user is camming around
- Added thresholds (as opposed to equality) to determine whether the update is significant or not. I thin these thresholds are ok, but we can play with them later
- Ignore updates of HeadRotation, which were problematic and aren't being used up stream
2013-07-21 09:00:42 -07:00
Diva Canto
174105ad02
Fixed the stats in show client stats. Also left some comments with observations about AgentUpdates.
2013-07-21 09:00:27 -07:00
Diva Canto
18d5d8f5dd
Removed verbose debug from previous commit
2013-07-21 09:00:08 -07:00
Diva Canto
edafea6ae6
PollServiceRequestManager: changed the long poll from a Queue to a List. No need to dequeue and enqueue items every 1sec.
2013-07-21 08:59:48 -07:00
Justin Clark-Casey (justincc)
3a6acbcc14
furhter shorten CheckAgentUpdateSignificance(). No real perf impact.
2013-07-21 08:59:31 -07:00
Justin Clark-Casey (justincc)
866de53978
Remove some pointless code in CheckAgentUpdateSignificance()
2013-07-21 08:59:17 -07:00
Justin Clark-Casey (justincc)
61eda1f441
Make the check as to whether any particular inbound AgentUpdate packet is significant much earlier in UDP processing (i.e. before we pointlessly place such packets on internal queues, etc.)
...
Appears to have some impact on cpu but needs testing.
2013-07-21 08:58:55 -07:00
Justin Clark-Casey (justincc)
e5c677779b
Add measure of number of inbound AgentUpdates that were seen as significant to "show client stats" (i.e. sent on for further processing instead of being discarded)
...
Added here since it was the most convenient place
Number is in the last column, "Sig. AgentUpdates" along with percentage of all AgentUpdates
Percentage largely falls over time, most cpu for processing AgentUpdates may be in UDP processing as turning this off even earlier (with "debug lludp toggle agentupdate" results in a big cpu fall
Also tidies up display.
2013-07-21 08:58:39 -07:00
Justin Clark-Casey (justincc)
5a2d4d888c
Hack in console command "debug lludp toggle agentupdate" to allow AgentUpdate in packets to be discarded at a very early stage.
...
Enabling this will stop anybody from moving on a sim, though all other updates should be unaffected.
Appears to make some cpu difference on very basic testing with a static standing avatar (though not all that much).
Need to see the results with much higher av numbers.
2013-07-21 08:58:21 -07:00
Justin Clark-Casey (justincc)
66048e1a70
minor: provide user feedback in the log for now when udp in/out bound threads are started/stopped
2013-07-21 08:58:02 -07:00
Justin Clark-Casey (justincc)
3a476bf60c
Fix up a temporary debugging change from last commit which stopped "lludp stop out" from actually doing anything
2013-07-21 08:57:36 -07:00
Diva Canto
98d47ea428
Delay the enqueueing of non-longpoll requests for 100ms. No need to have these requests actively on the processing queue if it seems they're not ready.
2013-07-21 08:57:16 -07:00
Justin Clark-Casey (justincc)
63c42d6602
Do some simple queue empty checks in the main outgoing udp loop instead of always performing these on a separate fired thread.
...
This appears to improve cpu usage since launching a new thread is more expensive than performing a small amount of inline logic.
However, needs testing at scale.
2013-07-21 08:56:48 -07:00
Diva Canto
9041f4a056
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-19 20:27:49 -07:00
Diva Canto
c1705236c7
Fix HGTravelStore.migrations in SQLite (mantis #6709 )
2013-07-19 20:25:33 -07:00
Robert Adams
1d65b0d802
BulletSim: add position resetting for stationary avatars so they don't
...
move around when standing on a stationary object.
Create proper linkage between BSCharacter and its actor by generating
a UpdatedProperties event the same way BSPrim does.
2013-07-18 19:09:55 -07:00
Dan Lake
edef7472d1
Enable storing of environment settings in NullSimulationData
2013-07-18 13:33:50 -07:00
Diva Canto
b5062ae7ee
Changed the timoeut of EQ 502s (no events) to 50 secs. The viewer post requests timeout in 60 secs.
...
There's plenty of room for improvement in handling the EQs. Some other time...
2013-07-18 13:30:04 -07:00
Justin Clark-Casey (justincc)
d9d995914c
try Hacking in an AutoResetEvent to control the outgoing UDP loop instead of a continuous loop with sleeps.
...
Does appear to have a cpu impact but may need further tweaking
2013-07-18 12:28:02 -07:00
Diva Canto
71b1511db5
Revert "Revert "I confuse myself. Let's try this variable name instead.""
...
This reverts commit 52dc7b2a96
.
2013-07-18 12:25:47 -07:00
Diva Canto
a22a4db5ce
Revert "Revert "Do the same trick that dahlia did for Dequeue(timeout)""
...
This reverts commit 5495df7443
.
2013-07-18 12:25:22 -07:00
Diva Canto
552b85d33d
Revert "Revert "Putting the requests back in the queue while testing for count >0 is not the smartest move...""
...
This reverts commit 7127891957
.
2013-07-18 12:25:04 -07:00
Diva Canto
ad198a714c
Revert "Revert "Didn't mean to commit this change in BlockingQueue.cs""
...
This reverts commit fda91d93da
.
2013-07-18 12:24:43 -07:00
Diva Canto
9e35b069a4
Reverting the reverts I did yesterday. cpu-branch has now been
...
successfully tested, and I'm merging back those changes, which proved to
be good.
Revert "Revert "Cleared up much confusion in PollServiceRequestManager. Here's the history:""
This reverts commit fa2370b32e
.
2013-07-18 12:23:27 -07:00
Dan Lake
ae997fffee
Merge branch 'master' of git://opensimulator.org/git/opensim
2013-07-18 02:28:36 -07:00
Dan Lake
6572847518
Added MinPoolThreads to ini [Startup] section to control SmartThreadPool.
2013-07-18 02:28:07 -07:00
Melanie
437326a480
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
2013-07-18 10:17:30 +01:00
Melanie
7830cc9954
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
OpenSim/Services/HypergridService/UserAgentService.cs
2013-07-18 10:08:10 +01:00
Justin Clark-Casey (justincc)
077be8b496
Fix what apepars to be a bug in DoubleQueue<T>.Enqueue(Queue<T> q, T data) where the q parmater is ignored and everyghig is always placed on m_lowQueue.
...
No actual impact presently since nothing ends up calling EnqueueHigh()
2013-07-18 01:23:33 +01:00
Diva Canto
6293614074
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-17 15:06:33 -07:00
Dan Lake
49b3b7ee83
Merge branch 'master' of git://opensimulator.org/git/opensim
2013-07-17 15:06:25 -07:00
Diva Canto
fa2370b32e
Revert "Cleared up much confusion in PollServiceRequestManager. Here's the history:"
...
This reverts commit e46459ef21
.
2013-07-17 15:05:36 -07:00
Dan Lake
f64f07e7c5
command line kick user now uses exact name match instead of substring search to avoid kicking the wrong user or multiple wrong users.
2013-07-17 15:05:30 -07:00
Diva Canto
fda91d93da
Revert "Didn't mean to commit this change in BlockingQueue.cs"
...
This reverts commit 0f5b616fb0
.
2013-07-17 15:05:16 -07:00
Diva Canto
7127891957
Revert "Putting the requests back in the queue while testing for count >0 is not the smartest move..."
...
This reverts commit f4317dc26d
.
2013-07-17 15:04:27 -07:00
Diva Canto
5495df7443
Revert "Do the same trick that dahlia did for Dequeue(timeout)"
...
This reverts commit af792bc7f2
.
2013-07-17 15:04:12 -07:00
Diva Canto
52dc7b2a96
Revert "I confuse myself. Let's try this variable name instead."
...
This reverts commit 1d3deda10c
.
2013-07-17 15:03:40 -07:00
Diva Canto
519dba9a69
Revert "Now trying DoubleQueue instead of BlockingQueue for the PollServiceRequestManager."
...
This reverts commit 5f95f4d78e
.
2013-07-17 15:03:16 -07:00
Diva Canto
5c54eb30ed
Revert "This is a completely unreasonable thing to do, effectively defying the purpose of BlockingQueues. Trying this, to see the effect on CPU."
...
This reverts commit 5232ab0496
.
2013-07-17 15:02:54 -07:00
Diva Canto
5232ab0496
This is a completely unreasonable thing to do, effectively defying the purpose of BlockingQueues. Trying this, to see the effect on CPU.
2013-07-17 14:36:55 -07:00
Diva Canto
5f95f4d78e
Now trying DoubleQueue instead of BlockingQueue for the PollServiceRequestManager.
2013-07-17 14:09:04 -07:00
Diva Canto
1d3deda10c
I confuse myself. Let's try this variable name instead.
2013-07-17 13:26:15 -07:00
Diva Canto
af792bc7f2
Do the same trick that dahlia did for Dequeue(timeout)
2013-07-17 13:23:29 -07:00
Diva Canto
f4317dc26d
Putting the requests back in the queue while testing for count >0 is not the smartest move...
2013-07-17 12:57:34 -07:00
Diva Canto
0f5b616fb0
Didn't mean to commit this change in BlockingQueue.cs
2013-07-17 12:02:00 -07:00
Diva Canto
2b8de2c404
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-17 11:19:56 -07:00
Diva Canto
e46459ef21
Cleared up much confusion in PollServiceRequestManager. Here's the history:
...
When Melanie added the web fetch inventory throttle to core, she made the long poll requests (EQs) effectively be handled on an active loop. All those requests, if they existed, were being constantly dequeued, checked for events (which most often they didn't have), and requeued again. This was an active loop thread on a 100ms cycle!
This fixes the issue. Now the inventory requests, if they aren't ready to be served, are placed directly back in the queue, but the long poll requests aren't placed there until there are events ready to be sent or timeout has been reached.
This puts the LongPollServiceWatcherThread back to 1sec cycle, as it was before.
2013-07-17 11:19:36 -07:00
Robert Adams
2c8bf4aaa6
BulletSim: fix small bug where everything looked like it was colliding
...
before the first simulator step.
2013-07-17 10:19:44 -07:00
Diva Canto
894554faf6
Removed the MapItems thread. Redirected the map items requests to the services throttle thread. Didn't change anything in how that processor is implemented, for better or for worse.
2013-07-16 20:28:48 -07:00
Diva Canto
9432f3c94d
Improvements to the ServiceThrottleModule: added a category and an itemid to the interface, so that duplicate requests aren't enqueued more than once.
2013-07-16 19:04:30 -07:00
Diva Canto
5f27aaa6dd
UserManagementModule: in the continuation, call the method that also looks up the cache, because the resource may be here in the meantime
2013-07-16 18:22:42 -07:00
Diva Canto
8bad56cb46
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-16 17:53:49 -07:00
Diva Canto
d4720bd721
Added config var to fiddle with the Interval for the service throttle thread
2013-07-16 17:53:05 -07:00
Dan Lake
9f129938c9
Attachments module only registers when enabled. This enables alternative attachments module implementations. All calls to Scene.AttachmentsModule are checking for null. Ideally, if we support disabling attachments then we need a null attachments module to register with the scene.
2013-07-16 17:43:36 -07:00
Diva Canto
9f578cf0c8
Deleted a couple of verbose messages
2013-07-16 17:18:11 -07:00
Diva Canto
0419852598
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-16 17:15:08 -07:00
Diva Canto
a006caabbc
Added IServiceThrottleModule.cs
2013-07-16 17:06:54 -07:00
Diva Canto
99a600753e
Changed the name to ServiceThrottle/ServiceThrottleModule in order to reflect its more generic nature.
2013-07-16 17:06:17 -07:00
Diva Canto
3fbd2c54bc
Eliminated the UserManagement/UserManagementModule throttle thread. Made the other one generic, taking any continuation.
2013-07-16 17:04:32 -07:00
Justin Clark-Casey (justincc)
cbc3576ee2
minor: Add warning method doc about possibly inconsistent results returned from BlockingQueue.Contains(), Count() and GetQueueArray()
2013-07-16 23:14:53 +01:00
Justin Clark-Casey (justincc)
50b8ab60f2
Revert "Revert "MSDN documentation is unclear about whether exiting a lock() block will trigger a Monitor.Wait() to exit, so avoid some locks that don't actually affect the state of the internal queues in the BlockingQueue class.""
...
This reverts commit 21a09ad3ad
.
After more analysis and discussion, it is apparant that the Count(), Contains() and GetQueueArray() cannot be made thread-safe anyway without external locking
And this change appears to have a positive impact on performance.
I still believe that Monitor.Exit() will not release any thread for Monitor.Wait(), as per http://msdn.microsoft.com/en-gb/library/vstudio/system.threading.monitor.exit%28v=vs.100%29.aspx
so this should in theory make no difference, though mono implementation issues could possibly be coming into play.
2013-07-16 23:00:07 +01:00
Justin Clark-Casey (justincc)
21a09ad3ad
Revert "MSDN documentation is unclear about whether exiting a lock() block will trigger a Monitor.Wait() to exit, so avoid some locks that don't actually affect the state of the internal queues in the BlockingQueue class."
...
This reverts commit 42e2a0d66e
Reverting because unfortunately this introduces race conditions because Contains(), Count() and GetQueueArray() may now end up returning the wrong result if another thread performs a simultaneous update on m_queue.
Code such as PollServiceRequestManager.Stop() relies on the count being correct otherwise a request may be lost.
Also, though some of the internal queue methods do not affect state, they are not thread-safe and could return the wrong result generating the same problem
lock() generates Monitor.Enter() and Monitor.Exit() under the covers. Monitor.Exit() does not cause Monitor.Wait() to exist, only Pulse() and PulseAll() will do this
Reverted with agreement.
2013-07-16 22:03:49 +01:00
Diva Canto
e0f0b88dec
In the pursuit of using less CPU: now trying to avoid blocking queues altogether. Instead, this uses a timer. No sure if it's better or worse, but worth the try.
2013-07-16 13:01:39 -07:00
Diva Canto
6da50d34df
Actually use DoubleQueue in UserManagement/UserManagementModule
2013-07-16 07:19:13 -07:00
Diva Canto
5a01ffa515
High CPU hunt: try a different blocking queue, DoubleQueue
2013-07-16 07:15:14 -07:00
dahlia
6dd454240f
revert last commit which seems to conflict with DoubleQueue internals. The random crash might be in DoubleQueue instead. See http://pastebin.com/XhNBNqsc
2013-07-16 02:03:01 -07:00
dahlia
70aa77f520
add locking to internal queue in WebFetchInvDescModule; lack of which caused a random crash in a load test yesterday
2013-07-16 01:31:09 -07:00
dahlia
42e2a0d66e
MSDN documentation is unclear about whether exiting a lock() block will trigger a Monitor.Wait() to exit, so avoid some locks that don't actually affect the state of the internal queues in the BlockingQueue class.
2013-07-16 01:12:56 -07:00
Justin Clark-Casey (justincc)
e8e073aa97
Simplify EventQueue cap setup so that it is also stat monitored.
...
Curiously, the number of requests received is always one greater than that shown as handled - needs investigation
2013-07-16 00:05:45 +01:00
Justin Clark-Casey (justincc)
eb14e5a175
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-15 23:28:02 +01:00
Justin Clark-Casey (justincc)
1b7b664c86
Add request received/handling stats for caps which are served by http poll handlers.
...
This adds explicit cap poll handler supporting to the Caps classes rather than relying on callers to do the complicated coding.
Other refactoring was required to get logic into the right places to support this.
2013-07-15 23:27:46 +01:00
Diva Canto
68fbf7eebb
Revert "Puts RequestImage (UDP) back to asyn -- CPU spike hunt"
...
This reverts commit b060ce96d9
.
2013-07-15 12:34:10 -07:00
Diva Canto
687c1a420a
Guard against null ref
2013-07-15 12:33:31 -07:00
Diva Canto
b060ce96d9
Puts RequestImage (UDP) back to asyn -- CPU spike hunt
2013-07-15 12:05:31 -07:00
Diva Canto
864f15ce4d
Revert the revert
...
Revert "Trying to hunt the CPU spikes recently experienced."
This reverts commit ac73e70293
.
2013-07-15 11:52:26 -07:00
Diva Canto
fbb01bd280
Protect against null requests
2013-07-15 11:37:49 -07:00
Diva Canto
ac73e70293
Trying to hunt the CPU spikes recently experienced.
...
Revert "Comment out old inbound UDP throttling hack. This would cause the UDP"
This reverts commit 38e6da5522
.
2013-07-15 11:27:49 -07:00
Diva Canto
60325f81d8
This might address the following observed exception:
...
17:14:28 - [APPLICATION]:
APPLICATION EXCEPTION DETECTED: System.UnhandledExceptionEventArgs
Exception: System.InvalidOperationException: Operation is not valid due to the current state of the object
at System.Collections.Generic.Queue`1[OpenSim.Region.ClientStack.Linden.WebFetchInvDescModule+aPollRequest].Peek () [0x00011] in /root/install/mono-3.1.0/mono/mcs/class/System/System.Collections.Generic/Queue.cs:158
at System.Collections.Generic.Queue`1[OpenSim.Region.ClientStack.Linden.WebFetchInvDescModule+aPollRequest].Dequeue () [0x00000] in /root/install/mono-3.1.0/mono/mcs/class/System/System.Collections.Generic/Queue.cs:140
at OpenSim.Framework.DoubleQueue`1[OpenSim.Region.ClientStack.Linden.WebFetchInvDescModule+aPollRequest].Dequeue (TimeSpan wait, OpenSim.Region.ClientStack.Linden.aPollRequest& res) [0x0004e] in /home/avacon/opensim_2013-07-14/OpenSim/Framework/Util.cs:2297
2013-07-15 10:29:42 -07:00
Diva Canto
af02231a7b
Added SQLite version of hg travel data store. UNTESTED. Hope it works!
2013-07-14 16:03:46 -07:00
Diva Canto
b0140383da
Cleanup old hg sessions (older than 2 days)
2013-07-14 15:47:54 -07:00
Diva Canto
e33ac50388
HG UAS: Moved hg-session data from memory to DB storage. This makes it so that traveling info survives Robust resets. It should also eliminate the cause of empty IP addresses in agent circuit data that we saw in CC grid. MySQL only.
2013-07-14 14:31:20 -07:00
Diva Canto
5939529036
Minor typo in log message
2013-07-14 14:29:10 -07:00
Diva Canto
c8dcb8474d
Let's go easy on authenticating ChildAgentUpdates, otherwise this will be chaotic while ppl are using different versions of opensim. Warning only, but no enforcement.
2013-07-14 10:26:05 -07:00
Diva Canto
98f59ffed5
Fix broken tests -- the test setup was wrong... sigh.
2013-07-14 09:22:55 -07:00
Diva Canto
c61ff917ef
Authenticate ChildAgentUpdate too.
2013-07-14 09:21:28 -07:00
Diva Canto
f3b3e21dea
Change the auth token to be the user's sessionid.
2013-07-14 07:28:40 -07:00
Diva Canto
fcb0349d56
And this fixes the other failing tests. Justin, the thread pool is not being initialized in the tests!
2013-07-13 23:01:41 -07:00
Diva Canto
e4f741f006
This should fix the failing test.
2013-07-13 22:52:51 -07:00
Diva Canto
a2ee887c6d
Deleted a line too many
2013-07-13 22:32:52 -07:00
Diva Canto
b4f1b9acf6
Guard against unauthorized agent deletes.
2013-07-13 21:28:46 -07:00
Diva Canto
931eb892d9
Deleted GET agent all around. Not used.
2013-07-13 17:56:42 -07:00
Diva Canto
4d93870fe5
Gatekeeper: stop bogus agents earlier, here at the Gatekeeper. No need to bother the sim.
2013-07-13 17:52:05 -07:00
Diva Canto
5a1d6727e1
Some more debug to see how many threads are available.
2013-07-13 11:39:17 -07:00
Diva Canto
bc405a6a34
That didn't fix the problem.
...
Revert "Trying to reduce CPU usage on logins and TPs: trying radical elimination of all FireAndForgets throughout CompleteMovement. There were 4."
This reverts commit 6825377380
.
2013-07-13 11:30:37 -07:00
Diva Canto
6825377380
Trying to reduce CPU usage on logins and TPs: trying radical elimination of all FireAndForgets throughout CompleteMovement. There were 4.
2013-07-13 11:11:18 -07:00
Diva Canto
3a26e366d2
This commit effectively reverses the previous one, but it's just to log that we found the root of the rez delay: the priority scheme BestAvatarResponsiveness, which is currently the default, was the culprit. Changing it to FrontBack made the region rez be a lot more natural.
...
BestAvatarResponsiveness introduces the region rez delay in cases where the region is full of avatars with lots of attachments, which is the case in CC load tests. In that case, the inworld prims are sent only after all avatar attachments are sent. Not recommended for regions with heavy avatar traffic!
2013-07-13 10:35:41 -07:00
Diva Canto
ff4ad60207
Same issue as previous commit.
2013-07-13 10:05:11 -07:00
Diva Canto
ccee2959f7
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-13 09:53:05 -07:00
Diva Canto
a412b1d682
Moved SendInitialDataToMe to earlier in CompleteMovement. Moved TriggerOnMakeRootAgent to the end of CompleteMovement.
...
Justin, if you read this, there's a long story here. Some time ago you placed SendInitialDataToMe at the very beginning of client creation (in LLUDPServer). That is problematic, as we discovered relatively recently: on TPs, as soon as the client starts getting data from child agents, it starts requesting resources back *from the simulator where its root agent is*. We found this to be the problem behind meshes missing on HG TPs (because the viewer was requesting the meshes of the receiving sim from the departing grid). But this affects much more than meshes and HG TPs. It may also explain cloud avatars after a local TP: baked textures are only stored in the simulator, so if a child agent receives a UUID of a baked texture in the destination sim and requests that texture from the departing sim where the root agent is, it will fail to get that texture.
Bottom line: we need to delay sending the new simulator data to the viewer until we are absolutely sure that the viewer knows that its main agent is in a new sim. Hence, moving it to CompleteMovement.
Now I am trying to tune the initial rez delay that we all experience in the CC. I think that when I fixed the issue described above, I may have moved SendInitialDataToMe to much later than it should be, so now I'm moving to earlier in CompleteMovement.
2013-07-13 09:46:58 -07:00
Diva Canto
cd64a70c79
Added UploadBakedTexture/UploadBakedTextureServerConnector, so that this can eventually be served by a robust instance. NOT FINISHED YET.
2013-07-13 08:31:03 -07:00
Melanie
c6d75cda97
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
2013-07-13 00:57:03 +01:00
Melanie
a53a10ad27
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
2013-07-13 00:47:58 +01:00
Justin Clark-Casey (justincc)
d06c85ea77
Reinsert PhysicsActor variable back into SOP.SubscribeForCollisionEvents() in order to avoid a race condition.
...
A separate PhysicsActor variable is used in case some other thread removes the PhysicsActor whilst this code is executing.
If this is now impossible please revert - just adding this now whilst I remember.
Also makes method comment into proper method doc.
2013-07-13 00:29:07 +01:00
Justin Clark-Casey (justincc)
b4cb644a05
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-13 00:03:23 +01:00
Justin Clark-Casey (justincc)
3d118fb580
In co-op termination, extend EventWaitHandle to give this an indefinite lifetime in order to avoid a later RemotingException if scripts are being loaded into their own domains.
...
This is necessary because XEngineScriptBase now retains a reference to an EventWaitHandle when co-op termination is active.
Aims to address http://opensimulator.org/mantis/view.php?id=6634
2013-07-13 00:02:54 +01:00
Robert Adams
fa02f28dbf
Add ToOSDMap() overrides to the Stat subclass CounterStat.
...
Add a GetStatsAsOSDMap method to StatsManager which allows the filtered
fetching of stats for eventual returning over the internets.
2013-07-12 14:04:14 -07:00
Diva Canto
3d700bb42c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-12 12:54:29 -07:00
Diva Canto
29f6ae199e
Changed UploadBakedTextureModule so that it uses the same pattern as the others, in preparation for experiments to direct baked texture uploads to a robust instance. No functional or configuration changes -- should work exactly as before.
2013-07-12 12:53:58 -07:00
Robert Adams
65239b059f
Enhance NullEstateData to remember stored estate values and return
...
them next time asked. This keeps any estate settings from being reset
when the estate dialog is opened in a region with null estate storage.
2013-07-11 20:55:32 -07:00
Robert Adams
1909ee70f8
Centralize duplicated code in SceneObjectPart for subscribing to
...
collision events. Improve logic for knowing when to add processing
routine to physics actor.
2013-07-11 16:57:07 -07:00
Diva Canto
83d1680057
Added a few more thingies to the asset client test to poke the threadpool.
2013-07-11 16:43:43 -07:00
Justin Clark-Casey (justincc)
ba8f9c9d0a
Try naming the materials handlers again, this time registering the POST as RenderMaterials
...
This was probably the mistake.
The other handlers are named RenderMaterials as well but this actully has no affect apart from on stats, due to a (counterintuitive) disconnect between the registration name and the name of the request handler.
Will be tested very soon and reverted if this still does not work.
2013-07-11 23:51:10 +01:00
Justin Clark-Casey (justincc)
7c2e4786ce
minor: remove some regression test logging switches accidentally left uncommented.
2013-07-11 23:19:55 +01:00
Justin Clark-Casey (justincc)
e15a15688b
minor: Take out unnecessary clumsy sleep at the end of regression Test404Response().
...
This wasn't actually necessary in the end but was accidentally left in.
2013-07-11 23:11:35 +01:00
Justin Clark-Casey (justincc)
f57f49eede
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-11 23:05:10 +01:00
Justin Clark-Casey (justincc)
44e9849ed1
Fix regression where llHTTPRequests which did not get an OK response returned 499 and the exception message in the http_response event rather than the actual response code and body.
...
This was a regression since commit 831e4c3
(Thu Apr 4 00:36:15 2013)
This commit also adds a regression test for this case, though this currently only works with Mono
This aims to address http://opensimulator.org/mantis/view.php?id=6704
2013-07-11 23:02:30 +01:00
Diva Canto
ee51a9f9c9
Added property to make for more flexible testing.
2013-07-11 14:23:37 -07:00
Diva Canto
51d106cff8
Added a test for the asset service
2013-07-11 14:21:57 -07:00
Diva Canto
c4f1ec1fd6
Changed the UserProfileModule so that it's less greedy in terms of thread usage.
2013-07-11 10:21:20 -07:00
Diva Canto
ea371a6f54
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-11 09:48:15 -07:00
Diva Canto
604967b31e
Switched UUIDNameRequest and RegionHandleRequest to Sync, because now they are also non-blocking handlers.
2013-07-11 09:47:46 -07:00
Diva Canto
3b48b6a792
Switched TransferRequest (UDP packet handler) to sync. The permissions checks may block, so they get a FireAndForget. Everything else is non-blocking.
2013-07-11 09:44:48 -07:00
dahlia
0120e858b7
remove names from Capability handlers (added by justincc in commit 013710168b
) as they seem to disable the use of multiple access methods for a single Capability in MaterialsDemoModule
2013-07-10 22:30:41 -07:00
Diva Canto
9173130fde
Switched RegionHandshakeReply to Sync, because it's not doing anything blocking.
2013-07-10 20:48:13 -07:00
Diva Canto
fe5da43d15
EXPERIMENTAL: make RequestImage (UDP packet handler) sync instead of async. This _shouldn't_ screw things up, given that all this does is to dump the request in a queue.
2013-07-10 19:29:14 -07:00
Diva Canto
bdaeb02863
show client stats: Fixed the requests/min. Also changed the spelling of the command, not without the dash.
2013-07-10 17:14:20 -07:00
Diva Canto
864a86983e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-10 16:10:04 -07:00
Diva Canto
1b265b213b
Added show client-stats [first last] command to expose what viewers are requesting.
2013-07-10 16:09:45 -07:00
Robert Adams
59d19f038a
Remove a null reference exception in SimianPresenceServiceConnector that
...
occurs when GetGridUserInfo cannot find the requested user info.
2013-07-10 08:55:54 -07:00
Robert Adams
38e6da5522
Comment out old inbound UDP throttling hack. This would cause the UDP
...
reception thread to sleep for 30ms if the number of available user worker
threads got low. It doesn't look like any of the UDP packet types are
marked async so this check is 1) unnecessary and 2) really crazy since
it stops up the reception thread under heavy load without any indication.
2013-07-09 18:34:24 -07:00
Robert Adams
bb6fb65392
Revert "minor: remove some mono compiler warnings in UserProfileModule"
...
Revert until we understand why all the calls to GetUserProfileServerURI were also
commented out.
This reverts commit 5f58b9b552
.
2013-07-09 18:24:39 -07:00
Justin Clark-Casey (justincc)
cec8e6d0f7
If a sensor is in an attachment, avoid throwing an exception if the attachee is removed from the scene before we try to retrieve them.
2013-07-09 23:52:47 +01:00
Justin Clark-Casey (justincc)
095066b1ce
Handle UUIDNameRequest UDP packet processing async instead of within the main inbound UDP processing loop, to avoid any chance that this is delaying the main udp in loop.
...
The potential impact of this should be lower now that these requests are being placed on a queue.
2013-07-09 23:39:29 +01:00
Diva Canto
d0dfb744b2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-09 14:13:51 -07:00
Diva Canto
67e500383e
Put guards on a bunch of exception-inducing code, as seen in logs from load test.
2013-07-09 14:12:52 -07:00
Robert Adams
2c761cef19
BulletSim: add parameter to optionally disable vehicle linear deflection.
...
Add parameter to not apply vehicle linear deflection Z forces if
vehicle is not colliding. This defaults to 'true' so vehicles will fall
even if there is some linear deflection to apply.
2013-07-09 09:37:42 -07:00
dahlia
065f8f56a2
remove some cruft and trigger a rebuild
2013-07-08 19:18:01 -07:00
dahlia
33eea62606
remove an invalid null UUID check which caused a warning
2013-07-08 17:12:39 -07:00
Robert Adams
fad4241e4e
BulletSim: make all the different angularVerticalAttraction algorithms
...
selectable from configuration paramters.
Changed default algorithm to "1" from previous default as it seems to
handle Y axis correction a little better.
Add config file independent enablement of vehicle angular forces to
make debugging easier (independent testing of forces).
2013-07-08 16:24:31 -07:00
Justin Clark-Casey (justincc)
76b2b20f7e
minor: remove mono compiler warnings from HGSuitcaseInventoryService
2013-07-09 00:06:22 +01:00
Justin Clark-Casey (justincc)
5f58b9b552
minor: remove some mono compiler warnings in UserProfileModule
2013-07-09 00:04:46 +01:00
Justin Clark-Casey (justincc)
83da14008f
minor: remove some mono compiler warnings in new groups code
2013-07-08 23:57:05 +01:00
Justin Clark-Casey (justincc)
af9b17c545
minor: remove mono compiler warnings related to keyframe code
2013-07-08 23:52:40 +01:00
Justin Clark-Casey (justincc)
2025dd25f6
Add missing file BaseOutputStreamHandler.cs from recent commit e19defd
2013-07-08 23:50:40 +01:00
Justin Clark-Casey (justincc)
047ef9c2a5
minor: remove some mono compiler warnings in OdePlugin
2013-07-08 23:36:57 +01:00
Justin Clark-Casey (justincc)
eccec4f8f6
minor: remove now unused migration-hack bool from DAMap
2013-07-08 23:32:19 +01:00
Justin Clark-Casey (justincc)
8be59829d1
minor: Add back commented out logging message in Caps.RegisterHandler() that I accidentally removed.
2013-07-08 22:41:24 +01:00
Justin Clark-Casey (justincc)
013710168b
For stat purposes, add names to capability request handlers where these were not set
2013-07-08 22:39:07 +01:00
Justin Clark-Casey (justincc)
dc54581700
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-08 22:19:37 +01:00
Diva Canto
b2d4b8b1da
BaseHttpServer: if the handler sets the content length, don't override it. This happens in HEAD handlers.
2013-07-08 14:12:11 -07:00
Justin Clark-Casey (justincc)
c3db595944
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-08 22:07:27 +01:00
Justin Clark-Casey (justincc)
e19defde36
Add "show caps stats by user" and "show caps stats by cap" console commands to print various counts of capability invocation by user and by cap
...
This currently prints caps requests received and handled, so that overload of received compared to handled or deadlock can be detected.
This involves making BaseStreamHandler and BaseOutputStream record the ints, which means inheritors should subclass ProcessRequest() instead of Handle()
However, existing inheriting classes overriding Handle() will still work, albeit without stats recording.
"show caps" becomes "show caps list" to disambiguate between show caps commands
2013-07-08 22:03:07 +01:00
Justin Clark-Casey (justincc)
a38c2abae4
Make dictionary read/write locking consistent in CapabilitiesModule, rename two dictionary fields to standard m_ format
2013-07-08 18:07:04 +01:00
Diva Canto
c66a9a08e4
Placed a throttle on UserManagementModule for name lookups. Singularity apparently is flooding the sims with name requests.
2013-07-08 08:41:18 -07:00
Diva Canto
1e72e1b258
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-07 20:44:23 -07:00
Diva Canto
bbb9af363d
Print out caller IP when unusual requests are received.
2013-07-07 20:43:42 -07:00
Vegaslon
bbc40fab62
BulletSim: Different Implementation of Angular Deflection for vehicles, Activates it again and fixes problem with fighting with vertical attractor removing wobble of forward axis. Comments on testing welcome, May require adjustments of this force or other forces after this commit, exact tweaking to come after testing on other hardware.
...
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-07-07 06:18:50 -07:00
Robert Adams
6026759406
BulletSim: fix jumping up and down of linksets when center-of-mass
...
was enabled. Didn't effect the physical position but the viewer saw
the linkset jumping between its simulator center and its physical
center.
2013-07-07 05:47:41 -07:00
Robert Adams
70d24a654b
BulletSim: rename position and orientation variables to remove the
...
inconsistant use of Raw* and _* conventions.
2013-07-07 05:46:24 -07:00
Diva Canto
1286677352
Try to normalize the creatorData of scene object parts with the trailing '/'. What a nightmare this '/' is!
2013-07-06 18:37:54 -07:00
Diva Canto
803e5498b0
A little more debug
2013-07-06 18:27:03 -07:00
Diva Canto
71e26555bd
Revert "WARNING: BRUTE FORCE DEBUG AGAIN. AVOID USING THIS COMMIT"
...
This reverts commit 9b75d75724
.
2013-07-06 18:16:27 -07:00
Diva Canto
391633c072
Some more fixes on strange behaviors of Unknown User, esp. related to large messy inventories and esp. related to kokua
2013-07-06 18:02:17 -07:00
Diva Canto
1dd3a0bc57
MORE DEBUG. DON"T USE THIS.
2013-07-06 17:29:19 -07:00
Diva Canto
9b75d75724
WARNING: BRUTE FORCE DEBUG AGAIN. AVOID USING THIS COMMIT
2013-07-06 16:51:14 -07:00
Diva Canto
93fd5e4036
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-06 15:18:29 -07:00
Diva Canto
b29a09ab8e
Simina activity detector was too eager. Disabled it in case simian is not being used.
2013-07-06 15:17:55 -07:00
Robert Adams
d838f15d97
Add implementations for llSetVelocity and llSetAngularVelocity.
2013-07-06 09:53:30 -07:00
Robert Adams
a65cec3986
BulletSim: implementation of linkset center-of-mass.
...
Default off, for the moment, until more testing.
Add separate thread and center-of-mass flags to OpenSimDefaults.ini.
Clean up comments in OpenSimDefaults.ini.
2013-07-06 08:25:15 -07:00
Robert Adams
97698ae311
BulletSim: More tweaking on center-of-mass. Almost there. Changes have no effect if LinksetOffsetCenterOfMass=false (the default).
2013-07-06 08:25:15 -07:00
Robert Adams
03268d85c4
BulletSim: comments and non-functional changes working toward the center-of-gravity implementation.
2013-07-06 08:25:14 -07:00
Robert Adams
5f97c6f8f0
BulletSim: non-functional updates. Comments and formatting.
...
Update TODO list.
2013-07-06 08:25:13 -07:00
Diva Canto
c358d5d168
Changed a few bits in Inventory/Archiver/InventoryArchiveReadRequest.cs to be less dependent on a Scene.
2013-07-05 20:17:10 -07:00
Justin Clark-Casey (justincc)
98de67d573
Fix mono warning in LLImageManagerTests
2013-07-06 00:55:14 +01:00
Justin Clark-Casey (justincc)
55ac8c83c7
Get InventoryWorkerThreads to update watchdog on processing requests
2013-07-06 00:34:22 +01:00
Justin Clark-Casey (justincc)
67407024a2
Update thread watchdog on GridServiceRequestThread periodically and turn off alarming
...
Unfortunately, alarm can spuriously go off if the thread blocks for a long time on an empty queue.
2013-07-06 00:29:19 +01:00
Justin Clark-Casey (justincc)
5dbdd5f8b4
refactor: Make stats and sim status simpler by extending BaseStreamHandler like other handlers instead of implementing the IStreamedRequestHandler interface directly
2013-07-06 00:12:48 +01:00
Justin Clark-Casey (justincc)
dd15f95499
Add very basic regression test TestChildAgentSingleRegionCapabilities() which checks for addition and removal of capabilities on add/remove of child agent
2013-07-05 20:06:27 +01:00
Diva Canto
ca26583e6b
Delete some verbose debug messages
2013-07-04 15:17:06 -07:00
Diva Canto
8265a88c4a
Throttle the viewer's requests for region handles. Apparently Kokua is requesting this for all landmarks in inventory. Not sure why. But this seems to be the root cause of the login freeze mentioned before. This commit adds a blocking queue / process thread pattern.
2013-07-04 14:51:18 -07:00
Melanie
5ddcc25ee9
Merge branch 'master' into careminster
2013-07-04 22:32:58 +01:00
Diva Canto
d80936bbbb
Guard against completely unknown user UUIDs.
2013-07-04 14:07:25 -07:00
Diva Canto
da3aa44138
Debug the RegionHandle handler (same issue)
2013-07-04 13:27:53 -07:00
Diva Canto
33ddb6c246
Revert "WARNING: BRUTE FORCE DEBUG. AVOID USING THIS COMMIT."
...
This reverts commit c95a23863a
.
2013-07-04 13:25:58 -07:00
Diva Canto
c95a23863a
WARNING: BRUTE FORCE DEBUG. AVOID USING THIS COMMIT.
2013-07-04 13:13:52 -07:00
Diva Canto
38a04ff993
Revert "Same freeze issue, now checking if it's in estate"
...
This reverts commit ca380ec039
.
2013-07-04 13:00:06 -07:00
Diva Canto
d997c49e47
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-04 12:45:34 -07:00
Diva Canto
ca380ec039
Same freeze issue, now checking if it's in estate
2013-07-04 12:41:45 -07:00
Justin Clark-Casey (justincc)
93ee515d9d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-04 20:41:02 +01:00
Justin Clark-Casey (justincc)
fdafc2a16c
With diva's permission, temporarily reinsert Unknown UserUMMAU3 to make sure that GUN7 failure has largely disappeared.
...
Unknown UserUMMAU3 insertion should definitely be removed down the line.
However, I would like a little more time to check the GUN* reduction first, since removing UMMAU3 will make these failures appear as GUN7 instead.
Also bumps GUN6 -> GUN7 and UMMAU2 -> UMMAU3
2013-07-04 20:39:16 +01:00
Diva Canto
bf214122cd
More debug, same issue
2013-07-04 11:53:22 -07:00
Diva Canto
15d0bc0900
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-04 11:37:00 -07:00
Diva Canto
ec9ffbb89a
More debug, same issue
2013-07-04 11:36:10 -07:00
Justin Clark-Casey (justincc)
c61becc62b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-04 19:33:12 +01:00
Diva Canto
0cc0a2485c
More debug related to the previous commit
2013-07-04 11:18:05 -07:00
Diva Canto
ae42c93f9a
Now trying to find a cause of freeze at login related to friends status notifications.
2013-07-04 10:59:21 -07:00
Diva Canto
98a2fa8e35
HG Friends: this was commented some commits ago, but it shouldn't have been.
2013-07-04 10:23:20 -07:00
Diva Canto
068a3afad9
HG Friends: migration #3 is failing on some installations of MySql. Setting the table to InnoDB seems to fix the problem.
2013-07-04 09:51:31 -07:00
Justin Clark-Casey (justincc)
16f40c1a15
Add --default option to "debug lludp packet" command to allow packet logging to be performed immediately from client start
2013-07-04 17:29:53 +01:00
Diva Canto
5eb78aad96
Revert "HG Friends: debug an issue where the friends data stored in the DB is incomplete."
...
This reverts commit 27cdfb7b84
.
2013-07-04 09:17:01 -07:00
Diva Canto
80f4a008eb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-04 08:48:19 -07:00
Diva Canto
27cdfb7b84
HG Friends: debug an issue where the friends data stored in the DB is incomplete.
2013-07-04 08:47:45 -07:00
Justin Clark-Casey (justincc)
25889b2d7e
change "debug packet" command to "debug lludp packet" to conform with other "debug lludp" options
...
also moves the implementing code into LLUDPServer.cs along with other debug commands from OpenSim.cs
gets all debug lludp commands to only activate for the set scene if not root
2013-07-04 00:02:53 +01:00
Diva Canto
119f84fe11
Squoosh one last opportunity for Unknown Users to creep in.
2013-07-02 17:03:04 -07:00
Diva Canto
06dba1fa62
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-02 16:47:17 -07:00
Diva Canto
4d24bf75fd
Deleted debug messages. Fixed a null ref exception on the POST handler of GridUserServerPostHandler.cs
2013-07-02 16:46:35 -07:00
Justin Clark-Casey (justincc)
d01b8e163d
minor: Correct typo of "Descrition" to "Description" in "show object *" console commands
...
Thanks to Ai Austin for pointing this out.
2013-07-03 00:27:22 +01:00
Diva Canto
316e8f9239
Fix SQL statement
2013-07-02 16:10:09 -07:00
Diva Canto
9725b829d5
Do the same for SQLite and MSSQL
2013-07-02 15:48:30 -07:00
Diva Canto
2c05caec7f
Really make it call the method with the query interface
2013-07-02 15:47:02 -07:00
Diva Canto
626940ceb8
More debug messages
2013-07-02 15:39:10 -07:00
Diva Canto
e984bfb4c6
This should have a strong effect on the Unknown User issue mantis #6625
2013-07-02 14:31:39 -07:00
Diva Canto
ccca005969
HG: close a loophole by which if something was wrong with the ServiceURLs it resulted in never ending asset requests
2013-07-02 13:29:44 -07:00
Justin Clark-Casey (justincc)
635704b7ef
Update debug unknown user name UserUMMTGUN3 to UserUMMTGUN4 and UserUMMAU -> UserUMMAU2 to track any new occurences.
...
This is to see the impact that Diva's fixes related to this issue (last one is currently commit c7383688
)
You will need to clear your viewer cache for this to have any effect
Relates to http://opensimulator.org/mantis/view.php?id=6625
2013-07-01 23:54:04 +01:00
Robert Adams
8eb86c9ec9
BulletSim: add the reset of the last commit for flush log file problems.
...
Fix small typo in one log message.
2013-06-30 19:22:43 -07:00
Robert Adams
c24c99f4ba
BulletSim: fix an occasional crash with flushing log files.
2013-06-30 19:08:15 -07:00
Robert Adams
9d5ae75950
BulletSim: remove the handle to the vehicle actor and cause routines
...
that need it to look it up.
2013-06-30 17:07:51 -07:00
Robert Adams
425d2a2a97
BulletSim: set linkset type to be prim specific rather than a simulator
...
wide default. This allows individual prims to differ in the
underlying linkset implementation.
2013-06-30 17:07:50 -07:00
Robert Adams
23516717e4
BulletSim: a better version of llMoveToTarget that doesn't go crazy.
...
There is still some overshoot but mostly fixes Mantis 6693.
Fix bug where moveToTarget was active for non-physical objects
and while selected.
Fix bug where move target was not getting changed if the script
changed the target during a move.
2013-06-30 17:07:49 -07:00
Robert Adams
2f4a729d40
BulletSim: add inTaintTime parameter to collision cache clear function.
2013-06-30 17:07:48 -07:00
Melanie
ffcee82b1d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Region/Framework/Scenes/EventManager.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2013-06-30 18:27:30 +01:00
Diva Canto
e377abcc35
Groups V2: charge for group creation only after the group has been successfully created
2013-06-30 08:39:35 -07:00
Diva Canto
c738368846
Revert "More debug mantis #6625"
...
This reverts commit 20f2cf8769
.
2013-06-30 07:25:46 -07:00
Diva Canto
1e97972f78
Revert "One more debug mantis #6625"
...
This reverts commit 8fa5d12fcb
.
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
2013-06-30 07:25:13 -07:00
Diva Canto
d7775d1e11
Revert "A little more debug for the Unknown User problem mantis #6625"
...
This reverts commit ff47cf77ab
.
2013-06-30 07:22:27 -07:00
Diva Canto
1fc873d09f
Same fix to LocalInventoryServiceConnector.cs
2013-06-30 07:21:22 -07:00
Diva Canto
74e7fac13f
More on mantis #6625
2013-06-29 22:32:26 -07:00
Diva Canto
20f2cf8769
More debug mantis #6625
2013-06-29 21:54:10 -07:00
Diva Canto
c462e0a51c
Fixed previous debug message
2013-06-29 21:30:07 -07:00
Diva Canto
8fa5d12fcb
One more debug mantis #6625
2013-06-29 21:26:58 -07:00
Diva Canto
0c97021565
More debug for mantis #6625 . It looks like the home friends list is being fetched on HG TPs.
2013-06-29 21:05:45 -07:00
Diva Canto
ff47cf77ab
A little more debug for the Unknown User problem mantis #6625
2013-06-29 19:15:25 -07:00
Diva Canto
00093a305d
Changed HG status notifications timeout down to 15secs from the default 100.
2013-06-29 18:35:23 -07:00
Justin Clark-Casey (justincc)
3a634c56e3
Remove hack to migrate previous experimental-level os materials data.
...
This didn't seem to be working anyway and it's better not to have such hacks in the code for experimental stuff.
2013-06-29 00:23:41 +01:00
Justin Clark-Casey (justincc)
371085546d
Add materials store null check into UuidGatherer code.
2013-06-28 23:57:41 +01:00
dahlia
4cb4c9fb25
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-28 14:03:46 -07:00
dahlia
cbb5122729
add some locking to materials storage dictionary
2013-06-28 14:00:28 -07:00
Justin Clark-Casey (justincc)
e26e8b8829
Remove "Asset deletion not supported by database" message from "delete asset" robust/standalone console command since it actually was implemented and performed.
...
Improve other associated messages.
2013-06-28 19:19:38 +01:00
Justin Clark-Casey (justincc)
dc0455e217
In XAssetService, on a delete asset request also delete the asset in any chained service.
...
This eliminates the async migration since it causes a race condition with the "delete asset" console command
2013-06-28 19:11:44 +01:00
Justin Clark-Casey (justincc)
f6ce87c96d
Reinsert code for gathering uuids reference by materials back directly into UuidGatherer for now.
...
This cannot be triggered as an event from Scene.EventManager since some invocations of UuidGatherer (e.g. IAR saving) use scene objects which are not in scenes.
There needs to be some way for modules to register for events which are not connected with a particular scene.
2013-06-28 18:50:33 +01:00
dahlia
529633d970
add method docs for DAMap.GetStore() and DAMap.SetStore()
2013-06-27 18:44:27 -07:00
dahlia
d47fc48b32
and yet another check for null returned from DynAttrs.GetStore()
2013-06-27 18:01:17 -07:00
dahlia
c1b8f83dd4
test for null return from DynAttrs.GetStore()
2013-06-27 17:53:15 -07:00
Justin Clark-Casey (justincc)
149487ea0f
refactor: Move code for gathering textures referenced by materials into MaterialsDemoModule from UuidGatherer
...
This code is now triggered via EventManager.OnGatherUuids which modules can subscribe to.
2013-06-27 23:42:35 +01:00
Justin Clark-Casey (justincc)
f7d09b898a
Make the concept of namespaces explicit in dynamic attributes
...
This is in order to reduce the likelihood of naming clashes, make it easier to filter in/out attributes, ensure uniformity, etc.
All dynattrs in the opensim distro itself or likely future ones should be in the "OpenSim" namespace.
This does alter the underlying dynattrs data structure. All data in previous structures may not be available, though old structures should not cause errors.
This is done without notice since this feature has been explicitly labelled as experimental, subject to change and has not been in a release.
However, existing materials data is being preserved by moving it to the "Materials" store in the "OpenSim" namespace.
2013-06-27 23:14:28 +01:00
Justin Clark-Casey (justincc)
f78d2ef166
Update temporary "Unknown UserUMMTGUN2" name to "Unknown UserUMMTGUN3" to see if Diva's recent HG updates (post 6c7e33f
) fix this issue.
...
This string is returned if a UserManagementModule.TryGetUserNames() cannot find a server-side name binding or a user account for a given UUID.
This is only called when the viewer requests a binding via the UDP UUIDNameRequest message
2013-06-25 00:46:15 +01:00
Justin Clark-Casey (justincc)
ce9b1320d2
Improve situation where editing just the root prim of an attachment causes other prims to be set to very far off positions on reattach.
...
Functionally the same as the patch by tglion in http://opensimulator.org/mantis/view.php?id=5334
However, not yet perfect - after editing just root prim on reattach the position is still wrong, though other prims are not set to far off positions.
2013-06-25 00:41:46 +01:00
Justin Clark-Casey (justincc)
4b00203fa5
Tidy up SOG.UpdateRootPosition() to eliminate unnecessary copying of Vector3 structs
2013-06-25 00:15:55 +01:00
Melanie
f70357eaa3
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2013-06-23 01:59:57 +01:00
Melanie
936700bda3
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-06-23 01:49:45 +01:00
Melanie
24a4367fc2
Merge branch 'avination-current' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
2013-06-23 01:48:57 +01:00
Melanie
25ed1658ca
Merge branch 'master' into careminster
2013-06-23 01:35:09 +01:00
Melanie
4bf1afe300
Fix prim locking to behave like SL
2013-06-23 01:34:35 +01:00
Melanie
8e9d6c6c56
Fix prim locking to behave like SL
2013-06-23 01:14:07 +02:00
Diva Canto
edb11a7eca
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-22 08:29:54 -07:00
Diva Canto
6c7e33fe47
Change IsLocalRegion from using region handle to using regionID. This was affecting UpdateAgent and CloseAgent in cases where the foreign region is on the same coordinates as *some* local region.
2013-06-22 08:29:06 -07:00
Diva Canto
ca3ce6da73
HG: avoid call on localhost between sim and UAS for standalone.
2013-06-22 08:26:59 -07:00
Diva Canto
4778d67005
Finally moved HG agent transfers to use agent fatpacks.
2013-06-21 20:52:46 -07:00
Robert Adams
74539659f6
BulletSim: move new linear deflection code to own routine.
...
Remove VehicleForwardVelocity changed storage since the value
will be modified as movement is processed.
2013-06-21 10:46:21 -07:00
Vegaslon
a5de4f692b
BulletSim: Implementation of Linear Deflection, it is a partial help for the vehicle tuning diffrence between Opensim and Second life.
...
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-06-20 19:02:15 -07:00
Robert Adams
bbeff4b8ca
BulletSim: rework velocity updating when not colliding and not flying
...
to prevent infinite jumps. Now jumps last only AvatarJumpFrames long
(default 4) which is about as high as in SL.
TODO: jumping should only depend on standing (collision with feet)
rather than collision anywhere on the avatar.
2013-06-20 09:55:40 -07:00
Justin Clark-Casey (justincc)
a33b6eed6d
minor: remove mono compiler warnings in WebsocketServerHandler.cs
2013-06-20 00:54:19 +01:00
Justin Clark-Casey (justincc)
085a87060a
Change "ObjectMemory" stat to "HeapMemory" to align with other stat names. Also round this and ProcessMemory to three decimal places in common with other memory stats.
...
I believe leaving out such minor info makes stats easier to read
2013-06-20 00:52:39 +01:00
Justin Clark-Casey (justincc)
05790ba1cf
Allow more than one stat category to be specified in "show stats"
...
e.g. "show stats httpserver.9000 server.network"
2013-06-20 00:45:56 +01:00
Justin Clark-Casey (justincc)
5b1a9f84fd
minor: Change "memory churn" terminology in statistics to "heap allocation rate" since this is more generally meaningful
2013-06-20 00:32:12 +01:00
Justin Clark-Casey (justincc)
d97333255d
Fix minor bug where the check whether to display SmartThreadPool stats was accidentally != null rather than == FireAndForgetMethod.SmartThreadPool
...
Due to another check this had no practical effect
2013-06-20 00:22:44 +01:00
Justin Clark-Casey (justincc)
3370e19205
minor: fix mono compiler warning in FetchInventory2Handler
2013-06-20 00:17:20 +01:00
Justin Clark-Casey (justincc)
086fd70a5f
Make it possible to specify display of stats in a particular 'container' by separating category and container with a period.
...
e.g. "show stats server.network"
I failed to realize this had already been implemented without the period in the show stats command (as the command help had not been updated).
However, I would prefer the . approach as it will allow specifying multiple stats, easier wildcarding, etc.
This commit also prevents any stat from having a period in its short name.
2013-06-20 00:00:39 +01:00
Justin Clark-Casey (justincc)
84af1cab9b
Display existing statistic of how many http requests a server is making as server.network.HTTPRequestsMade in "show stats all"
2013-06-19 20:48:12 +01:00
Talun
8a86e29579
Mantis 6608: Math error in parcel dimensions/borders seen with land show command
...
This patch changes the land show console command to return numbers in the
range 4 to 256 for the "to" coordinates instead of 0 to 252
Also trailing spaces removed from some lines.
2013-06-19 00:26:23 +01:00
Justin Clark-Casey (justincc)
1a72f62d7b
minor: remove mono compiler warning in OfflineIMService
2013-06-18 23:52:15 +01:00
Kevin Cozens
3fe5e9057f
Prevent an exception if no offline messages were retrieved.
2013-06-18 23:15:38 +01:00
Justin Clark-Casey (justincc)
dda44e31e3
minor: tidy up spacing if display a unit for additional stat information
2013-06-18 23:10:50 +01:00
Justin Clark-Casey (justincc)
9501a583cb
Make number of inbound http requests handled available as a httpserver.<port>.IncomingHTTPRequestsProcessed stat
2013-06-18 23:07:18 +01:00
Justin Clark-Casey (justincc)
768e8e363b
Fix issue where stat samples were accidentally static, so that any additional stat with sampling would produce wrong results
2013-06-18 22:49:49 +01:00
Justin Clark-Casey (justincc)
0767523834
Fix other places when saving scripts or notecards in prim inventories where messages should be transient without an OK button
2013-06-18 21:21:59 +01:00
Melanie
c78cb96c62
Allow coalesced objects to be rezzed even if they extend past the sim bounds
2013-06-18 04:42:20 +02:00
Melanie
56f4adeb60
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
2013-06-18 01:50:08 +01:00
Justin Clark-Casey (justincc)
a1e32b8437
If SmartThreadPool is active, display statistical information about it in "show stats server"
...
Also puts these and previous builtin threadpool stats in the "threadpool" stat container rather than "processor"
2013-06-18 00:10:21 +01:00
Justin Clark-Casey (justincc)
b7c9dee033
refactor: Move existing code to generate report information on the threadpool to the ServerBase rather than being in Util
2013-06-17 23:57:10 +01:00
Justin Clark-Casey (justincc)
c0a00cd7fd
Fix bug where no threadpool data would be displayed in the "show threads" command if threadpool type was QueueUserWorkItem (Unsafe worked as expected)
2013-06-17 23:34:09 +01:00
Justin Clark-Casey (justincc)
713a14a6b5
minor: remove mono compiler warnings in WebFetchInvDescModule
2013-06-17 23:23:56 +01:00
Justin Clark-Casey (justincc)
b9dac1f8df
Fix test failure in BasicCircuitTests from previous commit 0d2fd0d9
2013-06-17 23:17:55 +01:00
Justin Clark-Casey (justincc)
865d46ae1e
Drop server level stats to debug instead of info.
...
This was the original intention with these stats, as I didn't believe they would be useful to ordinary users if everything is working as it should.
Please amend if this is an issue.
Just for now, levels actually have no impact on what is displayed via the "show stats" command.
2013-06-17 22:57:47 +01:00
Justin Clark-Casey (justincc)
2c9bb0f973
Add server stats for available builtin threadpool and iocp workers
2013-06-17 22:55:25 +01:00
Justin Clark-Casey (justincc)
0d2fd0d914
Make general server stats available on the robust console as well as the simulator console
...
This means the "show stats" command is now active on the robust console.
2013-06-17 22:39:00 +01:00
dahlia
694c4bcbb6
correct method doc for llRot2Axis()
2013-06-14 20:00:20 -07:00
Justin Clark-Casey (justincc)
e6cb7b4764
Lock m_classifiedCache and m_classifiedInterest dictionary reads in UserProfileModule since in the presence of writes these are not thread-safe operations.
...
Simplified locking to m_classifiedCache only since r/w of both dictionaries always occurs together
2013-06-15 00:52:57 +01:00
Justin Clark-Casey (justincc)
42b0c68eab
Correct build break in previous commit 9c530d7
2013-06-15 00:46:55 +01:00
Justin Clark-Casey (justincc)
9c530d725f
refactor: In UserProfileModule, change classifiedCache and classifiedInterest to m_classifiedCache and m_classifiedInterest
...
This is the coding standard name style for private fields.
2013-06-15 00:41:02 +01:00
Justin Clark-Casey (justincc)
ecfc6a3f4a
Add the standard OpenSimulator copyright notice to the top of InventoryCache.cs
2013-06-15 00:36:16 +01:00
Justin Clark-Casey (justincc)
720806b661
Adjust the locking on InventoryCache. Locking for r/w of the ExpiringCache isn't needed since it's thread safe but r/w of contained dictionaries isn't thread-safe
2013-06-15 00:34:45 +01:00
Justin Clark-Casey (justincc)
da3724a904
minor: remove mono compiler warnings from LSL_Api, properly format method doc for llRot2Axis()
2013-06-15 00:11:36 +01:00
Talun
f074739e33
Mantis 6280: llSetContentType(). An implementation.
...
An implimentation of llSetContentType including all of the new
constants added since the mantis was raised.
2013-06-15 00:06:03 +01:00
Talun
fc89bde044
Mantis 6108: ossetprimitiveparams temporary/phantom problem
...
Corrected to ensure that the target prim is updated by
osSetPrimitiveParams when setting PRIM_TEMP_ON_REZ and/or PRIM_PHANTOM
instead of the prim that the script is in.
2013-06-15 00:00:00 +01:00
Justin Clark-Casey (justincc)
db9d9d83eb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-14 23:58:16 +01:00
Justin Clark-Casey (justincc)
d412c1b0eb
Don't try to abort worker threads in WebFetchInvDescModule if module was not enabled.
...
This also moves the abort to RemoveRegion() rather than a destructor.
2013-06-14 23:53:20 +01:00
BlueWall
d7f3d7efd2
Merge branch 'master' of /home/opensim/src/opensim
2013-06-13 09:27:13 -04:00
BlueWall
b2c8d5eec7
Add Option: ClassifiedFee
...
Add option to set minimum fee for publishing classifieds. Many viewers have a
hard coded minimum of 50, which makes publishing classifieds fail where grids
have no economy. This allows the grid to set the minimum fee to a suitable
value for their operation.
The option is located in the [LoginService] section and defaults to 0. The
value is sent as "classified_fee" in the login response.
2013-06-13 09:18:27 -04:00
Melanie
9975c5674c
Merge branch 'master' into careminster
2013-06-13 02:49:43 +01:00
Melanie
0be80e5813
Forward the reason to the script
2013-06-13 02:52:51 +02:00
Melanie
62c277ff9f
Add a result param to te money module interface
2013-06-13 02:52:11 +02:00
Melanie
689969e143
* This fixes having to select and deselect prim to get keyframemotion to start running when pulled from data storage.
...
Conflicts:
OpenSim/Data/SQLite/SQLiteSimulationData.cs
2013-06-13 02:50:39 +01:00
Diva Canto
b271217084
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-12 17:48:48 -07:00
Diva Canto
7c00ccb548
DataSnapshot: changed those annoying messages to Debug instead of Info.
2013-06-12 17:48:20 -07:00
Justin Clark-Casey (justincc)
6b8e94864a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-13 00:33:53 +01:00
Justin Clark-Casey (justincc)
7759b05dcb
Make XInventoryServicesConnector properly handle a RESULT = false return for methods where this contains failure rather than throwing an exception.
...
Result = False is generated for methods such as GetFolderForType() when the other end wants to signal a failure of the operation in methods such as GetFolderForType()
2013-06-13 00:31:32 +01:00
teravus
3357300362
* This fixes having to select and deselect prim to get keyframemotion to start running when pulled from data storage.
2013-06-12 18:13:00 -05:00
Justin Clark-Casey (justincc)
824a4b4808
After calls to GetSuitcaseXFolder() in HGSuitcaseInventoryService, consistently check for null return and log warning rather than throw exception.
...
This was being done already in some places.
If an exception is thrown it is now an error rather than debug
2013-06-12 23:47:47 +01:00
Justin Clark-Casey (justincc)
ef5be42c86
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-12 23:32:51 +01:00
Justin Clark-Casey (justincc)
47b6e78790
Implement logging of first 80 characters (debug level 5) or full body data (debug level 6) on outgoing requests, depending on debug level
...
This is set via "debug http out <level>"
This matches the existing debug level behaviours for logging incoming http data
2013-06-12 21:34:20 +01:00
Robert Adams
3cb65f0d31
BulletSim: when meshing or asset fetching fails, include position
...
and region with the offending object's name in the error message.
2013-06-11 17:58:08 -07:00
Robert Adams
7556a0f699
Add TriggerScenePresenceUpdated events when an animation is added
...
or removed. Shouldn't impact anyone as only DSG seems to use
OnScenePresenceUpdated event.
Some minor format changes to AnimationSet's ToString().
2013-06-11 17:18:12 -07:00
Justin Clark-Casey (justincc)
135e10ba09
Uncomment Mic's code and split to create new regression TestAddTemporaryAsset() and TestAddTemporaryLocalAsset()
2013-06-11 23:55:45 +01:00
Diva Canto
d8da83b4ff
Removed the lock entirely
2013-06-11 15:50:12 -07:00
Diva Canto
a0fed03e10
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-11 15:36:52 -07:00
Diva Canto
b33db917f5
Really bad idea to lock m_UserCache for so long in UserManagementModule. Added a special lock object instead, if we really want to avoid concurrent executions of that code.
2013-06-11 15:36:27 -07:00
Melanie
26b66c730e
Put the "script saved" and "notecard saved" messages back into the bottom
...
right corner.
2013-06-11 21:03:16 +01:00
Melanie
162dfd8a38
Merge branch 'avination-current' into careminster
2013-06-11 21:03:02 +01:00
Melanie
400f876d98
Merge branch 'master' into careminster
2013-06-11 21:01:58 +01:00
Melanie
a4a4898a0e
Put the "script saved" and "notecard saved" messages back into the bottom
...
right corner.
2013-06-11 20:39:09 +02:00
teravus
d47a18fd09
* Adds KeyFrameMotion storage support to SQLite, just a note, seems that there's still something wrong with keyframed motion starting when the sim starts up, you have to 'select' and 'deselect' the prim again to get it to appear to move. Not sure what this is but maybe melanie_t can comment on this.
...
* Has a prim table migration.. that might take a while, hold on to your hats.
* Fixes a null-ref when shutting down while keyframed motion is active.
2013-06-11 08:56:20 -05:00
dahlia
ed950e6c74
Adjust output of llRot2Axis and llRot2Angle to match domains SL(tm) uses. Addresses Mantis #0006671
2013-06-11 00:29:40 -07:00
dahlia
ba84074468
LSL_Rotation.Normalize() now returns 0,0,0,1 for x,y,z,s when normalization fails
2013-06-10 17:54:14 -07:00
dahlia
9d9b9d4938
llRot2Angle now checks absolute value of s rotation component before normalizing
2013-06-10 17:11:49 -07:00
dahlia
b242ead6df
llRot2Axis now checks absolute value of s rotation component before normalizing. Also removed some excessive division and cleaned up a bit
2013-06-10 17:10:04 -07:00
Melanie
6b55be6e2f
Merge branch 'master' into careminster
2013-06-11 01:04:50 +01:00
Melanie
a022ee5766
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
2013-06-11 01:03:15 +01:00
teravus
1c7fbb86c2
Check For NaN and Infinity in llRot2Axis/Angle Fixes mantis #6669
2013-06-10 18:47:08 -05:00
dahlia
a949556c4e
add a Normalize() method for LSL_Rotation
2013-06-10 16:42:49 -07:00
Justin Clark-Casey (justincc)
7af97f88b7
Add port numbers to poll service thread names so that we can tell which belong to which HttpServer
2013-06-10 23:39:17 +01:00
Justin Clark-Casey (justincc)
32d1e50565
Reinstate explicit starting and stopping of PollServiceRequestManager added in 3eee991
but removed in 7c0bfca
...
Do not rely on destructors to stop things.
These fire at unpredictable times and cause problems such as http://opensimulator.org/mantis/view.php?id=6503
and most probably http://opensimulator.org/mantis/view.php?id=6668
2013-06-10 23:30:35 +01:00
Mic Bowman
a2f1cd87f8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-10 15:15:38 -07:00
Mic Bowman
82e3b9a6e0
Fix test for adding temporary assets. Code for non-local temporary assets
...
is there but commented out.
2013-06-10 15:14:55 -07:00
Robert Adams
795acaa6aa
BulletSim: add failure flag for meshing failure vs asset fetch failure
...
so error messages make more sense.
Change some BulletSim status log messages from WARN to INFO.
Update TODO list.
2013-06-10 14:12:45 -07:00
Mic Bowman
57141e34bf
Remove Temporary from use to shortcut asset stores. The Local property
...
differentiates between local & grid storage. The Temporary property just
says that which service handles the it, the asset can be safely removed
in the future.
2013-06-10 13:26:19 -07:00
Talun
7de0912a97
Mantis 5346: llAxisAngle2Rot() should normalize before computing
...
Corrected to agree with
http://wiki.secondlife.com/wiki/Llaxisangle2rot#Deep_Notes
to normalise the vector before computing the quaternion
Signed-off-by: dahlia <dahlia@nomail>
2013-06-10 04:13:34 -07:00
Diva Canto
e741e5ebce
More on mantis #6666 -- Groups V2 remote connector.
2013-06-09 20:20:37 -07:00
Melanie
745a209bf2
Explicitly set uploaded mesh object perms
2013-06-10 01:16:22 +02:00
UbitUmarov
925a8d47eb
Merge branch 'avination-current' into ubitwork
2013-06-08 19:19:51 +01:00
UbitUmarov
244f6fa5cd
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
2013-06-08 19:18:47 +01:00
Diva Canto
4e2e69bd25
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-08 11:01:20 -07:00
Diva Canto
d00770d56b
Groups V2 -- fix mantis #6666
2013-06-08 11:00:22 -07:00
BlueWall
75e4af9d39
Catch exception triggered by incoming avatars using legacy profiles
2013-06-08 11:00:05 -04:00
Melanie
8582b2b992
Make objects attached from the ground appear in inventory again. Fixes a number
...
of interaction issues causing client crashes.
2013-06-08 02:32:05 +02:00
BlueWall
34d40e46a5
Merge branch 'profiles'
...
message to explain why this merge is necessary,
2013-06-07 20:17:45 -04:00
BlueWall
1cb1245d84
SQLite support for UserProfiles
2013-06-07 20:14:39 -04:00
BlueWall
1387224821
Ensure selected module is the only active one
2013-06-07 20:09:10 -04:00
Diva Canto
6aa54a8e16
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-07 16:01:07 -07:00
Melanie
cf4d291443
Merge branch 'master' into careminster
2013-06-08 00:00:39 +01:00
Diva Canto
07cc16ff9c
Put the configuration back in FetchInventoryDesc2 cap.
2013-06-07 16:00:32 -07:00
Melanie
3a722ef81b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-06-07 23:59:02 +01:00
Melanie
75631e0267
Supply proper type information for the various types of requests
2013-06-07 23:55:03 +01:00
Melanie
7c0bfca7a0
Adding Avination's PollService to round out the HTTP inventory changes
2013-06-07 23:43:45 +01:00
Justin Clark-Casey (justincc)
454499ff60
minor: Comment out debug logging (at warn level) about number of objects force selected and turn down to debug level
2013-06-07 23:38:23 +01:00
UbitUmarov
ed7fe6239c
add indexes for new visual parameters shape_hover and
...
APPEARANCEMESSAGE_VERSION. For reference only, this aren't used in sim for
now
2013-06-07 23:18:48 +01:00
Melanie
45e333652c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
2013-06-07 23:09:53 +01:00
Melanie
17a902fed4
Clean up poll service
2013-06-07 22:39:27 +02:00
Justin Clark-Casey (justincc)
f2a4d9b99c
Fix regression where multiple close agents could be sent to the wrong neighbour region on root agent close.
...
This was introduced in git master d214e2d0
(Thu May 16 17:12:02 2013)
Caught out by the fact that value types used in iterators act like references and this was dispatched asynchronously.
Should address http://opensimulator.org/mantis/view.php?id=6658
2013-06-07 19:13:24 +01:00
Justin Clark-Casey (justincc)
a74e65200c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-07 19:12:55 +01:00
Donnie Roberts
045c26f626
In LocalFriendshipTerminated, send the original client's agentId to the friend being removed instead of the friend's own id.
2013-06-07 18:43:00 +01:00
Diva Canto
664c6191ed
Mantis #6620 (removed debug message)
2013-06-07 08:37:18 -07:00
Melanie
dd7404d850
Merge branch 'master' into careminster
2013-06-06 23:50:03 +01:00
Melanie
ac9c37f31b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-06-06 23:49:34 +01:00
Melanie
06012f8675
Fix keyframe motion copyright
2013-06-06 23:49:02 +01:00
UbitUmarov
c173c2eed5
try to suspend and resume keyframes on copy to inventory to take copy
...
doesn't destroy state
2013-06-06 19:21:21 +01:00
UbitUmarov
8bfd5c8927
Merge branch 'avination-current' into ubitwork
2013-06-06 19:03:32 +01:00
UbitUmarov
18e4496d2d
keyframe: add more locks, change timming stop, added Suspend and resume
2013-06-06 18:57:32 +01:00
Diva Canto
25fa647a74
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-05 20:20:22 -07:00
Diva Canto
2ebf70d719
Strengthen some assumptions.
2013-06-05 20:19:59 -07:00
Melanie
fe4a67efb6
Merge branch 'avination-current' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs
OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
2013-06-06 03:20:15 +01:00
Melanie
a3210d1cf8
Database persistence for keyframes. Contains a Migration.
2013-06-06 03:17:38 +01:00
Melanie
ea9e1d1a1e
Merge commit 'e449950030decf7e65e7d9b334ddaed25c1bd629' into careminster
2013-06-06 03:04:47 +01:00
Melanie
81ad9255b5
Hook up Keyframe motion to almost everything. Failing to cross a sim border
...
may yield unexpected results in some cases. No database persistence yet,
2013-06-06 03:03:05 +01:00
Melanie
e1d98c9e4c
Committing Avination's Keyframe module. This is not hooked up yet and will do nothing. More commits to follow.
2013-06-06 02:25:19 +01:00
UbitUmarov
c5d967b946
Merge branch 'avination-current' into ubitwork
2013-06-06 00:37:06 +01:00
BlueWall
26cd59cd6f
Merge branch 'master' of /home/opensim/var/repo/opensim
2013-06-05 18:55:42 -04:00
Melanie
e53b62304f
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-06-05 23:44:26 +01:00
Melanie
a7dbafb0e3
Port Avination's inventory send throttling
2013-06-05 23:42:50 +01:00
BlueWall
e449950030
Prevent processing for Npc
2013-06-05 18:42:15 -04:00
BlueWall
cd64da8746
Cleanup
2013-06-05 18:41:55 -04:00
Justin Clark-Casey (justincc)
47ffa12078
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-05 22:26:42 +01:00
Justin Clark-Casey (justincc)
f41fc4eb25
Avoid a deadlock where a script can attempt to take a ScriptInstance.m_Scripts lock then a lock on SP.m_attachments whilst SP.MakeRootAgent() attempts to take in the opposite order.
...
This is because scripts (at least on XEngine) start unsuspended - deceptively the ResumeScripts() calls in various places in the code are actually completely redundant (and useless).
The solution chosen here is to use a copy of the SP attachments and not have the list locked whilst creating the scripts when an avatar enters the region.
This looks to address http://opensimulator.org/mantis/view.php?id=6557
2013-06-05 22:20:48 +01:00
BlueWall
10572b78f8
Remove a couple of orphaned lines
2013-06-05 15:10:53 -04:00
BlueWall
b4f472c4fa
Make locking more uniform
2013-06-05 15:08:25 -04:00
Robert Adams
b5d0ac4c42
BulletSim: default PhysicsTimeStep to same as the simulator's
...
heartbeat timestep when running the physics engine on a separate
thread. This reduces the occurance of heartbeats that happen when
there is no physics step which is seen as vehicle jerkyness.
2013-06-05 07:12:14 -07:00
Robert Adams
0c971d148c
BulletSim: fix corner case when rebuilding a compound linkset while
...
a mesh/hull while a mesh or hull is being rebuilt when its asset
is fetched. This fixes a 'pure virtual function' crash when changing
physical state of complex linksets that include many meshes.
2013-06-05 07:09:43 -07:00
Melanie
648e258b8e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
2013-06-04 21:09:25 +01:00
Melanie
57c8d82c9e
Fix llTeleportAgentGlobalCoords
2013-06-02 23:53:20 +02:00
Melanie
e2d4cb870e
Unsit seated avatars when an object is deleted
2013-06-02 23:53:07 +02:00
Melanie
bd87eb90d1
Implement PERMISSION_TELEPORT and the needed checks to make it work.
...
Old auth system still works as well.
2013-06-02 16:28:28 +02:00
Robert Adams
07058b044b
BulletSim: experimental movement of physics execution off of heartbeat
...
thread. Off by default until more testing.
Setting "[BulletSim]UseSeparatePhysicsThread=true" causes the physics
engine to be called on its own thread and the heartbeat thread only
handles the reporting of property updates and collisions. Physics frame
rate is about right but physics execution time goes to zero as accounted
by the heartbeat loop.
2013-06-01 14:52:44 -07:00
BlueWall
d7fa9f671e
Adding standard OpenSim header to source files
2013-05-31 22:03:27 -04:00
BlueWall
ba2f13db63
Adding back the BasicProfileModule
2013-05-31 21:19:15 -04:00
UbitUmarov
8fe2308afc
Merge branch 'avination-current' into ubitwork
2013-05-31 23:18:12 +01:00
Justin Clark-Casey (justincc)
217c7d1140
Remove unnecessary m_scenes and m_scene from AsyncCommandManager.
...
These were private and the sole point of use (to know when to load config for the first time) can be done by looking at script engines instead.
2013-05-31 23:00:10 +01:00
Justin Clark-Casey (justincc)
921ad8704e
Lock areas of AsyncCommandManager where multiple threads could try to access/update the same static structures simultaneously.
...
This is possible where there is more than one scene (multiple copies of the same script engine) and/or more than one script engine being used.
These operations are not thread safe and could be leading to the exceptions/problems seen in http://opensimulator.org/mantis/view.php?id=6651
This also prevents a small race condition where more than one AsyncLSLCmdHandlerThread could be started.
2013-05-31 22:50:15 +01:00
Melanie
9589a09eda
Fix multi-wear of alpha and tattoo layers.
2013-05-31 22:02:31 +02:00
Melanie
70d5c29310
Stop sending velocity to avoid snap-back
2013-05-31 21:55:56 +02:00
Justin Clark-Casey (justincc)
00c1586ff8
refactor: Remove unused AsyncCommandManager.PleaseShutdown
2013-05-31 18:12:36 +01:00
BlueWall
bf03523323
Fill in fields with default values on profile creation
2013-05-31 10:40:47 -04:00
Robert Adams
924a5df25f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-30 19:20:36 -07:00
BlueWall
e85c70223a
Merge branch 'work' contains UserProfiles with Robust service and updates region module using JsonRpc messaging. Requres no databse changes (but backup existing data before use).
2013-05-30 22:16:42 -04:00
Robert Adams
4d32ca19bf
Trigger OnScenePresenceUpdated when the avatar's animations change.
2013-05-30 19:16:36 -07:00
Robert Adams
48a175eff7
Add methods to Animation and AnimationSet for easier manipulation and
...
display of groups of animations (Equal(), ToString(), FromOSDArray(), ...).
No functional change to animations.
2013-05-30 19:16:34 -07:00
Robert Adams
439f11cc3c
Add region heartbeat start event to complement heartbeat end event.
...
This allows object modification before the usual heartbeat operation.
2013-05-30 19:16:31 -07:00
Justin Clark-Casey (justincc)
46335b103e
If an exception occurs in the AsyncCommandManager loop, spit it out to log rather than silently swallowing it.
...
This might help diagnose the cause of http://opensimulator.org/mantis/view.php?id=6651 where sometimes scripts fail to start on region start.
2013-05-30 23:51:35 +01:00
BlueWall
328883700a
UserProfiles
...
UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.
2013-05-30 17:59:18 -04:00
Justin Clark-Casey (justincc)
6b88a665d3
minor: fix warnings in GodsModule that were due to duplicate using statements
2013-05-30 22:43:52 +01:00
Justin Clark-Casey (justincc)
12a3b85561
Fix passing of voice distance attenuation to the Vivox voice server.
...
Because of a typo, this wasn't being done at all - now the 'default' value as described in OpenSimDefaults.ini of 10m is passed (vivox_channel_clamping_distance)
Thanks to Ai Austin for spotting this.
2013-05-30 22:20:02 +01:00
Melanie
669fa3ff9a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
2013-05-30 21:48:09 +01:00
Justin Clark-Casey (justincc)
8f9a726465
If on a sit request we sit the avatar on a different prim in a linkset for some reason (e.g. because it has a sit target), then send the actual sit prim UUID to the viewer rather than the requested one.
...
This purports to fix the issue described in http://opensimulator.org/mantis/view.php?id=6653 where the camera can end up following the requested sit prim rather than the actual.
The original spot was by Vegaslon, this commit just goes about it in a slightly different way
This commit also makes m_requestedSitTargetUUID to be the actual UUID, which is consistent with m_requestedSitTargetID which was already doing this.
However, this adjustment has no practical effect since we only currently need to know that there's any requested sit UUID at all, not which one it is.
2013-05-30 19:27:20 +01:00
Justin Clark-Casey (justincc)
cc7aa88b26
Try caching the user name for a new agent earlier on in the process of establishing a connection, to see if this helps with "Unknown UserUMMTGUN" issues.
...
The UMMTGUN form of Unknown User seems to appear because a viewer sometimes sends a UUIDNameRequest UDP request that fails to find a binding.
However, in theory the incoming agent should have made that binding before any such request is triggered.
So moving this binding to an earlier point in the process to see if this makes a difference.
Unknown user name is also updated to UserUMMTGUN2 - if you see the old name then you need to clear your viewer cache.
This relates to http://opensimulator.org/mantis/view.php?id=6625
2013-05-29 23:08:54 +01:00
Justin Clark-Casey (justincc)
f9ee9efb97
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-29 22:40:51 +01:00
Justin Clark-Casey (justincc)
4898f18f89
Add HG regression TestCachedUserNameForNewAgent()
2013-05-29 21:28:38 +01:00
UbitUmarov
4709436a6c
retouch prim stopped condition test
2013-05-29 20:23:52 +01:00
UbitUmarov
a6b964aa11
removed spurius ref to ode.dll from odeapi
2013-05-29 19:51:45 +01:00
UbitUmarov
d5b1baffec
correction to previus comment: all parameters but gravity modifier have
...
efect on all prims.
2013-05-29 06:45:25 +01:00
UbitUmarov
269febc87e
let gravity modifier, friction, restitution and density changes be applied
...
to prim. Only have efect on root prim. Density doesn't get effect
imediatly, only on next change of size or shape. density change
implies a full body rebuild to be done later, after reducing the number
of sets sop does. Other parameters should work. **** mainly untested ***
2013-05-29 06:32:26 +01:00
Diva Canto
233b9ec4d7
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-28 20:59:54 -07:00
Diva Canto
7e1c7f54c7
First change in Vivox for ages! -- added a lock to serialize calls to vivox servers. This may ameliorate things when lots of avies arrive in a sim at about the same time. Turns out that there are 4 http requests per avie to Vivox.
2013-05-28 20:59:25 -07:00
UbitUmarov
1cf24b7092
make sure friction slip parameters are zero ( or other value ) and not
...
default cmf
2013-05-29 04:47:59 +01:00
UbitUmarov
0882846770
missing file
2013-05-29 02:21:02 +01:00
UbitUmarov
f00ecf5fe7
missing files
2013-05-29 02:18:05 +01:00
UbitUmarov
4e72cf9ee2
*** DANGER TESTING **** changed prims mesh generation hopefully removing
...
spurius faces. CHanged several aspects. Fixed prims inertia that was too
low, still using box as model. Increased number of quickstep SOR
iterations to 15. Keep it 15 even on heavy load ( will only jump
simulation time).
2013-05-29 02:08:14 +01:00
Robert Adams
ae0d6ab28a
BulletSim: don't zero motion when changing vehicle type.
...
Some vehicle scripts change type on the fly as an easy way of setting
all the parameters (like a plane changing to a car when on the ground).
2013-05-28 09:19:08 -07:00
Robert Adams
7c3a46ccea
BulletSim: default using mesh asset hulls to 'true'. This means that,
...
if the mesh asset specifies physics hulls, BulletSim will fetch and
use same rather than approximating the hulls. If physics hulls are not
specified, the representation will fall back to the regular physics mesh.
2013-05-27 14:38:59 -07:00
Robert Adams
0c35d28933
BulletSim: enable GImpact shape for prims with cuts. Include DLLs and SOs
...
which recompute GImpact shape bounding box after creation as Bullet
doesn't do that itself (something it does for nearly every other shape).
Now, physical prims without cuts become single mesh convex meshes. Physical
prims with cuts become GImpact meshes. Meshes become a set of convex
hulls approximated from the mesh unless the hulls are specified in the
mesh asset data. The use of GImpact shapes should make some mechanical
physics more stable.
2013-05-26 17:35:12 -07:00
Melanie
a348c8e44a
Allow Linden trees to preserve their type when taken into inventory and rezzed again. Allow Linden trees to be sensed by LLSensor as PASSIVE objects.
2013-05-26 14:11:48 +02:00
Melanie
533bbf033d
Update the money framework to allow sending the new style linden "serverside is now viewerside" messages regarding currency
...
This will require all money modules to be refactored!
2013-05-25 02:08:54 +01:00
Melanie
ec22c84cb1
Merge branch 'master' into careminster
2013-05-25 02:00:22 +01:00
Melanie
2b87fb73a9
Merge commit '440905ad14d4261df9da0fd2ce7e20a350982af1' into careminster
2013-05-25 02:00:02 +01:00
Melanie
0086c3b5fb
Update the money framework to allow sending the new style linden "serverside is now viewerside" messages regarding currency
...
This will require all money modules to be refactored!
2013-05-25 01:58:50 +02:00
Robert Adams
1821372634
Meshmerizer: remember to add the copied hull verts to the list of hulls.
2013-05-24 16:32:19 -07:00
Robert Adams
5f1f5ea5ab
BulletSim: add VehicleInertiaFactor to allow modifying inertia.
...
Another parameter for vehicle operation tuning.
Default to <1,1,1> which means nothing is different under normal use.
2013-05-24 16:24:16 -07:00
Robert Adams
4979940def
BulletSim: properly set mesh hash key in use tracking structure.
...
Shouldn't see any functional difference.
2013-05-24 16:23:10 -07:00
Robert Adams
81a6c39781
Meshmerizer: add INI parameter to enable DEBUG mesh detail logging.
...
Default to off.
To turn mesh parsing DEBUG detail logging on, add
[Mesh]
LogMeshDetail=true
to the INI file.
2013-05-24 16:20:26 -07:00
Mic Bowman
a087dbed7f
One more appearance change: drop sending the SendAppearance packet
...
to avatar when it becomes root. This packet shows up in the viewer
logs as an error and appears to cause problems for completing the
texture rebake process for v1 viewers in some cases.
2013-05-24 13:26:07 -07:00
Mic Bowman
bb0ea25090
Protect one more update of the baked texture hashes.
2013-05-24 13:25:25 -07:00
Mic Bowman
681fbda4b6
This is an experimental patch that adds support for comparing texture
...
hashes for the purpose of accurately responding to AgentTextureCached
packets. There is a change to IClientAPI to report the wearbles hashes
that come in through the SetAppearance packet. Added storage of the
texture hashes in the appearance. While these are added to the
Pack/Unpack (with support for missing values) routines (which means
Simian will store them properly), they are not currently persisted in
Robust.
2013-05-24 13:18:16 -07:00
dahlia
440905ad14
change a hull debugging message to Debug instead of Info
2013-05-24 10:31:14 -07:00
dahlia
21a3a81c7a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-24 01:54:28 -07:00
dahlia
0cdea5c2f3
correct some errors in decoding of mesh asset convex decomposition data
2013-05-24 01:53:37 -07:00
Melanie
e2e839a0cd
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
2013-05-24 01:11:49 +01:00
Justin Clark-Casey (justincc)
eb2bd9d203
minor: Remove unnecessary duplication of AbsolutePosition Vector3 in SOG.Copy()
...
As a struct, Vector3 has already been cloned by MemberwiseClone()
2013-05-24 00:46:58 +01:00
Melanie
09c2cd0d76
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-05-24 00:45:08 +01:00
Justin Clark-Casey (justincc)
02fe05f346
Fix issue where llSetPayPrice on either one of a clone prim in the same OpenSimulator session would change the prices on both prims.
...
This is because the PayPrice array refernence was being memberwise cloned and not the array itself.
Addresses http://opensimulator.org/mantis/view.php?id=6639
2013-05-24 00:41:47 +01:00
Melanie
027580935a
Reset "Show in search" on parcels cut off other parcels that are in search
2013-05-24 01:09:07 +02:00
Justin Clark-Casey (justincc)
e597a7d94e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-23 23:53:44 +01:00
Justin Clark-Casey (justincc)
9b56f99326
Fix bug where a cloned object would report the wrong llGetNumberOfPrims() when avatars had been sitting on the original and a different avatar sat on the copy within the same opensim session.
...
This was because the sitting avatars list was being cloned rather than reset.
Addresses http://opensimulator.org/mantis/view.php?id=6649
2013-05-23 23:52:07 +01:00
dahlia
d90d8e9999
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-23 15:48:47 -07:00
dahlia
c5549d2730
add decoder for bounding convex hull
2013-05-23 15:47:47 -07:00
Melanie
9ba35c6b7e
Port fix from justicc - decouple pay prices on drag-copied prims
2013-05-24 00:45:30 +02:00
Justin Clark-Casey (justincc)
0d5566e879
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-23 23:07:46 +01:00
Justin Clark-Casey (justincc)
28548ab347
Fix bug where both ordinary UserManagementModule and HGUserManagementModules were being added to scenes if no UserManagementModule was specified.
...
Without explicit config non-hg UMM is used - this is in common with other HG modules.
This was causing a non-HG module to unpredictably use the UMM or HGUMM, though lack of bug reports suggest either UMM was always used or it didn't matter in this case.
2013-05-23 23:05:56 +01:00
Robert Adams
0e002e3693
Add DEBUG level logging in Meshmerizer for mesh parsing. There is
...
a compile time variable to turn this logging off if it is too spammy.
2013-05-23 14:41:05 -07:00
Robert Adams
29b3b44fab
BulletSim: add locking around Meshmerizer use to eliminate possible race
...
condition when extracting the convex hulls.
2013-05-23 14:40:16 -07:00
Robert Adams
5efce21abc
BulletSim: correct errors caused by misspelled INI parameter spec.
...
Add debugging messages for hull asset use.
2013-05-22 21:57:07 -07:00
Robert Adams
ffc9b3dda7
BulletSim: add code to experimentally use asset hull data.
...
Default to 'off' as it needs debugging.
2013-05-22 21:01:00 -07:00
Robert Adams
61cdf9390d
BulletSim: fix problem with walking up stairs that are oriented
...
in certain directions. The problem was really that the avatar capsule
orientation was being set incorrectly.
2013-05-22 16:06:06 -07:00
Melanie
4cb7ee47f2
Let the event queue do lees work - expire every 40s as per Teravus instead of every seconds - whoever put that in....
2013-05-22 23:49:34 +02:00
Justin Clark-Casey (justincc)
7d38f4940c
Implement llSetSoundQueueing().
...
This is controlled by the viewer, not the server.
So as per http://wiki.secondlife.com/wiki/LlSetSoundQueueing , only two sounds can be queued per prim.
You probably need to use llPreloadSound() for best results
2013-05-22 20:01:57 +01:00
Robert Adams
6596a1de80
Revert "BulletSim: add code to experimentally use asset hull data."
...
This reverts commit 2fd8819a04
.
Remove this code until I can figure out why the references that are
clearly in prebuild.xml doesn't work for the
'using OpenSim.Region.Physics.Meshing' in BSShape.cs.
2013-05-21 22:16:18 -07:00
Robert Adams
2fd8819a04
BulletSim: add code to experimentally use asset hull data.
...
Default to 'off' as it needs debugging.
2013-05-21 21:32:30 -07:00
Robert Adams
9de3979f5b
BulletSim: add gImpact shape type. Add logic to use gImpact shape
...
for prims that have cuts or holes. Default logic to 'off' as it
needs debugging.
2013-05-21 15:32:10 -07:00
Robert Adams
ece7b33a96
Merge branch 'master' of git://opensimulator.org/git/opensim
2013-05-21 15:31:13 -07:00
Justin Clark-Casey (justincc)
06ab168897
To further help with tracking down the apperance of too much "Unknown User" in chatlogs, etc. temporarily change each instance of this in OpenSimulator so we can identify where it's coming from
...
For instance, the "Unknown User" in Util.ParseUniversalUserIdenitifer becaomes "Unknown UserUPUUI (class initials + method initials)
This is to help with http://opensimulator.org/mantis/view.php?id=6625
2013-05-21 22:26:15 +01:00
Justin Clark-Casey (justincc)
ba6a6b2d40
Fix compile failure from recent git master 434c3cf
2013-05-21 18:18:16 +01:00
Justin Clark-Casey (justincc)
434c3cf83b
Make "show name" command display HomeURL like "show names"
2013-05-21 18:15:22 +01:00
Justin Clark-Casey (justincc)
5c8d38d6cf
minor: Change "show names" command to use consistent console display table
2013-05-21 18:11:07 +01:00
Justin Clark-Casey (justincc)
6edecd5d94
Add "show name" console command to make it possible to show a single binding of a UUID to a name.
2013-05-21 18:00:41 +01:00
Justin Clark-Casey (justincc)
c47de9878d
Log when "Unknown User" is sent to a user because the UMM had no binding for that UUID and when a binding replaces a previous "Unknown User" entry.
...
This is a temporary measure to hunt down issues where some but not all users see others as "Unknown user" in text chat, etc.
http://opensimulator.org/mantis/view.php?id=6625
2013-05-21 17:45:15 +01:00
Justin Clark-Casey (justincc)
6ae426c96b
Lock m_UserCache whilst iterating over it in UserManagementModule.GetUserData() to avoid concurrency exceptions
2013-05-21 17:25:06 +01:00
Diva Canto
10e4fb2ce2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-20 09:26:15 -07:00
Diva Canto
26904cc5a1
Add comment
2013-05-20 09:25:50 -07:00
dahlia
e65d1e459e
fix error in hull point indexing
2013-05-18 13:11:22 -07:00
dahlia
477bee6468
remove duplicate hull scaling
2013-05-18 11:15:05 -07:00
dahlia
fa8f5bafb2
add prototype code to decode convex hulls from mesh assets. Please do not use yet; the interface will be defined in a later commit.
2013-05-18 01:23:09 -07:00
Robert Adams
214bae1479
BulletSim: fix BulletSim crashing if there is no [BulletSim] section
...
in any INI file. Update TODO list.
2013-05-17 21:19:38 -07:00
Melanie
42c82b564e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
2013-05-16 21:59:14 +01:00
Justin Clark-Casey (justincc)
ec818a506b
minor: remove long commented out scene cache clearing code in EntityTransferModule.CrossAgentToNewRegionAsync()
2013-05-16 18:26:22 +01:00
Justin Clark-Casey (justincc)
61f4ab6674
minor: Remove completely unused IClientAPI.RequestClientInfo() call from EntityTransferModule.CrossAgentToNewRegionAsync()
2013-05-16 18:25:04 +01:00
Justin Clark-Casey (justincc)
3bc8cf65a4
Where this is not already happening, trigger asychoronous calls to CloseChildAgent() above the LocalSimulationConnector level.
...
This is so that other callers (such as SceneCommunicationService.SendCloseChildAgentConnections() can perform all closes asynchronously without pointlessly firing another thread for local closes).
No functional change apart from elimination of unnecessary chaining of new threads.
2013-05-16 17:30:30 +01:00
Justin Clark-Casey (justincc)
d214e2d0c4
On closing child agents, send separate asynchronous requests to each neighbour rather than sending all closes concurrently on a separate thread.
...
This is to reduce race conditions where neighbours may be responding erratically, thus mixing up create and close agent requests in time.
This mirrors OpenSimulator behaviour on enabling child agents where each region is contacted separately.
2013-05-16 17:12:02 +01:00
Justin Clark-Casey (justincc)
bd31821792
On logout, send close child agent requests to neighbours asynchronously, so user is not prevented from relogging if many neighbours are present but not responsive.
...
The symptom here is that previous user connections are still present but are labelled active == false
2013-05-16 16:37:21 +01:00
dahlia
46eb8465a0
fall back to using a display mesh for physics proxy if no physics_mesh entry was wound in a mesh asset
2013-05-15 17:12:17 -07:00
Justin Clark-Casey (justincc)
a4290cdbb3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-15 22:06:01 +01:00
Justin Clark-Casey (justincc)
177a53fbcf
Fix issue where osMakeNotecard() would fail if given a list containing vectors or quaternions.
...
http://opensimulator.org/mantis/view.php?id=6640
2013-05-15 22:04:38 +01:00
teravus
477a5e3a35
* This fixes the avatar stuck in objects on login and teleport by gently applying an upward motion when stuck in things on the Z
...
* Comments describe how it filters out good, normal collisions, from 'stuck' collisions.. It's especially sensitive in feetbox collisions since this is where normal collisions happen under usual circumstances.
2013-05-14 20:55:56 -04:00
teravus
799ba5aa7b
* Tweaks the hard cut to apply to collisions of Greater then Normal Z 0.95. This fits within Ubit's framework of multi-body collisions, just moves the reactive force to the Midboxgeom(actual detection) instead of the bigbox geom(pre detection)
2013-05-14 19:17:31 -04:00
Robert Adams
23ebae1828
Eliminate race condition where SimStatsReporter starts reporting
...
stats before the region is completely initialized.
2013-05-14 13:40:07 -07:00
Justin Clark-Casey (justincc)
df2a0fec5f
Comment out log message about looking for asset data in remove asset service for now, in order to reduce log levels in a test region with many hg origin avatars
2013-05-14 20:11:58 +01:00
Justin Clark-Casey (justincc)
ce979552fd
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-14 19:45:35 +01:00
Justin Clark-Casey (justincc)
e9847a4dbd
Comment out some debugging item permission messages since these are highly noisy on the console.
...
Please re-enable when required
2013-05-14 19:44:41 +01:00