Diva Canto
5cf6a6f830
WARNING: BREAKING CHANGES FOR REGION MODULE DEVELOPMENT.
...
This cleans up Opensim's use of mono addins. In particular, the extension points /OpenSim/RegionModules and /OpenSim/WindModule moved from OpenSim.exe to OpenSim.Region.Framework.dll. From here on, developers of region modules should declare their dlls to be dependent on OpenSim.Region.Framework, starting with version 0.8.1
Additional changes:
- Addins version uniformly updated to 0.8.1. These numbers should be compatible with the release numbers or else it becomes very confusing.
- Mono addins directives moved from files addins.xml to embedded directives in the class and assembly declarations, to make it all consistent
2014-12-30 07:58:42 -08:00
Diva Canto
89c1ac4cff
Updated OpenSim-as-addin version from 0.5 to 0.8.1. The addin version number doesn't need to match the release version number, but I think it's a very good idea that they do.
2014-12-29 15:05:44 -08:00
Justin Clark-Casey (justincc)
86367d7219
refactor: Move methods to start a monitored thread, start work in its own thread and run work in the jobengine from Watchdog to a WorkManager class.
...
This is to achieve a clean separation of concerns - the watchdog is an inappropriate place for work management.
Also adds a WorkManager.RunInThreadPool() class which feeds through to Util.FireAndForget.
Also switches around the name and obj arguments to the new RunInThread() and RunJob() methods so that the callback obj comes after the callback as seen in the SDK and elsewhere
2014-11-25 23:56:32 +00:00
Justin Clark-Casey (justincc)
20cede12a9
Fix ghosts copy of SimulatorFeatureModule to enable logging.
2014-11-25 23:28:38 +00:00
Justin Clark-Casey (justincc)
16a5e15443
Allow GetMesh capability to be served directly by a server like GetTexture
...
To do this required GetMesh to be converted to a BaseStreamHandler
Unlike GetTexture connector, no redirect URL functionality yet (this wasn't present in the first place).
2014-11-25 23:21:38 +00:00
Justin Clark-Casey (justincc)
a98b514184
minor: remove compiler warning from unused field in SimulatorFeaturesModule
2014-11-25 23:21:37 +00:00
Justin Clark-Casey (justincc)
fc878a33ed
refactor: consistently put all test classes in the OpenSim.Tests.Common package rather than some in OpenSim.Tests.Common.Mock
...
the separate mock package was not useful and was just another using line to always add
2014-11-25 23:21:37 +00:00
Diva Canto
0997ce8629
Small improvements to SimulatorFeaturesModule: (1) don't overwrite extras if the grid response is invalid; (2) make the name of the config variable for destination guide consistent with the grid-wide name in LoginService; (3) account for the existence of a [USERID] in the destination guide URL
2014-11-22 20:14:09 -08:00
Diva Canto
ac051ef4ab
Added grid information to SimFeatures response, so that the viewer can show it.
2014-11-06 17:49:04 -08:00
UbitUmarov
9a3df6445e
move AnimationSet and AvatarSkeleton to OpenSimExtras
2014-10-12 12:52:12 +01:00
UbitUmarov
39cfd82303
add simulator features AvatarSkeleton and AnimationSet report
2014-10-11 22:53:47 +01:00
UbitUmarov
c3e88b7b38
changed skeleton, do parse the mesh on upload to check skeleton. Sooner or
...
later this parsing needs to validate the model cost also.
2014-10-11 22:41:59 +01:00
UbitUmarov
cc71dd9a27
dont let test mesh go to meshes inventory folder that is not displayed by
...
viewers
2014-10-11 11:12:43 +01:00
UbitUmarov
dab2e778d6
bug fix
2014-10-11 10:22:57 +01:00
UbitUmarov
1a6ef2d60e
check for avatar skeleton data on meshs headers on cost estimation. Dont
...
let a model have more than one mesh with skeleton, for testing create a
mesh inventory item, for this meshs. Add also option to read a avatar
collider replacement. This information still needs to be saved somewhere
so it can be checked on attachment, etc, without parsing the mesh asset again.
2014-10-11 10:01:26 +01:00
Justin Clark-Casey (justincc)
c496bd57b4
minor: Comment out received seed caps request logging for now
2014-10-02 22:33:58 +01:00
UbitUmarov
46caea6987
change it again...
2014-09-26 15:03:33 +01:00
UbitUmarov
90cad82405
remove unnecessary argument ref
2014-09-26 14:22:54 +01:00
UbitUmarov
fcad64209c
make c# more happy
2014-09-26 14:17:01 +01:00
UbitUmarov
5f57b55dc9
use central animationset permitions define
2014-09-26 14:08:21 +01:00
Melanie Thielker
3a42ea5279
Extend upload verification to all upload paths
2014-09-25 21:21:20 +02:00
UbitUmarov
57166878b5
fix animation asset name to "animatn", use "animset" for the new
...
animationSet
2014-09-25 16:37:43 +01:00
UbitUmarov
f51779bb05
add also the name animset until its clear the name liru will use
2014-09-25 14:10:44 +01:00
UbitUmarov
18cc33e2c5
add animationset to upload assets, for now no cost
2014-09-25 13:35:30 +01:00
UbitUmarov
18de5c8a2d
make use of it in GetMeshModule, and meshs are Assets not Task itens,
...
reduce MeshModule impact on udp rate
2014-08-29 16:30:49 +01:00
UbitUmarov
c84a3c3630
also on other case
2014-08-09 16:22:46 +01:00
UbitUmarov
601c50dc1e
return even zero costs ( prims on other regions )
2014-08-09 16:19:07 +01:00
UbitUmarov
2eb1c1c377
move from RegisterInventoryServiceHandlers to
...
RegisterRegionServiceHandlers what belongs there ( readabilitly only )
2014-08-09 15:15:27 +01:00
UbitUmarov
c3f9c99fb3
DANGER... changed bakedtextures caching. Assuming grid baking is cache
...
only, reduced number of accesses to it. TESTING
2014-08-07 05:20:45 +01:00
BlueWall
10a8d2852e
OpenSimExtras
...
Move the experimental extra features functionality into the GridService. This sends default values for map, search and destination guide, plus ExportSupported control to the region on startup. Please watch http://opensimulator.org/wiki/SimulatorFeatures_Extras for changes and documentation.
2014-08-06 17:25:12 -04:00
UbitUmarov
552b4e45e8
bakemodule didnt like last changes
2014-08-06 05:56:10 +01:00
UbitUmarov
66dea8fe05
some debug to remove later
2014-08-06 05:17:30 +01:00
Justin Clark-Casey (justincc)
d6890d78ad
Make currently unfiltered EventQueue log messages only appear now at DebugLevel 1
...
This covers event queue setup messages and some outgoing messages (e.g. EnableSimulator)
In my experience these messages are only useful if you really know what they mean and you're looking for them
Otherwise, they're quite spammy.
Event queue DebugLevel 1 is enabled with the "debug eq 1" console command
2014-08-05 00:52:04 +01:00
UbitUmarov
9f5e19127d
comment out a debug msg. more on gods being Gods
2014-08-03 00:22:21 +01:00
BlueWall
de3421b408
Fix typo in log message
2014-08-02 08:21:25 -04:00
Justin Clark-Casey (justincc)
7cec4997db
Fix regression in SimulatorFeatures module that would stop OpenSimulator from starting if no [SimulatorFeatures] section was present in config.
2014-08-01 20:29:25 +01:00
BlueWall
cac910d401
Add region-side extra feature setting for destination guide
2014-07-31 08:20:06 -04:00
BlueWall
e0d8f42e6b
Simulator Extra Features Service
...
Provide a means for regions to fetch extra features supported by modern viewers from a central location
.
2014-07-30 11:24:39 -04:00
UbitUmarov
70890e211a
add queue transition code needs review/more testing
2014-07-25 17:33:01 +01:00
UbitUmarov
fa59cddc28
remove old and dead code that its only making it hard to understand
2014-07-25 13:03:40 +01:00
UbitUmarov
86a9710e77
change previus code, send a NoEvents response back to http server, even
...
if we know there is no one there, so that the server finishes handling
it.
2014-07-24 23:32:39 +01:00
UbitUmarov
ee951f7a10
EventQueueGetModule: dont reuse queues, we dont know whats there; make
...
pool silently loose requests for unknown avatars, or they will stay active
until timeout after close ( possible not a big problem after not reusing
queues ? )
2014-07-24 17:14:14 +01:00
Oren Hurvitz
9fa8d84598
Eliminated some warnings
2014-07-21 08:30:10 +01:00
Justin Clark-Casey (justincc)
4b73268cbd
minor: put standard 'category' in brackets at front of log messages from previous commit 3d70db4a
2014-07-04 23:48:37 +01:00
Latif Khalifa
3d70db4a58
When uploading mesh objects with textures also create inventory items for uploaded textures.
...
This implements:
http://opensimulator.org/mantis/view.php?id=7250
2014-07-04 23:40:09 +01:00
Justin Clark-Casey (justincc)
5450b1b024
Change assembly versions to 0.8.1
2014-06-17 18:37:15 +01:00
Justin Clark-Casey (justincc)
4374ce9fbf
If processing a queued request fails up to the top of the stack, log the exception and move to the next request rather than terminate the simulator.
2014-06-16 22:11:34 +01:00
Justin Clark-Casey (justincc)
d131c57978
Update regression TestInventoryDescendentsFetch() to account for recent commit 1fa3a6f
...
This was hidden in continuous integration because of another regression test issue.
2014-05-27 18:14:36 +01:00
Diva Canto
a845c1a893
Finished implementing redirects in GetTexture.
2014-05-07 19:38:33 -07:00
Justin Clark-Casey (justincc)
95eeb4dde8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-05-06 17:22:47 +01:00
Oren Hurvitz
1e5cff32fc
Show more meaningful error messages when failed to give an item to another user
2014-05-06 07:28:44 +01:00
Justin Clark-Casey (justincc)
53b72ab4b8
minor: Comment out Cacheitems debug log lines for now
2014-05-02 13:31:58 +01:00
Oren Hurvitz
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
Justin Clark-Casey (justincc)
86a2cd915c
Revert "Don't re-retrieve sit part in SP.HandleAgentSit() when we already have it."
...
This reverts commit 2c00b73cd2
.
Wrong code change
2014-04-05 02:11:36 +01:00
Justin Clark-Casey (justincc)
2c00b73cd2
Don't re-retrieve sit part in SP.HandleAgentSit() when we already have it.
2014-04-05 02:09:44 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
bc7fda39b4
Merge branch 'justincc-master'
2014-02-12 23:23:56 +00:00
Justin Clark-Casey (justincc)
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
Melanie
49c2213a01
Dropping the rest of Avination's modified appearance code for core.
...
Module to follow.
2014-02-04 01:54:16 +00:00
Robert Adams
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
Robert Adams
1eea6fd452
varregion: Debug messages for region crossing debugging.
2014-01-11 22:00:24 -08:00
Melanie
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
Robert Adams
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
Robert Adams
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
Justin Clark-Casey (justincc)
a5ca15c428
Create regression test TestSendAgentGroupDataUpdate() for groups agent data sending
2013-12-18 23:35:38 +00:00
Melanie
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
Justin Clark-Casey (justincc)
bb4f4d9480
minor: Use enums for setting inv/asset types on data upload rather than magic numbers
2013-12-06 00:38:18 +00:00
Justin Clark-Casey (justincc)
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
Melanie
91b70bf3fe
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2013-11-08 17:55:01 +00:00
Justin Clark-Casey (justincc)
50794c9008
minor: remove mono compiler warnings in AvatarPickerSearchModule and UploadBakedTextureModule
2013-10-31 23:51:01 +00:00
Melanie
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
Justin Clark-Casey (justincc)
42bdf44658
Bump OPenSimulator version and assembly versions up to 0.8.0 Dev
2013-10-04 23:33:47 +01:00
Melanie
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
Justin Clark-Casey (justincc)
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
Aleric Inglewood
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
(cherry picked from commit 4ff9fbca441110cc2b93edc7286e0e9339e61cbe)
2013-09-22 21:10:01 -05:00
Melanie
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
Mic Bowman
b29e9d37e7
Change handling of the FetchInventoryDescendents2 capability configuration to allow
...
for external handlers.
2013-09-11 12:15:16 -07:00
root
823e8b5d19
Add support for simple external CAPS texture services
2013-09-07 17:57:02 +02:00
Melanie
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
Justin Clark-Casey (justincc)
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
Melanie
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
Justin Clark-Casey (justincc)
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
Melanie
4a6eff1ee8
Merge branch 'master' into careminster
2013-08-13 22:53:47 +01:00
Justin Clark-Casey (justincc)
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
Melanie
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
Justin Clark-Casey (justincc)
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
Melanie
21f5e67030
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
2013-08-01 01:23:24 +01:00
Mic Bowman
1299592405
Experimental comment to eneralize the handling of Linden caps when the
...
cap is something other than "localhost". A new interface for handling
external caps is supported with an example implemented for Simian. The
only linden cap supporting this interface right now is the GetTexture
cap.
2013-07-31 15:37:15 -07:00
Diva Canto
fd050fca7c
Doing the HG Map / SimulatorFeatures "the right way": moved it to HGMapModule, hooking on to SimulatorFeatures.OnSimulatorFeaturesRequest event (similar to what the DynamicMenuModule does).
...
Only HG Visitors get this var, to avoid spamming local users.
The config var is now called MapTileURL, to be consistent with the login one, and its being picked up from either [LoginService], [HGWorldMap] or [SimulatorFeatures], just because I have a bad memory.
2013-07-30 21:10:00 -07:00
Diva Canto
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
Melanie
bf283208df
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2013-07-29 02:08:05 +01:00
Diva Canto
69975763d2
Several major improvements to group (V2) chat. Specifically: handle join/drop appropriately, invitechatboxes.
...
The major departure from flotsam is to send only one message per destination region, as opposed to one message per group member. This reduces messaging considerably in large groups that have clusters of members in certain regions.
2013-07-27 15:38:56 -07:00
Diva Canto
d5367a219d
Slight improvement: no need to delay the removal of the queues in EQ, because DisableSimulator is now being sent via UDP
2013-07-26 07:39:57 -07:00
Diva Canto
878ce1e6b2
This should fix all issues with teleports. One should be able to TP as fast as needed. (Although sometimes Justin's state machine kicks in and doesn't let you) The EventQueues are a hairy mess, and it's very easy to mess things up. But it looks like this commit makes them work right. Here's what's going on:
...
- Child and root agents are only closed after 15 sec, maybe
- If the user comes back, they aren't closed, and everything is reused
- On the receiving side, clients and scene presences are reused if they already exist
- Caps are always recreated (this is where I spent most of my time!). It turns out that, because the agents carry the seeds around, the seed gets the same URL, except for the root agent coming back to a far away region, which gets a new seed (because we don't know what was its seed in the departing region, and we can't send it back to the client when the agent returns there).
2013-07-25 23:44:58 -07:00
Melanie
a7eb1b5b85
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2013-07-24 03:50:09 +01:00
Diva Canto
b5062ae7ee
Changed the timoeut of EQ 502s (no events) to 50 secs. The viewer post requests timeout in 60 secs.
...
There's plenty of room for improvement in handling the EQs. Some other time...
2013-07-18 13:30:04 -07:00
Diva Canto
9e35b069a4
Reverting the reverts I did yesterday. cpu-branch has now been
...
successfully tested, and I'm merging back those changes, which proved to
be good.
Revert "Revert "Cleared up much confusion in PollServiceRequestManager. Here's the history:""
This reverts commit fa2370b32e
.
2013-07-18 12:23:27 -07:00
Diva Canto
fa2370b32e
Revert "Cleared up much confusion in PollServiceRequestManager. Here's the history:"
...
This reverts commit e46459ef21
.
2013-07-17 15:05:36 -07:00
Diva Canto
e46459ef21
Cleared up much confusion in PollServiceRequestManager. Here's the history:
...
When Melanie added the web fetch inventory throttle to core, she made the long poll requests (EQs) effectively be handled on an active loop. All those requests, if they existed, were being constantly dequeued, checked for events (which most often they didn't have), and requeued again. This was an active loop thread on a 100ms cycle!
This fixes the issue. Now the inventory requests, if they aren't ready to be served, are placed directly back in the queue, but the long poll requests aren't placed there until there are events ready to be sent or timeout has been reached.
This puts the LongPollServiceWatcherThread back to 1sec cycle, as it was before.
2013-07-17 11:19:36 -07:00
dahlia
6dd454240f
revert last commit which seems to conflict with DoubleQueue internals. The random crash might be in DoubleQueue instead. See http://pastebin.com/XhNBNqsc
2013-07-16 02:03:01 -07:00
dahlia
70aa77f520
add locking to internal queue in WebFetchInvDescModule; lack of which caused a random crash in a load test yesterday
2013-07-16 01:31:09 -07:00
Justin Clark-Casey (justincc)
e8e073aa97
Simplify EventQueue cap setup so that it is also stat monitored.
...
Curiously, the number of requests received is always one greater than that shown as handled - needs investigation
2013-07-16 00:05:45 +01:00
Justin Clark-Casey (justincc)
eb14e5a175
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-15 23:28:02 +01:00
Justin Clark-Casey (justincc)
1b7b664c86
Add request received/handling stats for caps which are served by http poll handlers.
...
This adds explicit cap poll handler supporting to the Caps classes rather than relying on callers to do the complicated coding.
Other refactoring was required to get logic into the right places to support this.
2013-07-15 23:27:46 +01:00
Diva Canto
687c1a420a
Guard against null ref
2013-07-15 12:33:31 -07:00
Melanie
c6d75cda97
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
2013-07-13 00:57:03 +01:00
Melanie
a53a10ad27
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
2013-07-13 00:47:58 +01:00
Diva Canto
29f6ae199e
Changed UploadBakedTextureModule so that it uses the same pattern as the others, in preparation for experiments to direct baked texture uploads to a robust instance. No functional or configuration changes -- should work exactly as before.
2013-07-12 12:53:58 -07:00
Justin Clark-Casey (justincc)
013710168b
For stat purposes, add names to capability request handlers where these were not set
2013-07-08 22:39:07 +01:00
Justin Clark-Casey (justincc)
e19defde36
Add "show caps stats by user" and "show caps stats by cap" console commands to print various counts of capability invocation by user and by cap
...
This currently prints caps requests received and handled, so that overload of received compared to handled or deadlock can be detected.
This involves making BaseStreamHandler and BaseOutputStream record the ints, which means inheritors should subclass ProcessRequest() instead of Handle()
However, existing inheriting classes overriding Handle() will still work, albeit without stats recording.
"show caps" becomes "show caps list" to disambiguate between show caps commands
2013-07-08 22:03:07 +01:00
Justin Clark-Casey (justincc)
55ac8c83c7
Get InventoryWorkerThreads to update watchdog on processing requests
2013-07-06 00:34:22 +01:00
Melanie
56f4adeb60
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Services/LLLoginService/LLLoginResponse.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
2013-06-18 01:50:08 +01:00
Justin Clark-Casey (justincc)
713a14a6b5
minor: remove mono compiler warnings in WebFetchInvDescModule
2013-06-17 23:23:56 +01:00
Justin Clark-Casey (justincc)
d412c1b0eb
Don't try to abort worker threads in WebFetchInvDescModule if module was not enabled.
...
This also moves the abort to RemoveRegion() rather than a destructor.
2013-06-14 23:53:20 +01:00
Melanie
162dfd8a38
Merge branch 'avination-current' into careminster
2013-06-11 21:03:02 +01:00
Melanie
745a209bf2
Explicitly set uploaded mesh object perms
2013-06-10 01:16:22 +02:00
Melanie
cf4d291443
Merge branch 'master' into careminster
2013-06-08 00:00:39 +01:00
Melanie
3a722ef81b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-06-07 23:59:02 +01:00
Diva Canto
07cc16ff9c
Put the configuration back in FetchInventoryDesc2 cap.
2013-06-07 16:00:32 -07:00
Melanie
75631e0267
Supply proper type information for the various types of requests
2013-06-07 23:55:03 +01:00
Melanie
7c0bfca7a0
Adding Avination's PollService to round out the HTTP inventory changes
2013-06-07 23:43:45 +01:00
Melanie
fe4a67efb6
Merge branch 'avination-current' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs
OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
2013-06-06 03:20:15 +01:00
Melanie
a7dbafb0e3
Port Avination's inventory send throttling
2013-06-05 23:42:50 +01:00
Melanie
4cb7ee47f2
Let the event queue do lees work - expire every 40s as per Teravus instead of every seconds - whoever put that in....
2013-05-22 23:49:34 +02:00
Melanie
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
Diva Canto
a1031772eb
Delete debug message
2013-05-10 08:09:26 -07:00
Melanie
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
Diva Canto
e92c05ebbd
Added AvatarPickerSearch capability handler.
2013-05-07 18:01:48 -07:00
Melanie
8c5445b774
Merge branch 'master' into careminster
...
Conflicts:
ThirdParty/SmartThreadPool/SmartThreadPool.cs
2013-05-01 21:39:49 +01:00
Melanie
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
Melanie
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
Melanie
e39156c656
Send 503 when throttling textures
2013-04-25 01:38:21 +02:00
Melanie
f548a41fb8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
2013-03-28 02:29:07 +00:00
Justin Clark-Casey (justincc)
617637c788
minor: Fix usage error message for "debug eq" console command
2013-03-28 01:41:41 +00:00
Justin Clark-Casey (justincc)
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
Melanie
4365daa8e1
Merge branch 'master' into careminster
2013-03-26 19:06:44 +00:00
Melanie
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
Melanie
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
Melanie
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
Melanie
710381e838
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Tests/SceneObjectUndoRedoTests.cs
2013-03-13 02:02:46 +00:00
Justin Clark-Casey (justincc)
e898a5fec5
minor: Remove mono compiler warnings in EventQueueTests
2013-03-11 22:42:27 +00:00
Melanie
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
Justin Clark-Casey (justincc)
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
Melanie
f39e4abf0e
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
2013-03-03 13:24:37 +00:00
Melanie
2ad72db0ec
Make a viewer sent XML error prettier
2013-03-03 11:40:46 +01:00
Melanie
e0e9118f81
The viewer tries to parse the error message body to LLSD - give it some.
2013-02-24 18:31:49 +01:00
Melanie
9534d5f929
Merge branch 'master' into careminster
2013-02-22 01:28:54 +00:00
Diva Canto
4779f7d7d5
Deleted all AssemblyFileVersion directives
2013-02-19 17:14:55 -08:00
Justin Clark-Casey (justincc)
8a6f2432fc
minor: remove some mono compiler warnings in OpenSim.Region.ClientStack.Linden.Caps.dll
2013-02-20 00:01:20 +00:00
Melanie
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
Melanie
a5a56a8755
Merge branch 'avination' into careminster
2013-02-14 09:12:27 +00:00
Melanie
ef662fc959
Add an event and some logic to allow customizing Simulator Features by avatar
2013-02-14 09:11:57 +00:00
Melanie
d5cd9308d5
Merge branch 'avination' into careminster
2013-02-14 07:45:30 +00:00
Melanie
32c4e1a850
Add an event and some logic to allow customizing Simulator Features by avatar
2013-02-14 08:40:15 +01:00
Melanie
4c7df6a147
Small fix to sim features module
2013-02-14 07:17:27 +01:00
Melanie
c2bfdaa026
Make the sim features module register it's interface so it can be used
2013-02-13 01:52:25 +00:00
Melanie
7bf33d333a
Plumb the path from the client to the extra physics params and back
2013-02-07 22:25:28 +00:00
Melanie
8b78b9429d
Merge branch 'avination' into careminster
2013-02-07 21:26:55 +00:00
Melanie
bbda7b94b3
Rename Bounciness to Restitution
2013-02-07 21:25:55 +00:00
Melanie
338b02a8bc
Send the new physics params to the viewer build dialog
2013-02-07 21:23:35 +00:00
Melanie
6aa876a83b
Rename Bounciness to Restitution
2013-02-07 03:40:48 +00:00
Melanie
598f891d70
Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SP
2013-02-06 04:03:32 +01:00
teravus
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
Melanie
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
Melanie
6bce4bc112
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-02-05 20:09:45 +00:00
Melanie
2163bebeb4
Try to fix uploaded mesh rotations - code from Avination code base.
2013-02-05 20:09:02 +00:00
Justin Clark-Casey (justincc)
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
Melanie
e6e6e8ab15
Merge branch 'avination' into careminster
2013-01-27 01:09:07 +00:00
teravus
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
Melanie
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
UbitUmarov
b263587e21
try to patch getmesh Throttle (test)
2013-01-13 15:25:51 +00:00
Melanie
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
Melanie
aecb32b74e
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-01-10 01:25:07 +00:00
Melanie
2ac96dd181
Add the new UpdateAgentInformation cap to make maturity on more recent viewers
...
work.
2013-01-08 22:52:14 +00:00
Melanie
0a393b317d
Add the new UpdateAgentInformation cap to make maturity on more recent viewers
...
work.
2013-01-08 22:32:39 +01:00
teravus
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
teravus
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
Melanie
79bdf464d3
Merge branch 'avination' into careminster
2012-12-18 09:48:12 +00:00
Melanie
7a093df24b
Prevent a failed user relogi from throwing exceptions in poll services
2012-12-14 03:35:55 +01:00
Melanie
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
Justin Clark-Casey (justincc)
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
Melanie
c3e1701d43
Merge branch 'avination' into careminster
2012-11-22 13:33:34 +00:00
teravus
98b0cb8df8
* While this is not producing any problems.. and does help in low bandwidth situations I can't demonstrate that it's better then just letting the client request what it needs in terms of responsiveness of the mesh in the scene yet.
2012-11-22 08:13:35 -05:00
Melanie
decc5318a7
Merge branch 'avination' into careminster
2012-11-20 01:21:15 +00:00
Melanie
ccc81183b0
Merge commit '619c39e5144f15aca129d6d999bcc5c34133ee64' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs
2012-11-20 01:20:59 +00:00
teravus
5e0294815f
* Plumbing and basic setting of the GetMesh Cap Throttler.
...
* Last step is to flip the throttle distribution.
2012-11-17 03:47:09 -05:00
Melanie
7ad082f7c3
Merge branch 'avination' into careminster
2012-11-17 02:58:14 +00:00
teravus
e9153e1d1a
Revert "Merge master into teravuswork", it should have been avination, not master.
...
This reverts commit dfac269032
, reversing
changes made to 619c39e514
.
2012-11-15 10:05:16 -05:00
teravus
dfac269032
Merge master into teravuswork
2012-11-15 09:46:41 -05:00
Melanie
06fa1681ae
Merge branch 'master' into careminster
2012-11-15 00:43:26 +00:00
Diva Canto
aeeaa3a0a9
Added AssemblyInfos to every dll in the OpenSim.Region namespace.
2012-11-14 11:09:43 -08:00
Melanie
9a5679876e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
2012-11-13 02:10:09 +00:00
Diva Canto
86903f23dd
Cleanup on region modules: gave short node id's to all of them.
2012-11-12 18:08:02 -08:00
Melanie
2e0ce70e63
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
OpenSim/Region/Framework/ModuleLoader.cs
OpenSim/Region/Framework/Scenes/SceneManager.cs
2012-11-12 23:27:47 +00:00
Melanie
0d15a6a01f
Remove any mention of IRegionModule from region names and comments to aid
...
grepping for remaining uses
2012-11-12 19:18:20 +00:00
Melanie
389077345f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
2012-11-11 16:31:01 +00:00
Diva Canto
3a5e317f65
One more module converted: ObjectAdd.
2012-11-10 10:35:27 -08:00
Diva Canto
4ac857f902
One more module: EventQueueGetModule. Also making it non-optional for this dll.
2012-11-10 08:48:31 -08:00
teravus
cda127e30f
* Prep work switching the GetMeshModule over to a poll service.
...
* This still has the image throttler in it.. as is... so it's not suitable for live yet.... The throttler keeps track of the task throttle but doesn't balance the UDP throttle yet.
2012-11-09 23:55:30 -05:00
teravus
182b487243
This implements the Caps throttler. After some testing, the system seemed to be OK with me specifying allowing 1 oversized image per 70,000b/sec with at least one. Try it out, start with a low bandwidth setting and then, set your bandwidth setting middle/high and see the difference.
...
Tested with Two Clients on a region with 1800 textures all visible at once.
2012-11-05 22:05:10 -05:00
teravus
b7b96a5e4f
Another step in the chain. Pipe the throttle update to the appropriate PollServiceTextureEventArgs. Each poll service having it's own throttle member is more consistent with the model then the region module keeping track of all of them globally and better for locking too. The Poll Services object is not set static to handle multiple nearby regions on the same simulator.
...
Next step is hooking it up to HasEvents
2012-11-05 13:10:00 -05:00
teravus
4fa088bafb
Pipe Throttle Update Event to EventManager, client --> ScenePresence --> EventManager, so that modules can know when throttles are updated. The event contains no client specific data to preserve the possibility of 'multiple clients' and you must still call ControllingClient.GetThrottlesPacked(f) to see what the throttles actually are once the event fires. Hook EventManager.OnUpdateThrottle to GetTextureModule.
2012-11-04 22:57:24 -05:00
Melanie
72c925a6c9
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Framework/WebUtil.cs
OpenSim/Region/Physics/OdePlugin/OdeScene.cs
2012-10-18 20:56:34 +01:00
Melanie
2e8e8d576e
Remove redundant and annoyingly modal message box in upload processing.
2012-10-18 13:20:50 +02:00
Melanie
322eefbb6f
Allow the console to be used by gods as well as region owners.
2012-10-17 01:31:05 +02:00
Melanie
416bc19da7
Merge branch 'avination' into careminster
2012-10-17 00:13:49 +01:00
Melanie
fa52effb27
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
2012-10-16 04:30:01 +01:00
Justin Clark-Casey (justincc)
0eb457442d
minor: Add missing newlines and spacing to help for "debug eq" console command
2012-10-16 01:31:51 +01:00
Justin Clark-Casey (justincc)
3ac6a423f7
minor: comment out "Registered seed capability" message for "Received SEED caps request" message for now.
...
I think this is more useful right now since it tells us if the viewer requested a seed caps at all in various scenarios (such as when teleporting to a new region).
2012-10-16 00:54:25 +01:00
Justin Clark-Casey (justincc)
8c2564c05c
minor: Comment out the region console caps message for now.
2012-10-16 00:40:28 +01:00
Melanie
de3ff44406
Make texture sedning use only two threads to make things less harsh on bandwidth
2012-10-14 17:10:26 +02:00
Melanie
6ce93b22d1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-10-12 19:05:06 +01:00
Justin Clark-Casey (justincc)
e76b01a201
Lock on AgentCircuitData during Scene.AddClient() and RemoveClient() to prevent an inactive connection being left behind if the user closes the viewer whilst the connection is being established.
...
This should remove the need to run the console command "kick user --force" when these connections are left around.
2012-10-10 00:26:43 +01:00
Melanie
001ec0e2e6
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-09-27 17:29:44 +01:00
UbitUmarov
617f1b9223
just remove the damm thing
2012-09-26 16:17:49 +01:00
UbitUmarov
7e3eba1064
Seems nothing actually need the request body for getevents. so change
...
control flag to false
2012-09-26 15:41:57 +01:00
UbitUmarov
654dd289f2
more changes to PollService
2012-09-26 03:05:27 +01:00
UbitUmarov
ef3d44240e
missed change
2012-09-25 04:03:15 +01:00
UbitUmarov
4d681bfde6
do the same to webFecthInvDescModule
2012-09-25 03:59:19 +01:00
UbitUmarov
2cb17d6fbb
change GetTextureModule processing
2012-09-25 03:38:45 +01:00
Melanie
421071bd8a
Text changes for upload messages
2012-09-24 23:19:57 +02:00
UbitUmarov
a1a0a90720
more upload changes (plus untouch prebuild.xml)
2012-09-24 22:57:33 +01:00
Melanie
68ece236a6
Protect the responses map with a lock. Also remove ugly "this." type of
...
member notation.
2012-09-23 23:55:28 +02:00
Melanie
291e57afb4
Merge branch 'ubitwork' into avination
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs
2012-09-23 19:18:49 +02:00
UbitUmarov
64db9e4114
try to allow free uploads for testing, if users prefix names with "TEST-". Let
...
textures get into inventory again. Both features under config control.
Have direct warnings to client, including a final one on upload complete
since i see nothing. problems: textures don't showup in inventory til
relog, also issues with permitions. A few more changes
2012-09-23 15:04:10 +01:00
UbitUmarov
11e05217df
report asset upload errors the right away
2012-09-22 21:14:15 +01:00
UbitUmarov
4bba72b7af
removed AssetUploaderWithCost, fixing AssetUploader. add parsing of some
...
more needed fields in request
2012-09-22 16:47:15 +01:00
UbitUmarov
7de67d5680
removed unused data in MeshUploadFlag response
2012-09-22 12:00:14 +01:00
UbitUmarov
f9c24c9414
read model upload cost parameters from config [Economy] section
2012-09-21 11:50:14 +01:00
Melanie
5d63c20122
refix prior commit
2012-09-20 15:41:16 +02:00
Melanie
9ff6c85325
Make uploads free for now - we will have to announce this
2012-09-20 15:39:46 +02:00
UbitUmarov
bf987f96d2
Fix model upload rotations and offsets ( i hope )
2012-09-20 14:32:30 +01:00
Melanie
629138d4fa
Change texture price back to 10 C$
2012-09-19 13:01:34 +02:00
UbitUmarov
5317b1053f
be more tolerant to small prims, skipping them, only failing if they are
...
more than half of total. Add a state control to NewFileAgentInventory
to avoid more than one at a time per client. ( Incomplete and possible not that good)
2012-09-19 03:53:51 +01:00
UbitUmarov
fb32604b41
create a single ModelCost provider for the caps instance. Let it know and
...
check scene prim size limits.
2012-09-19 01:33:16 +01:00
UbitUmarov
51ca84afdf
coment out mesh model upload code to add textures and individual meshs
...
assets to inventory, since it may actually be a bad ideia since good
model textures are deply related to it and there is no current use for
independent mesh assets. Added the option to have a reduced free for textures (2.5 C$ as is, total textures cost rounded to nearest int) compensating for the fact that they can't be used outside the model or its parts.
2012-09-19 00:29:16 +01:00
Melanie
ac2380bbfa
Add booleans to control whether we actually crete inventory items
2012-09-18 02:12:07 +02:00
UbitUmarov
e8ba26eac8
***TEST*** still bad... create inventory itens for model textures and meshs. Issues: meshs get into root folder, viewer and viewer does not update inventory until relog ( the upload funtion needs to return more information) ,etc. Droping a mesh into a prim, makes viewer think we dropped a sculpt map, but it does work, viewer displays the mesh and physics work (as physics is stored at the sculpt information fields). Textures show up in Textures folder, just its to costly to find that default folder as is..
2012-09-18 01:07:44 +01:00
UbitUmarov
fd20ef5c91
add some locks to GetTextureModule
2012-09-17 22:35:36 +01:00
UbitUmarov
c1eec3b828
on upload store mesh list contents as mesh assets. Build prims by instances not
...
meshs. (some prims can have same mesh)
2012-09-17 21:15:07 +01:00
UbitUmarov
c3666c9ec3
make sure client still has money at upload
2012-09-17 19:38:05 +01:00
UbitUmarov
7f5b1182ef
same cleanup
2012-09-17 19:09:51 +01:00
UbitUmarov
1740325392
removed broken fee compression
2012-09-17 17:49:10 +01:00
UbitUmarov
df77724bbc
let mesh model estimator work even without money module, so other
...
estimations can work
2012-09-17 15:50:59 +01:00
UbitUmarov
5915dfc26f
Make use of mesh cost functions
2012-09-17 15:37:05 +01:00
UbitUmarov
5bbc4fb2a5
missing file for suport of mesh upload cost
2012-09-17 13:39:38 +01:00