d27cc62458
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-26 14:13:02 -04:00
ad2ebd2f3d
Force map tiler to save Water.jpg as an actual jpeg format it seems even though we specified jpg extention it was actually a png and thus confusing the viewer silently.
2013-07-26 14:11:42 -04:00
a08f01fa83
Fix NPC regression test failures.
...
These were genuine failures caused by ScenePresence.CompleteMovement() waiting for an UpdateAgent from NPC introduction that would never come.
Instead, we do not wait if the agent is an NPC.
2013-07-26 18:43:15 +01:00
dd2c211e62
Comment debug message
2013-07-26 07:40:55 -07:00
d5367a219d
Slight improvement: no need to delay the removal of the queues in EQ, because DisableSimulator is now being sent via UDP
2013-07-26 07:39:57 -07:00
878ce1e6b2
This should fix all issues with teleports. One should be able to TP as fast as needed. (Although sometimes Justin's state machine kicks in and doesn't let you) The EventQueues are a hairy mess, and it's very easy to mess things up. But it looks like this commit makes them work right. Here's what's going on:
...
- Child and root agents are only closed after 15 sec, maybe
- If the user comes back, they aren't closed, and everything is reused
- On the receiving side, clients and scene presences are reused if they already exist
- Caps are always recreated (this is where I spent most of my time!). It turns out that, because the agents carry the seeds around, the seed gets the same URL, except for the root agent coming back to a far away region, which gets a new seed (because we don't know what was its seed in the departing region, and we can't send it back to the client when the agent returns there).
2013-07-25 23:44:58 -07:00
4cd03d8c31
Return Simulator/0.1 (V1) entity transfer behaviour to waiting only 2 seconds before closing root agent after 15.
...
This is because a returning viewer by teleport before 15 seconds are up will be disrupted by the close.
The 2 second delay is within the scope where a normal viewer would not allow a teleport back anyway.
Simulator/0.2 (V2) protocol will continue with the longer delay since this is actually the behaviour viewers get from the ll grid
and an early close causes other issues (avatar being sent to infinite locations temporarily, etc.)
2013-07-26 01:40:56 +01:00
72ed49af5f
Reset DoNotClose scene presence teleport flag before pausing. Rename DoNotClose to DoNotCloseAfterTeleport
2013-07-26 01:38:04 +01:00
1fabdcc43c
If a returning teleport starts to reuse a downgraded child connection that was a previous root agent, do not close that child agent at the end of the 15 sec teleport timer.
...
This prevents an issue if the user teleports back to the neighbour simulator of a source before 15 seconds have elapsed.
This more closely emulates observed linden behaviour, though the timeout there is 50 secs and applies to all the pre-teleport agents.
Currently sticks a DoNotClose flag on ScenePresence though this may be temporary as possibly it could be incorporated into the ETM state machine
2013-07-26 01:04:16 +01:00
20b989e048
Increased the wait time to 15 secs. In a 0.7.5 standalone where the effect was always present, this seems to have fixed it.
2013-07-24 17:10:26 -07:00
cac37e298c
Deleted all [ZZZ] debug messages.
2013-07-24 14:31:30 -07:00
f0320f5652
The previous commit did fix the infinity problem! I'm putting the same time on TP_V1 and adding a big red warning on top of those lines.
2013-07-24 14:31:18 -07:00
46d017b197
Today's wild shot at the infinity problem. Wait on the child agent left behind.
2013-07-24 14:31:03 -07:00
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
e6a0f6e428
One more thing to test in order to let CompleteMovement go up the stack.
2013-07-24 14:29:51 -07:00
14530b2607
Minor adjustment on timings of waits.
2013-07-24 14:29:37 -07:00
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
879cbb4575
This commit message intentionally left blank (last commit was idiotic)
2013-07-24 14:28:55 -07:00
261512606d
Improve the opening test in CompleteMovement, to account for multiple flags besides ViaLogin.
2013-07-24 14:28:41 -07:00
d7984ef775
More on putting TP V1 as it was
2013-07-24 14:28:27 -07:00
aaee63af82
Minor improvements on TP V1 trying to make it exactly as it was before.
2013-07-24 14:28:14 -07:00
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
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
9ab78d412c
EXPERIMENTAL: yet another variation of ES/EAC/TPFinish
2013-07-24 14:27:22 -07:00
00d4a26eef
Amend previous commit.
2013-07-24 12:49:30 -07:00
665fb66686
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-24 11:26:30 -07:00
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
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
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
fa2653c8e1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-23 23:32:24 +01:00
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
516062ae1f
Don't touch the Current Outfit folder also on coming back home
2013-07-23 15:05:32 -07:00
901bdfed40
Restoring landing on prims, which had been affected by the edit beams commit.
2013-07-23 14:31:16 -07:00
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
42e52f544d
Improvement of fetching name in groups
2013-07-23 14:30:50 -07:00
7c1eb86c7d
Don't post Link asset types back to the home grid
2013-07-23 14:28:53 -07:00
76e46d0158
Improve spacing between data and units on console stats display
2013-07-23 17:23:16 +01:00
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
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
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
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
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
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
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
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
a57a472ab8
Add proper method doc and comments to m_dataPresentEvent (from d9d9959)
2013-07-23 00:51:59 +01:00
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
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
8396f1bd42
Record raw number of UDP receives as clientstack.IncomingUDPReceivesCount
2013-07-23 00:35:23 +01:00
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
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
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
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
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
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
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
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
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
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
acb7b4a09a
BulletSim: only create vehicle prim actor when vehicles are enabled.
2013-07-22 10:27:18 -07:00
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
13a4a80b38
Add experimental stubs for an extension function interface on both
...
PhysicsScene and PhysicsActor.
2013-07-22 10:27:09 -07:00
803632f8f3
BulletSim: freshen up the code for constraint based linksets.
2013-07-22 10:27:06 -07:00
df63bfafef
Better version of previous commit
2013-07-21 15:42:22 -07:00
f81e289a1b
Add the Current Outfit folder as an available folder in the SuitcaseInventory.
2013-07-21 15:42:05 -07:00
99a727600b
Minor cosmetic changes.
2013-07-21 10:07:35 -07:00
8d18ad2f6f
Minor aesthetic change to make things more clear.
2013-07-21 09:02:56 -07:00
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
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
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
3919c80505
A couple of small optimizations over the previous commit
2013-07-21 09:00:57 -07:00
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
174105ad02
Fixed the stats in show client stats. Also left some comments with observations about AgentUpdates.
2013-07-21 09:00:27 -07:00
18d5d8f5dd
Removed verbose debug from previous commit
2013-07-21 09:00:08 -07:00
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
3a6acbcc14
furhter shorten CheckAgentUpdateSignificance(). No real perf impact.
2013-07-21 08:59:31 -07:00
866de53978
Remove some pointless code in CheckAgentUpdateSignificance()
2013-07-21 08:59:17 -07:00
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
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
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
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
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
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
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
9041f4a056
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-19 20:27:49 -07:00
c1705236c7
Fix HGTravelStore.migrations in SQLite (mantis #6709 )
2013-07-19 20:25:33 -07:00
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
edef7472d1
Enable storing of environment settings in NullSimulationData
2013-07-18 13:33:50 -07:00
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
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
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
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
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
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
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
ae997fffee
Merge branch 'master' of git://opensimulator.org/git/opensim
2013-07-18 02:28:36 -07:00
6572847518
Added MinPoolThreads to ini [Startup] section to control SmartThreadPool.
2013-07-18 02:28:07 -07:00
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
6293614074
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-17 15:06:33 -07:00
49b3b7ee83
Merge branch 'master' of git://opensimulator.org/git/opensim
2013-07-17 15:06:25 -07:00
fa2370b32e
Revert "Cleared up much confusion in PollServiceRequestManager. Here's the history:"
...
This reverts commit e46459ef21
2013-07-17 15:05:36 -07:00
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
fda91d93da
Revert "Didn't mean to commit this change in BlockingQueue.cs"
...
This reverts commit 0f5b616fb0
2013-07-17 15:05:16 -07:00
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
5495df7443
Revert "Do the same trick that dahlia did for Dequeue(timeout)"
...
This reverts commit af792bc7f2
2013-07-17 15:04:12 -07:00
52dc7b2a96
Revert "I confuse myself. Let's try this variable name instead."
...
This reverts commit 1d3deda10c
2013-07-17 15:03:40 -07:00
519dba9a69
Revert "Now trying DoubleQueue instead of BlockingQueue for the PollServiceRequestManager."
...
This reverts commit 5f95f4d78e
2013-07-17 15:03:16 -07:00
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
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
5f95f4d78e
Now trying DoubleQueue instead of BlockingQueue for the PollServiceRequestManager.
2013-07-17 14:09:04 -07:00
1d3deda10c
I confuse myself. Let's try this variable name instead.
2013-07-17 13:26:15 -07:00
af792bc7f2
Do the same trick that dahlia did for Dequeue(timeout)
2013-07-17 13:23:29 -07:00
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
0f5b616fb0
Didn't mean to commit this change in BlockingQueue.cs
2013-07-17 12:02:00 -07:00
2b8de2c404
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-17 11:19:56 -07:00
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
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
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
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
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
8bad56cb46
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-16 17:53:49 -07:00
d4720bd721
Added config var to fiddle with the Interval for the service throttle thread
2013-07-16 17:53:05 -07:00
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
9f578cf0c8
Deleted a couple of verbose messages
2013-07-16 17:18:11 -07:00
0419852598
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-16 17:15:08 -07:00
a006caabbc
Added IServiceThrottleModule.cs
2013-07-16 17:06:54 -07:00
99a600753e
Changed the name to ServiceThrottle/ServiceThrottleModule in order to reflect its more generic nature.
2013-07-16 17:06:17 -07:00
3fbd2c54bc
Eliminated the UserManagement/UserManagementModule throttle thread. Made the other one generic, taking any continuation.
2013-07-16 17:04:32 -07:00
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
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 21a09ad3adhttp://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
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
2013-07-16 22:03:49 +01:00
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
6da50d34df
Actually use DoubleQueue in UserManagement/UserManagementModule
2013-07-16 07:19:13 -07:00
5a01ffa515
High CPU hunt: try a different blocking queue, DoubleQueue
2013-07-16 07:15:14 -07:00
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
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
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
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
eb14e5a175
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-15 23:28:02 +01:00
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
68fbf7eebb
Revert "Puts RequestImage (UDP) back to asyn -- CPU spike hunt"
...
This reverts commit b060ce96d9
2013-07-15 12:34:10 -07:00
687c1a420a
Guard against null ref
2013-07-15 12:33:31 -07:00
b060ce96d9
Puts RequestImage (UDP) back to asyn -- CPU spike hunt
2013-07-15 12:05:31 -07:00
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
fbb01bd280
Protect against null requests
2013-07-15 11:37:49 -07:00
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
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
af02231a7b
Added SQLite version of hg travel data store. UNTESTED. Hope it works!
2013-07-14 16:03:46 -07:00
b0140383da
Cleanup old hg sessions (older than 2 days)
2013-07-14 15:47:54 -07:00
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
5939529036
Minor typo in log message
2013-07-14 14:29:10 -07:00
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
98f59ffed5
Fix broken tests -- the test setup was wrong... sigh.
2013-07-14 09:22:55 -07:00
c61ff917ef
Authenticate ChildAgentUpdate too.
2013-07-14 09:21:28 -07:00
f3b3e21dea
Change the auth token to be the user's sessionid.
2013-07-14 07:28:40 -07:00
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
e4f741f006
This should fix the failing test.
2013-07-13 22:52:51 -07:00
a2ee887c6d
Deleted a line too many
2013-07-13 22:32:52 -07:00
b4f1b9acf6
Guard against unauthorized agent deletes.
2013-07-13 21:28:46 -07:00
931eb892d9
Deleted GET agent all around. Not used.
2013-07-13 17:56:42 -07:00
4d93870fe5
Gatekeeper: stop bogus agents earlier, here at the Gatekeeper. No need to bother the sim.
2013-07-13 17:52:05 -07:00
5a1d6727e1
Some more debug to see how many threads are available.
2013-07-13 11:39:17 -07:00
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
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
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
ff4ad60207
Same issue as previous commit.
2013-07-13 10:05:11 -07:00
ccee2959f7
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-13 09:53:05 -07:00
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
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
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
b4cb644a05
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-13 00:03:23 +01:00
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
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
3d700bb42c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-12 12:54:29 -07:00
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
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
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
83d1680057
Added a few more thingies to the asset client test to poke the threadpool.
2013-07-11 16:43:43 -07:00
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
7c2e4786ce
minor: remove some regression test logging switches accidentally left uncommented.
2013-07-11 23:19:55 +01:00
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
f57f49eede
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-11 23:05:10 +01:00
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 831e4c3http://opensimulator.org/mantis/view.php?id=6704
2013-07-11 23:02:30 +01:00
ee51a9f9c9
Added property to make for more flexible testing.
2013-07-11 14:23:37 -07:00
51d106cff8
Added a test for the asset service
2013-07-11 14:21:57 -07:00
c4f1ec1fd6
Changed the UserProfileModule so that it's less greedy in terms of thread usage.
2013-07-11 10:21:20 -07:00
ea371a6f54
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-11 09:48:15 -07:00
604967b31e
Switched UUIDNameRequest and RegionHandleRequest to Sync, because now they are also non-blocking handlers.
2013-07-11 09:47:46 -07:00
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
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
9173130fde
Switched RegionHandshakeReply to Sync, because it's not doing anything blocking.
2013-07-10 20:48:13 -07:00
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
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
864a86983e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-10 16:10:04 -07:00
1b265b213b
Added show client-stats [first last] command to expose what viewers are requesting.
2013-07-10 16:09:45 -07:00
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
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
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
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
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
d0dfb744b2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-09 14:13:51 -07:00
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
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
065f8f56a2
remove some cruft and trigger a rebuild
2013-07-08 19:18:01 -07:00
33eea62606
remove an invalid null UUID check which caused a warning
2013-07-08 17:12:39 -07:00
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
76b2b20f7e
minor: remove mono compiler warnings from HGSuitcaseInventoryService
2013-07-09 00:06:22 +01:00
5f58b9b552
minor: remove some mono compiler warnings in UserProfileModule
2013-07-09 00:04:46 +01:00
83da14008f
minor: remove some mono compiler warnings in new groups code
2013-07-08 23:57:05 +01:00
af9b17c545
minor: remove mono compiler warnings related to keyframe code
2013-07-08 23:52:40 +01:00
2025dd25f6
Add missing file BaseOutputStreamHandler.cs from recent commit e19defd
2013-07-08 23:50:40 +01:00
047ef9c2a5
minor: remove some mono compiler warnings in OdePlugin
2013-07-08 23:36:57 +01:00
eccec4f8f6
minor: remove now unused migration-hack bool from DAMap
2013-07-08 23:32:19 +01:00
8be59829d1
minor: Add back commented out logging message in Caps.RegisterHandler() that I accidentally removed.
2013-07-08 22:41:24 +01:00
013710168b
For stat purposes, add names to capability request handlers where these were not set
2013-07-08 22:39:07 +01:00
dc54581700
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-08 22:19:37 +01:00
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
c3db595944
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-08 22:07:27 +01:00
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
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
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
1e72e1b258
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-07 20:44:23 -07:00
bbb9af363d
Print out caller IP when unusual requests are received.
2013-07-07 20:43:42 -07:00
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
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
70d24a654b
BulletSim: rename position and orientation variables to remove the
...
inconsistant use of Raw* and _* conventions.
2013-07-07 05:46:24 -07:00
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
803e5498b0
A little more debug
2013-07-06 18:27:03 -07:00
71e26555bd
Revert "WARNING: BRUTE FORCE DEBUG AGAIN. AVOID USING THIS COMMIT"
...
This reverts commit 9b75d75724
2013-07-06 18:16:27 -07:00
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
1dd3a0bc57
MORE DEBUG. DON"T USE THIS.
2013-07-06 17:29:19 -07:00
9b75d75724
WARNING: BRUTE FORCE DEBUG AGAIN. AVOID USING THIS COMMIT
2013-07-06 16:51:14 -07:00
93fd5e4036
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-06 15:18:29 -07:00
b29a09ab8e
Simina activity detector was too eager. Disabled it in case simian is not being used.
2013-07-06 15:17:55 -07:00
d838f15d97
Add implementations for llSetVelocity and llSetAngularVelocity.
2013-07-06 09:53:30 -07:00
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
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
03268d85c4
BulletSim: comments and non-functional changes working toward the center-of-gravity implementation.
2013-07-06 08:25:14 -07:00
5f97c6f8f0
BulletSim: non-functional updates. Comments and formatting.
...
Update TODO list.
2013-07-06 08:25:13 -07:00
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
98de67d573
Fix mono warning in LLImageManagerTests
2013-07-06 00:55:14 +01:00
55ac8c83c7
Get InventoryWorkerThreads to update watchdog on processing requests
2013-07-06 00:34:22 +01:00
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
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
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
ca26583e6b
Delete some verbose debug messages
2013-07-04 15:17:06 -07:00
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
d80936bbbb
Guard against completely unknown user UUIDs.
2013-07-04 14:07:25 -07:00
da3aa44138
Debug the RegionHandle handler (same issue)
2013-07-04 13:27:53 -07:00
33ddb6c246
Revert "WARNING: BRUTE FORCE DEBUG. AVOID USING THIS COMMIT."
...
This reverts commit c95a23863a
2013-07-04 13:25:58 -07:00
c95a23863a
WARNING: BRUTE FORCE DEBUG. AVOID USING THIS COMMIT.
2013-07-04 13:13:52 -07:00
38a04ff993
Revert "Same freeze issue, now checking if it's in estate"
...
This reverts commit ca380ec039
2013-07-04 13:00:06 -07:00
d997c49e47
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-04 12:45:34 -07:00
ca380ec039
Same freeze issue, now checking if it's in estate
2013-07-04 12:41:45 -07:00
93ee515d9d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-04 20:41:02 +01:00
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
bf214122cd
More debug, same issue
2013-07-04 11:53:22 -07:00
15d0bc0900
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-04 11:37:00 -07:00
ec9ffbb89a
More debug, same issue
2013-07-04 11:36:10 -07:00
c61becc62b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-04 19:33:12 +01:00
0cc0a2485c
More debug related to the previous commit
2013-07-04 11:18:05 -07:00
ae42c93f9a
Now trying to find a cause of freeze at login related to friends status notifications.
2013-07-04 10:59:21 -07:00
98a2fa8e35
HG Friends: this was commented some commits ago, but it shouldn't have been.
2013-07-04 10:23:20 -07:00
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
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
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
80f4a008eb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-04 08:48:19 -07:00
27cdfb7b84
HG Friends: debug an issue where the friends data stored in the DB is incomplete.
2013-07-04 08:47:45 -07:00
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
119f84fe11
Squoosh one last opportunity for Unknown Users to creep in.
2013-07-02 17:03:04 -07:00
06dba1fa62
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-02 16:47:17 -07:00
4d24bf75fd
Deleted debug messages. Fixed a null ref exception on the POST handler of GridUserServerPostHandler.cs
2013-07-02 16:46:35 -07:00
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
316e8f9239
Fix SQL statement
2013-07-02 16:10:09 -07:00
9725b829d5
Do the same for SQLite and MSSQL
2013-07-02 15:48:30 -07:00
2c05caec7f
Really make it call the method with the query interface
2013-07-02 15:47:02 -07:00
626940ceb8
More debug messages
2013-07-02 15:39:10 -07:00
e984bfb4c6
This should have a strong effect on the Unknown User issue mantis #6625
2013-07-02 14:31:39 -07:00
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
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 c7383688http://opensimulator.org/mantis/view.php?id=6625
2013-07-01 23:54:04 +01:00
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
c24c99f4ba
BulletSim: fix an occasional crash with flushing log files.
2013-06-30 19:08:15 -07:00
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
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
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
2f4a729d40
BulletSim: add inTaintTime parameter to collision cache clear function.
2013-06-30 17:07:48 -07:00
e377abcc35
Groups V2: charge for group creation only after the group has been successfully created
2013-06-30 08:39:35 -07:00
c738368846
Revert "More debug mantis #6625"
...
This reverts commit 20f2cf8769
2013-06-30 07:25:46 -07:00
1e97972f78
Revert "One more debug mantis #6625"
...
This reverts commit 8fa5d12fcb
2013-06-30 07:25:13 -07:00
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
1fc873d09f
Same fix to LocalInventoryServiceConnector.cs
2013-06-30 07:21:22 -07:00
74e7fac13f
More on mantis #6625
2013-06-29 22:32:26 -07:00
20f2cf8769
More debug mantis #6625
2013-06-29 21:54:10 -07:00
c462e0a51c
Fixed previous debug message
2013-06-29 21:30:07 -07:00
8fa5d12fcb
One more debug mantis #6625
2013-06-29 21:26:58 -07:00
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
ff47cf77ab
A little more debug for the Unknown User problem mantis #6625
2013-06-29 19:15:25 -07:00
00093a305d
Changed HG status notifications timeout down to 15secs from the default 100.
2013-06-29 18:35:23 -07:00
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
371085546d
Add materials store null check into UuidGatherer code.
2013-06-28 23:57:41 +01:00
4cb4c9fb25
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-28 14:03:46 -07:00
cbb5122729
add some locking to materials storage dictionary
2013-06-28 14:00:28 -07:00
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
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
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
529633d970
add method docs for DAMap.GetStore() and DAMap.SetStore()
2013-06-27 18:44:27 -07:00
d47fc48b32
and yet another check for null returned from DynAttrs.GetStore()
2013-06-27 18:01:17 -07:00
c1b8f83dd4
test for null return from DynAttrs.GetStore()
2013-06-27 17:53:15 -07:00
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
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
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
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
4b00203fa5
Tidy up SOG.UpdateRootPosition() to eliminate unnecessary copying of Vector3 structs
2013-06-25 00:15:55 +01:00
936700bda3
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-06-23 01:49:45 +01:00
4bf1afe300
Fix prim locking to behave like SL
2013-06-23 01:34:35 +01:00
edb11a7eca
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-22 08:29:54 -07:00
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
ca3ce6da73
HG: avoid call on localhost between sim and UAS for standalone.
2013-06-22 08:26:59 -07:00
4778d67005
Finally moved HG agent transfers to use agent fatpacks.
2013-06-21 20:52:46 -07:00
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
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
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
a33b6eed6d
minor: remove mono compiler warnings in WebsocketServerHandler.cs
2013-06-20 00:54:19 +01:00
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
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
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
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
3370e19205
minor: fix mono compiler warning in FetchInventory2Handler
2013-06-20 00:17:20 +01:00
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
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
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
1a72f62d7b
minor: remove mono compiler warning in OfflineIMService
2013-06-18 23:52:15 +01:00
3fe5e9057f
Prevent an exception if no offline messages were retrieved.
2013-06-18 23:15:38 +01:00
dda44e31e3
minor: tidy up spacing if display a unit for additional stat information
2013-06-18 23:10:50 +01:00
9501a583cb
Make number of inbound http requests handled available as a httpserver.<port>.IncomingHTTPRequestsProcessed stat
2013-06-18 23:07:18 +01:00
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
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
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
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
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
713a14a6b5
minor: remove mono compiler warnings in WebFetchInvDescModule
2013-06-17 23:23:56 +01:00
b9dac1f8df
Fix test failure in BasicCircuitTests from previous commit 0d2fd0d9
2013-06-17 23:17:55 +01:00
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
2c9bb0f973
Add server stats for available builtin threadpool and iocp workers
2013-06-17 22:55:25 +01:00
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
694c4bcbb6
correct method doc for llRot2Axis()
2013-06-14 20:00:20 -07:00
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
42b0c68eab
Correct build break in previous commit 9c530d7
2013-06-15 00:46:55 +01:00
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
ecfc6a3f4a
Add the standard OpenSimulator copyright notice to the top of InventoryCache.cs
2013-06-15 00:36:16 +01:00
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
da3724a904
minor: remove mono compiler warnings from LSL_Api, properly format method doc for llRot2Axis()
2013-06-15 00:11:36 +01:00
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
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
db9d9d83eb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-14 23:58:16 +01:00
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
d7f3d7efd2
Merge branch 'master' of /home/opensim/src/opensim
2013-06-13 09:27:13 -04:00
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
b271217084
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-12 17:48:48 -07:00
7c00ccb548
DataSnapshot: changed those annoying messages to Debug instead of Info.
2013-06-12 17:48:20 -07:00
6b8e94864a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-13 00:33:53 +01:00
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
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
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
ef5be42c86
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-12 23:32:51 +01:00
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
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
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
135e10ba09
Uncomment Mic's code and split to create new regression TestAddTemporaryAsset() and TestAddTemporaryLocalAsset()
2013-06-11 23:55:45 +01:00
d8da83b4ff
Removed the lock entirely
2013-06-11 15:50:12 -07:00
a0fed03e10
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-11 15:36:52 -07:00
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
26b66c730e
Put the "script saved" and "notecard saved" messages back into the bottom
...
right corner.
2013-06-11 21:03:16 +01:00
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
ed950e6c74
Adjust output of llRot2Axis and llRot2Angle to match domains SL(tm) uses. Addresses Mantis #0006671
2013-06-11 00:29:40 -07:00
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
9d9b9d4938
llRot2Angle now checks absolute value of s rotation component before normalizing
2013-06-10 17:11:49 -07:00
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
1c7fbb86c2
Check For NaN and Infinity in llRot2Axis/Angle Fixes mantis #6669
2013-06-10 18:47:08 -05:00
a949556c4e
add a Normalize() method for LSL_Rotation
2013-06-10 16:42:49 -07:00
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
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
a2f1cd87f8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-10 15:15:38 -07:00
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
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
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
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
e741e5ebce
More on mantis #6666 -- Groups V2 remote connector.
2013-06-09 20:20:37 -07:00
4e2e69bd25
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-08 11:01:20 -07:00
d00770d56b
Groups V2 -- fix mantis #6666
2013-06-08 11:00:22 -07:00
75e4af9d39
Catch exception triggered by incoming avatars using legacy profiles
2013-06-08 11:00:05 -04:00
34d40e46a5
Merge branch 'profiles'
...
message to explain why this merge is necessary,
2013-06-07 20:17:45 -04:00
1cb1245d84
SQLite support for UserProfiles
2013-06-07 20:14:39 -04:00
1387224821
Ensure selected module is the only active one
2013-06-07 20:09:10 -04:00
6aa54a8e16
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-07 16:01:07 -07:00
07cc16ff9c
Put the configuration back in FetchInventoryDesc2 cap.
2013-06-07 16:00:32 -07:00
3a722ef81b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-06-07 23:59:02 +01:00
75631e0267
Supply proper type information for the various types of requests
2013-06-07 23:55:03 +01:00
7c0bfca7a0
Adding Avination's PollService to round out the HTTP inventory changes
2013-06-07 23:43:45 +01:00
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
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 d214e2d0http://opensimulator.org/mantis/view.php?id=6658
2013-06-07 19:13:24 +01:00
a74e65200c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-07 19:12:55 +01:00
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
664c6191ed
Mantis #6620 (removed debug message)
2013-06-07 08:37:18 -07:00
ac9c37f31b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-06-06 23:49:34 +01:00
06012f8675
Fix keyframe motion copyright
2013-06-06 23:49:02 +01:00
25fa647a74
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-05 20:20:22 -07:00
2ebf70d719
Strengthen some assumptions.
2013-06-05 20:19:59 -07:00
a3210d1cf8
Database persistence for keyframes. Contains a Migration.
2013-06-06 03:17:38 +01:00
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
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
26cd59cd6f
Merge branch 'master' of /home/opensim/var/repo/opensim
2013-06-05 18:55:42 -04:00
e53b62304f
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-06-05 23:44:26 +01:00
a7dbafb0e3
Port Avination's inventory send throttling
2013-06-05 23:42:50 +01:00
e449950030
Prevent processing for Npc
2013-06-05 18:42:15 -04:00
cd64da8746
Cleanup
2013-06-05 18:41:55 -04:00
47ffa12078
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-06-05 22:26:42 +01:00
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
10572b78f8
Remove a couple of orphaned lines
2013-06-05 15:10:53 -04:00
b4f472c4fa
Make locking more uniform
2013-06-05 15:08:25 -04:00
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
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
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
d7fa9f671e
Adding standard OpenSim header to source files
2013-05-31 22:03:27 -04:00
ba2f13db63
Adding back the BasicProfileModule
2013-05-31 21:19:15 -04:00
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
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
00c1586ff8
refactor: Remove unused AsyncCommandManager.PleaseShutdown
2013-05-31 18:12:36 +01:00
bf03523323
Fill in fields with default values on profile creation
2013-05-31 10:40:47 -04:00
924a5df25f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-30 19:20:36 -07:00
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
4d32ca19bf
Trigger OnScenePresenceUpdated when the avatar's animations change.
2013-05-30 19:16:36 -07:00
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
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
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
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
6b88a665d3
minor: fix warnings in GodsModule that were due to duplicate using statements
2013-05-30 22:43:52 +01:00
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
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
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
f9ee9efb97
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-29 22:40:51 +01:00
4898f18f89
Add HG regression TestCachedUserNameForNewAgent()
2013-05-29 21:28:38 +01:00
233b9ec4d7
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-28 20:59:54 -07:00
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
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
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
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
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
1821372634
Meshmerizer: remember to add the copied hull verts to the list of hulls.
2013-05-24 16:32:19 -07:00
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
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
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
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
bb0ea25090
Protect one more update of the baked texture hashes.
2013-05-24 13:25:25 -07:00
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
440905ad14
change a hull debugging message to Debug instead of Info
2013-05-24 10:31:14 -07:00
21a3a81c7a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-24 01:54:28 -07:00
0cdea5c2f3
correct some errors in decoding of mesh asset convex decomposition data
2013-05-24 01:53:37 -07:00
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
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
e597a7d94e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-23 23:53:44 +01:00
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
d90d8e9999
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-23 15:48:47 -07:00
c5549d2730
add decoder for bounding convex hull
2013-05-23 15:47:47 -07:00
0d5566e879
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-23 23:07:46 +01:00
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
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
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
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
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
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
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
6596a1de80
Revert "BulletSim: add code to experimentally use asset hull data."
...
This reverts commit 2fd8819a04
2013-05-21 22:16:18 -07:00
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
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
ece7b33a96
Merge branch 'master' of git://opensimulator.org/git/opensim
2013-05-21 15:31:13 -07:00
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
ba6a6b2d40
Fix compile failure from recent git master 434c3cf
2013-05-21 18:18:16 +01:00
434c3cf83b
Make "show name" command display HomeURL like "show names"
2013-05-21 18:15:22 +01:00
5c8d38d6cf
minor: Change "show names" command to use consistent console display table
2013-05-21 18:11:07 +01:00
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
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
6ae426c96b
Lock m_UserCache whilst iterating over it in UserManagementModule.GetUserData() to avoid concurrency exceptions
2013-05-21 17:25:06 +01:00
10e4fb2ce2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-20 09:26:15 -07:00
26904cc5a1
Add comment
2013-05-20 09:25:50 -07:00
e65d1e459e
fix error in hull point indexing
2013-05-18 13:11:22 -07:00
477bee6468
remove duplicate hull scaling
2013-05-18 11:15:05 -07:00
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
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
ec818a506b
minor: remove long commented out scene cache clearing code in EntityTransferModule.CrossAgentToNewRegionAsync()
2013-05-16 18:26:22 +01:00
61f4ab6674
minor: Remove completely unused IClientAPI.RequestClientInfo() call from EntityTransferModule.CrossAgentToNewRegionAsync()
2013-05-16 18:25:04 +01:00
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
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
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
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
a4290cdbb3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-15 22:06:01 +01:00
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
23ebae1828
Eliminate race condition where SimStatsReporter starts reporting
...
stats before the region is completely initialized.
2013-05-14 13:40:07 -07:00
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
ce979552fd
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-14 19:45:35 +01:00
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
f8bb90d963
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-14 09:07:20 -07:00
91091c3e54
Second take at HGTP-mesh bug: delay sending the initial data only for agents that are coming via TP (root agents)
2013-05-14 09:06:58 -07:00
03fddb301b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-14 08:49:41 -07:00
b135f1d58a
BulletSim: Fix for mantis 6487, also minor adjustment to fix flying while you are running.
...
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-05-14 08:48:40 -07:00
645da54f25
Revert "HGTP-mesh bug: the mesh download requests were going to the departing sims for a little while. This was also true for local TPs. BUt for local TPs the assets are on the same server, so it doesn't matter. For HGTPs, it matters. This potential fix moves sending the initial data to later, after the client has completed the movement into the region. Fingers crossed that it doesn't mess other things up!"
...
This reverts commit f32a21d967
2013-05-14 08:47:18 -07:00
66c328f51b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-14 08:12:23 -07:00
f32a21d967
HGTP-mesh bug: the mesh download requests were going to the departing sims for a little while. This was also true for local TPs. BUt for local TPs the assets are on the same server, so it doesn't matter. For HGTPs, it matters. This potential fix moves sending the initial data to later, after the client has completed the movement into the region. Fingers crossed that it doesn't mess other things up!
2013-05-14 08:12:01 -07:00
c86e828dbf
BulletSim: add a lock to try and catch a native shape creation/destruction
...
race condition.
2013-05-13 13:30:44 -07:00
15360cbb6b
BulletSim: add adjustment for avatar capsule height scaling. Makes
...
avatar standing on ground view better and enables tuning.
2013-05-13 13:30:42 -07:00
45f37e11ad
BulletSim: use heightmap terrain when using BulletXNA.
...
Output messages on features disabled when using BulletXNA.
2013-05-13 13:30:40 -07:00
4194d935ec
Fixed mantis #6609 -- LoadPlugin error messages on Robust.
2013-05-13 13:07:39 -07:00
af1fa95875
Groups: Improve error handling on remote connector.
2013-05-13 11:36:17 -07:00
25fea82049
Fixes mantis #6636 -- Groups
2013-05-13 07:29:17 -07:00
a4431381fa
Finalize the logic for SetHome. See comments in Land/LandManagementModule.cs about who has permission to set home where.
2013-05-11 07:58:14 -07:00
ab4d530462
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-11 07:15:31 -07:00
48f8b884c3
Handle SetHome properly
2013-05-11 07:15:09 -07:00
55c9bc15e5
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-05-11 01:29:30 +01:00
81d8deb1a8
Send up the part missing from the Avination Estate commit.
...
Warning - contains a small migration.
2013-05-11 01:27:37 +01:00
a42bb799cc
BulletSim: fix CPU loop that occurs when any 'degenerate' sculptie
...
is in a region. This fixes the high CPU usage for regions with nothing
else going on.
2013-05-10 14:48:52 -07:00
a1031772eb
Delete debug message
2013-05-10 08:09:26 -07:00
ff0332730d
Implement delete key for local console
2013-05-09 23:11:37 +01:00
292a6037ad
minor: Remove unnecessary code that was generating warning in TestXInventoryDataPlugin
2013-05-09 22:48:10 +01:00
0e6ad94829
minor: Remove mono compiler warning in RemoteAdminPlugin
2013-05-09 22:44:45 +01:00
9978f36d9f
Don't send BulkUpdateInventory at the end up of UpdateInventoryItemAsset().
...
This is causing editing of worn clothes to fail frequently, possibly due to a race condition with a transaction.
This looks to address http://opensimulator.org/mantis/view.php?id=6600
2013-05-09 22:43:16 +01:00
b4a6f2195d
Only send one kill object to the deleter when they derez an object rather than two.
...
Extend regression test to check this.
2013-05-09 18:53:34 +01:00
3290cd09d3
remove pointless region handle paramter from IClientAPI.SendKillObject()
2013-05-09 18:12:17 +01:00
2cb2f1d7e3
Fix issue where objects removed via llDie() would not disappear for users looking in from neighbouring sims.
...
This was because this particular code path (unlike user delete) only sent kills to root presences, for no apparent good reason.
Added regression test for this case.
This fixes http://opensimulator.org/mantis/view.php?id=6627
2013-05-09 18:02:19 +01:00
2b0b9f3e6c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-09 18:01:49 +01:00
641c636790
minor: Simplify test setup in SceneObjectDeRezTests since permissions module doesn't need different configuration anymore
2013-05-09 16:43:16 +01:00
182ea00cb3
Application support:
...
Adding some viwer supported url settings for destination guide and avatar picker apps. URL for the destinations should be: "secondlife:///app/teleport/slurl"
2013-05-09 10:50:18 -04:00
543d1fe70b
Guard the scene list when estates are updated
2013-05-08 21:14:52 +01:00
33aaa40bee
Adds an event and a method so that handling of the CachedTexture
...
packet can be pulled out of LLClientView and moved to
AvatarFactory. The first pass at reusing textures (turned off by
default) is included. When reusing textures, if the baked textures
from a previous login are still in the asset service (which generally
means that they are in the simulator's cache) then the avatar will not
need to rebake. This is both a performance improvement (specifically
that an avatars baked textures do not need to be sent to other users
who have the old textures cached) and a resource improvement (don't
have to deal with duplicate bakes in the asset service cache).
2013-05-08 13:13:51 -07:00
6f5222e863
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-07 18:02:25 -07:00
e92c05ebbd
Added AvatarPickerSearch capability handler.
2013-05-07 18:01:48 -07:00
ac6dcd35fb
Bulletsim: and the rotational friction.
...
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-05-07 07:14:10 -07:00
f247ae1a75
BulletSim: Another way to create vehicle framed friction.
...
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-05-07 07:14:06 -07:00
ddd97cb78e
BulletSim: normalize quaternian rotations when building compound linksets.
...
Attempt to fix vehicles being twisted off the ground when they go physical.
2013-05-06 18:06:34 -07:00
84118c5735
BulletSim: properly free references to simple convex hull shapes. Didn't
...
loose memory since shapes are shared but did mess up usage accounting.
2013-05-06 18:05:37 -07:00
1c6b8293d7
Step 3: Commit the Avination XEstate estate comms handler
...
This adds estate-wide Teleport Home and Teleport All User Home as well
2013-05-07 00:52:40 +01:00
5d5edde429
Step 2: commit the IEstateModuleInterface changes needed
2013-05-07 00:37:45 +01:00
4c83b5e719
Step one of estate settings sharing - port the Avination Estate module (complete module) as changes are too extensive to apply manually
2013-05-07 00:31:11 +01:00
93e1986d69
BulletSim: apply linear and angular friction in vehicle coordinates
...
and not world coordinates.
2013-05-06 16:48:01 -07:00
045aaa838a
BulletSim: remove friction calcuation from BSMotor and move linear and
...
angular friction computation into linear and angular movement code.
The friction wasn't being applied properly. This will make it so vehicles
don't drift as much and the drift is tunable by changing the friction
timescales.
2013-05-06 13:32:26 -07:00
bf31896983
BulletSim: simplify parameter specification by reducing the number of
...
specifications required for simple properties with defaults.
2013-05-06 13:32:24 -07:00
f9fb1484aa
BulletSim: extend BSActorLockAxis to allow locking linear movement in
...
addition to angular movement. Not enabled by anything yet.
2013-05-06 13:32:22 -07:00
90f03ccd42
Added new method to Remote Admin for reloading the estate settings. This is meant to be called when some other program has changed the data on the backend.
2013-05-06 11:47:55 -07:00
a81ddf3d70
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-06 09:18:17 -07:00
ad00466483
Minor reordering of operations on NewUserConnection. The agent circuit needs to be added earlier for some of the checks to work correctly.
2013-05-06 09:17:54 -07:00
1ffa69f691
Merge branch 'master' into bulletsim4
2013-05-03 14:25:52 -07:00
5d25bb3084
BulletSim: zero vehicle motion when changing vehicle type.
...
Rebuild compound linkset of any child in the linkset changes shape.
Comments and better detailed logging messages.
2013-05-03 14:23:53 -07:00
5d93c99e8c
Fix possible race condition with local region cache if a region was added after startup.
2013-05-03 18:56:58 +01:00
7ca42d5711
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-05-03 18:51:29 +01:00
304c5d4a8b
On startup, start scenes after we're set up all local scenes, rather than starting scenes before others have been created.
...
This aims to avoid a race condition where scenes could look to inform neighbours that they were up before those neighbours had been created.
http://opensimulator.org/mantis/view.php?id=6618
2013-05-03 18:48:50 +01:00
4042c82a72
BulletSim: prims with no cuts created with single convex hull shape.
...
Parameter added to enable/disable this feature.
2013-05-02 12:27:30 -07:00
d9c3947824
BulletSim: Rebuild physical body if physical shape changes for mesh and hull.
...
Properly rebuilds collision caches.
Release asset data fetched when building mesh or hulls.
2013-05-02 10:06:12 -07:00
a9480aed85
Merge branch 'master' into bulletsim4
2013-05-02 07:02:28 -07:00
ed46b42fea
BulletSim: fix crash when mesh asset wasn't available when meshing
...
the first time.
Debugging added for mesh/hull asset fetch.
2013-05-01 17:16:46 -07:00
0378baed35
BulletSim: rework LinksetCompound to work with new BSShape system.
...
Not all working yet.
2013-05-01 17:15:54 -07:00
e3d9d5566a
Fix inventory issue
...
Fix issue where objects rezzed from Trash or Lost And Found then be placed back in the respective folder when taking the object or a copy back into inventory.
2013-05-01 18:51:43 -04:00
c6d50cd431
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-05-01 21:37:17 +01:00
b26276c8c4
Fix the long standing bug of items being delivered to lost and found or trash when takig copy.
...
This bug was recently aggravated through the perms changes required for the
export permission.
2013-05-01 21:35:50 +01:00
fca4e4ec7c
Merge branch 'master' into bulletsim4
2013-05-01 12:08:12 -07:00
81a90e30c6
Add in-code exaplanation for the change in cancellation signalling in STP 2.2.3. Remove left in Console.WriteLine accidentally inserted in recent 206fb306
2013-05-01 19:29:46 +01:00
206fb306a7
Update SmartThreadPool to latest version 2.2.3 with a major and minor change.
...
SmartThreadPool code comes from http://www.codeproject.com/Articles/7933/Smart-Thread-Pool
This version implements thread abort (via WorkItem.Cancel(true)), threadpool naming, max thread stack, etc. so we no longer need to manually patch those.
However, two changes have been made to stock 2.2.3.
Major change: WorkItem.Cancel(bool abortExecution) in our version does not succeed if the work item was in progress and thread abort was not specified.
This is to match previous behaviour where we handle co-operative termination via another mechanism rather than checking WorkItem.IsCanceled.
Minor change: Did not add STP's StopWatch implementation as this is only used WinCE and Silverlight and causes a build clash with System.Diagnostics.StopWatch
The reason for updating is to see if this improves http://opensimulator.org/mantis/view.php?id=6557 and http://opensimulator.org/mantis/view.php?id=6586
2013-05-01 19:01:43 +01:00
ac135c649c
Fix CAPS to work like they should - do not send caps to the viewer if they're not in the requested caps list.
...
The previous wrong behavior caused the debug setting "UseHTTPInventory" to fail
on all viewers when turned off. UDB inventory would not be correctly used in
that case.
2013-04-30 23:50:23 +01:00
46ae84cfba
BulletSim: fix error messages created while an avatar has no initial
...
collisions. Usually happens when logging in an avatar that had been
previously flying. Uninitialized variable.
2013-04-30 13:10:15 -07:00
7cdb07b386
BulletSim: improvements to LinksetCompound and PrimDisplaced. Not all working yet.
2013-04-30 11:42:11 -07:00
d322625f90
BulletSim: Add non-static BSShape.GetReference for getting another reference
...
to an existing shape instance.
BSShapeNative rebuilds shape for all references.
BSShapeCompound returns another reference copy if the compound shape
already exists (for linksets).
2013-04-29 17:30:54 -07:00
15a3f80e2e
BulletSim: LinksetCompound work to disable collision for root and
...
child prims so compound shape can do all collisions.
Don't try to build a compound linkset for non-physical linksets.
Remove and replace root body when compound shape is added so collision
cache is rebuilt.
2013-04-29 17:30:38 -07:00
3ce198165c
minor: remove some mono compiler warnings in ServicesServerBase
2013-04-29 22:21:57 +01:00
537b243360
minor: Eliminate warning in LLimageManagerTests by properly calling through to OpenSimTestCase.SetUp()
2013-04-29 22:18:11 +01:00
67789201c3
Add TestRejectGivenFolder() and TestAcceptGivenFolder() regression tests
2013-04-29 22:14:13 +01:00
0beccf23c0
Add regression test for inventory item give, reject and subsequent trash folder purge by receiver.
...
This commit also actually adds the InventoryTransferModuleTests file which I previously forgot
2013-04-29 21:11:44 +01:00
a7cbb9edc9
Add regression test for offer, accept and subsequent receiver delete of an item offered via instant message.
2013-04-29 20:50:49 +01:00
12054aaa9f
Fix bug where an agent that declined an inventory offer and subsequently emptied their trash would make the item invalid in the giver's inventory
...
This was because the original item/folder ID was sent in the session slot of the offer IM rather than the copy.
2013-04-29 17:14:44 +01:00
92ee288d66
BulletSim: remove trailing white space to make git happier. No functional changes.
2013-04-29 07:54:50 -07:00
ad1787770e
BulletSim: rename variable 'PhysicsScene' to be either 'PhysScene' or 'm_physicsScene' to match coding conventions and reduce confusion.
2013-04-29 07:38:55 -07:00
21ec434688
BulletSim: first cut at new linksetCompound shape building.
2013-04-29 07:38:51 -07:00
f2d408829b
BulletSim: fix crash when creating new hull.
2013-04-29 07:38:47 -07:00
2da8e60b6d
BulletSim: code for creating the avatar capsule shape.
2013-04-29 07:38:44 -07:00
e5582939fd
BulletSim: massive refactor of shape classes. Removed shape specific code from BSShapeCollection. Using BSShape* classes to hold references to shape. Simplified shape dependency callbacks. Remove 'PreferredShape' methods and have each class specify shape type. Disable compound shape linkset for a later commit that will simplify linkset implementation.
2013-04-29 07:38:40 -07:00
890cb6a293
BulletSim: complete BSShape classes.
2013-04-29 07:38:35 -07:00
3ff7391495
Some more pieces of Avination's ban system - if an avatar isn't allowed on any
...
parcel in the sim, keep them out entirely.
2013-04-29 00:55:34 +01:00
a517e597f5
Fix wrong sql statement in offline im.
2013-04-28 09:03:09 -07:00
a49c5291dc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-04-27 21:24:07 -07:00
222f530411
Added an interface to an external ban service. With this commit, the interface is used only in Hypergrided worlds (Gatekeeper), although in those, it applies to both local and foreign users. The Ban service itself is not in core; it is to be provided externally.
2013-04-27 21:23:29 -07:00
90a6891a7d
Better error reporting
2013-04-27 10:34:23 -07:00
f675d465b2
Make method virtual
2013-04-27 10:34:13 -07:00
12599c34e2
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-04-27 17:57:22 +01:00
cbb3bb62da
Unbreak the sample money module
2013-04-27 17:56:39 +01:00
ef08ab68a7
Small oversight in EconomyDataRequest - this would have affected everyone NOT using a money module.
2013-04-27 17:42:54 +01:00
2262b13048
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-04-25 17:02:32 -07:00
0e162511cf
Groups: make some methods protected.
2013-04-25 17:01:57 -07:00
03c9d8ae4f
Change EconomyDataRequest signature to use an IClientAPI rather than UUID. This is needed because recent LL viewer codebases call this earlier in login when the client is not yet established in the sim and can't be found by UUID.
...
Sending the reply requires having the IClientAPI.
2013-04-25 21:35:18 +01:00
5d0a8ff391
Change copyright notice on DynamicMenuModule to proper BSD
2013-04-25 20:48:12 +01:00
3bc8017464
Recover a lost "virtual". Downstream projects need this.
2013-04-25 09:23:15 -07:00
c10405330d
UUIDGatherer now includes UUIDs which reference texture assets used as materials
2013-04-24 20:43:15 -07:00
0e22021c65
Make the kicked user's avie truly disappear when it's god-kicked.
2013-04-24 19:00:41 -07:00
ec4f981f1d
Adding the dynamic menu module which allows registering new menu options in compliant viewers
2013-04-25 01:52:34 +01:00
5cd77a460c
Commit Avination's God Kick feature.
2013-04-25 00:51:57 +01:00
6f3c905744
Add Avination's support for parcel eject and freeze
2013-04-25 00:24:48 +01:00
1868680848
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-04-24 12:46:23 -07:00
70081a40a4
Bug fix: compare tolower. This should fix the issue where HG visitors currently in the region were not being found by the avatar picker window.
2013-04-24 12:45:19 -07:00
c22a2ab7d2
BulletSim: partial addition of BSShape class code preparing for
...
different physical mesh representations (simplified convex meshes)
and avatar mesh.
2013-04-24 08:05:42 -07:00
e324f6f3f0
BulletSim: update DLLs and SOs to they have no dependencies on newer
...
glibc (2.14) since that is not yet in some Linux distributions.
Add unmanaged API calls and code for creating single convex hull shapes.
2013-04-24 08:03:45 -07:00
522ab85045
BulletSim: improve avatar stair walking up. Add more parameters to control force
...
of both position change and up force that move avatars over barrier.
Default parameters are for steps up to 0.5m in height.
2013-04-23 18:31:12 -07:00
115e0aaf83
Fix issue in ConciergeModule where UpdateBroker was sending malformed XML if any number of avatars other than 1 was in the region.
...
I don't know how well the rest of ConiergeModule works since I've practically never looked at this code.
Addresses http://opensimulator.org/mantis/view.php?id=6605
2013-04-23 21:55:51 +01:00
e1ac683154
BulletSim: fix crash when deleting llVolumeDetect enabled objects. Bullet's check for an object being linked into the world does not work for Bullet's ghost objects so BulletSim was deleting the object while it was still linked into the physical world structures.
2013-04-22 16:50:06 -07:00
293a024c14
Allow callers to set the invoice parameter for GenericMessage
2013-04-22 22:39:08 +01:00
69f07fdb34
Materials persistence via SceneObjectPart.dynAttrs. This appears to work across region restarts and taking objects into inventory, but probably will not work across archiving via OAR or IAR as materials texture assets may not be adequately referenced to trigger archiving.
2013-04-20 23:39:07 -07:00
233f761779
handle PUT verb for RenderMaterials Cap
2013-04-20 02:08:22 -07:00
258804cc04
RenderMaterials POST Cap now return material entries when invoked with an OSDArray of MaterialIDs
2013-04-19 22:19:57 -07:00
9ae24cac2f
Materials-capable viewers send ImageUpdate packets when updating materials that are normally sent via RenderMaterials CAP. This can cause a race condition for updating TextureEntry fields. Therefore filter any TextureEntry updates so they only update if something actually changed.
2013-04-19 00:35:06 -07:00
06829c4082
remove default parameter value that apparently mono cant handle
2013-04-18 01:29:50 -07:00
d5419f0a46
Initial experimental support for materials-capable viewers. This is in a very early stage and this module is disabled by default and should only be used by developers for testing as this module could cause data corruption and/or viewer crashes. No materials are persisted yet.
2013-04-18 01:03:19 -07:00
7c839f176f
amend previous commit, a line was left out
2013-04-17 23:14:28 -07:00
53122fad40
Thanks lkalif for a fix to SendRegionHandshake() which fixes a potential crash with Server-side baking enabled viewers
2013-04-17 23:10:02 -07:00
ce043c5141
Allow changes to TextureEntry to propagate to viewers when MaterialID changes
2013-04-17 22:41:12 -07:00
c5de9840b0
refactor: Remove IClientNetworkServer.NetworkStop() in favour of existing Stop().
...
This was an undocumented interface which I think was for long defunct region load balancing experiments.
Also adds method doc for some IClientNetworkServer methods.
2013-04-16 21:58:24 +01:00
5f2cbfc0fd
BulletSim: fixing problems with llMoveToTarget. Not all fixed yet.
2013-04-09 18:00:29 -07:00
b53713cdda
BulletSim: some formatting changes.
2013-04-09 18:00:27 -07:00
9cc41d5118
Another algorithm for AngularVerticalAttraction. This one Takes into account all rotations before it and makes the corrections more close to the time that sl does.
...
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-04-09 18:00:25 -07:00
59135c9a31
BulletSim: add Bullet HACD library invocation. Turned off by default as not
...
totally debugged. Updated DLLs and SOs with more debugged HACD library code.
2013-04-09 18:00:23 -07:00
17fd075f39
BulletSim: fix problem where large sets of mega-regions weren't registering
...
all the terrain with the base region.
2013-04-09 18:00:20 -07:00
148e46563f
minor: fix mono compiler warning in ScriptsHttpRequests.cs
2013-04-10 00:07:58 +01:00
29e28f4b84
minor: remove mono compiler warnings in InventoryAccessModule
2013-04-10 00:05:03 +01:00
e20b0d5695
minor: Make exceptions thrown by MySQLAssetData more consistent.
2013-04-10 00:03:37 +01:00
06068444e2
Comment out rez perms logging I accidentally left in at 7f07023 (Sat Apr 6 02:34:51 2013)
2013-04-09 23:21:13 +01:00
8690a08881
minor: Log an exception if we aren't able to delete a script state file rather than simply ignoring it.
...
This should never normally happen but if it does then it can be valuable diagonstic information.
2013-04-09 23:02:11 +01:00
aab2b032aa
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-04-09 22:45:00 +01:00
8e04c752fc
If OpenSimulator is writing a PID file and finds the file already present on startup, logging an error since this is commonly due to an unclean shutdown.
...
Unclean shutdown can cause constantly moving objects to disappear if an OAR has just been loaded and they have not reached persistence time threshold, among other problems.
2013-04-09 22:38:47 +01:00
99f39836a1
BulletSim: moving comments around. No functional change.
2013-04-08 06:27:45 -07:00
a7a1b8b7e9
BulletSim: clean up actor code so routines use the same coding pattern.
...
Fix a few enabling problems.
2013-04-08 06:27:44 -07:00
fe16dc09da
BulletSim: complete movement of physical object action code out of the
...
physical object and into actors for setForce, setTorque, hover, lock
axis and avatar move.
2013-04-08 06:27:43 -07:00
c7cd077e55
Optimize the number of Simian calls to get the initial presence
...
information for the friends list. This is a pretty big performance
improvement on login. Note that you must upgrade simian to incorporate
the corresponding GetSessions call.
2013-04-07 17:31:44 -07:00
7f070236f7
Fix taking (and rezzing) of coalesced objects in the non-root subregions of megaregions.
...
This fixes the combined bounding box location for regions bigger than 256x256.
It also fixes the position on taking coalesced objects in the non-root regions, where position checks are properly done on rez instead.
It also fixes the megaregion land channel to return null if the land does not exist, which should probably also be done for the ordinary land channels rather than returning a dummy region.
Inspiration from Garmin's commit in http://opensimulator.org/mantis/view.php?id=6595 . Thanks!
2013-04-06 02:34:51 +01:00
0f008d5f7d
When rezzing a coalesced object, check adjust position of all components.
2013-04-06 01:44:06 +01:00
d2367968e4
* In between the fog, a moment of clarity. This fixes mantis 6570
2013-04-04 19:10:23 -04:00
f064075a85
Fix XmlRpcAdmin admin_exists_user call so that it actually returns the last user login time rather than serializing the DateTime directly which generates a set of unexpected fields.
...
lastlogin return is in unix timestamp format.
2013-04-04 01:06:57 +01:00
f281a994e8
refactor: Simplify ScriptsHttpRequests.GetNextCompletedRequest to more simply iterate through pending requests without unnecessary checks.
2013-04-04 00:49:07 +01:00
831e4c3850
Fix bug where outstanding llHTTPRequests for scripts were not being aborted when they were deleted.
...
This was because AsyncCommandManager was handing an item ID to IHttpRequestModule.StopHttpRequest() rather than the expected request ID.
This commit also makes the http request asynchronous using BeginGetResponse() rather than doing this by launching a new thread
so that we can more safely abort it via HttpWebRequest.Abort() rather than aborting the thread itself.
This also renames StopHttpRequest() to StopHttpRequestsForScript() since any outstanding requests are now aborted and/or removed.
2013-04-04 00:36:15 +01:00
94d44142e3
minor: Stop falsely logging that a teleport was being aborted on client logout even when no teleport was active.
2013-04-03 00:48:36 +01:00
7bf1986e91
Fix minor race condition in SOP.SitTargetOrientationLL where inconsistent values could be returned if the sit orientation was changed whilst the property was being fetched.
2013-04-03 00:24:33 +01:00
97f0c9da84
Use consistent GroupPosition value Make SOP.UpdateGroupPosition() rather than one that could change whilst the method is being executed.
2013-04-03 00:23:20 +01:00
c0319daa40
fix minor race condition in SOP.SitTargetPositionLL where inconsistency could occur if the sit target position changed whilst the property was fetched
2013-04-03 00:09:28 +01:00
3332af4060
minor: Make SOP.UpdateOffset() more consistent by checking against the same old OffsetPosition rather than one which may vary if it simultaneously changes.
2013-04-03 00:01:06 +01:00
a3c723ee30
Fix minor race condition where SOP.GetGeometricCenter() and GetCenterOfMass() could return results which were never the case if these values were changed whilst the method was running
...
No need to create new Vector3s since these are structs.
2013-04-02 23:48:55 +01:00
68c8633ba1
BulletSim: create axis lock constraint with proper orientation and
...
enable axis lock functionality.
2013-04-02 06:40:12 -07:00
17aef1c883
BulletSim: update unmanaged API for HACD parameter passing. Bullet HACD
...
mesh to hull conversion calls in place but code not working. Update
BulletSim DLLs and SOs for new API and HACD code.
2013-04-01 18:03:11 -07:00
ebc1209fc9
BulletSim: rearrange mega-region terrain code to make the thread flow
...
a little clearer.
2013-04-01 18:03:09 -07:00
2bfe60e2fb
Use Output instead of OutputFormat in appropriate places of XEngine status reporting.
2013-04-02 01:28:16 +01:00
69bc37acd6
minor: Remove unnecessary call to GetAttachments() in AttachmentsModule.UpdateUserInventoryWithAttachment()
2013-04-02 01:00:55 +01:00
0dce496499
Fix what appears to be a bug in HGUserManagementModule where it enables on the base.Name rather than its own Name.
2013-04-02 00:55:00 +01:00
600087ab49
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-04-02 00:46:53 +01:00
4153cfbf14
Change recent MSSQL migrations to drop COLUMN from ALTER TABLE which is either not syntactical or unnecessary.
...
May fix http://opensimulator.org/mantis/view.php?id=6593
2013-04-02 00:45:29 +01:00
84eb25da23
BulletSim: stop an avatar from moving if standing on a stationary
...
object. This will stop avatars from sliding down steep terrains
or objects while still allowing an avatar to be moved if standing
on a moving object.
2013-03-31 22:19:44 -07:00
933ac60746
BulletSim: not quite functional axis lock code.
2013-03-31 22:19:43 -07:00
7d50015a74
BulletSim: start the renaming of local variables to m_ form to match the OpenSim coding conventions.
2013-03-31 22:19:42 -07:00
75b8cf428e
BulletSim: fix line endings in BSActor*
2013-03-31 22:19:42 -07:00
747ece59d2
BulletSim: convert BSDynamic to a BSActor and change BSPrim to set
...
up the vehicle actor.
2013-03-31 22:19:41 -07:00
2c581cae2a
BulletSim: Add physical 'actors' that operate on the physical object.
...
Add first 'actor' for locked axis.
2013-03-31 22:19:41 -07:00
9b83e53b28
Export permission, part two. Setting export perms for textures and clothing works. Setting perms for prims also works but they don't propagate correctly yet.
...
NOT FOR PRODUCTIN USE. Your database will need to be updated before you can use this!
2013-03-31 21:59:44 +01:00
9fee431cc8
In the flotasm asset cache, if we get a request for a file that we're actively writing, simply return null instead of first logging an exception.
2013-03-30 01:21:16 +00:00
f8785b5f47
refactor: rename ETM.InformClientToInitateTeleportToLocationDelegate to InformClientToInitiateTeleportToLocationDelegate to correct spelling and bring into line with other ETM Initiate methods
2013-03-30 00:29:52 +00:00
76629289f0
refactor: move the append magic number processing for attachments back up into RezSingleAttachmentFromInventory from RezSingleAttachmentFromInventoryInternal() done in commit 023faa2
2013-03-29 23:59:21 +00:00
cbc9ae898c
Added missing functionality (mainly custom headers) to llHTTPRequest.
2013-03-29 23:32:11 +00:00
023faa227e
Check viewer 2/3 attachment calls against avatar appearance attachment data rather than actually attached objects
...
By checking against the grid's Avatar data, we can ignore viewer side attachments but still initiate these calls simulator-side.
Initiating simulator-side is always necessary for version 1 viewers.
This is a further commit to resolve http://opensimulator.org/mantis/view.php?id=6581
2013-03-29 23:10:28 +00:00
23ae4c0a4d
Fix bug where CHANGED_REGION and/or CHANGED_TELEPORT weren't firing for scripts in attachments.
...
This was because the script resumption in AttachmentsModule was firing the attach event instead.
Had to reinstate the code in 285bd3ahttp://opensimulator.org/mantis/view.php?id=6578
2013-03-29 02:21:38 +00:00
e89bcf4f77
Revert "Try eliminating the pause before auto-reteleporting for a megaregion now that we're telepoting in a different way."
...
Unfortunately fails on Nebadon's system right now. Needs investigation. May put in a temproary option for experimentation soon.
This reverts commit d87ddf50fc
2013-03-29 01:34:31 +00:00
4dfffa1df3
Add Location (relative), Rotation (Relative) and Rotation (World) to "show part" and other related console commands
2013-03-29 01:31:37 +00:00
d87ddf50fc
Try eliminating the pause before auto-reteleporting for a megaregion now that we're telepoting in a different way.
...
On my own system, I can now eliminate the pause entirely and the reteleport happens whilst the teleport screen is still up.
Trying this change to see if this is true for other people.
2013-03-29 01:16:29 +00:00
285bd3abc8
Eliminate code which tries to restart attachment scripts in ScenePresence.MakeRootAgent(), since this is already done in AttachmentsModule
2013-03-29 00:49:55 +00:00
c92654fb43
Stop attempts to update/add existing attachments in user inventory when teleporting between regions.
...
This appears to resolve issues on teleport where attachments disappear or become labelled as invalid within user inventory.
2013-03-28 23:57:35 +00:00
2b142f2f9e
Add "debug attachments" console command to allow highly verbose attachment logging to be switched on and off.
...
Default is off.
2013-03-28 23:09:35 +00:00
feffc8081d
minor: remove some mono compiler warnings from EntityTransferModule
2013-03-28 22:56:30 +00:00
03e421bf3d
minor: comment out unused Scene.AgentCrossing() to reduce code complexity
2013-03-28 22:55:13 +00:00
4ad9b27530
If the viewer has already rezzed any attachments itself, then ignore the simulator-side rez attachments call.
...
This is a further effort to reduce v3 viewer race conditions where this call may clash with the viewer signalling attachment wearing from its current outfit folder.
2013-03-28 22:51:59 +00:00
3b377f16b2
Fix regression tests by making a new NPC always trigger simulator side attachment code when created.
...
Regression from previous commit c2093ccc
2013-03-28 22:44:59 +00:00
e97567e227
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-28 22:35:24 +00:00
c2093ccce1
Move the simulator-side RezAttachments call on login to SP.MakeRootAgent with the other attachments code, using TeleportFlags.ViaLogin check to fire if necessary.
...
This is to simplify the code (no tricky 'wasChild' signalling required)
and to reduce the risk of a thread clash between simulator-side attaching (necessary for v1 viewers)
and the viewer-side attaching the v3 viewers perform.
2013-03-28 22:07:58 +00:00
6a9630d2bd
BulletSim: fix race condition when creating very large mega-regions.
...
The symptom was exceptions while creating physical terrain.
Reduce default terrain mesh magnification to 2 from 3 because the
higher resolution uses a lot of memory and doesn't solve the terrain
smoothness for vehicles.
Added comments here and there and improved some debugging log messages.
2013-03-28 10:59:18 -07:00
3f9b274180
BulletSim: tweaks to terrain boundry computation. No functional changes.
2013-03-28 10:59:16 -07:00
9ca54d00d8
Add back a log message when we attempt a megaregion auto-reteleport
2013-03-28 02:29:34 +00:00
afd0d6af07
minor: Only try to deregister stats in EntityTransferModule.RemoveRegion() if module was enabled.
2013-03-28 02:23:09 +00:00
d9c049fd9f
Fix a bug in HGEntityTransferModule to call base.RemoveRegion() when a region is removed rather than base.AddRegion()
2013-03-28 02:20:43 +00:00
b05ed4ffa6
Instead of going via GodLikeRequestTeleport, auto-teleport the agent directly in a megaregion, in the same manner at the "teleport user" console command.
...
This is to bypass an issue with the HGLureModule which stops the auto-teleport from happening.
2013-03-28 02:17:32 +00:00
506d5e41bf
On the North and East sides of a megaregion, only consider regions within 256m to be neighbours rather than regions up to 512 distant.
...
This looks like an off-by-one bug since the view distance was already only 256 on the west and south sides.
This reduces the number of child agents being logged into regions neighbouring a megaregion.
2013-03-28 01:54:11 +00:00
617637c788
minor: Fix usage error message for "debug eq" console command
2013-03-28 01:41:41 +00:00
b5b01e5bb5
Make HGLureModule track god like lures as well as normal lures, to see if this fixes issues where second megaregion auto-teleport hangs on black teleport screen when HG is active.
2013-03-28 01:37:52 +00:00
876d0d310f
Add "show eq" console command to show numbers of messages in agent event queues.
...
For debugging purposes.
2013-03-28 01:36:34 +00:00
f32027f3b5
Remove some Console.WriteLines accidentally left in last commit cfb20f09
2013-03-28 01:08:47 +00:00
cfb20f09a9
refactor: combine the checks for megaregion view range into a single place.
2013-03-28 00:57:43 +00:00
dd7d7683c9
Fix problem with megaregions where teleporting into a different region which already had a child agent would stop the eq working for the agent in the new region.
...
This was because the calculation as to whether a new agent was needed in the receiving region did not take megaregions into account,
unlike the original calculation when the user first teleported into the region.
This meant that on teleport, entity transfer would create a new CAP but this would be ignored by the viewer and receiving region, meaning that the EQ could no longer be used.
This would prevent subsequent teleport, amongst other things.
Currently, regions up to 512m from a megaregion are considered neighbours.
2013-03-28 00:12:48 +00:00
da5dbaf1d0
Add admin_get_agents xmlrpc method.
...
This allows one to retrieve information about agents from a particular region (name, id, position, etc.)
Similar to output from "show users"
See http://opensimulator.org/wiki/Remoteadmin:admin_get_agents for more details
2013-03-26 23:02:13 +00:00
3072f257f5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-26 23:00:51 +00:00
abde0d4efb
BulletSim: prevent asset fetching loop when the fetched asset fails to mesh.
...
Check for the case where the fetched mesh asset fails meshing (degenerate
triangles or no physical mesh). In this case, the asset is marked 'failed'
and BulletSim doesn't keep trying to fetch over-and-over trying to get a
good asset.
2013-03-26 15:02:10 -07:00
13170ca627
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-26 20:32:22 +00:00
3f0f313a76
Make llGetLinkPrimitiveParams() and llGetPrimitiveParams() work for avatars in a linkset.
...
llGetPrimitiveParams() works through PRIM_LINK_TARGET
Setting via llSetLinkPrimitiveParams(), etc. not yet implemented
2013-03-26 20:25:58 +00:00
e82fab34d7
Implement a pref to turn on the simulator ExportSupported feature entry.
...
This tells the viewer to enable the UI for export permissions.
WARNING: If your inventory store contains invalid flags data, this will result
in items becoming exportable! Don't turn this on in production until it's complete!
2013-03-26 19:00:30 +00:00
5f4c4df227
Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask
...
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
2013-03-26 03:40:06 +00:00
285dc554ec
BulletSim: new algorithm for vertical attraction which uses quaternion
...
arithmetic to compute the shortest path between the current tilt
and vertical.
2013-03-25 15:40:46 -07:00
c96a6f1de6
BulletSim: small tweaks and formatting in the parameter fetching code.
2013-03-25 15:40:44 -07:00
953090fd62
BulletSim: fix possible race condition where an prim's asset can be requested quicker than the asset fetcher returns and thus falsely reporting that an asset was not fetched and defaulting the assset to a bounding box.
2013-03-25 15:40:43 -07:00
f783b9169f
BulletSim: parameterize C# HACD hull creation. Add feature of reducing max hull count for simple (non-cut prims) meshes.
2013-03-25 15:40:41 -07:00
128c72a234
Start recording inter-region teleport attempts, aborts, cancels and failures in statistics for monitoring/debugging purposes
...
These are recorded as 'entitytransfer' stats as seen by the "show stats entitytransfer" console command.
2013-03-25 21:53:27 +00:00
01636ca900
Fix teleporting into the non-SW 256x256 corner of a megaregion, though currently with a 10 second delay before auto-reteleport to the correct location.
...
This now does a check for border crossing (required to trigger the teleport) immediately in SP.MakeRootAgent().
If left any later, it looks like the physics scene changes the position and stops the cross happening.
If done any earlier, nothing happens because the cross-code currently requires a PhysicsActor to be in place, thuogh it's probably not necessary for this case.
2013-03-23 00:47:59 +00:00
93206ef0fa
Add "show borders" command to show the borders of a region.
...
This is relevant to mega-regions where the borders are very different to a regular region.
Also adds some method doc and other code comments.
2013-03-23 00:45:21 +00:00
c4d9a23f26
Following on from 476a7d3e (which wasn't enough), make chat across regions on different simulators work.
...
Also resolves an issue of multiple chatting if the originating simulators had more than one region and they were neighbours
2013-03-22 01:43:18 +00:00
1f17ef6d3c
Take out a testing sleep I accidentally left in the teleport code from last commit 7471bc7
2013-03-22 01:06:56 +00:00
7471bc7775
At strategic points in the teleport process, if the client has simultaneously logged out then do not continue.
...
This aims to reduce any side effects if the process tries to complete after the client has logged back in (e.g. it was delayed due to a slow destination region response).
This introduces a new Aborting entity transfer state which signals that the teleport should be stopped but no compensating actions performed.
2013-03-22 01:00:13 +00:00
476a7d3eee
Implement chat across region borders since we can tell if avatars in neighbouring regions are in range.
2013-03-22 00:03:10 +00:00
e23a0dcc5d
minor: On teleport, signal a child agent before we send the viewer TeleportFinish in order to avoid a theoretical race condition when teleporting to a neighbour.
...
If we do this after TeleportFinish, then it's possible for a neighbour destination to request the source to create a child agent whilst its still treated as root.
This closes the original presence which we don't really want to do.
This is probably okay (albeit with warnings on the console) but afaics there's no reason not to move the child agent signal.
2013-03-21 23:37:23 +00:00
46c833810c
On a teleport, lock m_agentsInTransit whilst we grab the value to check for completion just to be sure we're not using a thread cached version.
2013-03-21 00:46:08 +00:00
4de530af45
minor: disable logging on regression TestCrossOnSameSimulator() that I accidentally left on a few commits ago.
2013-03-20 23:13:12 +00:00
b1cd1d917e
minor: don't bother with the pause before rezzing attachments if we are running regression tests (fire and forget calls launched on the same thread).
...
Also adds code comments as to why this pause exists.
2013-03-20 23:12:13 +00:00
16af5b87f8
Add file missing from last commit 36651be
2013-03-20 23:08:35 +00:00
36651bed71
On the later forms of teleport failure, tell the user if this was because viewer couldn't/didn't connect with destination or if destination didn't signal teleport completion.
...
Also adds regression test for the case where the viewer couldn't connect with the destination region.
Also refactoring of regression test support code associated with entity transfer in order to make this test possible and the code less obscure.
2013-03-20 23:01:16 +00:00
8de933ab07
Insert a short delay on the simulator side rezzing of attachments in order to fix viewer 3 issues if its own rezzing actions on login collide with the simulator side actions.
...
This resolves issues (at least in my tests with LL 3.3.4) where this can make attachments invisible until one zooms in on the avatar.
This doesn't affect version 1 viewers since this delay is shorter than the login delay.
This doesn't increase the login time since this part of the process was already being performed asynchronously.
This may be a temporary solution.
2013-03-20 02:09:25 +00:00
c0ff5635ba
Fix "show attachments" command probably broken in commit addab12 (Wed Jan 2 21:38:00 2013)
...
This break was not connected with the recent attachment code changes.
2013-03-20 02:00:56 +00:00
3cb1c23554
Force a viewer object update for attachments at the end of the final Scene.CompleteMovement() in order to make all multi-attachments appear on the destination region.
...
For some reason, sending updates before this will not have this effect.
This may be something related to some viewers (e.g. LL 3.3.4) or something OpenSimulator isn't getting quite right.
2013-03-20 01:46:50 +00:00
9151b9d233
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-20 01:36:28 +00:00
90b9121e66
BulletSim: change 'degenerate mesh' message from Error to Debug because there
...
seem to be lots of sculpties with this problem while the condition really doesn't
change region operation.
2013-03-19 17:15:24 -07:00
3648164219
Prevent multiple instances of the same item ID being appended to an AvatarAppearance
...
It looks like this was happening when AttachmentsModule.RezAttachments was doing a secondary set of each attachment to update with the asset ID (initially they only have the inventory ID).
However, with multi-attach this was appending a second copy of the same attachment rather than updating the data that was already there.
This commit requires both simulator and service to be updated.
2013-03-19 21:49:29 +00:00
c2e4f8aed5
For the moment, disable the output of the 'scene' statistics in SimExtraStatsCollector
...
and thus for the command 'show stats' because it is ugly and most of the information
is already output in the formatted printout that appears before.
2013-03-19 12:37:44 -07:00
1dd2d432f1
For those people collecting and comparing logfiles from servers scattered
...
around the world, change LogWriter to use DateTime.UtcNow rather than
DateTime.Now.
2013-03-19 11:40:10 -07:00
8360223fed
BulletSim: code to generate a higher resolution terrain mesh. Parameter
...
TerrainMeshMagnification controls number of vertices generated per
heightmap point. Default is 3.
2013-03-19 00:00:03 -07:00
8510f57ad4
BulletSim: add terrain contact processing threshold parameter. Initialize contact processing threshold for static object as well as mesh terrain.
2013-03-19 00:00:02 -07:00
397379cd3f
Process default attachment point in AttachObjectInternal before we check whether a worn object needs to displace an existing attachment on the same point if we are not using multi-attach.
2013-03-19 00:39:58 +00:00
55ab6f015a
Fix tests for multiattach
2013-03-18 23:48:03 +00:00
5e1f651e21
Merge branch 'master' into newmultiattach
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-18 23:31:27 +00:00
0635d9d174
Merge commit 'ccd6f443e1092cb410f565e921f7cf4dd8cd2dac' into newmultiattach
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-18 23:21:01 +00:00
e4a70b9f9a
Limit each attachment point to 5 items as per spec
2013-03-18 22:56:26 +00:00
d07943c262
Multiattach, part 2
2013-03-18 22:56:17 +00:00
fcecfc81bb
Multiattach, part 1
...
Conflicts:
OpenSim/Framework/AvatarAppearance.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-03-18 22:56:03 +00:00
3611d33b00
Improve rejection of any attempt to reattach an object that is already attached.
...
This also adds/extends regression tests for wearing attachments directly for the scene and attempting to reattach/rewear already attached objects.
2013-03-18 22:04:27 +00:00
a7a9a8a614
Fix recent regression where an item worn to an attachment point that was already occupied did not remove the previous attachment (current behaviour)
...
Regression was commit ccd6f4 (Tue Mar 5 23:47:36 2013)
Added regression test for this case.
2013-03-18 20:48:50 +00:00
46a81b3527
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-03-17 23:07:12 +00:00
464201b41d
BulletSim: add INI parameter for angular banking timescale fudge parameter.
2013-03-16 15:34:07 -07:00
fc84ebb819
BulletSim: Working Implementation of Angular Banking for Vehicles (Not SL Grade, Other features when implemented should slow it down for now be Strong with Vertical Angular attraction setting and conservative with Angular Velocity on X axis)
...
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-03-16 15:13:40 -07:00
6e1b3f9951
*Yet another HTTPServer update code changes in OpenSim Libs. * This fixes a connection close issue by getting rid of the socket references * This adds a connection timeout checker to shutdown poor or evil connections and combats DOS attempts that just connect and make no complete requests and just wait. It also actually implements KeepAlive... instead of just understanding the connection header in the request... you can test by connecting and requesting a keepalive header and sending another request on the same connection. The new timeout checker closes expired keepalive sessions, just make sure you send the request within 70 seconds of connecting or the timeout checker will timeout the connection.
2013-03-16 03:14:11 -04:00
03075359b5
Finally remove the 'REST' ApplicationPlugins code which has been non-functional and largely commented out for many years.
2013-03-15 23:48:40 +00:00
7e5d553781
Make the LSL memory functions virtual so script engines can override them if they have different memory management.
2013-03-15 23:46:49 +00:00
35843e8ec8
Change the table and field names of XAssetService mysql db tables to be capitalized like Avatars, Friends, etc.
...
Also fixes access time being set on assets rather than XAssetsMeta
This is to try and be somewhat consistent with other service tables that are mainly in this style.
No migration is supplied, since nobody should be using this service yet except on a test basis.
2013-03-15 23:42:16 +00:00
e9f3cd1a60
Implement access time updates on assets for XAssetService.
...
This only happens if access time is older than 30 days currently, in order to reduce database updates.
The idea is to give some idea of assets which haven't been accessed for a very, very long time.
These might conceivably be deleteable, though this will be a risk due to caching at other points in the chain.
This is actually currently much less useable on the xasset service since access time is on metadata rather than the data itself.
And many metadata entries may point to the same data. Probably need to address this.
2013-03-15 23:17:54 +00:00
45dee383db
refactor: Reuse Get() method in AssetService to eliminate some copy/paste in other Get methods
2013-03-15 22:42:34 +00:00
bd0c1d9b6a
Migrate assets from chained asset service to xassetservice as they are requested.
...
This shrinks the asset database over time as duplicate assets are fetched.
2013-03-15 22:33:39 +00:00
d05af4bdad
Fix bug in AssetService where requesting data only for an asset would throw an exception if the asset did not exist.
2013-03-15 22:14:34 +00:00
7fb458b055
minor: log an error rather than info if a connector fails to load.
2013-03-15 22:08:11 +00:00
3a7d9f740e
minor: Make logged message in ServerUtils more consistent.
2013-03-15 22:05:18 +00:00
8cc3adb585
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-15 21:57:25 +00:00
924d6e892a
Make it possible to chain another asset service underneath the de-duplicating XAssetService.
...
This makes it possible to use the dedupliicating service without needing to migrate all the existing asset data beforehand.
Currently controlled by a ChainedServiceModule setting in [AssetService] (e.g. ChainedServiceModule = "OpenSim.Services.AssetService.dll:AssetService")
Not yet ready for use.
2013-03-15 21:53:39 +00:00
78b25094dc
BulletSim: Tweak vertical angular attraction to remove double VehicleOrientation application fixing the problem with the vertical attractor pushing vehicles nose first into ground when tilted on side.
...
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-03-15 14:05:38 -07:00
c10c43d6f6
Fix server statistics always reporting zero for total network bytes in/out.
...
Clean up some parameter code in Statistics.Binary.
2013-03-15 13:59:34 -07:00
d3e76730bd
Add example code to DOExampleModule to pull data from that previously saved by DAExampleModule when instantiating a dynamc object.
2013-03-15 00:49:35 +00:00
cb74186888
Add ParentGroup.HasGroupChanged = true setting to DAExampleModule as this is necessary to get attributes to save (though this probably happens anyway due to the prim move)
2013-03-15 00:27:06 +00:00
e25ba116a3
refactor: make llGetLinkName() and llGetLinkKey() use a common GetLinkEntity() method
2013-03-15 00:06:42 +00:00
081271e1d7
minor: remove mono compiler warnings in LSL_Api.cs
2013-03-14 23:44:16 +00:00
12900ea84e
Log same environment information to Robust log as is already done for simulator logs, for debug purposes
2013-03-14 23:39:15 +00:00
2fbc08d7dd
refactor: minor cleanup in osGetAvatarList()
2013-03-14 23:19:18 +00:00
0ea0f8aa83
Fix bug in osCauseHealing() if called with an avatar ID for an avatar that is not in the scene.
2013-03-14 23:16:39 +00:00
56b333f301
minor: Use more compact libomv primitive constructors in osNpcGetPos() and osNpcGetRot()
2013-03-14 23:12:58 +00:00
55204ccde6
Fix minor race conditions in OSSL_Api functions where a parcel could be misidentified for moving prims.
2013-03-14 23:09:59 +00:00
f8dab4f93f
refactor: Use LSL_Vector(Vector3) constructor in llCastRay()
2013-03-14 23:06:54 +00:00
ca99f418d8
refactor: Use ILandChannel.GetLandObject(Vector3) in LSL_Api rather than having to continually take intermediate Vector3s to avoid race conditions
2013-03-14 23:05:21 +00:00
c1115e4c2e
Add ILandChannel.GetLandObject(Vector3 position) as this is a very common input to GetLandObject()
...
This conforms to the existing ILandChannel.ParcelsNearPoint() method
2013-03-14 22:56:26 +00:00
c09f4ff483
Fix minor race condition in llGetCameraRot() where inconsistent information could be returned for a rotating camera
2013-03-14 22:49:08 +00:00
114fd042de
Fix minor race condition in llGetCameraPos() where an inconsistent post could be returned for a moving camera
2013-03-14 22:46:27 +00:00
d4b109b4c4
Fix minor race condition in llParcelMediaCommandList() where a parcel could be misidentified for a moving prim
2013-03-14 22:45:00 +00:00
2a81eb8d45
Fix minor race conditions in LSL_Api.GetPrimParams() for PRIM_POSITION, PRIM_SIZE and PRIM_ROT_LOCAL
...
This function is used by all the various ll*Params() and os*Params() functions
2013-03-14 22:42:11 +00:00
b23009e480
Fix minor race condition in llGetGeometricCenter() if this was changing whilst the function was called.
2013-03-14 22:35:41 +00:00
a6f8638174
refactor: use LSL_Rotation(Quaternion) constructor in lLGetRootRotation()
2013-03-14 22:34:48 +00:00
dd6f1fc637
Fix minor race condition in llGetRootPosition() where inconsistent results could be returned for moving prims
2013-03-14 22:33:44 +00:00
e7603f98b7
Fix minor race conditions in detecting current parcel for llAddToLandPassList(), llSetParcelMusicURL() and llGetParcelMusicURL() for moving prims
2013-03-14 22:31:07 +00:00
e6eb914675
refactor: use LSL_Vector(Vector3) constructor in llGroundNormal()
2013-03-14 22:29:09 +00:00
f8c24b2a61
minor: Reuse ground LSL_Vector in llGroundSlope() rather than creating a new one.
2013-03-14 22:26:37 +00:00
3c9bea1e3f
Fix minor race conditions in llTeleportAgent(), llTeleportAgentGlobalCoords(), llEjectFromLand() and llOverMyLand() where the wrong parcel could be identified for very fast moving avatars.
2013-03-14 22:22:10 +00:00
7b85279dba
refactor: Use LSL_Vector(Vector3) constructor in llGetCenterOfMass()
2013-03-14 22:14:32 +00:00
ff6a16b46e
Fix a minor race condition in llInstantMessage() where slightly wrong origin co-ordinates could be given for a fast moving prim
2013-03-14 22:09:05 +00:00
895aa7346f
Fix minor race condition in llGetOmega() where inconsistent results could be returned (accidentally stated that commit 1774c631 was this fix).
...
Commit 1774c631
2013-03-14 22:07:07 +00:00
1774c631cb
Fix minor race condition in llGetOmega() where a call whilst a prim was changing angular velocity could return inconsistent results
2013-03-14 22:04:11 +00:00
04e806036f
refactor: Use LSL_Vector(Vector3) constructor in llGetVel()
2013-03-14 22:02:43 +00:00
ffbbe29229
refactor: Use LSL_Vector(Vector3) constructor in llGetTorque()
2013-03-14 22:01:24 +00:00
c3e081a5ca
Fix minor race condition in llGetLocalRot() where inconsistent results could be returned if the prim was rotating during the call
2013-03-14 22:00:04 +00:00
f840728273
refactor: use cleaner LSL_Rotation quaternion constructor in LSL_Api.GetPartRot()
2013-03-14 21:57:43 +00:00
ad9bd3fe93
Fix sensors, llGetRootRotation(), llGet*Param() and other functions to use the world rotation if the avatar to which they are attached is sitting
2013-03-14 21:46:29 +00:00
e9c394fb4e
Make llGetObjectDetails() return the correct world rotation for a sitting avatar
...
This addresses http://opensimulator.org/mantis/view.php?id=6567
This creates a ScenePresence.GetWorldRotation() with the same semantics as SOP.GetWorldRotation()
SP.Rotation can't be used since it's relative to the sat upon prim if the avatar is sitting.
2013-03-14 21:23:48 +00:00
43220afda2
Improve DAExampleModule to show current necessary locking to avoid race conditions with a serialization thread.
2013-03-13 23:42:14 +00:00
48d41ef307
Remove unnecessary instation of DOMap() in SOP from commit 5c53660 since this is being done lazily
2013-03-13 23:25:56 +00:00
39a0928052
minor: Remove some mono compiler warnings in OpenSim.Framework.dll
2013-03-13 23:17:27 +00:00
5c53660a7f
Add prototype dynamic objects map for scene object parts
...
This allows region modules to add dynamic objects to SOPs rather than having to continually push and pull OSD dynamic attributes.
This is to explore the original MOAP use case for dynamic attributes where it could be very awkward and possibly time-consuming to keep reconstructing MediaEntrys from stored DynamicAttributes.
This commit adds a DOExampleModule to demonstrate/evolve this code.
Dynamic objects involve no storage or persistence changes - the 'backing store' for any data that does need to be saved will remain the DAMap.
DOExampleModule in this commit only attaches a fresh dynamic object. Actually constructing this from stored dynamic attributes and handling persistence is left for later.
These changes should affect no existing functionality, though it may or may not reveal necessary changes in DAMap down the road.
2013-03-13 22:59:06 +00:00
b7216f4daf
minor: save some commented out log lines which will be useful again in future debugging of VectorRenderModule
2013-03-13 00:46:17 +00:00
f8a4d95bdd
minor: Remove mono compiler warning in LLClientView
2013-03-13 00:22:07 +00:00
0d25be3f81
Make C# scripts return correct error line and column numbers instead of failing because they have no linemap.
...
Adapted fix from http://opensimulator.org/mantis/view.php?id=6571
Thanks Nickel Briand
2013-03-13 00:19:37 +00:00
fb1211ad5e
Add DisableInterRegionTeleportCancellation option in [EntityTransfer] section of OpenSim.ini. False by default.
...
This option allows the simulator to specify that the cancel button on inter-region teleports should never appear.
This exists because sometimes cancellation will result in a stuck avatar requiring relog.
It may be hard to prevent this due to the protocol design (the LL grid has the same issue)
In small controlled grids where teleport failure is practically impossible it can be better to disable teleport cancellation entirely.
2013-03-12 23:01:27 +00:00
c43d4b5572
Improve teleport cancellation in some circumstances, though cancelling teleports is still not recommended.
...
Previously, hitting the cancel button on a teleport would cancel on the client side but the request was ignored on the server side.
Cancel would still work if the teleport failed in the early stages (e.g. because the destination never replied to early CreateAgent and UpdateAgent messages).
But if the teleport still completed after a delay here or later on, the viewer would become confused (usual symptom appears to be avatar being unable to move/reteleport).
This commit makes OpenSimulator obey cancellations which are received before it sends the TeleportFinish event queue message and does proper cleanup.
But cancellations received after this (which can happen even though the cancel button is removed as this messages comes on a different thread) can still result in a frozen avatar.
This looks extremely difficult and impossible to fix.
I can replicate the same problem on the Linden Lab grid by hitting cancel immediately after a teleport starts (a teleport which would otherwise quickly succeed).
2013-03-12 22:16:09 +00:00
0c6268fe56
minor: remove mono compiler warning in SceneObjectUndoRedoTests
2013-03-11 23:15:13 +00:00
be686f80a3
minor: Remove mono compiler warnings from LSL_ApiHttpTests
2013-03-11 23:01:07 +00:00
e898a5fec5
minor: Remove mono compiler warnings in EventQueueTests
2013-03-11 22:42:27 +00:00
1120bcf123
BulletSim: remove the ability for avatars to fly off the edge of
...
regions when there are no region neighbors.
Add some terrain location processing routines to support above.
2013-03-09 14:15:14 -08:00
5097437e11
* Apparently, sometimes texture entries come in from the wire with no default texture defined.. so apply better fallback protection against that. The net result is clients will have their selected textures set when they would have previously had an ignored exception.
2013-03-08 19:32:47 -05:00
33dab49d22
* Just another one of those new packet blocks causing a null ref. Defaulting to zero length array.....
2013-03-07 19:19:36 -05:00
6706e189d5
minor: remove some completely unused string local vars added recently in commit 984faf2
2013-03-06 23:11:32 +00:00
2fe938d11d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-06 23:07:04 +00:00
5751ecde52
Add code for testing event queue messages recevied on region cross.
...
This is currently disabled pending an improvement in the test code to properly add avatars when an event queue module is present.
2013-03-06 23:06:00 +00:00
8960418e7d
Add regression test for presence crossing between regions on the same simulator.
...
Unlike a much earlier commented out version of this test, this is done in synchronous mode.
2013-03-06 21:37:53 +00:00
9875e840f7
Per discussions with justincc... split the JsonStore type
...
functions into one for node type and one for value type.
Define and export constants for both nodes and values.
2013-03-05 20:33:17 -08:00
30e06b0742
Convert doubles passed back through the MOD interface into LSL_Floats
2013-03-05 20:32:06 -08:00
a9f380d124
Fix bug in osGetPrimitiveParams() so that it works for prims with the same owner as the script and not ones with different owners.
...
Addresses http://opensimulator.org/mantis/view.php?id=6560
2013-03-06 00:22:58 +00:00
b272b91317
minor: Fix mono compiler warning in MonitorModule
2013-03-05 23:59:39 +00:00
5cd38d680a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-05 23:52:52 +00:00
ccd6f443e1
Get attachment script state before taking sp.AttachmentsSyncLock() to avoid race conditions between closing agents and scripts that may be doing attachment manipulation.
...
This is in an effort to resolve http://opensimulator.org/mantis/view.php?id=6557
2013-03-05 23:47:36 +00:00
f676408e2a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-05 15:30:54 -05:00
69fbcdf14c
* Add a Max Payload size property to the Websocket Server Handler. If you would like to restrict the maximum packet size, (and therefore protect against Memory DOSing) then you should set this. I defaulted it to 40MB. This means that in theory, a malicious user could connect and send a packet that claims that the payload is up to 40 mb (even if it doesn't actually turn out to be 40mb. More testing needs to be done on it where the packets are maliciously malformed.
2013-03-05 00:04:09 -05:00
7556b42d7a
* Update LibOMV to f8f8e616b37a7ea22b7922b2331999bc06725bf9
...
* Add zero length blocks to the new packet blocks to remain compatible with older viewers and avoid a NullRef when _packets_.cs calls the Length parameter.. which adds up the Length property all of the blocks.
2013-03-04 21:26:26 -05:00
fa9f4ef1ba
Fix issue in the mesh upload flag module where the ID of the last agent to request the capability was always used instead of the original requesting agent for each cap.
...
Should address http://opensimulator.org/mantis/view.php?id=6556
2013-03-04 23:20:00 +00:00
66d74e76b1
Add method to remove JsonRpc Handlers from the server
2013-03-03 09:40:44 -05:00
e70c71a175
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-02 17:54:19 -08:00
b0985f7019
Fixed typos in TempAttachmentsModule. No changes.
2013-03-02 17:53:57 -08:00
1bc8692a99
Move AllowedClients and BannedClients section to new [AccessControl] section in OpenSim.ini from [Startup]
...
This change also corrects the setting names - they were actually wrong (though the text in {} was correct).
If there are settings in [Startup] they will continue to be used and anything there will override settings in [AccessControl]
2013-03-02 01:43:54 +00:00
1a98ce5f64
minor: Quieten down the parts of the WebSocketEcho module logging for now where it tells us it is added/loaded/removed from regions
2013-03-02 01:06:08 +00:00
c91753c065
minor: Log number of region modules loaded from each plugin
2013-03-02 00:56:53 +00:00
20530ee667
Moved permissions config vars out of [Startup] into [Permissions]. Backwards compatible ([Startup] still being looked up), but please update your configs sometime soon.
2013-03-01 15:24:22 -08:00
90a19fb573
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-01 21:49:05 +00:00
c851ebcd8c
Add the Mono AddinDependency attribute to the example region modules.
...
It turns out this is required to get Mono.Addins to pick up plugin DLLs
2013-03-01 21:47:17 +00:00
326634a0b3
BulletSim: more things into the TODO list.
2013-03-01 09:44:39 -08:00
1c740798b4
BulletSim: add parameters, code cleanup around checking and enforcing
...
maximum velocity and angular velocity values for prims.
2013-03-01 09:44:37 -08:00
862c3fd446
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-03-01 00:21:56 +00:00
faf96f5c85
minor: Log location in which simulator/robust was started.
...
Useful information for system debugging, especially if logging and ini files locations have been changed from defaults.
2013-02-28 23:59:26 +00:00
433102108b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-28 14:20:31 -08:00
ea3e0ef8a3
Bug fix in DataSnapshot, where a var was being used before being initialized.
2013-02-28 14:20:07 -08:00
239a8da74e
Fix potential concurrency issue since the LSL notecard cache was not being checked for expiry under lock
2013-02-28 21:19:23 +00:00
a523ed1e4d
Fix bug where simultaneous calls by different scripts to llGetNotecardLine() or llGetNumberOfNotecardLines() would sometimes not trigger a dataserver event.
...
This was because the notecard asset ID was being used as the request identifier.
Now using a random ID, in common with other code using the DataServer
2013-02-28 21:15:14 +00:00
14684116f8
Add regression tests for llGetNotecardLine()
2013-02-28 20:57:03 +00:00
3cc3a8e5bf
Removed duplicate 'using' statement.
2013-02-27 21:12:27 -08:00
bb44758179
Switched to using the other Util function with a default value.
2013-02-27 20:59:16 -08:00
64b8ce73da
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-27 20:50:03 -08:00
f1010d7b15
Moved the HG default variables out of [Startup] and into their own section [Hypergrid] in *Common.ini.example. Backwards compatible for now.
2013-02-27 20:49:41 -08:00
b892411575
Add comment to example region modules about need to add Assembly annotation if adding modules to a DLL which does not already have this
2013-02-27 22:54:51 +00:00
0e8ec5649e
Get "show modules" console command to obey selected command line region/s
2013-02-27 22:32:14 +00:00
647cb278c7
Get "show modules" console command to show modules in alphabetical order, and group shared and non-shared modules together
...
This is to make it easier to tell if a region has a certain module active or not
2013-02-27 22:25:03 +00:00
9b045e72b6
Add asset name and description truncation warnings to SQLite database plugin for consistency.
2013-02-27 21:41:21 +00:00
74916ed777
Add more information to warnings logged when asset names and descriptions have to be truncated for database storage
...
On balance, I still think this is useful because asset names and descriptions can sometimes be helpful in determining what things are.
Even though they are never subsequently (inventory names/descriptions are always used instead).
2013-02-27 21:35:54 +00:00
61ba02e95f
minor: remove some mono compiler warnings in script regression tests
2013-02-27 20:38:10 +00:00
056f11c297
Show http poll handlers in separate http (poll) section of "show http-handlers" console command instead of never showing them (due to a previous bug).
...
The code was assuming that poll handlers were also included in general http handlers but this was not the case.
2013-02-27 20:33:11 +00:00
59bd099b03
Add regression test for llReleaseUrl() (and for llRequestUrl)
...
Forgot to add file for llRequestUrl() test in commit b8a7c8b
2013-02-27 20:12:58 +00:00
80c19b7cac
Make sure we dispose of WebResponse, StreamReader and Stream in various places where we were not already.
2013-02-27 00:21:02 +00:00
ea4be309e8
minor: remove warning in ConfigurationLoaderTest
2013-02-26 23:40:55 +00:00
b8a7c8b26f
Add regression test for llRequestUrl()
2013-02-26 23:36:36 +00:00
bf9132e1c7
BulletSim: fix crash around race condition when a mesh asset cannot
...
be fetched.
Update TODO list.
2013-02-26 11:32:01 -08:00
2b53f08386
BulletSim: tweeks to make avatar jump work better.
2013-02-25 21:58:00 -08:00
a356978c79
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-25 16:28:12 -08:00
00da59ae52
Mantis #6552 -- stricter error (crash) if server URL is malformed.
2013-02-25 16:27:41 -08:00
d0cb4fc326
Move map related settings from [Startup] to a new [Map] section in OpenSim.ini
...
Existing map settings in [Startup] will continue to work, and if present will override anything in [Map]
However, the proper place for such settings would now be [Map]
This is to reduce the use of [Startup] as a bag for non-generic settings which should really go in sections, in common with other settings.
This commit also extends Diva's previous work to allow a default setting to be given when looking at multiple sections for settings.
2013-02-25 23:04:38 +00:00
66c5934d90
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-25 10:25:56 -08:00
f7aa018a78
Fixes mantis #6551 -- misspelled key name. Also fixed an issue with the roles cache.
2013-02-25 10:24:28 -08:00
aa538fe36f
Add StatsManager registration for region specific stats as collected
...
by MonitorModule. Left existing functionality (command line and HTTP
fetch) and just added StatsManager registration.
2013-02-24 07:48:02 -08:00
b2495c9a1e
Streamline stat registration code in ServerStats. Remove most of the
...
usage of ProcessCounters which tend to fail oddly and are not supported
everywhere.
2013-02-24 07:48:01 -08:00
2aae046b95
Make StatsManager default output a little more readable
2013-02-24 07:48:01 -08:00
9f213892ea
Add EventHistogram.GetHistogramAsOSDMap that returns that parameters
...
about the histogram as well as the values.
2013-02-24 07:48:00 -08:00
ee8d726ec5
Modify StatsManager so console command "show stats category container"
...
only outputs the statistics in the specified container in the category.
2013-02-24 07:48:00 -08:00
8e67ad25b0
Addition of ServerStats shared region module which collects and registers
...
server wide statistics (CPU%, network bytes sent, ...) with StatsManager.
2013-02-24 07:47:59 -08:00
d7115cfd46
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-22 15:58:06 -08:00
0e8289cd00
Added new Util function for reading config vars that's more generic than the one I added yesterday -- this is for helping move config vars out of [Startup]
2013-02-22 15:57:33 -08:00
a93f06eb88
minor: Add doc to ScenePresence.IsInTransit to make it clear that this is set only for region crossing and not teleport, etc.
2013-02-22 23:08:42 +00:00
ccb7cce819
Make reset of EntityTransferStateMachine for an avatar transfer always happen despite unexpected exceptions.
...
This means that if such an exception does occur, the region does not need to be reset before that user can teleport from it again.
This is all Oren's code from his patch in http://opensimulator.org/mantis/view.php?id=6374 but I've chosen to split it in two.
2013-02-22 21:59:00 +00:00
56c979afe8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-21 17:27:03 -08:00
e515cdddec
Simplification of HG configs: HomeURI and GatekeeperURI now are defined as default under [Startup]. They can then be overwritten in the other sections (but probably shouldn't). I kept the existing code for backwards compatibility, so this should not cause any breaks from people's current configurations. But people should move to have these 2 vars under [Startup] -- see OpenSim.ini.example and Robust.HG.ini.example. And yes, both names now end with "URI" for consistency.
2013-02-21 17:26:19 -08:00
76ee47c797
Add a virtual ToOSDMap() function to Monitoring.Stat for future
...
overloading by aggregation statistics and browser based stat viewers.
2013-02-21 15:53:04 -08:00
303e21babe
Add CounterStat which is a wrapper for a counter stat but, because
...
the 'count' event is internal, historical data can be built it.
Also includes EventHistogram class for building time based,
bucketed history of event occurances.
Make Stat implement IDisposable for subclasses that might need it.
2013-02-21 15:53:02 -08:00
9de670c550
minor: Change summary in "show appearance" console command to "incomplete" rather than "corrupt"
...
Corrupt is misleading - it implies textures were uploaded but are not j2k valid.
The actual situation is that at least one required baked texture is not present.
2013-02-21 23:08:50 +00:00
efb5da0aa6
BulletSim: add OutOfBounds logic and some position sanity checking
...
to eliminate some of the "cannot find terrain height" warning messages.
2013-02-21 08:52:11 -08:00
681653ca13
Add a method to IStatsCollector for returning stats as an OSDMap.
...
Extend implementors of IStatsCollector to return an OSDMap of stats.
Update UserStatsCollector and AssetStatsCollector to return both
string and OSDMap data (as well as console format).
2013-02-20 16:13:51 -08:00
16bb40229b
Add flush after write feature to LogWriter
2013-02-20 16:13:49 -08:00
99ebff94b5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-20 22:11:04 +00:00
a671c06ee5
Correct mistake in parsing 'show object pos' and similar pos commands where the 'to' text would be treat as the end vector rather than discarded.
...
Before this, the commands still work but the help text is wrong - one has to leave out the 'to' in stating the vectors
2013-02-20 22:09:33 +00:00
903b40b47e
Fix the JsonStore path set problem justincc found earlier today and
...
remove the deprecated TestPath functions.
2013-02-19 22:53:46 -08:00
4779f7d7d5
Deleted all AssemblyFileVersion directives
2013-02-19 17:14:55 -08:00
c5cbf862f9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-19 17:04:43 -08:00
66bc526e4c
Updated AssemblyInfo.cs for Groups and OfflineIM to 0.7.6.*. Removed AssemblyFileVersionNumber too.
2013-02-19 17:04:21 -08:00
05a0998f57
Give the user some feedback about the success or failure of console login property commands
2013-02-20 00:51:55 +00:00
8a6f2432fc
minor: remove some mono compiler warnings in OpenSim.Region.ClientStack.Linden.Caps.dll
2013-02-20 00:01:20 +00:00
26dca1adc3
Convert JsonTestPath() use in json regression tests to JsonGetPathType() instead
2013-02-19 23:53:57 +00:00
9380d01976
First commit of Diva Groups. The Data bits went to OpenSim.Data core, the rest to Addons.Groups.dll.
2013-02-19 07:26:40 -08:00
46e182dbf5
Offline IM: moved the Data and MySQL bits to the corresponding places in core, so that it will be easier to plugin a SQLite backend, if anyone is interested in doing that.
2013-02-19 06:37:20 -08:00
9e460f2af8
One more sql statement on migration #2 for offline im, to really clean up things.
2013-02-18 19:54:18 -08:00
4e846d55a8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-18 16:06:01 -08:00
5e709b087c
Donating Diva OfflineIM as an addon in a single dll, OpenSim.Addons.OpenSim.dll
2013-02-18 15:44:00 -08:00
050ef1dc4e
minor: Rename regression test method TestGetArrayLength() -> JsonTestGetArrayLength() to match others
2013-02-18 22:59:29 +00:00
8b1b8a3921
I need these for OfflineIM and Groups.
2013-02-18 12:08:05 -08:00
26421294f6
BulletSim: experimental lock axis code using constraints. Not enabled
...
by default. Like more debugging is needed.
2013-02-17 20:13:50 -08:00
1d7276235a
BulletSim: add calls for creating all the different Bullet constraint types.
...
Updated the DLLs and SOs and code for BulletXNA to create the types.
All the detailed control calls are not all in place yet.
2013-02-17 20:13:49 -08:00
885b45b112
BulletSim: rework parameter setting for different types of values
...
(like vectors or quaternions).
2013-02-17 20:13:48 -08:00
6560d80fa8
* Fix walking to <NaN, NaN, NaN> via autopilot.
2013-02-16 22:54:37 -05:00
e549c2922a
BulletSim: fix physical object appearing to slowly float off when
...
they stop moving.
2013-02-16 19:28:38 -08:00
3108d18ffb
Fix shape parameters sent for meshes tosupport the full number of faces
2013-02-16 05:44:41 +00:00
7d7736dc73
Separate IAR tests into separate files for load/save/loadpath tests
2013-02-16 01:57:42 +00:00
d54d31807a
Make it so that "load iar / ..." does not save the 'root' "My Inventory" folder.
...
Really "My Inventory" is just the name of the root, it isn't a folder in its own right.
This also makes it more intuitive for users to save whole inventory iars for backup/later restoration, as they don't need to remember to use /*
/* will still work and this is a special case just for the root
If you want to save only the contents of other folders (rather than the folder itself), you still need to specify something like a/b/*
Added a regression test for this case.
2013-02-16 00:50:52 +00:00
84de7e55e9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-16 00:27:16 +00:00
e9cc22fea4
Add regression test TestSaveNonRootFolderToIar
2013-02-16 00:26:21 +00:00
e09467b30d
Merge branch 'master' of git://opensimulator.org/git/opensim
2013-02-14 20:06:22 -08:00
afeb5d4917
Use SortedDictionary in StatsManager instead of regular Dictionary so stats will interate and print in a defined order
2013-02-14 20:05:42 -08:00
8d5fe5c222
Enable one sub-test in TestJsonSetValue() which now works (using identifier with embedded .).
...
Need to look further at other still commented tests.
Still need to check coverage against some of Mic's scripts.
2013-02-15 01:00:49 +00:00
61f18d15e1
Rename JsonSetValueJson() -> JsonSetJson() and JsonGetValueJson() -> JsonGetJson()
...
This is because JsonGetJson() is getting json from anywhere in the structure, not just values.
Equally, JsonSetJson() is setting any type of json, not just json which represents a value.
Agreed with cmickeyb
2013-02-15 00:38:07 +00:00
0b2608d8f4
Comment out regression TestJsonTestPath and TestJsonTestPathJson as these will go away soon
2013-02-15 00:32:20 +00:00
30a60d661f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-15 00:28:00 +00:00
cc40517863
Add regression TestJsonList2Path()
2013-02-15 00:27:30 +00:00
71862f34b6
* Handle null check on configs in module startup so that the the code can be run on 'stop on handled and unhandled null reference exceptions' mode without pausing during startup a bunch of times. I don't think exceptions were really meant for replacing a single if statement...
2013-02-14 18:52:11 -05:00
c22276a169
* gracefully handle a Situation where a double close is called on the WebSocket handler
2013-02-14 18:43:53 -05:00
13d4f6f747
Add regression TestGetArrayLength()
2013-02-14 21:34:57 +00:00
6fe771f27e
Add regression TestJsonGetPathType()
2013-02-14 21:31:34 +00:00
0ad07eb44d
minor: remove some mono compiler warnings
2013-02-14 21:29:35 +00:00
edb99dcc19
Rename new JsonScript functions JsonPathType() -> JsonGetPathType() and JsonArrayLength() -> JsonGetArrayLength()
...
This is for consistentency with the verb:noun naming approach existing json script functions and other script functions.
Corresponding c# methods also changed since verb:noun is also the .net c# method naming guideline (as used by OpenSimulator) and for consistency with script functions.
As agreed with cmickeyb
2013-02-14 21:11:58 +00:00
a52dfd43b6
Make new JsonStore script constants separated with underscores, to be consistent with existing LSL/OSSL, etc script constants.
...
Agreed with cmickeyb
2013-02-14 21:03:07 +00:00
5920abbf8d
Add EventManager events triggered when a SOP is added or removed
...
from the physical scene. Invocations added in SceneObjectPart.
2013-02-14 09:48:11 -08:00
ef662fc959
Add an event and some logic to allow customizing Simulator Features by avatar
2013-02-14 09:11:57 +00:00
69d0e168fb
Fix a very unlikely-to-occur NullReferenceException race condition in llPushObject() where the code assumed that the physics actor it null-checked would still be null when it invoked a method on it
2013-02-14 00:20:23 +00:00
bcb172301d
Adds a couple requested functions to the JsonStore script
...
interface. JsonPathType returns the type of node pointed to by the
path and deprecates the functionality of both JsonTestPath
functions. JsonArrayLength returns the length of an array node.
2013-02-13 07:14:04 -08:00
708c3f8b86
Make path parsing more robust in the JsonStore.
2013-02-12 23:21:49 -08:00
d652de1d0e
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-02-13 01:53:29 +00:00
c2bfdaa026
Make the sim features module register it's interface so it can be used
2013-02-13 01:52:25 +00:00
5557b523fd
Add more sub-tests to TestJsonSetValue for paths containing []{} without {} delineation.
...
As expected, values are not set and the set call returns FALSE (0).
As a reminder, these tests are not currently running on jenkins continuous integration as the functionality is only available on .net 4 (mono 2.8 and later).
2013-02-13 01:38:33 +00:00
b1a165a39a
Extend JsonTestSetValue() with tests for escaping brackets, periods and unbalanced braces from paths
...
The sub-tests that are commented out are currently those which fail unexpectedly based on my understanding of the path syntax
2013-02-13 01:25:30 +00:00
70e641c708
Add test for array as root element in TestJsonCreateStore()
2013-02-13 00:51:45 +00:00
3e9f3c0383
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-13 00:34:08 +00:00
4b797f2ead
Extend TestJsonRemoveValue() with tests for non-penultimate nodes and arrays
2013-02-13 00:12:20 +00:00
0194a3d890
BulletSim: fix density since the simulator/viewer track density in a
...
funny unit that is 100 times real density (default 1000).
Fix avatar drifting slowly when stationary flying.
Fix for physical prims getting corrected for being under terrain when it was
just its geometric center that was below terrain.
Add PreUpdatePropertyAction allowing plugable modifiction of phys
parameters returned from Bullet.
Fix an exception setting GravityMultiplier on initialization.
Update DLLs and SOs for good measure (no functional change).
2013-02-12 15:52:10 -08:00
fb903ff490
BulletSim: More work on center-of-mass. Remove linksetinfo and rely on simulator to update info.
2013-02-12 15:52:08 -08:00
992ef9e971
Extend TestJsonCreateStore() with a one key input and an input with raw number values
2013-02-12 23:00:24 +00:00
a82bd5678e
Use an integer when specifying the XWorkItem wait rather than a TimeSpan to avoid a Windows casting issue in SmartThreadPool for large TimeSpans.
...
TimeSpan.Milliseconds is an int64. However, STP casts this to an int (32-bit).
If TimeSpan.MaxValue is given then the casting results in an invalid value for the SDK WaitHandle.WaitAll() call.
This was causing the co-op script termination regression tests to fail on Windows but not Mono 2.10.8 (which is perhaps not strict in the negative values that it accepts).
Solution here is to use the int millisecondsTimeout STP call rather than the TimeSpan one.
This also allows us to more clearly specify Timeout.Infinite rather than TimeSpan.MaxValue
Thanks to Teravus for this spot.
2013-02-12 21:34:12 +00:00
058d477ce7
Re-enable subtest for single quoted token in TestJsonSetValueJson()
...
This is in response to the resolution of http://opensimulator.org/mantis/view.php?id=6540
2013-02-12 20:51:36 +00:00
4b8c22ecfa
Adds the parameter for OSD serialization to encode default values. This
...
makes the JsonStore get/set operations symmetric.
2013-02-12 11:10:17 -08:00
d3b2cdc2b4
Fix handling of string values in JsonSetValueJson(). There are
...
some oddities with empty strings: the Json serializer treats them
as default values and does not return them in serialized hashes.
2013-02-11 19:55:10 -08:00
586def0bcc
Add regression TestJsonSetValueJson()
...
The part to test setting of single leaf-node string tokens is currently commented out.
See http://opensimulator.org/mantis/view.php?id=6540
2013-02-12 01:27:38 +00:00
d55974bcb7
Add regression TestJsonGetValueJson()
2013-02-11 23:47:49 +00:00
6924bd21f4
Add regression TestJsonTestPathJson()
2013-02-11 23:10:07 +00:00
9d001e40e7
Add section to TestJsonGetValue() to test call on a sub-tree
2013-02-11 22:56:43 +00:00
8fcfd82241
Extend TestJsonTestPath() for non-terminating section of path (i.e. one that does not point to a value/leaf)
2013-02-11 22:44:25 +00:00
cbb8d82c7d
Add section to TestJsonSetValue() to test attempted set of value where the penultimate section of path does not exist
2013-02-11 22:28:50 +00:00
c72c189864
Add test to try reading notecard into an invalid path in TestJsonReadNotecard() regression test
2013-02-11 22:16:07 +00:00
6f3dcf58b8
Fix code to check for no spawn points. Possibly a merge artefact?
2013-02-10 20:00:39 +00:00
7524bd5a7c
Additional ThreadPool worker and IOCP thread startup logic
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2013-02-10 14:14:33 -05:00
adedd70c35
Fix teleport/telehub issue:
...
Fix bug that allowed only login access to regions with mis-configured telehubs. Administrators now have teleport access when there exists a mis-configured telehub in the region. Estate owners are now placed at region center in the absence of spawnpoints instead of being denied access. Grid Gods are unrestricted. All others are denied access to the region until spawnpoints are assigned to the telehub object.
2013-02-10 13:01:33 -05:00
0a297a0e52
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-08 22:43:56 -08:00
7bb82c8f2e
Make JsonStore path parsing more robust. Should fix the
...
invalid path problem.
2013-02-08 22:43:15 -08:00
745ef40153
Fixed ReadSculptData(): the check whether there are enough bytes to read was incorrect
2013-02-09 02:04:26 +00:00
ae701eccd2
Fixed check for 0 results in GetUserAccounts()
2013-02-09 01:57:36 +00:00
6935bec0ab
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-09 01:11:41 +00:00
a8bc08ebe6
Change TestDestroyStore() and TestJsonRemoveValue() to reflect the fact that the return values have changed.
2013-02-09 01:10:53 +00:00
85b81ff7f2
Added physics parameters support to MSSQL and SQLite (not tested)
2013-02-09 01:03:58 +00:00
4808b8ee38
BulletSim: add parameter to set global contact breaking threshold. Update DLLs and SOs for setting same.
2013-02-08 16:29:52 -08:00
222040f1ec
BulletSim: Change BSCharacter to use new base Density and Friction
...
variables rather than own local varaibles.
2013-02-08 16:29:45 -08:00
1b55a9d81e
BulletSim: fix avatar bobbing or jiggling while stationary flying.
...
Various comments and debugging message mods.
2013-02-08 16:29:40 -08:00
d92eb80373
BulletSim: add initial instance of the ExtendedPhysics region module which adds new LSL commands for extended physics functions. Uses the modInvoke system. Disabled by default.
2013-02-08 16:29:35 -08:00
1b203601f4
BulletSim: include the linkage to the layered prim implementation. Separate layers for physical (vs simulator) location displacement and linksets.
2013-02-08 16:29:29 -08:00
2fd184e350
BulletSim: reclass BSPrim into layers so linkset and physical world displacement is implemented as overlay classes rather than if statements scattered about.
2013-02-08 16:29:24 -08:00
6d825d7ea2
Broaden the internal OSD type checks to parse JSON that has
...
non string values.
2013-02-08 15:46:42 -08:00
4d5c04837e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-08 15:09:13 -08:00
e93defd0ca
Adds size limits to JsonStore. Adds a separate configuration
...
variable to enable binding to dynamic attributes.
2013-02-08 15:07:43 -08:00
a08e1b60ec
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-08 21:56:22 +00:00
b08977ea7d
Don't allow exceptions to propogate from FlotsamAssetCache which may occur when deleting expired files or stamping the region status file.
...
Changes various error level log lines to warn since these are not fatal to the operation of OpenSimulator
2013-02-08 21:21:20 +00:00
2b5eba9c74
Fix the return values for JsonDestroyStore, JsonRemoveValue, and JsonSetValue.
...
Fix the link message status when reading a notecard.
2013-02-08 12:00:16 -08:00
c2bf91c5e3
If a component of a coalesced object fails to deserialization, do not add a null where the object should be.
...
This prevents a later load IAR failure.
This code is currently only used by IAR loading.
2013-02-08 02:45:30 +00:00
221a90e3a1
On IAR loading, if loading of a coaleseced item entirely fails, then continue with the IAR load rather than failing completely.
2013-02-08 02:34:13 +00:00
e836da5d20
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-08 02:01:17 +00:00
42f724f380
Refine TestJsonReadNotecard() and use / instead of . to separate paths.
...
An attack of the stupid meant that I was using / as a path separator.
Fixing this makes the tests behave better, though still with some questions.
Also, I imagine / shouldn't really put data in the root as that's not a valid identifier.
This commit also fix the / mistake in other tests those this does not affect their outcomes.
2013-02-08 01:59:27 +00:00
913965256f
BulletSim: Adapt BulletSim to the newer physical properties. Viewer
...
dialog setting of friction, restitution, ... working.
2013-02-07 17:13:28 -08:00
b545e13184
BulletSim: fix exceptions caused by setting physical properties before the prim body is initialized.
2013-02-07 17:13:27 -08:00
ebb63b55aa
BulletSim: add user setting of friction, density and restitution.
2013-02-07 17:13:27 -08:00
528f23beab
Extend TestJsonReadNotecard() for reads to non-root locations and fake stores.
...
Assertions for loading to non-root paths are currently commented out because this doesn't seem to be working. Will be raising mantis to resolve.
2013-02-08 01:02:25 +00:00
9c9b48b29a
Stop wrongly create a receiving store already populated with "Hello":"World" in TestJsonReadNotecard()
2013-02-08 00:38:30 +00:00
24bfdbfb80
Extend TestJsonWriteNotecard() regression test for cases with fake paths and fake stores.
...
Also separates out TestJsonWriteReadNotecard() into separate write and read tests
2013-02-08 00:36:20 +00:00
bef8961578
Extend TestJsonSetValue() regressio ntes tto test against a fake store
2013-02-08 00:04:05 +00:00
be982666fb
Extend TestJsonTestPath() regression test with checks against fake values and fake stores
2013-02-08 00:01:06 +00:00
75f1e04315
Add tests for removing fake values/from fake store in TestJsonRemoveValue()
...
Again, need to check if returning true for removing a value that doesn't exist is most appropriate.
2013-02-07 23:58:19 +00:00
715d6f2da1
Add testing for getting non-existing values and values from a non-existing datastore to TestJsonGetValue()
2013-02-07 23:52:28 +00:00
a2dad09172
Actually plumb the new values to physics.
2013-02-07 23:34:47 +00:00
de53955610
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-02-07 23:23:42 +00:00
2e86978b60
Add TestJsonDestoreStoreNotExists()
...
This still returns true even if we ask to destroy a store that does not exist.
Need to check that this is more appropriate behaviour.
2013-02-07 23:30:03 +00:00
22675e6b14
Add some more code from Avination. This changes physics actor stuff around
...
to work with the new params. Not actually plumbed just yet.
2013-02-07 23:22:00 +00:00
9e17dc3daa
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-07 23:09:47 +00:00
c135c3224f
Fix a recent regression in e17392a where JsonSetValue() stopped working (probably other functions as well).
...
Fix is to call through to the no-arg constructor from the string constructor in JsonStore, which I suspect was just forgotten.
This was actually picked up by the TestJsonSetValue() regression test failing
But this isn't being run on jenkins due to the .net version issue.
This commit also puts the full stack trace in logged messages and makes these error level messages instead of info
2013-02-07 23:08:19 +00:00
7bf33d333a
Plumb the path from the client to the extra physics params and back
2013-02-07 22:25:28 +00:00
338b02a8bc
Send the new physics params to the viewer build dialog
2013-02-07 21:23:35 +00:00
9089757ea2
Revert "Add plumbing for physics properties to get to the physics engine."
...
This reverts commit c658fa1c0d
2013-02-07 21:05:58 +00:00
c658fa1c0d
Add plumbing for physics properties to get to the physics engine.
...
Addition of entries to PhysicsActor and setting code in SceneObjectPart.
2013-02-07 11:10:15 -08:00
af73ea909c
Change passed PhysicsParameter value from float to the more general string value
2013-02-07 11:10:14 -08:00
a5c83f7505
Websocket Echo module should not be on by default.
2013-02-07 12:22:03 -05:00
4bd1794b5a
* missing example module.. Oops.
2013-02-07 12:19:54 -05:00
94a5232d3a
* Adds Websocket support to baseHttpServer and IHttpServer.cs . This allows modules to set up a websocket server that websocket clients can connect to. An example module is in OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs
2013-02-07 10:50:17 -05:00
4867a7cbbf
This is the final commit that enables the Websocket handler
2013-02-07 10:27:18 -05:00
6504e3d4ce
Rename "Bounciness" to "Restitution"
2013-02-07 03:30:02 +00:00
2c5d24d394
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-07 02:19:53 +00:00
3657a08844
Add TestJsonWriteReadNotecard() regression test
2013-02-07 02:19:26 +00:00
274d376c82
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-06 17:32:57 -08:00
e17392acbb
Enables script access to the per object dynamic attributes through the JsonStore
...
script functions. Adds JsonAttachObjectStore to associate a store identifier with
an object (scripts can only access the store in their host object, this could be
extended but isn't necessary for now).
Note this opens a method to the DAMap OSDMap. This will be removed later, but
greatly simplifies the code for now.
The JsonStore and these scripts are disabled by default.
2013-02-06 17:29:17 -08:00
4d1758985f
Make json store tests operate on a single thread to ensure we don't run into any race related test failures in the future.
2013-02-07 00:54:09 +00:00
7590ebc934
Merge branch 'master' of git://opensimulator.org/git/opensim
2013-02-06 16:45:47 -08:00
df37738ce7
WebStats will now use actual logfile as specified in OpenSim.exe.config rather than hardcoded ./OpenSim.log. This allows for rotating logs and other file appender types
2013-02-06 16:44:59 -08:00
c8c5d74c22
minor: add method doc to DAMap.ValidateKey()
2013-02-07 00:22:39 +00:00
5d523ea493
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-06 16:18:27 -08:00
e2c1e37b07
Add key length validation to DAMap.Add(KeyValuePair<string, OSDMap> kvp) to match Add(string key, OSDMap store)
2013-02-07 00:15:50 +00:00
d2ece00e68
BulletSim: set removing zero width triangles in meshes to be enabled by default. This should fix the invisible barrier in sculptie doorways bug.
2013-02-06 15:59:59 -08:00
0baa2590be
BulletSim: check for completely degenerate meshes (ones with all
...
triangles having zero width) and output an error rather than
throwing and exception.
2013-02-06 15:52:28 -08:00
67d92e4e16
BulletSim: remove an exception which occurs if a physics mesh
...
asset is not found.
2013-02-06 14:00:27 -08:00
054a9928a0
Fix a bug I brought in by manually editing a diff file. Terrain is if cource not always at 20m.
2013-02-06 18:13:02 +00:00
e5beb480ea
Partial port of Avination's support for the new physics parameters.
...
Implements the parameters as properties, the serialization and
database storage (MySQL only). Implements llSetPrimitiveParams for
prim physics shape and the other 4 extra params. Only the prim shape type
"None" is currently functional. No support for the Viewer UI (yet), that
will be ported in due course. Lots more to port, this is a large-ish changeset.
2013-02-06 08:03:04 +00:00
145e38e5e9
Remove long unused Scene.DumpAssetsToFile boolean.
2013-02-06 02:21:17 +00:00
2ce8a050e4
Remove very long unused IScriptHost and NullScriptHost
2013-02-06 02:15:54 +00:00
9ebad38c34
Remove unused ScriptEngineLoader and ScriptEngineInterface in OpenSim.Region.Framework.dll
...
I believe this predates the generic system of registering interfaces and is very long unused.
2013-02-06 02:08:44 +00:00
dfe5826f9f
Remove wrong code in ScriptUtils.GetAssetIdFromKeyOrItemName which would return the item ID instead of the asset ID if the identifier was a uuid that matched an inventory item name.
...
This would practically never happen.
This makes this overloaded version of the function consistent with the other version.
It looks like this accidentally came over in commit c5af16a
2013-02-06 01:49:32 +00:00
eddfed3812
Allow JsonReadNotecard() to accept the name of the notecard as well as the asset ID.
...
Agreed in discussion with cmickeyb.
This is to make this consistent with similar existing LSL/OSSL functions such as llTriggerSound() and osNpcLoadAppearance() that allow an item name or an asset id.
2013-02-06 01:37:22 +00:00
0d4df99d04
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-06 01:35:25 +00:00
3646361279
BulletSim: make removing zero width triangles from meshes optional
...
and, for the moment, default to 'off'.
2013-02-05 17:19:55 -08:00
5c94346bd7
refactor: Move functions that lookup asset ids from task inventory or pass them through to ScriptUtils class in OpenSim.Region.Framework.dll
...
Renames functions to better reflect what they do.
This is so that code registering with modInvoke() can reuse this code to provide functions that behave in a consistent manner with existing LSL/OSSL functions.
2013-02-06 01:17:19 +00:00
dce9e323f4
BulletSim: remove degenerate triangles from meshes. This fixes the
...
invisible barriers in sculptie doorways (Mantis 6529).
Bump up level-of-detail for physical meshes to 32 (the max). This
fixes the invisible barriers that showed up in prim cut arches.
NOTE: the default LOD values are removed from OpenSimDefaults.ini.
If you don't change your OpenSimDefaults.ini, you will continue
to see the arch problem.
2013-02-05 16:56:33 -08:00
13233da66c
BulletSim: add debugging looking for doorway sculpty problems
2013-02-05 16:56:28 -08:00
ad438ee59f
BulletSim: rework some parameter setting implementation moving functionality that was in BSScene to BSParam. Remove unused parameters that were passed to the unmanaged code. Update DLLs and SOs for the new param block.
2013-02-05 16:56:23 -08:00
2b6d226911
BulletSim: correct angular vertical attraction to properly correct an upside down vehicle.
2013-02-05 16:56:17 -08:00
4cdee3dd3c
Changed protection of CreateDefaultAppearanceEntries to protected, so extensions of the UserAccountService can reuse this.
2013-02-05 16:28:25 -08:00
2104e4d4d4
* the root prim was being given an OffsetPosition in addition to setting the position when creating the root prim. The offset position caused the positioning code to re-move the root prim when you selected it and released it.
2013-02-05 18:46:02 -05:00
1dc09d8e8f
We're not really done here.. but we're getting there. Socket Read is working.. Still have to do Header.ToBytes and compose a websocket frame with a payload.
2013-02-05 18:02:25 -05:00
6bce4bc112
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-02-05 20:09:45 +00:00
2163bebeb4
Try to fix uploaded mesh rotations - code from Avination code base.
2013-02-05 20:09:02 +00:00
562067eb16
Fix bug where viewers would not see the "Module command functions not enabled" error if these were disabled and a viewer attempted to call one.
...
This was not working because the shouter was wrongly signalled as an agent rather than a prim
2013-02-05 02:09:21 +00:00
1fc9f282fa
Merge branch 'dynamic-attributes2'
2013-02-05 00:35:15 +00:00
1f1da23097
Bump version and assembly version numbers from 0.7.5 to 0.7.6
...
This is mostly Bluewall's work but I am also bumping the general version number
OpenSimulator 0.7.5 remains in the release candidate stage.
I'm doing this because master is significantly adding things that will not be in 0.7.5
This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names
and so the exact version match requirement is not in force.
2013-02-05 00:23:17 +00:00
ee4f8ac193
Merge branch 'master' into JSONTCPClient
2013-02-03 08:18:53 -05:00
8fd99ecab1
Merge branch 'master' of ssh://opensim/var/git/opensim
2013-02-03 08:14:47 -05:00
6b0310b829
Adds the ability to load more then one IClientNetworkServer thereby allowing additional client network servers at the same time. Use comma separated values in clientstack_plugin in your config. Additional plugins lying around shouldn't be picked up because the loader only loads configured dll assemblies and breaks at the first IClientNetworkServer found in the assembly. (the only new functionality is the ability to specify more in config). Note: The existing functionality also passes in a nini config.. and has a boolean to determine if the client network server should be initialized for a specific scene.
2013-02-03 08:13:52 -05:00
d18fbb98b7
Adds the ability to load more then one IClientNetworkServer thereby allowing additional client stacks. Use comma separated values in clientstack_plugin in your config.
2013-02-03 07:44:45 -05:00
27a0b3ecbd
Commit 1 in of this branch feature. This is one of many...
2013-02-03 06:49:17 -05:00
219a25c985
Merge /home/opensim/src/opensim
2013-02-01 23:14:19 -05:00
0ab68f6c31
Revert "Update assembly version numbers"
...
This reverts commit 141ad829f4
2013-02-01 23:13:33 -05:00
840f72f8a8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-01 22:07:08 -05:00
0d0bfa4dcd
minor: change comment about assuming script references are textures in UuidGatherer since this is no longer the behaviour.
2013-02-02 03:02:04 +00:00
57cf89f4a9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-01 21:58:32 -05:00
141ad829f4
Update assembly version numbers
2013-02-01 21:57:49 -05:00
9822bb664b
Log missing assets on "fcache assets" found. This ignores references found by scanning LSL/notecard files since these are the source of false positives.
...
This also changes UuidGatherer to reutn an AssetType.Unknown for embedded script/lsl references instead of Texture, since these are often not textures.
This is added to help people in determining when they have missing assets such as textures, etc.
In this case, one wants to run "fcache clear" first.
2013-02-02 02:57:38 +00:00
2ff301ca11
Correct spelling mistake in new RayFilterFlags, LSLPhanton -> LSLPhantom
2013-02-02 01:34:49 +00:00
9588328242
Stop exceptions being thrown if GenerateMapTiles = false but no static map tile has been set. Do more informative warn instead.
2013-02-02 00:59:26 +00:00
d8d4e7f236
Sit and Spin reduction. If sitting, slam avatar angular velocity to zero.
2013-02-01 15:42:24 -05:00
5bb85a14d4
BulletSim: fix problem where editting a physical linkset caused the
...
child prim physical positions to get out of sync with the view.
More reliably compute the offset of children in a physical linkset.
2013-02-01 11:52:27 -08:00
75a05c16c5
BulletSim: fix crash caused when linksets were rebuilt. A problem added
...
when individual child pos/rot changes were implementated a week or so ago.
Remove some passing of inTaintTime flag when it was never false.
2013-01-31 15:56:10 -08:00
ed71c939fc
BulletSim: make sure vehicle physical properties are set when going
...
physical by delaying setting until pre-step time. Change vehicle.Refresh()
to schedule the pre-step setting.
Comments and updating of TODO list.
2013-01-31 15:56:02 -08:00
371449db2f
BulletSim: clean up TargetVelocity implementation by using the default defn in the PhysicsActor base class.
2013-01-31 15:55:53 -08:00
f984922dfd
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-31 14:54:19 -08:00
1e0420431f
Move the JsonStore regular expressions to static variables to avoid
...
recompiling on every operation. Added JsonList2Path script function
to simplify array iteration.
2013-01-31 14:53:16 -08:00
6a4c8824ea
Whitespace fix and removing unneccessary parentheses
2013-01-31 20:46:41 +00:00
b659ccfc80
Merge branch 'master' of git://opensimulator.org/git/opensim
2013-01-31 11:15:22 -08:00
17440d8a29
Added option for UUID as command parameters. This lets the command handle the UUID parsing and type checking before the command is executed.
2013-01-31 11:14:43 -08:00
a8fa8af9fc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-30 23:44:06 -05:00
fac72d540b
Allow use of MaptileStaticUUID in Regions.ini to override the global setting in OpenSim.ini for each region.
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2013-01-30 23:37:02 -05:00
a0ef3df194
Add JsonTestStore to determine if a JsonStore is associated with
...
a particular UUID.
2013-01-30 14:45:03 -08:00
52ea6eadae
* This adds a bit more to the previous flying roll effect by adding additional roll when pressing page down, and reducing your roll when pressing page up to make it feel more responsive and give the user more visual feedback.
2013-01-30 07:34:48 -05:00
7c4e0ff03c
* Adds a satisfying angular roll when an avatar is flying and turning. (General, not physics). Makes flying not feel as stiff.
2013-01-30 06:22:05 -05:00
d42c7afe3f
Add JsonDestroyStore() basic regression test
2013-01-30 05:56:30 +00:00
5a22efe69c
refactor: Make invocations of json store functions from the regression test simpler
2013-01-30 05:49:28 +00:00
addf9ada49
Add regression test for script func JsonRemoveValue()
2013-01-30 05:39:34 +00:00
5ac84a3793
Fix issue where lsl -> c# generation in co-operative termination mode did not correctly handle single statement versions of for, while and do-while loops.
...
Add regression tests to validate the fix.
This problem will not affect the default abort termination mode.
2013-01-30 03:52:22 +00:00
a61ecee227
BulletSim: fix physics repositioning when under ground to only happen
...
for physical objects. Non-physical objects can go anywhere they want.
2013-01-29 17:04:28 -08:00
39700445f2
minor: change name of json script tests to JsonStoreScriptModuleTests instead of copy/pasted LSL_ApiInventoryTests
2013-01-29 04:36:41 +00:00
ccdf86c737
minor: remove EnableLogging() left over in CoopTerminationTests
2013-01-29 04:35:05 +00:00
e0f4e91d22
Try ignoring json tests if they can't be run due to being on <=.net 3.5
2013-01-29 04:26:47 +00:00
fd34a75cde
minor: Tidy up disabled logging on AssetTransactionModule for future use. Make it clear that transaction parameter to HandleUDPUploadRequest is an ID.
2013-01-29 04:03:33 +00:00
77cd74ded6
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-29 03:59:38 +00:00
ca26ff9436
minor: remove some mono compile warnings in XEngine.cs
2013-01-29 03:58:11 +00:00
47f09ed4c1
BulletSim: enable angular vertical attraction.
...
Increase terrain collision margin to help vehicles from tunneling
into same.
2013-01-28 17:21:13 -08:00
531d0429d1
BulletSim: first unit test: vehicle angular attraction
2013-01-28 17:08:34 -08:00
e9aff0a91d
BulletSim: do not zero an avatar's standing velocity if it is standing
...
on a moving object.
Rearrange pre/post action subscription code to put more in locks.
Add meshmerizer params to BulletSimTestUtil scene creation (and fix line endings).
Rebuilt version of DLLs and SOs with cleaned up code and no profiling for sure.
2013-01-28 15:11:50 -08:00
e4c6a19940
BulletSim: rename 'uint' to 'UInt32' to make clear the type that is passed to unmanaged code.
2013-01-28 15:11:20 -08:00
f6380a3ad3
BulletSim: fix the trimming of colliders so only the top 25 are returned.
2013-01-28 09:02:01 -08:00
b546af9ac2
BulletSim: simplify the initialization of some of the parameters.
...
Disable vertical attraction for vehicles by default (for the moment).
Fix bug where vehicle would go crazy when velocity got above a
certain speed.
2013-01-27 12:50:07 -08:00
26d4596080
BulletSim: reinstate the supression of rotational velocity for vehicles
2013-01-27 12:50:07 -08:00
a345a2feb7
BulletSim: add framework for BulletSim unit tests. No tests yet.
2013-01-27 12:50:06 -08:00
05adf4b30f
BulletSim: disable center-of-mass computation because it does not work yet
2013-01-27 12:50:06 -08:00
80f0a978db
BulletSim: fix compile error from last commit
2013-01-27 12:50:06 -08:00
36f401d850
BulletSim: parameterize the value for gravity reduction for ground vehicles on the ground. Set defaults for vehicle factors to one. Debug logging changes.
2013-01-27 12:50:05 -08:00
ddef8f16e5
BulletSim: first attempt at reporting top colliders
2013-01-27 12:50:05 -08:00
dd08e1fba6
BulletSim: parameterize several vehicle debugging values: physical linear and angular force factors now default to less than 1 (0.2) vehicle friction and restitution now default to low values
2013-01-27 12:50:05 -08:00
c44a8e9f92
BulletSim: finish the post step event for physical object actions. Modify vehicle to use post step event for logging.
2013-01-27 12:50:04 -08:00
776cc33541
Prevent items being destroyed by rename operations. Renaming of a wearable also
...
sends an asset transaciton but it is empty. So we can't ignore name data
when a transaction is present and can't treat every transaction as valid.
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2013-01-27 01:07:37 +00:00
b0cff35d96
Fix issue where the "set terrain texture" console command did not tell the viewers that textures had updated (hence they did not display the changes).
...
Addresses http://opensimulator.org/mantis/view.php?id=6513
2013-01-26 04:27:01 +00:00
53833babf9
Add OnScriptMovingStartEvent and OnScriptMovingEndEvent to EventManager so that these can be triggered by future code (not yet implemented).
...
Also hooks up moving_start and moving_end script events, eliminating itemID on XEngine EventManager methods since this is completely unused.
An adaptation of the patch in http://opensimulator.org/mantis/view.php?id=6515
Thanks Garmin Kawaguichi and Signpost Marv.
2013-01-26 03:57:51 +00:00
8ea112a5b2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-26 02:58:10 +00:00
ceabb1b49a
Mantis 6343: Turn a prim to flexy to OFF don't work llSetPrimParams
...
Correction so that scripts can turn Flexi off as well as on.
2013-01-26 02:55:24 +00:00
5128ae7b86
* This adds llVolumeDetect functionality to the C# implementation of BulletSim.
2013-01-25 20:15:37 -05:00
c3fb114461
minor: Fix full scene part console report to show proper Light* names rather than all wrongly FlexiDrag
2013-01-26 00:31:50 +00:00
d6d6618f62
minor: Call down to base OpenSimTestCase.SetUp() in NPCModuleTests to disable any enabled logging from previous tests
2013-01-26 00:28:45 +00:00
7a139f8e53
Remove the accidental PrimShapes column that I added back to the SQLite region store
2013-01-25 04:35:06 +00:00
7789415148
Fix tests by adding DynAttrs add column commands to RegionStore.migrations (these were originally in 021_RegionStore.sql which I might have forgotton to add 2 years ago).
2013-01-25 04:22:32 +00:00
6daf559fb6
Added unit tests for Dynamic Attributes
2013-01-25 04:03:30 +00:00
23f0610f0c
Disabled DAExampleModule
2013-01-25 04:03:28 +00:00
af6a7cf95d
Added DynAttrs to the serialized XML format of prims. When copying prims, use deep copy for DynAttrs.
2013-01-25 04:03:26 +00:00
86802bcf93
Store NULL in the 'DynAttrs' column if the prim doesn't have any dynamic attributes
2013-01-25 04:03:24 +00:00
fdec05a15e
Stopped storing dynamic attributes in the PrimShape
2013-01-25 04:03:20 +00:00
8b4441d940
Changed DAMap to be the container of "data stores", which are OSDMaps. Store names must have at least 4 characters.
2013-01-25 04:03:18 +00:00
918b062866
Added missing DynAttrs references in MySQL
2013-01-25 04:03:15 +00:00
1650846df3
Lock DAMap rather than encapsulated OSDMap
...
This allows external lockers to preserve atomicity of dynamic attribute changes
2013-01-25 04:03:13 +00:00
a6d9c26365
Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting from it
...
This is the easier way to give us control over locking, rather than asking that OSDMap IDictionary methods be virtual
2013-01-25 04:03:11 +00:00
a3e1e6dd61
Implement dynamic attribute persistence on mysql and mssql
...
mssql is untested
2013-01-25 04:03:09 +00:00
d3095e2649
Add DAExampleModule to demonstrate dynamic attributes
...
This module demonstrates that we can add an arbitrary persisted value to SOP without any changes to core code.
Every time the object is moved, the move record is updated and the users in the scene alerted
The number of moves is persisted over server restarts in sqlite
2013-01-25 04:03:07 +00:00
1bd0b06ec1
Implement Dynamic Attributes for SOP and PBS. Implement storage in SQLite
2013-01-25 04:03:04 +00:00
d977bb77cb
Disable json tests for now - I see this is failing on jenkins because mono 2.4.3 doesn't have Funcs >5 params, though mono 2.6 onwards does.
...
Standardize logging in JsonStoreScriptModule and some minor code formatting.
2013-01-25 03:19:56 +00:00
614d4eda3e
See if getting the registering JsonReadNotecard with MethodInfo works around an apparent issue with registering methods with more than 5 parameters on mono 2.4.3
2013-01-25 03:02:08 +00:00
4f52acaa83
Increase logging by enabling during test setup rather than during individual tests of for JsonStore
2013-01-25 02:32:38 +00:00
8c68451856
Enable logging in new json store tests to find out why they fail on jenkins but not locally.
2013-01-25 02:22:24 +00:00
844e60da0f
Add JsonTestPath() regression test
2013-01-25 02:12:28 +00:00
f32361d595
Add regression test for JsonSetValue()
2013-01-25 02:08:33 +00:00
b914fb98c4
minor: remove mono compiler warning in SceneCommandsModule
2013-01-25 01:56:41 +00:00
ba369c5cfe
Add basic JsonGetValue() regression test.
2013-01-25 01:55:27 +00:00
f557d7e828
Add basic JsonCreateStore() regression test
2013-01-25 01:48:31 +00:00
6a5d088197
BulletSim: reduce the force of gravity on ground vehicles when they
...
are on the ground. Makes them a little more stable.
2013-01-24 16:26:04 -08:00
a2a32fc844
BulletSim: reduce the zeroing threshold for rotational velocity.
...
Sometimes settling of a vehicle from gravity introduces small
velocities that need to be kept.
2013-01-24 14:36:00 -08:00
591faac3ac
BulletSim: disable CCD (continuious collision detection) and
...
contact processing threshold since the first didn't solve tunneling
problems but used resources and the latter caused instabilities.
2013-01-24 14:35:42 -08:00
2cf29c87bc
BulletSim: zero motion on an object that we pop up because it is
...
below terrain. If the position is being corrected because it is out
of bounds, all other movement rules are out the window.
2013-01-24 14:35:23 -08:00
3ecfddd791
BulletSim: remove exception that can happen when setting physics parameters from the console.
2013-01-24 14:35:05 -08:00
71f7bfc2ff
Mantis 6508 llHTTPResponse body is incorrectly interpreted by IE
...
This patch html escapes responses going to IE so that they cannot be
interpreted as HTML if the response type is "text/plain". This has no
effect if the reponse type has been set to "text/html" by
osSetContentType
Signed-off-by: nebadon <michael@osgrid.org>
2013-01-24 14:48:20 -07:00
427ab219b8
Add JSONification of WebStats module. Adds a '?json' query parameter
...
to the fetch URL to return the data in JSON format. Also adds a simple
'sim.html' that uses JavaScript to display the JSON data. Not pretty
but an example.
2013-01-24 10:44:57 -08:00
d5b950633d
* Added in the manifold point dept on collision desc. In BulletSim engine BulletXNA.
2013-01-24 07:36:24 -05:00
ba9d6b7337
* Repairs the Object updates, Collision updates, and Child Prim methods making the bulletXNA engine work again.
...
* The only thing that had an issue was when creating a new RigidBody, BulletXNA didn't know the type SimMotionState and the upcast type is unknown in the constructor. Therefore, I had to update the IMotionState with a new method 'SetBody'. All of the duplicated type information has been removed and BulletXNA is not relying on any non-standard types external to the library.
2013-01-24 07:11:32 -05:00
878df52515
* This makes the non-physics llCastRay 'better'. It's not 'correctly working', and if you look deep enough, you see that the results are not really stable depending on the direction of the ray.
2013-01-23 21:58:51 -05:00
f7feed4d44
Remove unnecessary System.Linq reference from Compiler.cs
...
Hopefully will fix windows build via compile.bat
2013-01-24 01:11:04 +00:00
b775761104
Disable the not very useful infinite recursion co-op termination tests for now as they appear to cause failures with testing in jenkins.
...
These tests are not very useful anyway as they never actually get a chance to try termination before the script runs out of stack
2013-01-24 00:31:42 +00:00
957cea59a0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-24 00:24:13 +00:00
1a610f30d8
Fix mono 2.4.3 build break by using CreateInstanceAndUnwrap 9 method call deprecated in later .net versions
2013-01-24 00:23:12 +00:00
5b334079e0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-23 16:23:11 -08:00
1c3d84fe03
BulletSim: pass up and report the real collision penetration.
2013-01-23 16:20:44 -08:00
55c6753b13
Merge branch 'master' into cooptermination
2013-01-24 00:03:44 +00:00
8a22ac3f94
Pass narrower WaitHandle rather than EventWaitHandle as co-op termination wait handle to script APIs.
...
APIs don't need to reference any methods on EventWaitHandle
2013-01-23 23:38:08 +00:00
72dd3633ee
Improve logging by making it clearer which script is failing if an assembly fails to load.
...
Moves the noise co-op start/stop debug log messages to only display if xengine debug level >= 1
Logs which stop strategy is being used (abort or co-op)
Adjusts some other logging to remove not very useful stuff
2013-01-23 23:34:15 +00:00
a7b810ddee
BulletSim: remove setting of vehicle InterpolationRotationalVelocity.
...
This doesn't seem to help the vehicle stability.
Rename vehicle internal variables adding a "V" or "W" so it is clear
when coordinates are vehicle or world relative.
2013-01-23 14:25:42 -08:00
13182904da
BulletSim: small change to center-of-mass computation left out last commit
2013-01-23 14:25:30 -08:00
a5e9c665f0
BulletSim: center-of-gravity linkset changes. Not working yet.
...
Conflicts:
OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
2013-01-23 14:25:18 -08:00
c1371ab786
BulletSim: working on COM
2013-01-23 14:25:06 -08:00
775fd6f8cc
BulletSim: fix build break introduced by previous commit
2013-01-23 14:24:54 -08:00
a0d460e6bf
BulletSim: remove the unused RestoreBodyDependencies used by linksets
...
and vehicles and clean up code by removing their kludgyness.
2013-01-23 14:24:42 -08:00
c1795ed399
Add the Avination physics raycast glue so Core Physics can implement raycast
2013-01-23 21:03:24 +00:00
6a2b673fca
Remove the return value from llGiveMoney and add llTransferLindenDollars. Also
...
make llGiveMoney async so the script thread is not held up waiting for comms
to an external server.
2013-01-23 19:45:36 +00:00
2841ed05cf
Merge branch 'master' of /home/opensim/var/repo/opensim
2013-01-23 08:16:18 -05:00
1776986dc3
Add additional return status
...
Adding additional return status for JsonRpcMethod. Now returns true/false
2013-01-23 08:14:21 -05:00
cf168194e5
If ScriptStopStrategy hasn't been set to co-op in [XEngine] config, then continue to generate C# that is functionality identical to historical generation
...
This is to eliminate disruption until co-op termination has been well-tested.
In non co-op mode, XEngine will continue to load DLLs of the existing Script class and the new XEngineScript class.
Moving to co-op mode still requires existing script DLL deletion to force recompilation, either manually or by setting DeleteScriptsOnStartup = true for one run.
This change also means that scripts which fail to initialize do not still show up as running scripts.
2013-01-23 02:36:43 +00:00
80b1e32bfa
BulletSim: Tweeks to vehicle motion.
...
Pass through old angular velocity making for smoother transitions.
Remove some old kludges for angular motion (damping and rotvel suppression).
2013-01-21 23:43:24 -08:00
9a4914e58c
Add co-op termination regression test for infinite recursive manual call on event function.
...
Such code would normally terminate quickly with a stack overflow exception anyway.
2013-01-22 02:32:40 +00:00
0727784186
Set script delay factor to 0 in co-op termination tests
...
This is to ensure loops aren't actually terminating from a wait on an LSL function.
This was not the case with any of the existing tests.
2013-01-22 02:26:04 +00:00
679dc811dd
Add regression test for co-op termination on infinite user function call regression.
...
Such a script would probably run out of stack pretty quickly anyway.
2013-01-22 02:22:58 +00:00
b93e8020e2
Add regression test for co-op stop of an infinite jump loop
...
Also fixes bug in do-while test
Improves detection of failure due to invalid script in test
Sets up xengine anew for each test rather than once for the while testsuite to improve isolation between tests.
Stop listening for chat after the first 'script is running' chat is received to reduce test run time.
2013-01-22 02:16:10 +00:00
cf0b5e4f27
Add do-while co-op termination test
...
Minor changes to scripts in other tests.
2013-01-22 01:53:10 +00:00
fbdfe43d75
Add single and comound while loop co-op termination test
2013-01-22 01:40:18 +00:00
c6ba27d096
Fix bug in generating termination checks in compound statement for loop.
...
Add regression test for this case.
2013-01-22 01:23:10 +00:00
a558f9797d
factor out common code in existing co-op termination regression tests
2013-01-22 01:13:45 +00:00
419f8e0f76
Increase WaitForEventCompletionOnScriptStop to 120 secs to show that the co-op setting is active in its regression tests.
2013-01-22 01:08:24 +00:00
1730de14a4
minor: comment out Console.WriteLine debugging message in XEngine
2013-01-22 01:00:53 +00:00
cd446c32d6
Add regression test TestStopOnLongForLoop()
2013-01-22 00:59:46 +00:00
49d674c74d
refactor: rename XEngineTest to more descriptive XEngineBasicTests
2013-01-22 00:35:56 +00:00
471c477863
BulletSim: allow changing position and rotation of a child of a linkset
...
without rebuilding the whole compound shape. Should make vehicles move
smoother.
2013-01-21 15:58:22 -08:00
95c53ecae7
Have SOP and LSL_Api call the proper GetCenterOfMass and GetGeometricCenter
...
routines on the physics engine. Won't make a difference for any
existing scripts since ODE always returned Vector3.Zero.
2013-01-21 15:55:54 -08:00
3f6698a595
BulletSim: remove unused MaxTaintsToProcessPerStep parameter
2013-01-21 09:19:09 -08:00
52b341e2e2
BulletSim: More aggressive as setting character velocity to zero
...
when should be standing.
Modify angular force routines to be the same pattern as linear force routines.
BulletSim vehicle turning is scaled like SL and is DIFFERENT THAN ODE!!
Fix some bugs in BSMotor dealing with the motor going to zero.
Add a bunch of parameters: MaxLinearVelocity, MaxAngularVelocity,
MaxAddForceMagnitude, VehicleMaxLinearVelocity, VehicleMaxAngularVelocity,
and most of the values are defaulted to values that are larger
than in SL.
Use the new parameters in BSPrim, BSCharacter and BSDynamic.
2013-01-20 23:09:54 -08:00
3c4868f613
BulletSim: fix problem of avatar sliding very slowly occasionally after stopping walking. Consolidate movement tests into the one prestep motion action
2013-01-20 23:09:54 -08:00
2cb1d5240e
BulletSim: small fix making sure terrain height is calculated
...
properly if the vehicle moves during vehicle actions.
2013-01-20 23:09:54 -08:00
3b0df52d10
BulletSim: modify motors to return correction rather than current value
...
to better use them for incremental updates.
Modify prim and character to use the new motors.
Simplify the vehicle linear movement code to just update the velocity
directly or the basic movement.
2013-01-20 23:09:53 -08:00
2c517d792f
This updates prebuild to remove BulletSimN, implements the BulletSim API in BulletSPlugin using the BulletXNA Bullet physics engine. It also updates the BulletXNA library to be compatible with the changes. OpenSimDefaults has been updated to describe how to switch engines and terrain implementations.
2013-01-20 08:18:16 -05:00
6a75949323
* Dumping BulletSimNPlugin in favor of combining the API
2013-01-20 08:07:49 -05:00
82b954b212
* Tweak the BulletSimN API a bit.
2013-01-20 08:06:15 -05:00
9c590e51b6
IRCBridgeModule: optional agent-alertbox for IRC enabled Regions look in OpenSimDefaults.ini / section [IRC]
...
http://opensimulator.org/mantis/view.php?id=6470
idea: https://github.com/ssm2017/IrcBridgeAlert
2013-01-19 02:40:28 +00:00
fc6115f777
Check the existing ScenePresence.ParentPart to make sure we're not trying to sit on a prim we're already sat upon, rather than looking up the part from scratch.
...
An adaptation of commit 055b8a2
2013-01-19 02:29:02 +00:00
b77da5039e
Assign the SmartThreadPool name in the constructor
...
This is required because some threads are created in the constructor, so assigning the name afterwards would be too late.
2013-01-19 02:08:58 +00:00
3eee991935
Explicitly stop PollServiceRequestManager() rather than relying on its destructor.
...
Hopes to address occasional shutdown failures from http://opensimulator.org/mantis/view.php?id=6503
2013-01-19 02:04:36 +00:00
27e2ec177a
New constants for llGetObjectDetails
...
New constants for llGetObjectDetails OBJECT_CHARACTER_TIME,
OBJECT_ROOT, OBJECT_ATTACHED_POINT, OBJECT_PATHFINDING_TYPE,
OBJECT_PHYSICS, OBJECT_PHANTOM and OBJECT_TEMP_ON_REZ
also Pathfining constants, 3 of which are used by llGetObjectDetails
2013-01-19 01:50:16 +00:00
4f70e423df
Mantis 6507 keys returned by llGetAgentList incorrect for llList2Key
...
The type of the keys returned by llGetAgentList corrected to LSL_Key
2013-01-19 01:14:11 +00:00
652cfa2ee2
Fix use of scene debug commands when region is set to root or a specific region where there is more than one region on the simulator.
2013-01-19 00:27:17 +00:00
115e1c2abb
Add "debug set set animations true|false" region console command.
...
Setting this logs extra information about animation add/remove, such as uuid and animation name
Unfortunately cannot be done per client yet
2013-01-18 23:22:02 +00:00
74256c0cc4
Restore previous client AO behaviour by not allowing them to remove the default animation but continue to allow scripts to do so.
...
This keeps the fix from http://opensimulator.org/mantis/view.php?id=6327
and fixes the behaviour regression in http://opensimulator.org/mantis/view.php?id=6483
Animations may still exhibit different behaviour if both scripts and clients are adjusting animations.
A change in the behaviour of client AO to not remove all animations may be a better long term approach.
2013-01-18 22:57:09 +00:00
c6b6c94ccb
BulletSim: reduce jitter in avatar velocity when walking or flying.
...
OpenSimulator is VERY sensitive to changes in avatar velocity and
will send an avatar update message when velocity changes more than
0.001m/s. This significantly reduces the number of avatar update messages by
smoothing the avatar velocity returned by Bullet.
2013-01-18 11:39:24 -08:00
482c7b5368
BulletSim: add logic to turn off pre-step actions when object goes
...
non-active. This turns off 'setForce', 'setTorque' and 'moveToTarget'
when the object is selected or made non-physical.
2013-01-18 11:37:36 -08:00
c8afc8523b
Implement non-wait co-operative termination of scripts for XEngine in addition to termination on wait.
...
This involves inserting opensim_reserved_CheckForCoopTermination() calls in lsl -> c# translation at any place where the script could be in a loop with no wait calls.
These places are for, while, do-while, label, user function call and manual event function call.
Call goes through to an XEngineScriptBase which extends ScriptBase.
IEngine is extended to supply necessary engine-specific parent class references and constructor parameters to Compiler.
Unfortunately, since XEngineScriptBase has to be passed WaitHandle in its constructor, older compiled scripts will fail to load with an error on the OpenSim console.
Such scripts will need to be recompiled, either by removing all *.dll files from the bin/ScriptEngines/<region-id> or by setting DeleteScriptsOnStartup = true in [XEngine] for one run.
Automatic recompilation may be implemented in a later commit.
This feature should not yet be used, default remains termination with Thread.Abort() which will work as normal once scripts are recompiled.
2013-01-17 23:39:09 +00:00
a6afd2f706
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-17 14:51:52 -08:00
75f710f1e7
BulletSim: Add one function that all actors who act on the physical
...
can use to know if the object is currently active.
Code cleaning including use of Util.ClampV function.
2013-01-17 14:47:35 -08:00
caad1edabf
Add utility function to clamp a vector to a maximum magnitude.
2013-01-17 14:44:54 -08:00
9c99ed26eb
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-01-16 16:52:57 +00:00
5563a8916e
Complete removal of the now unused state queue
2013-01-16 16:45:18 +00:00
37fcf87946
Changed a couple of debug messages at the request of osgrid.
2013-01-16 08:20:32 -08:00
8ee9daa121
BulletSim: add the editting children in linkset going phantom bug to TODO list.
2013-01-15 21:08:47 -08:00
5d098d8f17
BulletSim: don't modify angular parameters when doing LIMIT_MOTOR_UP.
...
It was a dumb idea to try and do a nose over feature for jumping cars anyway.
Add better logging of native shape creation/reuse so can tell the difference.
2013-01-15 21:08:46 -08:00
61ff79587b
BulletSim: add debugging messages to know when assets for physical
...
objects have been fetched.
Update TODO list with more work.
2013-01-15 21:08:46 -08:00
daef2b8d87
BulletSim: reduce maximum force a script can apply (like in llApplyImpulse)
...
to the documented maximum from the outragious number previously.
2013-01-15 21:08:46 -08:00
0963ece25b
Implement co-operative script termination if termination comes during a script wait event (llSleep(), etc.)
...
This makes use of EventWaitHandles since various web references indicate that Thread.Interrupt() can also cause runtime instability.
If co-op termination is enabled, then termination sets the wait handle instead of waiting for a timeout before possibly aborting the thread.
This allows the script to cleanly terminate if it's in a llSleep/LL function delay or the next time it enters such a wait without any timeout period.
Co-op termination is not yet testable since checking for termination request within loops that never trigger a wait is not yet implemented.
This commit, unlike 1b5c41c
2013-01-16 02:07:43 +00:00
b8949024bc
Revert "Implement co-operative script termination if termination comes during a script wait event (llSleep(), etc.)"
...
Doing this as a favour to Melanie. This will be back with passing the wait handles directly to the api.
This reverts commit 1b5c41c14a
2013-01-16 01:45:09 +00:00
03a8a4426f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-16 00:20:18 +00:00
1b5c41c14a
Implement co-operative script termination if termination comes during a script wait event (llSleep(), etc.)
...
This makes use of EventWaitHandles since various web references indicate that Thread.Interrupt() can also cause runtime instability.
If co-op termination is enabled, then termination sets the wait handle instead of waiting for a timeout before possibly aborting the thread.
This allows the script to cleanly terminate if it's in a llSleep/LL function delay or the next time it enters such a wait without any timeout period.
Co-op termination is not yet testable since checking for termination request within loops that never trigger a wait is not yet implemented.
2013-01-16 00:12:40 +00:00
fccb03227e
Instead of passing separate engine, part and item components to script APIs, pass down IScriptInstance instead.
...
This is to allow the future co-operative script thread terminate feature to detect and act upon termination requests.
This splits the assembly and state loading out from the ScriptInstance() constructor to a separate Load() method
in order to facilititate continued script logic regression testing.
2013-01-15 21:13:22 +00:00
f54b398540
Merge branch 'master' of /home/opensim/var/repo/opensim
2013-01-15 10:08:27 -05:00
ca3e0d67d2
Add Json-Rpc 2.0 To Registered Handlers
...
Added registration json-rpc handlers in the http server. Covers version 2.0
See: http://www.jsonrpc.org/specification
2013-01-15 10:04:16 -05:00
021964c6e0
BulletSim: tweeks to improve hover.
2013-01-15 04:24:24 -08:00
181d4c6fcb
BulletSim: temporarily disable banking and direction deflection
...
because the computations are wrong.
Add VehicleTorqueImpulse routines.
2013-01-15 02:58:14 -08:00
0374b2a0b4
BulletSim: fix logic for enabling unmanaged code debug messages.
...
Free pinned memory when physics engine is unloaded.
2013-01-15 02:21:38 -08:00
edf198b766
Merge branch 'master' of git://opensimulator.org/git/opensim
2013-01-15 01:46:30 -08:00
13778c895a
BulletSim: by default, turn on continuious collision detection (CCD)
...
and enable friction computation caching. Remove dangerous BulletSim
settings from OpenSimDefaults.ini.
2013-01-15 01:44:34 -08:00
055b8a2d58
move resit fix to ScenePresence.cs and allow for requesting sit on objects other than the object currently sat on
2013-01-14 22:24:24 -08:00
1c240cd555
Print full stacktrace from plugin loading failure to help determine what went wrong, rather than a possibly unhelpful simple exception message.
2013-01-15 01:07:20 +00:00
c846cefda9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-01-15 00:24:51 +00:00
4e1ca890c2
BulletSim: fix not moving physical objects below terrain to over terrain.
...
Add locking on register prestep action list preventing potential race conditions.
Little comment and formatting changes.
2013-01-14 15:46:46 -08:00
7978b349bd
refactor: Simplify ScriptInstance by retaining reference to SceneObjectPart instead of sometimes but not always looking it up.
2013-01-14 23:19:47 +00:00
8bf0a9f85d
BulletSim: disable center-of-mass computation for linksets until debugged. Move physical prim above ground if it is underground. Previously tried to correct by applying and up force but the prim would never go through the ground.
2013-01-14 07:50:58 -08:00
459fcd81c9
BulletSim: move center of gravity of linkset to its geometric center.
...
Necessitated allowing simulator and physical position of a body to
get out of sync since Bullet assumes that <0,0,0> is the center of mass.
Update DLLs and SOs for the UpdateChildTransform so positions of
individual prim in a linkset can be implemented.
2013-01-11 16:47:53 -08:00
eacc2561d1
BulletSim: add osGetPhysicsEngineType() LSL function and update
...
the physics engines to return the name that is specified in the INI
file ("physics = XXX") as the type of engine.
This os function is a little different than the others in that it
does not throw an exception of one is not privilaged to use it.
It merely returns an empty string.
2013-01-11 16:47:35 -08:00
93adc4cb66
BulletSim: Add IsSelected attribute to physical objects. Have vehicles check to see if physical before trying to step. Replace vehicle gravity application. Previously relying on Bullet to apply gravity but since vehicles over-ride the velocity calculation, gravity never had a chance to accelerate the body down. Added AddForceImpulse as well as AddForce for those who need to apply immediate velocity updates. Use the impulse to apply the linear motion.
2013-01-11 16:47:20 -08:00
daacd4deed
Fix exception reporting in SceneObjectPart so it logs what the exception is rather than just saying it happened.
2013-01-11 16:47:07 -08:00
7e58bbaac6
BulletSim: Redo linear function coding so they can better interact. New algorithm for limitMotorUp that relies on going up when not colliding rather than distance from ground. Add parameter for turning on and off embedded source vehicle debugging.
2013-01-11 16:46:53 -08:00
98168edc29
BulletSim: remove double application of buoyancy. Centralize computation of buoyancy. Add motor angular debugging controls.
2013-01-11 16:46:38 -08:00
b592ec265b
BulletSim: fix the 'No recognised physics mesh found ...' error spew by remembering that the last asset fetch failed until the simulator resets the shape parameters.
2013-01-11 16:44:34 -08:00
72cc94cfbc
add some sanity checking to HandleAgentRequestSit handler
2013-01-10 20:21:18 -08:00
660d36a5b0
Implement a workaround solution for saving manual script state changes by the user before logout instead of wrongly removing the script early.
...
This workaround relies on the fact that a closing client goes inactive before the attachments derez calls happen.
This reverts the change to remove scripts too early instead of stopping them, since the the two step stop then remove is necessary to execute the detach event.
2013-01-11 02:28:43 +00:00
05ac6d3209
Save attachments on detach/exit if a contained script state has been changed.
...
This involves making Attachments module listen for start/stop script changes.
It also involves removing the script from the region on detach in the same manner as every other DeleteSceneObject() call rather than simply stopping it
This is necessary tue to the bad assymetry of start and stop script triggers but it appears to be the correct behaviour anyway, as detached objects are completely gone from the sim.
Not just in a state where their scripts have been stopped.
2013-01-11 01:46:36 +00:00
26347307ec
Fix a regression in the last few scene commands changes where setting these via the viewer estate dialog stopped working.
...
Forgot to register the new interface.
Also removes some code which got included by adpating an existing module.
2013-01-11 00:08:52 +00:00
f3a2bbbd93
Add "debug scene get" console command to list current scene options
2013-01-10 23:56:11 +00:00
a16ae5d7e3
Move scene debug commands into separate module. Command changes from "debug scene <key> <value>" to "debug scene set <key> <value>" to accomodate future settings
2013-01-10 23:49:48 +00:00
983e458bb6
refactor: route the final scene backup through the same code that handles periodic backup
...
This is rather than making unnecessary duplicate checks that the SOG later performs again.
2013-01-10 22:59:40 +00:00
17f21ba9a0
minor: Capitalize GroupsModule command category
2013-01-10 22:46:25 +00:00
e65737be93
minor: add missing newline to "debug scene" console command
2013-01-10 22:42:33 +00:00
f566dc0618
Remove unimplemented "debug teleport" console command
2013-01-10 22:42:12 +00:00
701ca1e4b8
Add "debug scene pbackup true|false" console command. This enables or disable periodic scene backup. For debug purposes.
...
If false, scene is still saved on shutdown.
2013-01-10 22:38:48 +00:00
170d376967
On baked texture save, replace any HG ID with an ordinary asset ID so the HGAssetBroker doesn't try to save back to the avatar's originating region
2013-01-10 01:45:56 +00:00
84407e322f
revert accidental change to MemoryWatchdog stat calculation in previous b1b4687
2013-01-10 01:30:00 +00:00
b1b4687250
Add "show script timers" command to show script timers. For debug purposes.
...
Also, "show sensors" changes to "show script sensors".
2013-01-10 00:57:49 +00:00
a0000a034f
Add "show sensors" command to show script sensor information for debug purposes.
2013-01-10 00:32:22 +00:00
290dc274ec
minor: Remove unnecessary commented out code from last commit c28a2f05 and fix up code comment
2013-01-09 01:04:43 +00:00
c28a2f05ca
minor: make spacing consistent in console help output
2013-01-09 00:54:28 +00:00
e4fad4a09d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-01-09 00:21:43 +00:00
df1d7414ad
BulletSim: Fix hover height (boats float at the correct level).
...
Fix problem of vehicles going crazy when backing up.
2013-01-08 16:37:49 -08:00
f16c4a254c
Revert "Prevent empty Anim Packs"
...
This reverts commit 5561333668
2013-01-09 00:20:24 +00:00
c1c540f454
Revert "Fix sequence id fr default anim"
...
This reverts commit a775931a0c
2013-01-09 00:20:14 +00:00
3d5e3e35b7
minor: Fix command match of "debug script" command to "debug scripts" to match other scripts commands (and it's own short help text)
2013-01-09 00:08:08 +00:00
5fa4b8b144
minor: Allow "script *" console commands to take multiple script item ids
2013-01-09 00:01:48 +00:00
a775931a0c
Fix sequence id fr default anim
2013-01-08 23:36:05 +00:00
5561333668
Prevent empty Anim Packs
2013-01-08 23:12:32 +00:00
2ac96dd181
Add the new UpdateAgentInformation cap to make maturity on more recent viewers
...
work.
2013-01-08 22:52:14 +00:00
1603606f1d
BulletSim: improve vehicle angular banking and deflection computation. Rotate angular correction forces to be world relative rather than vehicle relative.
2013-01-07 22:00:50 -08:00
8452c0a870
BulletSim: add function to push avatar up when hitting stairs.
...
It looks like BulletSim and ODE rely on penetration correction to cause
the avatar to move up and thus allowing walking up stairs. Object
penetration was minimized for walking and flying (so one doesn't go
through walls) and this stopped stairs from working. This commit
introduces avatar movement code to check for collisions at the
feet while walking and attempts to raise the avatar for the steps.
Not yet perfect but movement is better.
2013-01-07 16:05:02 -08:00
599dbc3d95
BulletSim: fix exception when re-creating the terrain when loading an OAR file
2013-01-07 16:04:21 -08:00
2e5222055f
BulletSim: comments and removing small compile errors introduced in last commit.
2013-01-06 22:56:16 -08:00
9393403253
BulletSim: update DLLs and SOs with better debugging output.
...
Add definition of hand crafted avatar mesh. Not used yet.
Comments and cleanup.
2013-01-06 14:01:15 -08:00
2eba80a8cd
BulletSim: fix problem where mesh shapes were physically just their bounding box and not the complete mesh. Fill mesh physical objects are back.
2013-01-04 17:06:52 -08:00
48cfc6d089
BulletSim: implement llMoveToTarget by adding PIDActive, etc.
...
Implementation of non-vehicle hover but haven't tested it a lot.
Update TODO list.
2013-01-04 17:06:51 -08:00
d0c7f7f050
BulletSim: add some features to the PID motor to make it more flexible.
2013-01-04 17:06:51 -08:00
613f516007
BulletSim: convert avatar movement from a force to an impulse. Shouldn't
...
change functionality but removes an oddity in computing the force.
2013-01-04 17:06:50 -08:00
2c6b269b6e
BulletSim: add initial implementation of llMoveToTarget and hover height.
...
Not all there yet.
2013-01-04 17:06:50 -08:00
5432180027
BulletSim: reorganize motor code a little to pull together common functions.
...
Add BSFMotor.
2013-01-04 17:06:50 -08:00
44492b3a49
BulletSim: add comments to force and impulse setting functions
...
so it is clear what Bullet is actually doing with the set values.
2013-01-04 17:06:49 -08:00
92a6958b6d
BulletSim: fix problem where pre-step actions would not replaced
...
by new registrations thus causing multiple instances of an action.
2013-01-04 17:06:49 -08:00
2eda385f5e
BulletSim: add ResetBroadphasePool and ResetConstraintSolver diagnostic
...
functions. If values set from console, the functions are called. Looking
for why the collision pools fill up with unnecessary stuff.
2013-01-04 17:06:48 -08:00
7232cedd2b
Set default particle burst count to 1 instead of 0 in any set particle system script call that does not have an empty list.
...
As per http://opensimulator.org/mantis/view.php?id=6353
2013-01-04 21:37:11 +00:00
7e45096314
Fix build break caused by missing ) from dce2809.
...
Was hand-typing in a line of code I had tested before but not retested this time
2013-01-04 21:22:51 +00:00
dce2809137
Automatically grant sit-related llRequestPermissions() for subsequent avatars sitting on the same scene obejct, instead of wrongly popping up request permissions dialog.
...
Resolves http://opensimulator.org/mantis/view.php?id=6478
2013-01-04 21:18:53 +00:00
a3bf3a2aa5
refactor: simplify llGetNumberOfPrims() to return prim count + sitting avatar count rather than independently inspecting every scene presence
2013-01-04 20:56:39 +00:00
9869ca83b4
Fix llGetLinkName() to return the name of the last avatar sat as the last link number.
...
As per http://wiki.secondlife.com/wiki/LlGetLinkName
2013-01-04 20:54:11 +00:00
9503383887
Fix llGetLinkKey() to return the last sat avatar as the last link number.
...
As per http://wiki.secondlife.com/wiki/LlGetLinkKey
This is done by keeping a scene-object wide list of sitters.
This also fixes bugs in this function where linknums 0 and 1 weren't treated properly if there were sitting avatars on a single prim.
This also fixes a minor race condition for multiple concurrent sitters on a prim with no current sitters by locking on the object-wide list rather than individual sop lists
Addresses http://opensimulator.org/mantis/view.php?id=6477
2013-01-04 20:34:39 +00:00
a75f24bb79
minor: Add some doc to the extremely unhelpful 'fudge....' comment as to why we're deselecting the prim in code before scheduling an update on attachment
2013-01-03 21:06:50 +00:00
7f195de303
Fix problem where object attached from ground often does not get attached properly.
...
It seems this is happening because we send a kill for objects that are selected when attached.
A code comment says that this is to get the client to deselect it, but v3 and v1 clients do this just fine without the kill.
Aims to address http://opensimulator.org/mantis/view.php?id=6456
2013-01-03 20:57:14 +00:00
aa78df4a79
Scipt modules get the OpenMetaverse types, so lists passed as arguments to script module functions which then later call LSL_Types.list.GetVector3Item() or LSL_Types.list.GetQuaternionItem() methods would then trigger an InvalidCastException, which is now avoided.
2013-01-03 00:18:33 +00:00
a5ac6af16a
Improving documentation of AttachToAvatar and GetLine methods in LSL_Api.cs based on doxygen error output
2013-01-03 00:17:24 +00:00
79b7c571ff
updating documentation in SampleMoneyModule based on doxygen error log output; changing an xml-style hint to a uri-style hint in the class summary, improving documentation of Initialise method and removing a superfluous parameter, improving documentating of ClientClosed method and documenting an omitted parameter
2013-01-03 00:17:24 +00:00
589e3e8686
minor: Change channel digger replacement message in TerrainModule to Info from Warn.
...
This is to stop this unnecessarily triggering log analysis code which reports warn and error level statements.
2013-01-03 00:03:29 +00:00
1b826b4877
Allow registering regions whose names are equivalent under LIKE but not truly equal
2013-01-02 23:31:19 +00:00
1a6694b264
Fixed several problems with the Sun: some settings didn't work, or were inconsistently used. - The sun position is always calculated by combining the sun settings in the Region and Estate. This fixes the problem that 'UseEstateSun' didn't work. - To remove ambiguity, the EstateToolsSunUpdate event no longer accepts the sun's position as parameters. That's because the position is always calculated from the Region and Estate settings. - Use only the 'FixedSun' flag to determine whether the sun is fixed; not the 'UseGlobalTime' flag. - Don't change the region's 'SunPosition' field according to the sun's position: this field is used only to set the position when using a FixedSun. (The 'SunVector' field does get updated according to the sun's position in the sky)
2013-01-02 23:16:24 +00:00
24e486e9df
Fixed: the AvatarEnteringNewParcel event wasn't triggered in some cases
...
If an avatar moved between regions: A -> B -> A, then when returning to region A the AvatarEnteringNewParcel wasn't triggered. This happened because the ScenePresence in region A still remembered its previous 'currentParcelUUID', so it appeared as if the avatar didn't change parcels. Now, however, when a ScenePresence becomes a child presence we clear its 'currentParcelUUID'.
2013-01-02 23:00:23 +00:00
5097ba81d4
Added locking in NullRegionData.
...
This prevents errors when one thread iterates over the regions (e.g., from RegenerateMaptileAndReregister()) while another thread is adding a region.
2013-01-02 22:48:25 +00:00
8f31649fad
Fix indenting on ConsoleDisplayTable, align indenting on "show animations" console command
2013-01-02 22:37:50 +00:00
2db1f22b89
minor: minor code and log formatting fixes to recent changes in LandManagementModule
2013-01-02 22:31:18 +00:00
9784e4e07d
Changed locks to prevent deadlocks (especially during multi-region Load OAR)
2013-01-02 22:28:41 +00:00
d2f4ca0dfe
If Save OAR/IAR times-out while waiting for assets then notify the caller that the operation failed
2013-01-02 22:15:00 +00:00
6b55f51837
minor: Allow objects to be added directly to a row on a ConsoleDisplayTable rather than having to ToString() them first
2013-01-02 22:11:13 +00:00
70695a6ed9
Implemented Return Objects when it's invoked from the Top Colliders or Top Scripts dialogs
2013-01-02 21:59:01 +00:00
addab1244e
Add "show animations" console command for debug purposes.
...
This shows the current animation sequence and default anims for avatars.
2013-01-02 21:38:00 +00:00
30e5e5cce6
If an NPC is unowned, then always auto-grant permissions requested via llRequestPermissions()
...
This is consistent with all other OSSL NPC functions that allow unowned avatars to be manipulated.
Aims to address http://opensimulator.org/mantis/view.php?id=6483
2013-01-02 19:25:52 +00:00
aa236b2020
BulletSim: add parameter to have Bullet output performance statistics
...
every so many frames. Default to off.
2013-01-01 17:27:34 -08:00
b14b65ea95
BulletSim: move selection of the unmanaged Bullet DLL from BSPlugin
...
into the unmanaged Bullet interface class.
2013-01-01 17:27:33 -08:00
9d840fd2ee
BulletSim: move over and port the interface for BulletXNA.
...
Copied BulletSNPlugin.BulletSimAPI to a new
BulletSPlugin.BSAPIXNA.cs and then modifyed the latter to
comply with the BSAPITemplate definition. Not totally debugged
but the code is all there for an INI variable to select either
unmanaged C++ Bullet or the C# version of Bullet.
2013-01-01 17:27:33 -08:00
0662d109c2
BulletSim: fix line endings.
2013-01-01 17:27:33 -08:00
04132d3af4
BulletSim: subclass Bullet[World|Body|Shape|Constraint] for unmanaged
...
to have pointers and managed to have objects.
Initial paste of XNA code. Commented out.
2013-01-01 17:27:32 -08:00
a0739a80a8
Fixed bugs when getting the root folder.
...
1. The error checking for the case where there's no "My Inventory" folder was
incorrect: it checked the wrong variable.
2. If GetSystemFolderForType() is called to get AssetType.RootFolder then
it should return the root folder immediately; not look for another root
folder below it.
2013-01-02 00:04:14 +00:00
bc9a7ba0d6
minor: Assign names to the different SmartThreadPools for debugging purposes.
...
A different approach to the patch in http://opensimulator.org/mantis/view.php?id=6462
that doesn't involve further forking of SmartThreadPool
2013-01-01 23:57:20 +00:00
416244051d
refactor: call Util.InitThreadPool() if we are initializing an uninitialized pool on first use rather than constructing it ourselves.
...
No functional change.
2013-01-01 23:50:38 +00:00
db3b6e8921
BulletSim: remove unused unmanaged memory reference functions from BSAPITemplate.
2012-12-31 19:57:26 -08:00
6988b5ceaf
BulletSim: remove rigid body contruction functions from BSAPITemplate that relied on prebuilt construction info structures.
2012-12-31 19:57:25 -08:00
9396ccc078
BulletSim: eliminate the use of the unmanaged HeightMapInfo structure.
...
Remove all related calls from the unmanaged and BSAPITemplate interfaces.
Update DLLs and SOs to include the version without HeightMapInfo structures.
2012-12-31 19:57:25 -08:00
3d0fc70864
BulletSim: complete movement of BulletSimAPI functions to BSAPITemplate.
...
Update BulletSim DLLs and SOs with simplier step function interface.
2012-12-31 19:57:24 -08:00
c2a7af18b6
BulletSim: nearly complete in conversion from BulletSimAPI to BSAPITemplate. Only initialization and debug fuctions left.
2012-12-31 19:57:23 -08:00
5379d6d112
BulletSim: remove all the debug printing of pointer formatting (.ToString(X)) and replace it with a method on BulletBody, BulletShape, ...
2012-12-31 19:57:22 -08:00
9218748321
BulletSim: another round of conversion: dynamics world and collision object functions.
2012-12-31 19:57:22 -08:00
9fd0e1b080
BulletSim: add the implementation files for the two versions of Bullet:
...
unmanaged (C++) and managed (C#).
2012-12-31 19:57:21 -08:00
48f718f39f
BulletSim: first round of conversion from direct BulletSimAPI interfacing by BulletSim core to using the BulletSimAPITemplate. Physical object creation and destruction first.
2012-12-31 19:57:21 -08:00
203588e3c0
BulletSim: change physical data structures to classes. Add default
...
instantiations for PhysBody and PhysShape when BSPhysObject is created
to account for them being classes and not structures.
Update TODO list.
2012-12-31 19:57:21 -08:00
4914d6c0ea
Resolve Mantis 6480 ( http://opensimulator.org/mantis/view.php?id=6480 )
...
by reversing the sign on the recoil computation and adding a
[XEngine]RecoilScaleFactor parameter which defaults to zero.
Testing in SL seems to show that there is not a recoil action there.
Or, at least, it is very small. If someone knows how small, the default
for the scale factor should be changed.
2012-12-31 19:57:20 -08:00
26f364cc5d
Comment out test messages that go directly to the console.
2012-12-31 19:57:20 -08:00
28a8949b9f
BulletSim: remove check for small motor movement because, while it
...
did the right thing for stopping (speed reducing to zero), it prevented
movement from starting (speed increasing from zero). Will revisit
when the generalize PID motor is debugged.
2012-12-29 10:19:47 -08:00
0538096fa3
BulletSim: an 'if' to suppress multiple setting of avatar orientation.
...
Looks like the viewer bombards the server with avatar orientation
information (we're talking several hundred a second) when the avatar
is being turned or when walking. This change just reduces the number
of 'set' calls into unmanaged code.
2012-12-29 08:32:57 -08:00
db6c0363f0
BulletSim: tweeking avatar capsule code in an attempt to have
...
asymmetrical avatar capsule work now that rotation is being passed
from the simulator. Turns out the Bullet capsule is just not very
functional: it doesn't scale properly, the implementation only half
does asymmetry and, in general, is hard to work with.
Avatar shape is about what it was before these changes.
Added initial data structures for avatar shape mesh.
2012-12-29 08:03:57 -08:00
fdf8732cd7
ScenePresence passes the avatar rotation down to the physics engine. This will be a no-op for ODE but enables asymmetrical avatars for BulletSim.
2012-12-28 16:29:16 -08:00
7266eeca6e
BulletSim: add 'AvatarAlwaysRunFactor' parameter and use in setTargetVelocity
...
to implement the 'always run' feature.
2012-12-28 12:01:57 -08:00
70e0a86601
BulletSim: fix problem of avatars appearing to walk through walls
...
by moving the movement motor to a pre-step action and out of its
questionable previous home in UpdateProperties.
2012-12-28 11:56:07 -08:00
1f6aaad0b5
BulletSim: correct collision mask definition for linkset children.
...
Remove unused code. Add comments and TODOs.
2012-12-27 22:12:28 -08:00
422f0fd6ec
BulletSim: fix physical object not interacting with static objects.
...
Another instance of the underlying Bullet doing, ah, helpful things
when items are added to the world.
2012-12-27 22:12:28 -08:00
c1e7539c77
BulletSim: Parameterize nominal frame rate (55) and add parameters to dynamially turn on/off detailed, unmanaged data dumping of prims and vehicles.
2012-12-27 22:12:28 -08:00
7a5f598399
BulletSim: move logic for IsColliding, CollidingGround and CollidingObj from individual sub-classes and up to parent BSPhysObject class.
2012-12-27 22:12:27 -08:00
5afab9bcfe
Add check to always push terse updates for presences that have new velocities of zero.
2012-12-27 22:12:27 -08:00
e57c0e6731
BulletSim: fix buoyancy so it's properly set by a script when an
...
object is selected.
Update TODO list.
2012-12-27 22:12:26 -08:00
7230990679
BulletSim: fix odd code that wasn't really recomputing the mass of a
...
rebuilt linkset. I was burnt by making get/set methods with side
effects. I should know better.
2012-12-27 22:12:26 -08:00
f3baed5827
BulletSim: add physical parameter min/max constants in BSParam. I just don't like raw numbers scattered around the code.
2012-12-27 22:12:25 -08:00
e98e223927
BulletSim: complete applyImpulse function in BSCharacter (like I said
...
I did last time).
2012-12-27 22:12:25 -08:00
29cdf0f3dd
* Merges BulletSim Updates to BulletSimN(BulletSNPlugin)
2012-12-18 15:00:10 -05:00
225b564573
BulletSim: scale the force for external AddForce by the simulation
...
step time so it will be applied completely the next step. The internal
AddForce routine does not scale the force.
2012-12-26 10:25:50 -08:00
d1ede1df3a
BulletSim: make llBuoyancy work. For some reason, Bullet resets an
...
object's individual gravity to the world gravity when the object
is added to the physical world.
2012-12-25 23:55:25 -08:00
5f71ee57c4
BulletSim: stop avatar from sliding VERY slowly after walking by
...
only zeroing the movement motor in the UpdateProperties routine.
2012-12-25 23:54:10 -08:00
bbc5a5089f
BulletSim: Rename some of the interface structures (BulletWorld, ...)
...
to get ready for...
Start creation of BulletAPITemplate. This defines the abstract interface
functions. Following commits will move over to the new interface.
This will enable switching between the managed and unmanaged version of
Bullet.
2012-12-24 20:18:06 -08:00
4759a8acee
BulletSim: Default avatar density changed to 3.5 which is WAY closer
...
to the SL value.
Fixed frictin values for physical materials which were just wrong
which caused things that should have slipped to not.
2012-12-24 20:16:10 -08:00
80cee1b85a
BulletSim: Fix single physical prim reporting its mass as zero.
...
Properly return root mass as mass of just the root prim rather
than the mass of the linkset. SOG has the logic to add the masses
together to get the linkset mass.
Update TODO list.
2012-12-24 08:56:02 -08:00
9318870607
* Update BulletSimN terrain implementation to default to Heightfield, it's less CPU intensive.
2012-12-23 16:17:18 -05:00
92e4f9f412
* Initial commit of BulletSimN (BulletSNPlugin). Purely C# implementation of BulletSim. This is designed to be /as close as possible/ to the BulletSim plugin while still being entirely in the managed space to make keeping it up to date easy as possible (no thinking work). This implementation is /slower/ then the c++ version just because it's fully managed, so it's not appropriate for huge sims, but it will run small ones OK. At the moment, it supports all known features of BulletSim. Think of it like.. POS but everything works. To use this plugin, set the physics plugin to BulletSimN.
2012-12-23 15:21:25 -05:00
30807b81cc
BulletSim: modify avatar motor code to make falling movement better. Clean up some usages. Disable motor when done.
2012-12-22 17:09:40 -08:00
144322a7c9
BulletSim: remove post step one-time taints (doesn't make any sense). Rename pre and post step event invocation routines to Trigger* to be consistant. Remove old, unused code.
2012-12-22 17:07:52 -08:00
16e49035f7
BulletSim: add Enabled parameter and operation to motors.
2012-12-22 17:06:13 -08:00
3e3c168987
Add helper routine Util.InRange()
2012-12-22 17:04:53 -08:00
5b2cbc0ae6
BulletSim: remove all special vehicle code from BSScene. Replace per-frame updates for vehicles with per-frame action registration. One fewer special case.
2012-12-21 23:24:31 -08:00
a54392d7cc
BulletSim: remove the movement decay while flying. Made flying slow down over time.
2012-12-21 23:05:05 -08:00
37fb691ba5
BulletSim: Fix llApplyImpulse so it works after the first impulse. The problem was Bullet deactivating the object between the pushes (when, as far as the physics engine is concerned, it isn't moving).
2012-12-21 23:03:27 -08:00
3d659fe97d
BulletSim: add BSPhysObject code to manage registrations of preStep events. Use same to implement setForce and setTorque so the values are restored at the beginning of each step (since Bullet zeros forces applied last step). Simplify implementation of AddForce and AddTorque by relying on the addition of forces in Bullet.
2012-12-21 17:27:53 -08:00
6dbf9c8ed4
BulletSim: repair vehicle problems introduced in previous 'improvements'. Fix line endings in BSParams.
2012-12-21 15:21:32 -08:00
ae4d932e7f
BulletSim: Move all the parameter variables, tables and get and fetch logic to a separate, static class for easier addition and to remove all that bulk from the BSScene class.
2012-12-21 13:35:44 -08:00
2e3e95e846
BulletSim: small fix to avatar movement motor use which keeps avatar from flying up forever. This doesn't fix the overall problem but keeps avatar flying from being totally unusable.
2012-12-21 10:04:12 -08:00
8c99f63239
BulletSim: avatar movement smoothed with motor that modifies avatar velocity to target velocity. Fails in incorporating physical world effects (gravity) so avatar doesn't fly correctly.
2012-12-21 10:00:03 -08:00
b4f8a05e9a
BulletSim: Better detail logging of VMotor actions.
2012-12-21 09:56:31 -08:00
750492796d
BulletSim: begin movement of parameters from pinned memory block to variables all in managed code. Add note to TODO list to remember to do the rest. Other updates to TODO list.
2012-12-21 09:55:20 -08:00
9d2f569d60
BulletSim: fix incorrectly defined property changed flag.
2012-12-20 16:06:52 -08:00
e522bdb96a
BulletSim: Check for unspecified TimeScale in BSVMotor and don't scale if not specified. Add test dump routine. Don'e zero current and target values when error goes to zero as the values could be used externally to store the actual target values, etc.
2012-12-20 16:05:33 -08:00
a5b2539cf9
BulletSim: replace use of funky nullable values for vehicle property update control (m_known* stuff). Bitmaps will be quicker to test and to clear.
2012-12-20 10:32:33 -08:00
e73dac4deb
BulletSim: angularMotorUp working again (seems a little slow as it takes longer than timescale to correct, but getting better). Disabled angularDeflection (need to resolve interactions between angular corrections). Update TODO list.
2012-12-20 10:19:16 -08:00
b7ad44e3a6
BulletSim: reorganize motor step code to separate error computation allowing subclass for PID error correction.
2012-12-20 08:35:36 -08:00
a9b9c0f035
BulletSim: improve angularVerticalAttraction calculation to compute angular correction velocity rather than estimating correction (excuse to use trig functions).
2012-12-18 23:05:59 -08:00
7b84bcfbb8
BulletSim: initial implementation of a PID motor. Not hooked up yet.
2012-12-18 22:59:59 -08:00
cf89e29ac3
BulletSim: comments and TODO list update
2012-12-18 19:25:51 -08:00
d15bfcf614
Replace axis rotation numeric constants (STATUS_ROTATE_XYZ) with symbols. Also made it so llSetStatus() can individually enable disable rotation axi using the bitmask of flags.
2012-12-18 19:25:40 -08:00
ae67435146
Disable UDPPacketBuffer pooling for now to resolve an issue on Windows of interference between incoming packets.
...
On Windows, concurrent multi-threaded processing of inbound UDP somehow allows different data input processing to interfere with each other.
Possibly the endpoint reference is being switched, though I don't yet know the mechanism. Not seen on Mono.
Also resolveable by setting RecyclePackets = false or RecycleBaseUDPPackets = false in [PacketPool]
Or async_packet_handling = false in [ClientStack.LindenUDP]
For now, will simply disable this particular pooling though will revisit this issue.
In response to http://opensimulator.org/mantis/view.php?id=6468
2012-12-19 01:51:30 +00:00
235afebf03
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-12-17 22:19:42 +00:00
8653ea93b2
BulletSim: apply friction to linear and angular motion before returning advanced motor value. This seems to be the problem with BulletSim vehicles turning too quickly. Also removed the configuration parameter that controlled the timestep scaling kludge for angular velocity that was added to research the question of quick turning.
2012-12-17 13:51:39 -08:00
e6fd8365af
Extend default 1 second wait for event completion to other thread script reset (as called by llResetOtherScript()).
...
As with script stop (via llDie()) aborting other scripts event threads, llResetOtherScript() can also abort any current event thread on another script.
On mono 2.6, 2.10 and possibly later this may cause locking problems in certain code areas.
This commit reuses the recently introduced [XEngine] WaitForEventCompletionOnScriptStop to make this a 1 sec timeout, rather than 0 secs.
2012-12-17 21:37:02 +00:00
11532a4390
BulletSim: fix vehicles going underground when unsat. Problem was that, when doing unsit, the order of operations on the prims and the vehicle is very chaotic and not in a good order so the root prim was being left physical and thus it fell for a bit. Also changed default of velocity scaling to be closer to the movement standard.
2012-12-17 13:22:04 -08:00
021623a17d
BulletSim: fix vehicles being shot in the air at border crossings because of mis-application of correction to postion for below groundness.
2012-12-16 22:31:22 -08:00
2b8efa24dd
BulletSim: add parameter to UpdateProperties call into the linkset so changes from the physics engine can be differentiated from changes made by the user. This eliminates a linkset rebuild loop. Also add logic to not rebuild or freak out when the object/linkset crosses a terrain boundry.
2012-12-16 21:19:13 -08:00
3f2aaffd4d
BulletSim: add even more to the TODO list.
2012-12-16 21:19:13 -08:00
7ed860d3ac
BulletSim: add check for border crossing in character position sanity check.
2012-12-16 21:19:12 -08:00
4cbc5082ff
BulletSim: refactor to combine common terrain height testing code. Add function to test if a position is over known terrain.
2012-12-16 21:19:12 -08:00
8a95953bb7
BulletSim: experimentally remove unit displacement from prim border crossing test. This seems to cause border crossing to be sensed either a little early or a little late depending on which directin the object is moving. If border crossings become totally borked or someone remembers why this was displacement was done, revert this change.
2012-12-16 21:19:12 -08:00
21dc5f4a1a
Add stack dump function that takes an alternate printer outter. I've found that log4net can be slowish so, if one is generating A LOT of debug output, alternate printers are better
2012-12-16 21:19:11 -08:00
f3b1efd889
BulletSim: remove some errors on shutdown by moving terrain destruction until after physical object destruction. TerrainManager also made disposable and that feature used.
2012-12-16 21:19:11 -08:00
ace1f1e931
BulletSim: rip out old code for linkset child position fetching. BulletSim doesn't need to do that bookkeeping because SOG/SOP already does it.
2012-12-16 21:19:10 -08:00
1a262bdde7
Make WebStatsModule properly handle scenes added or removed after initial startup.
...
This may have been the cause of the DivByZero in http://opensimulator.org/mantis/view.php?id=6460
2012-12-15 00:45:27 +00:00
494e6a5f11
minor: If the physics module tells us that an object has gone out of bounds, more helpfully log the name, id, position and region of that object.
2012-12-15 00:30:17 +00:00
56ec177b3b
minor: Add commented out log lines to ScenePresenceAnimator for future debug use (such as logging anim pack contents sent to clients)
2012-12-14 23:42:23 +00:00
2816551215
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-12-14 23:29:33 +00:00
750ad2d3af
Fix issue where calling llVolumeDetect(FALSE) would not remove phantom flag, causing subsequent issues if physics was re-enabled.
...
Added regression tests
Addresses http://opensimulator.org/mantis/view.php?id=6365
2012-12-14 22:15:40 +00:00
664dad53dd
BulletSim: Add more to the TODO list. Clean up and improve some comments.
2012-12-13 23:08:01 -08:00
469c6c000a
Return the last set targetVelocity rather than the current velocity as the default action made available in PhysicsActor.TargetVelocity. Doesn't change any physics operation but makes DSG work better as the targetVelocity value does not keep moving around.
2012-12-13 16:32:25 -08:00
31d3952477
BulletSim: fix problem with continuious rebuilding of physical linksets. This caused movement problems and large prim vehicles to take up a LOT of simulation time.
2012-12-13 16:32:19 -08:00
60950bfab5
BulletSim: correct line endings in new BulletSimData.cs file.
2012-12-13 16:32:12 -08:00
3b2b785a46
BulletSim: Add 'BulletSimData' which separates structures created
...
for the operation of BulletSim and those defintiions/structures defined
so they can be used in the unmanaged world.
Consolidate setting of collision flags so implementation is not scattered.
2012-12-13 16:32:06 -08:00
9e0dd9952b
BulletSim: remove extra linkset rebuilds.
2012-12-13 16:32:00 -08:00
0b93a68030
minor: add some more detail to the logging if an LLClientView fails to process a packet
2012-12-13 23:32:28 +00:00
3c91d0e00d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-12-13 23:21:52 +00:00
523213060b
Add WaitForEventCompletionOnScriptStop [XEngine] config param to OpenSimDefaults.ini to allow change of the wait time for an event to complete on script removal before aborting its thread
...
Default is 1000, as has previously been the case.
This parameter exists for further debug work concerning mono 2.10 crashes that may be related to locks not being removed on Thread.Abort
2012-12-13 23:21:25 +00:00
88b094cbf7
Simplify sit code a bit by determining correct animation in HandleSit instead of HandleSitRequest. This eliminates m_nextSitAnimation, an unneeded state-saving variable in ScenePresence
2012-12-13 13:05:28 -08:00
6f002733b1
Fix formatting
2012-12-13 13:38:57 -05:00
5f11b4658e
Fix module pathname handling for Windows
2012-12-13 13:15:57 -05:00
7a87c35f94
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-12-12 23:34:20 -05:00
8e8da20af2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-12-13 01:12:12 +00:00
6fca93f0b1
Fix sounds so that they play from inventory after teleport rather than only on initial login region.
...
Regression from commit ed162a10http://opensimulator.org/mantis/view.php?id=6453
Many thanks to danbanner for identifying the exact commit where this went wrong, which made identifying the fix easy.
2012-12-13 01:03:35 +00:00
e1814aa827
BulletSim: fix problem of avatar's floating off the ground after unsitting. Reworked size/scale logic so physical scale is kept in Bullet and physObject scale is the preferred size -- usually same as size but avatars are computed differently.
2012-12-12 16:51:43 -08:00
6f1f7f0206
BulletSim: non-functional commenting and reorganization of material attribute specifications.
2012-12-12 16:51:36 -08:00
7bb5613dc6
BulletSim: updates and rearrangement of the TODO list.
2012-12-12 16:51:29 -08:00
512e4c9313
Log situations where workitem event threads are aborted on stop request because they failed to complete event processing within the given timeout.
...
This is for bug hunting purposes where thread aborts may be causing dangling lock issues and subsequent vm crashes on mono (with ReaderWriterLockSlim, etc.)
2012-12-12 23:30:26 +00:00
047270bdc8
Add "debug script log" command to allow setting a numeric debug level on individual IScriptInstances for debugging purposes.
...
Current, state changes and event fires can be logged for individual scripts.
See command help for more details.
2012-12-12 23:13:34 +00:00
418c0cb01d
Add asset id to "show script" and "show scripts" command output to make it easier to extract and inspect the script's asset via "dump asset"
2012-12-12 22:06:09 +00:00
c5d333c16c
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-12-12 16:15:32 -05:00
bb6eeb5429
BulletSim: do not return the current velocity for targetVelocity.
2012-12-12 11:01:36 -08:00
a082ce9da7
BulletSim: fix crash caused by the creation of a linkset child that is under the terrain. Users can sure find some interesting corner conditions.
2012-12-11 14:27:09 -08:00
b1849e7fde
Hide some console output when initializing addin repository
...
We do this in OpenSim.exe to hide output when unmanaged dll are scanned by mono addins. Libomv has hard-coded path to "." for the openjpeg libraries, causing output to the console when they are scanned. We will cover this up for now, then look at getting libomv to look for the libs outside the "." later.
2012-12-11 17:03:42 -05:00
d4e0e98c00
BulletSim: protect character property setting to remove crash from taints setting properties after the destroy character taint.
2012-12-11 13:54:26 -08:00
63099184db
BulletSim: protect prim property setting to remove crash from taints setting properties after the destroy object taint has happened.
2012-12-11 13:42:23 -08:00
905d7c43ad
BulletSim: modify LIMIT_MOTOR_UP to limit BOAT types to be at water rather than ground level. This makes boats float at water level better but not perfectly. There probably needs to be some interaction between HOVER and LIMIT_MOTOR_UP.
2012-12-11 00:35:16 -08:00
8b861e880a
BulletSim: add ini file and command line parameters to control
...
dumping of physical vehicle parameters (out of Bullet) on each
simulation step and to optionally scale vehicle angular velocity
by the time step. The latter looks to be part of a difference
between angular parameters for ODE and BulletSim. SL docs say
angular velocity is measured in radians/timeScale. Not sure if this
is different than what ODE does.
2012-12-11 00:13:13 -08:00
ebf30e7ba6
BulletSim: set mass for single prim linksets when going physical. This fixes single prim vehicles not working (the surf board now zooms).
2012-12-11 00:02:20 -08:00
93393fb975
BulletSim: comment out some chatty debug logging. Rearrange some code in BSDynamics to make velocity vs force calculation clearer.
2012-12-10 16:46:12 -08:00
9df85eadf4
BulletSim: Fix crash on the destruction of physical linksets.
...
While fixing the above, add methods to physical body and shape pointer
wrapper so routines won't have to know that IntPtr.Zero means no
physical instance.
Fix problem with physical linksets failing after a few sits and
unsits by properly restoring child prom positions for compound
linksets after multiple selection and deselections.
2012-12-10 15:35:53 -08:00
a19896cc56
BulletSim: some comments about rebuilding linksets (having to recompute and restore a child's position in the world based on its position in the moved linkset).
2012-12-09 22:32:46 -08:00
ce5083a504
BulletSim: adjust friction and restitution based on material type.
2012-12-09 22:32:46 -08:00
af8d53657d
HGAssetMapper: Get wasn't really working. It's true that some assets are copied in the process of being gathered their UUID, but not all. Specifically, terminal assets like textures aren't copied. We have to go one more time through the ids.
2012-12-09 22:05:12 -08:00
b8178f5a50
Switched the order by which foreign inventory and foreign assets are brought in, to avoid race conditions on the client.
2012-12-09 22:03:21 -08:00
39b388a094
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-12-09 15:31:50 -08:00
cb80d8a29c
UserManagementModule: search the local cache for names too.
...
Inventory transfers: don't do async on asset transfers or now.
2012-12-09 15:31:11 -08:00
nebadon