06e4fcd260
Fixed the UpdateAgentInformation CAP: the viewer expects the simulator to echo back the maturity that it sent
...
Without this change, attempts to change the maturity rating in the viewer's Preferences don't work.
2014-04-29 07:59:10 +01:00
998d7009a6
Eliminated many warnings
2014-04-23 16:37:36 +03:00
f93dac9239
Implement Oren's fix to prevent a privilege escalation with groups
2014-04-20 10:47:31 +02:00
853c0fccc8
Fixed: when any avatar changed his Active Group, it was set as the active group for *all* the avatars in the scene (not permanently)
2014-04-20 06:23:37 +01:00
c8914d22eb
BulletSim: reduce the terrain collison margin to be the same as other
...
objects in the world.
This was originally changed in an attempt to make vehicles work better
but the effect was not that large and it causes avatars to float
above the terrain.
2014-04-12 17:37:57 -07:00
86a2cd915c
Revert "Don't re-retrieve sit part in SP.HandleAgentSit() when we already have it."
...
This reverts commit 2c00b73cd2
2014-04-05 02:11:36 +01:00
2c00b73cd2
Don't re-retrieve sit part in SP.HandleAgentSit() when we already have it.
2014-04-05 02:09:44 +01:00
e735f76553
LogThreadPool: when the thread is for ProcessPacketMethod, also log the packet type
...
Resolves http://opensimulator.org/mantis/view.php?id=6945
2014-03-25 08:01:41 +01:00
a2dd8f31de
Trim search queries (for users, groups, etc.). I have found that sometimes the viewer adds a space at the end, which causes searches to fail.
...
Resolves http://opensimulator.org/mantis/view.php?id=6935
2014-03-24 18:01:28 +01:00
178a5a5585
rename prefix of scene-inventory.<scene-name>.ProcessedFetchInventoryRequests and QueuedFetchInventoryRequests to inventory.httpfetch.*
...
Actual inventory processing is done with a single set of static structures rather than per scene.
2014-03-21 23:29:31 +00:00
1497b75361
minor: Put ProcessedFetchInventoryRequests and QueuedFetchInventoryRequests in stats category "scene-inventory" instead of "scene"
...
To distinguish from general scene stats
2014-03-19 00:37:06 +00:00
a660c0a750
Add scene.<scene-name>.ProcessedFetchInventoryRequests
...
This shows the number of requests that have been processed.
These have not necessarily been sent back to the request since this is done separately by the PollServiceRequestManager
2014-03-18 20:59:11 +00:00
e82d394ddf
Add scene.<scene-name>.QueuedFetchInventoryRequests stat
...
This is to aid in detecting whether there are fetch inventory requests remaining to be processed.
2014-03-18 20:10:41 +00:00
f3e177814a
Add regression test for http inventory fetch.
...
Involved some restructuring to allow regression tests to dequeue inventory requests and perform poll responses synchronously rather than async
2014-03-17 20:51:35 +00:00
0b213af675
Fix problem of hurricane speed winds. Thanks Vegaslon.
2014-02-22 15:04:28 -08:00
bc7fda39b4
Merge branch 'justincc-master'
2014-02-12 23:23:56 +00:00
e10012a7a6
If a caller tries to queue a CAPs message to a scene presence that has no event queue (e.g. an NPC), only warn if event queue debugging is greater than zero.
...
Removes the spurious log warnings if groups are active when NPCs are used.
Adds more regression tests associated with adding messages to the event queue
2014-02-12 23:18:10 +00:00
c0cc5e0fa4
varregion: Send large region patches for wind and clouds.
2014-02-11 21:07:55 -08:00
49c2213a01
Dropping the rest of Avination's modified appearance code for core.
...
Module to follow.
2014-02-04 01:54:16 +00:00
c6e9db5866
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/RegionSettings.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
2014-01-28 21:02:20 +00:00
4faf11e001
varregion: fix for teleporting by double clicking on a map location.
...
Thanks Garmin.
2014-01-28 08:49:22 -08:00
4c362a83f9
Merge branch 'master' into varregion
2014-01-21 11:31:51 -08:00
83626e60e6
Adds a configuration option to cannibalize bandwidth from the
...
udp texture throttle and move it to the task throttle. Since most
viewers are using http textures, the udp texture throttle is holding
onto bw that could be used for more responsive prims updates. See
the documentation for CannibalizeTextureRate in OpenSimDefaults.ini.
Option is disabled by default.
2014-01-20 18:59:43 -08:00
cc5cffc212
varregion: properly pack the region size parameters so he viewer will parse them.
...
This gets rid of the viewer crash when teleporting into varregions and allows
multiple, adjacent varregions (of the same size) with border crossings.
2014-01-11 22:00:52 -08:00
1eea6fd452
varregion: Debug messages for region crossing debugging.
2014-01-11 22:00:24 -08:00
1cf17a3cf7
Merge branch 'master' into varregion
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneBase.cs
OpenSim/Services/Interfaces/IGridService.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
(conflicts were debug statements that are commented out in master branch)
2014-01-11 08:52:23 -08:00
9050c152b4
Dynamically adjust to the number of visual params sent.
2014-01-10 20:31:52 +00:00
32e9c16957
Merge branch 'justincc-master'
2014-01-08 01:04:26 +00:00
0155d42b80
If an agent is sitting, then do send the rotation in the agent update instead of zeroing it to resolve mouselook camera problems
...
Addresses http://opensimulator.org/mantis/view.php?id=6892
Thanks to tglion for this spot.
This resolves a recent regression from 17b32b764a
2014-01-08 00:54:39 +00:00
e79fab91db
Intermediate commit. Sill errors.
...
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
OpenSim/Framework/RegionInfo.cs
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Services/UserProfilesService/UserProfilesService.cs
2014-01-05 20:12:32 +00:00
7e32313a49
varregion: Add region size to teleport event messages (EnableSimulator,
...
CorssRegion, TeleportFinishEvent).
Have Simian grid service return the region size.
Many teleport related debug log messages. Can be removed when teleport
works (like that's ever going to happen).
Conflicts:
OpenSim/Framework/RegionInfo.cs
2014-01-04 19:01:04 -08:00
dd96fef940
Dynamically adjust to the number of visual params sent.
2014-01-04 21:18:37 +00:00
9984ecf862
varregion: Add region size to teleport event messages (EnableSimulator,
...
CorssRegion, TeleportFinishEvent).
Have Simian grid service return the region size.
Many teleport related debug log messages. Can be removed when teleport
works (like that's ever going to happen).
2014-01-03 07:41:06 -08:00
a01862509e
Merge branch 'master' into varregion
2013-12-20 06:52:28 -08:00
68773ee7c4
Merge branch 'justincc-master'
2013-12-19 01:41:04 +00:00
a5ca15c428
Create regression test TestSendAgentGroupDataUpdate() for groups agent data sending
2013-12-18 23:35:38 +00:00
6937eec258
Merge branch 'master' into varregion
...
Add new region crossing code to varregion
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-12-17 06:18:13 -08:00
13a9a4b653
varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z.
...
Rename 'RegionWorldLocX' to 'WorldLocX' and same for Y and Z.
This keeps the downward compatibility and follows the scheme of 'region'
and 'world' location naming that is happening in the Util module.
2013-12-14 07:53:01 -08:00
5b73b9c4a8
Committing the Avination Scene Presence and related texture code
...
- Parts of region crossing code
- New bakes handling code
- Bakes now sent from sim to sim without central storage
- Appearance handling changes
- Some changes to sitting
- A number of unrelated fixes and improvements
2013-12-11 01:39:56 +00:00
6d6b9ab791
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-12-07 01:08:49 +00:00
4eb52eb19e
Merge branch 'master' into varregion
2013-12-05 21:07:44 -08:00
bb4f4d9480
minor: Use enums for setting inv/asset types on data upload rather than magic numbers
2013-12-06 00:38:18 +00:00
16aaba77d4
Properly set InventoryType.Snapshot when a snapshot is uploaded
...
Resolves http://opensimulator.org/mantis/view.php?id=6857
This prevents the inventory service complaining later about an attempt to change an invariant
2013-12-06 00:30:44 +00:00
17b32b764a
Fix regression where mouse look flight direction no longer worked by zeroing x/y rot before sending agent updates, instead of before any agent update processing
...
It turns out that the x/y rot data in mouselook is needed to implement this and to push the avatar against the ground if walking in mouselook.
Doing this in the terse send so that we preserve mouselook rotation information
2013-12-05 02:10:46 +00:00
31bacfbb63
Merge branch 'master' into varregion
2013-12-01 15:51:42 -08:00
8b3a4367ea
Still send CameraEyeOffset in UDP SendSitReponse even if at offset is Vector3.Zero
2013-11-29 02:51:35 +00:00
ca079c378a
Merge branch 'link-sitting'
2013-11-29 02:41:32 +00:00
0785210e29
Fix stand positions rather than having the stand jump to the root prim.
2013-11-27 02:08:22 +00:00
3589acdab1
Merge branch 'master' into careminster
...
Conflicts:
.gitignore
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
prebuild.xml
runprebuild.bat
2013-11-23 19:13:22 +00:00
60e049ea39
Revert "Fix issue where sitting on non-root linked prims would send camera to wrong position in third-person and mouselook"
...
Reverting to place on separate branch
This reverts commit ff4e7de776
2013-11-23 02:31:39 +00:00
a68d1fad73
Revert "Still send CameraEyeOffset in UDP SendSitReponse even if at offset is Vector3.Zero"
...
This reverts commit 9bdd3dc7de
2013-11-23 02:29:14 +00:00
9bdd3dc7de
Still send CameraEyeOffset in UDP SendSitReponse even if at offset is Vector3.Zero
...
As far as I can see it's valid to change the eye offset even if you aren't changing the at target.
2013-11-23 01:12:20 +00:00
ff4e7de776
Fix issue where sitting on non-root linked prims would send camera to wrong position in third-person and mouselook
...
We now specify sits as offsets from the root prim, as the viewer expects.
2013-11-23 00:53:09 +00:00
91b70bf3fe
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2013-11-08 17:55:01 +00:00
a75ce7423c
Merge branch 'master' into varregion
2013-11-05 21:42:27 -08:00
26fd29622d
Added sending (for now hard-coded) sim isze in SendMapBlockSplit()
2013-11-06 03:52:04 +01:00
8e1bf55e7b
Add IncomingPacketsResentCount clientstack statistics
...
This records how many packets were indicated to be resends by clients
Not 100% reliable since clients can lie about resends, but usually would indicate if clients are not receiving UDP acks at all or in a manner they consider timely.
2013-11-06 01:02:20 +00:00
c931b16c1f
Merge branch 'master' into varregion
2013-11-04 22:12:57 -08:00
92c06a5d0b
varregion: fix lawn-mower terrain fill so it works for non-square regions.
...
Add some debugging logs on region creation to report region size.
2013-11-01 16:37:27 -07:00
4c4a1cf715
Start counting resent packets in the places that I missed when the stat was first added a few commits ago
2013-10-31 23:59:22 +00:00
50794c9008
minor: remove mono compiler warnings in AvatarPickerSearchModule and UploadBakedTextureModule
2013-10-31 23:51:01 +00:00
3d5a7e9b19
Add OutgoingPacketsResentCount clientstack stat.
...
This allows one to monitor the total number of messages resent to clients over time.
A constantly increasing stat may indicate a general server network or overloading issue if a fairly high proportion of packets sent
A smaller constantly increasing stat may indicate a problem with a particular client-server connection, would need to check "show queues" in this case.
2013-10-31 23:45:52 +00:00
39777db8ef
varregion: fix problem of X/Y dimensions swapped and incorrect terrain
...
compression base computation.
Complete replacement of float[] for terrain heightmap with TerrainData instance.
2013-10-31 09:24:06 -07:00
2be0347f50
Merge branch 'master' into varregion
2013-10-28 09:30:26 -07:00
df76e52310
minor: Add commented out code for apparent passing of texture IDs in ObjectProperties UDP replies to viewer
...
Not yet shown that this is used or resolves a bug where not all textures appear on objects with an "XML with textures" upload from singularity 1.8.3
Proper texture entries are actually present and appear properly on relog, but not on select from viewer until at least one face texture is changed.
2013-10-24 23:00:02 +01:00
cccdfcb59e
Comment out LLUDPServer.BroadcastPacket() to reduce code complexity. Appears to be a never used method.
2013-10-24 00:37:49 +01:00
5d61c4039d
Only set the data present event if we actually queued an outoing packet (not if we sent immediately)
2013-10-24 00:33:14 +01:00
86bf79aa2b
Merge branch 'master' into varregion
2013-10-07 13:58:17 -07:00
7416809077
varregion: plug in TerrainData class and modify TerrainModule and LLClientView to use same. This passes a terrain info class around rather than passing a one dimensional array thus allowing variable regions. Update the database storage for variable region sizes. This should be downward compatible (same format for 256x256 regions).
2013-10-07 13:57:40 -07:00
69054ad134
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/VersionInfo.cs
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
2013-10-06 18:32:20 +01:00
42bdf44658
Bump OPenSimulator version and assembly versions up to 0.8.0 Dev
2013-10-04 23:33:47 +01:00
75c68fa29e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-10-04 20:03:12 +01:00
8c1d80fdfd
varregion: serious rework of TerrainChannel:
...
-- addition of varaible region size in X and Y
-- internal storage of heightmap changed from double[] to short[]
-- helper routines for handling internal structure while keeping existing API
-- to and from XML that adds region size information (for downward compatibility,
output in the legacy XML format if X and Y are 256)
Updated and commented Constants.RegionSize but didn't change the name for compatibility.
2013-09-28 07:33:56 -07:00
317c04fe17
VarRegion: change RegionInfo storage of region coordinates from region
...
count number to integer world coordinates.
Added new methods RegionWorldLoc[XY].
Refactored name of 'RegionLoc*' to 'LegacyRegionLoc*' throughout OpenSim.
Kept old 'RegionLoc*' entrypoint to RegionInfo for downward compatability
of external region management packages.
2013-09-28 07:33:52 -07:00
2cd95fac73
refactor: Rename Scene.AddNewClient() to AddNewAgent() to make it obvious in the code that this is symmetric with CloseAgent()
2013-09-27 22:27:39 +01:00
b16bc7b01c
refactor: rename Scene.IncomingCloseAgent() to CloseAgent() in order to make it clear that all non-clientstack callers should be using this rather than RemoveClient() in order to step through the ScenePresence state machine properly.
...
Adds IScene.CloseAgent() to replace RemoveClient()
2013-09-27 19:14:21 +01:00
32ddfc2740
Reinsert client.SceneAgent checks into LLUDPServer.HandleCompleteMovementIntoRegion() to fix race condition regression in commit 7dbc93c (Wed Sep 18 21:41:51 2013 +0100)
...
This check is necessary to close a race condition where the CompleteAgentMovement processing could proceed when the UseCircuitCode thread had added the client to the client manager but before the ScenePresence had registered to process the CompleteAgentMovement message.
This is most probably why the message appeared to get lost on a proportion of entity transfers.
A better long term solution may be to set the IClientAPI.SceneAgent property before the client is added to the manager.
2013-09-25 18:45:56 +01:00
732554be04
Reinsert 200ms sleep accidentally removed in commit 7dbc93c (Wed Sep 18 21:41:51 2013 +0100)
2013-09-25 18:29:14 +01:00
f384a6291e
Instead of swallowing any socket begin/end receive exceptions, log them for debugging purposes.
...
This may reveal why on some teleports with current code, the UseCircuitCode message gets through but CompleteMovement disappears into the ether.
2013-09-25 00:02:17 +01:00
2dc92e7de1
Preserve attachment point & position when attachment is rezzed in world
...
Patch taken from
http://opensimulator.org/mantis/view.php?id=4905
originally by Greg C.
Fixed to apply to r/23314 commit
ba9daf849e
2013-09-22 21:10:01 -05:00
f4d82a56f4
Double the time spent waiting for a UseCircuitCode packet in LLUDPServer.HandleCompleteMovementIntoRegion()
...
This is to deal with one aspect of http://opensimulator.org/mantis/view.php?id=6755
With the V2 teleport arrangements, viewers appear to send the single UseCircuitCode and CompleteAgentMovement packets immediately after each other
Possibly, on occasion a poor network might drop the initial UseCircuitCode packet and by the time it retries, the CompleteAgementMovement has timed out and the teleport fails.
There's no apparant harm in doubling the wait time (most times only one wait will be performed) so trying this.
2013-09-18 22:09:46 +01:00
7dbc93c62a
Change logging to provide more information on LLUDPServer.HandleCompleteMovementIntoRegion()
...
Add more information on which endpoint sent the packet when we have to wait and if we end up dropping the packet
Only check if the client is active - other checks are redundant since they can only failed if IsActve = false
2013-09-18 21:41:51 +01:00
72206a0e29
Merge branch 'avination-current' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
2013-09-16 22:32:53 +01:00
b29e9d37e7
Change handling of the FetchInventoryDescendents2 capability configuration to allow
...
for external handlers.
2013-09-11 12:15:16 -07:00
ddf67bf929
Mono 2.0 fix - call ToArray() explicitly
2013-09-08 19:41:51 +02:00
823e8b5d19
Add support for simple external CAPS texture services
2013-09-07 17:57:02 +02:00
2f365ea80b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2013-09-07 13:54:19 +01:00
857f24a5e2
Fix bug where users teleporting to non-neighbour regions could continue to hear chat from their source region for some time after teleport completion.
...
This occurs on v2 teleport since the source region now waits 15 secs before closing the old child agent, which could still receive chat.
This commit introduces a ScenePresenceState.PreClose which is set before the wait, so that ChatModule can check for ScenePresenceState.Running.
This was theoretically also an issue on v1 teleport but since the pause before close was only 2 secs there, it was not noticed.
2013-09-02 19:15:10 +01:00
008c98a974
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Region/RestartModule.cs
OpenSim/Region/Framework/Scenes/SceneGraph.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-09-01 22:49:31 +01:00
a0c99a7dcc
minor: remove mono compiler warning from LLClientView
2013-08-23 00:03:47 +01:00
1f39a763a5
Don't allow users to attempt to sit on objects in a child region without going to that region first.
...
If this is attempted, they get a "Try moving closer. Can't sit on object because it is not in the same region as you." message instead, which is the same as current ll grid.
Sitting on ground is okay, since viewer navigates avatar to required region first before sitting.
2013-08-21 21:35:03 +01:00
bef03fb30b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
2013-08-17 03:23:45 +01:00
7d268912f1
Packet headers are not zero-encoded so don't try to zero-decode these in PacketPool.GetType()
...
Instead adjusts code with that from Packet.BuildHeader(byte[], ref int, ref int):Header in libomv
This stops packet decoding failures with agent UUIDs that contain 00 in their earlier parts (e.g. b0b0b0b0-0000-0000-0000-000000000211)
Thanks to lkalif for pointing this out.
2013-08-16 00:58:25 +01:00
104626d732
minor: Comment out AvatarPicketSearch caps log message for now, which is occuring on every login and entity transfer
2013-08-14 23:22:52 +01:00
93dffe1777
Add stat clientstack.<scene>.IncomingPacketsOrphanedCount to record well-formed packets that were not initial connection packets and could not be associated with a connected viewer.
2013-08-14 22:33:12 +01:00
0d5680e971
Count any incoming packet that could not be recognized as an LLUDP packet as a malformed packet. Record this as stat clientstack.<scene>.IncomingPacketsMalformedCount
...
Used to detect if a simulator is receiving significant junk UDP
Decimates the number of packets between which a warning is logged and prints the IP source of the last malformed packet when logging
2013-08-14 22:08:28 +01:00
4a6eff1ee8
Merge branch 'master' into careminster
2013-08-13 22:53:47 +01:00
f3edc0d8b7
minor: Extend warning message when adding trying to add an event for a client without a queue to include the event message name.
2013-08-12 19:38:23 +01:00
ad1b2902f2
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-08-11 17:31:25 +01:00
97bcb59bee
Merge branch 'TeleportWork'
2013-08-09 17:52:29 +01:00
b1c26a56b3
Fix an issue where under teleport v2 protocol, teleporting from regions in an line from A->B->C would not close region A when reaching C
...
The root cause was that v2 was only closing neighbour agents if the root connection also needed a close.
However, fixing this requires the neighbour regions also detect when they should not close due to re-teleports re-establishing the child connection.
This involves restructuring the code to introduce a scene presence state machine that can serialize the different add and remove client calls that are now possible with the late close of the
This commit appears to fix these issues and improve teleport, but still has holes on at least quick reteleporting (and possibly occasionally on ordinary teleports).
Also, has not been completely tested yet in scenarios where regions are running on different simulators
2013-08-08 23:29:30 +01:00
99a4a91488
* This makes in-world terrain editing smoother, even in MegaRegions. This change only affects the editing user's experience. Non-editing users will see nothing different from the current 'slow' result. See comments for the thought process and how the issues surrounding terrain editing, cache, bandwidth, threading, terrain patch reliability and throttling were balanced.
2013-08-07 21:22:04 -05:00
005c69511d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2013-08-07 23:29:42 +01:00
f9dc5815c4
For LLImageManagerTests, make tests execute under synchronous fire and forget conditions.
...
I generally prefer this approach for regression tests because of the complexity of accounting for different threading conditions.
2013-08-05 23:15:30 +01:00
5b4b349776
Fix the failing TestSendImage. J2K decoding is async.
2013-08-03 21:27:32 -07:00
6fc03c7e6e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-08-01 23:42:19 +01:00
68b98a8003
minor: Add name to debug lludp packet level feedback on console
2013-08-01 23:16:41 +01:00
0c4c084bed
Try a different approach to slow terrain update by always cycling the loop immediately if any data was sent, rather than waiting.
...
What I believe is happening is that on initial terrain send, this is done one packet at a time.
With WaitOne, the outbound loop has enough time to loop and wait again after the first packet before the second, leading to a slower send.
This approach instead does not wait if a packet was just sent but instead loops again, which appears to lead to a quicker send without losing the cpu benefit of not continually looping when there is no outbound data.
2013-08-01 18:12:28 +01:00
932c382737
Revert "Issue: painfully slow terrain loading. The cause is commit d9d995914c (r/23185) -- the WaitOne on the UDPServer. Putting it back to how it was done solves the issue. But this may impact CPU usage, so I'm pushing it to test if it does."
...
This reverts commit 59b461ac0e
2013-08-01 18:11:50 +01:00
59b461ac0e
Issue: painfully slow terrain loading. The cause is commit d9d995914c (r/23185) -- the WaitOne on the UDPServer. Putting it back to how it was done solves the issue. But this may impact CPU usage, so I'm pushing it to test if it does.
2013-08-01 09:27:44 -07:00
21f5e67030
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
2013-08-01 01:23:24 +01:00
1299592405
Experimental comment to eneralize the handling of Linden caps when the
...
cap is something other than "localhost". A new interface for handling
external caps is supported with an example implemented for Simian. The
only linden cap supporting this interface right now is the GetTexture
cap.
2013-07-31 15:37:15 -07:00
fd050fca7c
Doing the HG Map / SimulatorFeatures "the right way": moved it to HGMapModule, hooking on to SimulatorFeatures.OnSimulatorFeaturesRequest event (similar to what the DynamicMenuModule does).
...
Only HG Visitors get this var, to avoid spamming local users.
The config var is now called MapTileURL, to be consistent with the login one, and its being picked up from either [LoginService], [HGWorldMap] or [SimulatorFeatures], just because I have a bad memory.
2013-07-30 21:10:00 -07:00
590a8b0315
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-30 17:27:32 -07:00
2b54199271
After talking to lkalif on the IRC: SimulatorFeatures response: renamed the OSDMap GridServices to OpenSimExtras, normalized the url keys under it, and moved ExportEnabled to under it too. Melanie: change your viewer code accordingly.
...
Documentation at http://opensimulator.org/wiki/SimulatorFeatures_Extras
2013-07-30 17:26:56 -07:00
1416c90932
minor: Add timeout secs to connection timeout message. Change message to reflect it is a timeout due to no data received rather than an ack issue.
2013-07-29 23:53:59 +01:00
8004e6f31c
Fix issue just introduced in 8efe4bfc2e where I accidentally left in a test line to force very quick client unack
2013-07-29 23:38:54 +01:00
8efe4bfc2e
Make "abnormal thread terminations" into "ClientLogoutsDueToNoReceives" and add this to the StatsManager
...
This reflects the actual use of this stat - it hasn't recorded general exceptions for some time.
Make the sim extra stats collector draw the data from the stats manager rather than maintaing this data itself.
2013-07-29 23:18:29 +01:00
bf283208df
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2013-07-29 02:08:05 +01:00
69975763d2
Several major improvements to group (V2) chat. Specifically: handle join/drop appropriately, invitechatboxes.
...
The major departure from flotsam is to send only one message per destination region, as opposed to one message per group member. This reduces messaging considerably in large groups that have clusters of members in certain regions.
2013-07-27 15:38:56 -07:00
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
7914eaa357
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
bin/OpenSimDefaults.ini
2013-07-25 16:55:23 +01:00
cac37e298c
Deleted all [ZZZ] debug messages.
2013-07-24 14:31:30 -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
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
e82d4154a2
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Physics/Manager/PhysicsActor.cs
OpenSim/Region/Physics/Manager/PhysicsScene.cs
2013-07-24 04:45:07 +01:00
a7eb1b5b85
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2013-07-24 03:50:09 +01:00
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
99a727600b
Minor cosmetic changes.
2013-07-21 10:07:35 -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
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
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
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
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
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
437326a480
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
2013-07-18 10:17:30 +01:00
7830cc9954
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
OpenSim/Services/HypergridService/UserAgentService.cs
2013-07-18 10:08:10 +01:00
fa2370b32e
Revert "Cleared up much confusion in PollServiceRequestManager. Here's the history:"
...
This reverts commit e46459ef21
2013-07-17 15:05:36 -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
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
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
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
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
c6d75cda97
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
2013-07-13 00:57:03 +01:00
a53a10ad27
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
2013-07-13 00:47:58 +01:00
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
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
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
1b265b213b
Added show client-stats [first last] command to expose what viewers are requesting.
2013-07-10 16:09:45 -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
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
013710168b
For stat purposes, add names to capability request handlers where these were not set
2013-07-08 22:39:07 +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
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
5ddcc25ee9
Merge branch 'master' into careminster
2013-07-04 22:32:58 +01: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
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
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
f70357eaa3
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2013-06-23 01:59:57 +01:00
56f4adeb60
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
2013-06-18 01:50:08 +01:00
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
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
162dfd8a38
Merge branch 'avination-current' into careminster
2013-06-11 21:03:02 +01:00
745a209bf2
Explicitly set uploaded mesh object perms
2013-06-10 01:16:22 +02:00
cf4d291443
Merge branch 'master' into careminster
2013-06-08 00:00:39 +01:00
3a722ef81b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-06-07 23:59:02 +01: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
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
fe4a67efb6
Merge branch 'avination-current' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs
OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
2013-06-06 03:20:15 +01:00
a7dbafb0e3
Port Avination's inventory send throttling
2013-06-05 23:42:50 +01:00
9589a09eda
Fix multi-wear of alpha and tattoo layers.
2013-05-31 22:02:31 +02:00
669fa3ff9a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
2013-05-30 21:48:09 +01:00
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
0086c3b5fb
Update the money framework to allow sending the new style linden "serverside is now viewerside" messages regarding currency
...
This will require all money modules to be refactored!
2013-05-25 01:58:50 +02:00
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
4cb7ee47f2
Let the event queue do lees work - expire every 40s as per Teravus instead of every seconds - whoever put that in....
2013-05-22 23:49:34 +02:00
42c82b564e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
2013-05-16 21:59:14 +01:00
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
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
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
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
f9daf921f7
Explicitly zero avatar velocity on sit
2013-05-13 03:29:11 +02:00
e8f4c7128f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2013-05-12 03:24:57 +01:00
13cd8c17d7
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
OpenSim/Tests/Common/Mock/TestClient.cs
2013-05-11 02:35:26 +01:00
a1031772eb
Delete debug message
2013-05-10 08:09:26 -07:00
3290cd09d3
remove pointless region handle paramter from IClientAPI.SendKillObject()
2013-05-09 18:12:17 +01:00
cdaceea5a6
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/IClientAPI.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
2013-05-08 21:51:48 +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
bda4565067
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
2013-05-08 20:59:44 +01:00
e92c05ebbd
Added AvatarPickerSearch capability handler.
2013-05-07 18:01:48 -07:00
8c5445b774
Merge branch 'master' into careminster
...
Conflicts:
ThirdParty/SmartThreadPool/SmartThreadPool.cs
2013-05-01 21:39:49 +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
b89d18e6f4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2013-04-30 23:45:38 +01:00
0af1d8fe19
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:35:59 +02:00
537b243360
minor: Eliminate warning in LLimageManagerTests by properly calling through to OpenSimTestCase.SetUp()
2013-04-29 22:18:11 +01:00
4275d7a839
Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
...
Conflicts:
bin/Regions/Regions.ini.example
2013-04-28 19:03:39 +02:00
40036ca05f
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:37:40 +01:00
fb8aa22084
Merge branch 'master' into careminster
2013-04-25 21:37:25 +01: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
e39156c656
Send 503 when throttling textures
2013-04-25 01:38:21 +02:00
293a024c14
Allow callers to set the invoice parameter for GenericMessage
2013-04-22 22:39:08 +01:00
671a97ef76
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2013-04-22 22:28:41 +02:00
6571e7ead2
Allow callers to set the invoice parameter for GenericMessage
2013-04-22 22:24:41 +02:00
231c298ca5
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
bin/OpenMetaverse.StructuredData.XML
bin/OpenMetaverse.XML
bin/OpenMetaverseTypes.XML
2013-04-21 14:11:39 +01: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
d3f288e27b
Merge branch 'master' into careminster
2013-04-16 22:37:47 +01: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
f548a41fb8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
2013-03-28 02:29:07 +00:00
617637c788
minor: Fix usage error message for "debug eq" console command
2013-03-28 01:41:41 +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
4365daa8e1
Merge branch 'master' into careminster
2013-03-26 19:06:44 +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
c341664c1b
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-24 18:56:28 +01:00
b9146a7922
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/BaseOpenSimServer.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-03-15 23:45:32 +00: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
710381e838
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
2013-03-13 02:02:46 +00:00
f8a4d95bdd
minor: Remove mono compiler warning in LLClientView
2013-03-13 00:22:07 +00:00
e898a5fec5
minor: Remove mono compiler warnings in EventQueueTests
2013-03-11 22:42:27 +00:00
70f0587558
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2013-03-08 01:07:05 +00: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
81552f41c6
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
2013-03-05 23:57:53 +00: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
f39e4abf0e
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
2013-03-03 13:24:37 +00:00
2ad72db0ec
Make a viewer sent XML error prettier
2013-03-03 11:40:46 +01:00
da2b598484
Make banking no longer break sit rotations. Fix spinning avatars.
2013-02-25 18:26:59 +01:00
e0e9118f81
The viewer tries to parse the error message body to LLSD - give it some.
2013-02-24 18:31:49 +01:00
9534d5f929
Merge branch 'master' into careminster
2013-02-22 01:28:54 +00: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
4779f7d7d5
Deleted all AssemblyFileVersion directives
2013-02-19 17:14:55 -08:00
8a6f2432fc
minor: remove some mono compiler warnings in OpenSim.Region.ClientStack.Linden.Caps.dll
2013-02-20 00:01:20 +00:00
8c0b9080a4
Fix an issue where the viewer would request the seed cap before
...
there was a handler for it.
2013-02-18 21:09:14 +01:00
3108d18ffb
Fix shape parameters sent for meshes tosupport the full number of faces
2013-02-16 05:44:41 +00:00
4be35df5fa
Fix shape parameters sent for meshes tosupport the full number of faces
2013-02-16 05:09:27 +01:00
a5a56a8755
Merge branch 'avination' into careminster
2013-02-14 09:12:27 +00:00
ef662fc959
Add an event and some logic to allow customizing Simulator Features by avatar
2013-02-14 09:11:57 +00:00
d5cd9308d5
Merge branch 'avination' into careminster
2013-02-14 07:45:30 +00:00
32c4e1a850
Add an event and some logic to allow customizing Simulator Features by avatar
2013-02-14 08:40:15 +01:00
4c7df6a147
Small fix to sim features module
2013-02-14 07:17:27 +01:00
c2bfdaa026
Make the sim features module register it's interface so it can be used
2013-02-13 01:52:25 +00:00
14c064c65d
Revert "Push updates from keyframe directly to the front of the output queue rather"
...
This reverts commit 04235e58e8
2013-02-12 03:15:40 +01:00
2065590232
Revert "Use actual time dilation for unqueued updates"
...
This reverts commit 048e904f05
2013-02-12 03:15:32 +01:00
048e904f05
Use actual time dilation for unqueued updates
2013-02-12 01:13:30 +01:00
04235e58e8
Push updates from keyframe directly to the front of the output queue rather
...
than through the update system.
2013-02-12 01:02:16 +01:00
7bf33d333a
Plumb the path from the client to the extra physics params and back
2013-02-07 22:25:28 +00:00
8b78b9429d
Merge branch 'avination' into careminster
2013-02-07 21:26:55 +00:00
bbda7b94b3
Rename Bounciness to Restitution
2013-02-07 21:25:55 +00:00
338b02a8bc
Send the new physics params to the viewer build dialog
2013-02-07 21:23:35 +00:00
6aa876a83b
Rename Bounciness to Restitution
2013-02-07 03:40:48 +00:00
598f891d70
Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SP
2013-02-06 04:03:32 +01: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
d3892bbd06
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Framework/Servers/VersionInfo.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-02-05 21:30:12 +00: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
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
cc1781926b
* Adds a satisfying angular roll when an avatar is flying and turning. (General, not physics). Makes flying not feel as stiff.
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
2013-01-31 20:37:58 +00:00
9a4de546fe
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
2013-01-31 02:53:11 +00: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
e6e6e8ab15
Merge branch 'avination' into careminster
2013-01-27 01:09:07 +00:00
2eab339b87
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-26 04:40:48 +01:00
9d1989e64f
* Handle a NRE with Baked Textures that may result in a failed appearance. This may be an issue, or it may be a symptom.
2013-01-22 18:49:50 -05:00
2d3a57a002
Merge branch 'avination'
...
Conflicts:
OpenSim/Framework/ThrottleOutPacketType.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
2013-01-19 21:49:33 +01:00
7bd9a0edb7
Remove group IM test code also mentioning "OpenSimulator Testing"
2013-01-19 14:30:38 +01:00
5b86af36e6
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-16 20:23:45 +01:00
582cb89beb
Add a way to put things at the front of the queue for any throttle group.
...
Adds a DoubleLocklessQueue and uses it for the outgoing buckets. Added
a flag value to the Throttle Type (again) because although it's hacky, it's
the best of a bad bunch to get the message through the UDP stack to where it's
needed.
2013-01-16 19:29:27 +01:00
206bfe0657
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Instance/Tests/CoopTerminationTests.cs
2013-01-16 17:05:37 +00: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
518326b049
Merge branch 'ubitwork' into avination
2013-01-16 16:47:21 +01:00
91138014e2
Change all uses of the removed state queue to the task queue for now.
2013-01-16 17:12:56 +00:00
85aa1804df
Complete removal of the now unused state queue
2013-01-16 17:06:25 +00:00
778ed1c05a
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-16 16:35:09 +01:00
4d92c6b39f
fix STATE udp queue data rate since it is in use again, after being
...
removed by intel folks (?)( should it be used or removed ??)
2013-01-16 15:30:58 +00:00
503705bfad
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-16 14:24:23 +01:00
94710a17a4
Merge branch 'avination' into ubitwork
2013-01-16 13:11:02 +00:00
70fa41863d
Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminster
2013-01-16 01:13:14 +00: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
ee6333f89b
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-13 16:27:47 +01:00
b263587e21
try to patch getmesh Throttle (test)
2013-01-13 15:25:51 +00:00
923e5df7ae
Merge branch 'master' into careminster
2013-01-13 13:44:24 +00:00
2eb0d8b617
add some sanity checking to HandleAgentRequestSit handler
2013-01-13 13:43:59 +00:00
72cc94cfbc
add some sanity checking to HandleAgentRequestSit handler
2013-01-10 20:21:18 -08:00
3a495ccd56
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2013-01-10 01:38:03 +00:00
aecb32b74e
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-01-10 01:25:07 +00:00
f392fa96c3
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-09 18:03:04 +01:00
2ac96dd181
Add the new UpdateAgentInformation cap to make maturity on more recent viewers
...
work.
2013-01-08 22:52:14 +00:00
0a393b317d
Add the new UpdateAgentInformation cap to make maturity on more recent viewers
...
work.
2013-01-08 22:32:39 +01:00
152407f341
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-08 15:11:04 +01:00
083ac92b34
Merge branch 'avination' into careminster
2013-01-06 10:52:22 +00:00
41a44d7165
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-02 09:28:55 +01:00
2805ec6466
* Fixed a bug that replayed old cached appearance when changing outfits
...
* Added suser(bad client) DOS protection by limiting the max cacheitems to the maximum sane amount.
* Prevents potential numerous loops from running amok and index errors if the client purposely provides bad cache info.
* If the XBakes service wasn't running, the SetAvatarAppearance routine would crash when contacting the XBakes service even though it was in a Try/Catch for the appropriate error type. It only properly error handles with the type Exception :(. (commented on that because it's unusual)
2012-12-31 23:04:28 -05:00
6797ac1474
* This finishes the implementation of AgentCachedTexture. Requires the XBakes Module and service for full functionality. Previous no-cache functionality works without the service and module. In some ways, I would have been happier not putting an AssetBase in WearableCacheItem.. but turns out it was probably unavoidable. No additional locks, yay.
2012-12-29 08:53:58 -05:00
77cc7ce399
* Partial Commit for Avatar Appearance to include the functionality of Cached Bakes.
2012-12-21 19:12:30 -05:00
569f39e124
Merge branch 'master' into careminster
2012-12-21 22:13:41 +00:00
c648325d7c
Merge branch 'avination' of careminster:/var/git/careminster into teravuswork
2012-12-19 11:53:26 -05: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
021485b581
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-12-18 11:09:53 +01:00
79bdf464d3
Merge branch 'avination' into careminster
2012-12-18 09:48:12 +00:00
0a876a305c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
2012-12-16 21:19:30 +00:00
1d713bcdb8
Merge branch 'ubitwork' into avination
2012-12-14 03:57:31 +01:00
7a093df24b
Prevent a failed user relogi from throwing exceptions in poll services
2012-12-14 03:35:55 +01: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
3cf0d8b165
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-12-13 08:36:18 +01:00
b3a77c16bd
FIX small avatars movement on terrain. (avatar appearance getting even
...
more messy)
2012-12-13 07:34:27 +00:00
020bc9c358
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-12-13 04:36:47 +01:00
20773dcfcc
add a Check method to flotsamAssetCache, so to check if a asset is in
...
cache without actually loading it. Make use limited use of it in
avatarfactory textures check. Also on llclientview
HandleAgentTextureCached that now should work. Other asset cache modules
for now will return false, so are broken. baked textures logic
still unchanged. *UNTESTED*
2012-12-13 02:55:36 +00:00
a1f0e3d95a
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-12-11 05:37:33 +01:00
c6430b14db
typo fix
2012-12-10 11:25:30 +00:00
ecdd0e225f
add velocityinterpolator packets handling but actually do nothing, since
...
they don't do what i was looking for.
2012-12-09 00:55:09 +00:00
6c1a852137
* This is a better way to do the last commit.
2012-12-08 00:05:12 -05:00
0e2b717b4d
* Should promote faster self appearance.
2012-12-07 20:15:32 -05:00
fc33b7e9eb
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-12-07 22:28:48 +01:00
93bede4e6a
revert the use of avatar skeleton and use avatar size provided by viewers,
...
since at least for now seems good enought
2012-12-07 21:26:58 +00:00
5d4b7d537d
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-12-03 21:26:36 +01:00
fd7a83f439
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
2012-11-25 14:13:50 +00:00
22d4c52ffc
Consistenly make NUnit test cases inherit from OpenSimTestCase which automatically turns off any logging enabled between tests
2012-11-24 03:15:24 +00:00
Oren Hurvitz