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