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
Melanie
66bf1376b5
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
2012-09-16 04:21:18 +01:00
Melanie
387e59ff7f
Revamp the HTTP textures handler to allow a maximum of four fetches
...
at any time and to drop requests for avatars n longer in the scene
2012-09-14 21:24:25 +02:00
Melanie
45fe25de0d
Allow some more connections to try to ease lag.
2012-09-14 00:14:39 +02:00
Melanie
e7932682a2
Add a logger so the prior commit will work
2012-09-12 21:24:09 +02:00
Melanie
d8e9188908
Stop expiry timer when upload is complete. Log if timeout is reached.
2012-09-12 21:14:55 +02:00
Melanie
5139db2638
Add a timer to time out upload caps handlers that are not used.
2012-09-12 12:56:59 +02:00
Melanie
fd1ee58f87
Add a missing brace, remove a useless temp variable, enable charging.
2012-09-11 22:52:11 +02:00
UbitUmarov
013e94af5d
report mesh upload costs ( fake values)
2012-09-11 23:06:29 +01:00
UbitUmarov
245763b1b0
let LLSDAssetUploadRequest include asset_resources information plus let
...
NewAgentInventoryRequest know about mesh (does nothing with it still)
2012-09-11 20:30:30 +01:00
Melanie
19b00a5b3c
Removing the variable prica handler again. It's never called, was misnamed and
...
probably never worked past the mesh beta.
2012-09-11 17:58:46 +02:00
Melanie
757a669924
Re-add the module and fix a typo
2012-09-11 17:55:33 +02:00
Melanie
375ca478dd
Rename NewFileAgentInventoryVariablePrice to NewAgentInventoryVariablePrice
...
which is the name actually used in viewer code.
2012-09-11 17:52:24 +02:00
Melanie
a6928a479e
Add cost calculation suppor tto the VariablePrice one as well
2012-09-11 17:51:20 +02:00
Melanie
ead4b8998c
Revert "Remove the unused NewFileAgentInventoryVariablePrice module."
...
It's actually used.
This reverts commit 94a8e5572b
.
2012-09-11 17:28:37 +02:00
Melanie
bd1d9a214b
Add the option to have variable costing for uploads
2012-09-11 17:28:13 +02:00
Melanie
94a8e5572b
Remove the unused NewFileAgentInventoryVariablePrice module.
2012-09-11 15:07:32 +02:00
Melanie
a6753c14a5
Revamp the v3 inventory sending. Uses threads and some nifty mechanics to
...
leverage the Poll Service without blocking it's workers.
2012-09-11 10:39:43 +02:00
Melanie
21c476228a
Merge branch 'avination' into careminster
2012-09-10 13:53:00 +01:00
Melanie
657428a439
Remove commented code
2012-09-10 01:52:02 +02:00
UbitUmarov
b7737b7273
webFetchInventory: change control event to simple flag, adjust locking
2012-09-10 01:20:34 +01:00
UbitUmarov
c298ae9e75
bug fix
2012-09-04 10:51:43 +01:00
UbitUmarov
d4fad2ba42
a forgotten file plus minor changes. Imp and SL viewer seem to preserve
...
flight. FS 4.2.2 does not.
2012-09-04 07:32:03 +01:00
Melanie
fd92560649
Merge branch 'avination' into careminster
2012-08-31 00:34:22 +01:00
Melanie
6d48dbf8ca
Remove debug spam
2012-08-24 23:49:31 +02:00
Melanie
7e17f4296e
Fix background inventory loading (Viewer 3) so it won't lag out the sim
2012-08-24 23:48:01 +02:00
Melanie
f8603a215d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/IClientAPI.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-23 01:41:47 +01:00
Justin Clark-Casey (justincc)
bcbd450fe4
Add --force flag to "kick user" console command to allow bypassing of recent race condition checks.
...
This is to allow a second attempt to remove an avatar even if "show connections" shows them as already inactive (i.e. close has already been attempted once).
You should only attempt --force if a normal kick fails.
This is partly for diagnostics as we have seen some connections occasionally remain on lbsa plaza even if they are registered as inactive.
This is not a permanent solution and may not work anyway - the ultimate solution is to stop this problem from happening in the first place.
2012-08-20 20:24:54 +01:00
Melanie
0a959343a5
Make the console output from the reigon console hookable
2012-08-18 22:36:48 +02:00
Melanie
f6562e2269
Actually add the module
2012-08-14 22:22:25 +01:00
Melanie
f21fdff4f9
Actually add the module
2012-08-14 21:58:07 +02:00
Melanie
b9c4a637b4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-08-04 03:00:20 +01:00
Justin Clark-Casey (justincc)
205f2326dc
Consolidate PersistBakedTextures, DelayBeforeAppearanceSend and DelayBeforeAppearanceSave into [Appearance] section from [Startup] config section so that all appearance settings are in the same place and not in the startup bucket.
...
All these settings are in OpenSimDefaults.ini only. If you are using them then please adjust your OpenSim.ini
2012-08-03 23:02:39 +01:00
Melanie
26d89777d8
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-07-06 20:51:18 +01:00
UbitUmarov
02cb0bf80a
added a timeout paramenter to PollServiceEventArgs, so each type can define it's timeout
2012-07-04 17:40:02 +01:00
Melanie
32cc9c6094
Merge branch 'master' into careminster
2012-06-15 15:59:49 +01:00
Justin Clark-Casey (justincc)
c935f03467
Put all debug console commands into a single Debug section rather than scattering them over other categories
2012-06-15 03:32:43 +01:00
Melanie
30d872caad
Merge branch 'master' into careminster
2012-06-15 02:53:34 +01:00
Justin Clark-Casey (justincc)
257b1b517d
Add main instance to internal MainServer.m_Servers list to simplify internal logic.
...
This does require the server to be added before it is set as the main Instance
2012-06-15 02:03:50 +01:00
Melanie
36117e079a
Merge branch 'master' into careminster
2012-06-14 00:57:05 +01:00
Justin Clark-Casey (justincc)
6a77a65675
minor: remove unnecessary IsAttachment = false setting for new object in UploadObjectAssetModule, property always starts as false
2012-06-14 00:35:26 +01:00
Melanie
ebd9d2618b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
2012-05-19 13:34:44 +01:00
Justin Clark-Casey (justincc)
0147dc6302
Fix build break. Comment out EQG deregister/register logging.
2012-05-18 03:50:23 +01:00
Justin Clark-Casey (justincc)
45af29291a
Add level 2 debug eq logging which logs event queue polls.
...
Refactor: eq message logging into common method.
2012-05-18 03:43:36 +01:00
Justin Clark-Casey (justincc)
6501b1b1bb
refactor: move EventQueueGet path generation into common method. Rename some local variables in line with code conventions. Add commented out EQG log lines for future use.
2012-05-18 00:38:29 +01:00
Melanie
a90822f4b8
Merge branch 'master' into careminster
2012-05-10 00:42:10 +01:00
Justin Clark-Casey (justincc)
6987aef38d
Improve logging on the prim inventory script asset request path for future use.
...
This adds name and description of the request handler to http request logging when DebugLevel >= 1
2012-05-09 23:12:30 +01:00
Melanie
31ab8b2fe0
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/WebUtil.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-05-05 10:32:04 +01:00
Justin Clark-Casey (justincc)
231a3bf147
Implement optional name and description on http stream handlers so that we can relate a slow request to what the handler actually does and the agent it serves, if applicable.
...
This is most useful for capabilities where the url is not self-describing.
2012-05-03 01:45:49 +01:00
Melanie
90305001de
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-04-27 17:09:49 +01:00
Justin Clark-Casey (justincc)
07e62df558
Add regression test for teleporting an agent between separated regions on the same simulator.
...
This involves a large amount of change in test scene setup code to allow test scenes to share shared modules
SetupScene is now an instance method that requires an instantiation of SceneHelpers, though other SceneHelpers methods are still static
May split these out into separate classes in the future.
2012-04-27 00:58:54 +01:00
Justin Clark-Casey (justincc)
f49912f92a
minor: Add more detail to unauthorized caps client message
2012-04-26 16:10:24 +01:00
Melanie
b18b1b1d70
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-03-27 23:14:43 +01:00
Snoopy Pfeffer
7223b63563
User level based restrictions for HyperGrid teleports, asset uploads, group creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users.
2012-03-27 22:09:58 +02:00
Justin Clark-Casey (justincc)
c39fba8f9d
minor: remove some mono compiler warnings
2012-03-20 23:19:11 +00:00
Melanie
35c3124c3b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-20 23:39:02 +00:00
Melanie
618244f285
Remove debug output using Console.WriteLine and trim excessive whitespace
2012-03-19 14:39:19 +01:00
UbitUmarov
ae8e089b9c
some more work on costs
2012-03-16 15:33:49 +00:00
UbitUmarov
15ad5f492b
Playing with object costs CAPS ...
2012-03-15 10:25:18 +00:00
UbitUmarov
84ca09f7c5
added ObjectPhysicsProperties http event message to send viewer that data. For now on caps/EventQueue, and still only used on a material change...
2012-03-15 02:24:13 +00:00
Melanie
d4e6834f99
Hook up the new cap to the SOP changes
2012-03-13 20:49:16 +01:00
Melanie
f415eb84e1
Implement the cap to send extra physics params to the viewer. Not functional
...
yet because the parameters are not actually stored anywhere yet.
2012-03-13 20:06:39 +01:00
Justin Clark-Casey (justincc)
749c3fef8a
Change "help" to display categories/module list then "help <category/module>" to display commands in a category.
...
This is to deal with the hundred lines of command splurge when one previously typed "help"
Modelled somewhat on the mysql console
One can still type help <command> to get per command help at any point.
Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet).
Does not affect command parsing or any other aspects of the console apart from the help system.
Backwards compatible with existing modules.
2012-03-08 01:51:37 +00:00
Justin Clark-Casey (justincc)
98ad6ed255
comment out "[CAPS]: ScriptTaskInventory Request" log spam
2012-03-02 23:29:35 +00:00
Justin Clark-Casey (justincc)
ddca5347c3
When an asset is uploaded (e.g. a mesh) set individual copy/move/transfer permissions, not PermissionMask.All
...
Setting PermissionMask.All will cause next permissions to replace current permissions when the object is rezzed, since bit 4 will be set.
This is not correct behaviour for a freshly uploaded mesh. Freshly rezzed in-world prims also do not have bit 4 set (don't yet know exactly what this is).
Should resolve http://opensimulator.org/mantis/view.php?id=5651
2012-02-10 02:13:15 +00:00
PixelTomsen
e8b688b61f
Fix:Get embedded objects in notecard http://opensimulator.org/mantis/view.php?id=2607
...
Signed-off-by: nebadon <michael@osgrid.org>
2012-01-29 12:40:43 -07:00
Melanie
7352aea9ac
Remove IClientAPI from the money module. It was only used to pass in the
...
agent id anyway
2012-01-28 00:18:12 +00:00
Justin Clark-Casey (justincc)
7661a0b2a9
Implement the FetchInventory2 capability. This accompanies the existing FetchInventoryDescendents2 capability.
...
Not yet enabled by default. You can enable this by setting Cap_FetchInventory2 = "localhost" in the [ClientStack.LindenCaps] section of OpenSim.ini
Enabling both FetchInventory2 and FetchInventoryDescendents2 improves the situation with properly fetching attachments and hud objects
Probably because viewers are never expecting the odd situation where FetchInventoryDescendents2 is present but not FetchInventory2
However, for some reason attachments and hud objects occasionally fail to appear, though their status is correct in inventory
For attachments, focussing on the avatar makes them appear. Hud objects have to be reattached.
2012-01-06 21:07:34 +00:00
Justin Clark-Casey (justincc)
e6272b8d56
Stop also adding an ordinary http handler when we set up a poll http handler.
...
It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path.
2011-12-07 12:28:42 +00:00
Justin Clark-Casey (justincc)
8e542cfa03
Stop accidentally setting up the UploadTexture caps handler with the same url for all users
...
This meant that if a user exited the region, the UploadTexture handler would be effectively removed for everyone, causing subsequent failures.
This hopefully resolves the recent UploadTexture LLSD problems
This was a regression in 5640f2e (Thu Dec 1 23:24:15 2011 +0000)
2011-12-06 21:42:56 +00:00
Justin Clark-Casey (justincc)
4567555c49
Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.
...
This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation.
This is also required to write regression tests that involve the HTTP layer.
If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
2011-12-05 20:44:20 +00:00
Justin Clark-Casey (justincc)
5460f2e035
refactor: Separate the upload baked texture handler out from BunchOfCaps
2011-12-01 23:24:15 +00:00
Justin Clark-Casey (justincc)
fa63054c4f
On "show caps", stop excluding the seed cap but do exclude it elsewhere
2011-11-29 20:37:03 +00:00
Justin Clark-Casey (justincc)
658d02b5e9
Improve some of the debug help messages
2011-11-29 16:56:31 +00:00
Justin Clark-Casey (justincc)
ff0d020007
Correct mistake in "debug eq" help
2011-11-29 16:18:14 +00:00
Justin Clark-Casey (justincc)
bafea2282a
Rip out unused Scene.HandleFetchInventoryDescendentsCAPS().
...
This has been handled by WebFetchInvDescHandler.Fetch() for some time.
2011-11-26 01:39:23 +00:00
Justin Clark-Casey (justincc)
11c19b0d2e
Use the same web fetch handler for every request from every avatar, since it contains no instance code
2011-11-26 00:29:01 +00:00
Justin Clark-Casey (justincc)
95a686dbf5
Fix config so that you can have both WebFetchInventoryDescendents and FetchInvnetoryDescendents2 caps active at once
2011-11-25 23:45:29 +00:00
Justin Clark-Casey (justincc)
5b4fe23f7f
Resolve error where an unknown asset type would cause the fetch inventory descendents cap to fail.
...
Introduced just a few commits ago in 0688861
2011-11-25 23:43:57 +00:00
Justin Clark-Casey (justincc)
676d32974a
Implement the FetchInventoryDescendents2 capability using the same code as WebFetchInventoryDescendents.
...
Enabling this by setting Cap_FetchInventoryDescendents2 = "localhost" in the [ClientStack.LindenCaps] section of OpenSim.ini downloads inventory via http rather than udp in later viewers.
2011-11-25 22:46:42 +00:00
Justin Clark-Casey (justincc)
8c82ff16ad
Fix WebFetchInventoryDescendents cap to use Utils.AssetTypeTostring/InventoryTypeToString to convert types to strings
...
These cover a wider range of types.
2011-11-25 21:54:31 +00:00
Justin Clark-Casey (justincc)
0a60e9537f
comment out a noisy log line I accidentally left in from the last commit
2011-11-24 21:30:40 +00:00
Justin Clark-Casey (justincc)
63c137820b
Stop passing a request handler to the initial caps.RegisterHandler in EventQueueGetModule since this is immediatley replaced by a poll server handler.
...
This allows us to comment out a bunch of code and simplify the codebase and readability.
2011-11-24 21:27:35 +00:00
Justin Clark-Casey (justincc)
0174e326e3
Add a "debug eq" console command for debugging.
...
This will log outgoing event queue message names if turned on.
2011-11-24 20:27:11 +00:00
Dan Lake
e2c51a977d
Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL.
...
UpdateFlag is now referenced/used only within SOP and SOG. Outsiders are
using ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule on
SOP consistently now. Also started working toward eliminating those
calls to ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule
from outside SOP in favor of just setting properties on SOP and let SOP
decide if an update should be scheduled. This consolidates the update
policy within SOP and the client rather than everywhere that makes
changes to SOP. Some places forget to call update while others call it
multiple times, "just to be sure".
UpdateFlag and Schedule*Update will both be made private shortly.
UpdateFlag is intended to be transient and internal to SOP so it has
been removed from XML serializer for SOPs.
2011-11-02 14:59:00 -07:00
Dan Lake
7c8bfac11b
Removed redundant SceneContents property from Scene. It's the same as SceneGraph property.
2011-11-01 17:20:12 -07:00
Justin Clark-Casey (justincc)
8a0a78cbcc
Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.
...
This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes.
Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers
Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer
MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo)
2011-10-25 20:24:21 +01:00
Justin Clark-Casey (justincc)
9ec672c70b
Fix bugs in EventQueueGetModule.ClientClosed() and BaseHttpServer.RemovePollServerHTTPHandler() that stopped existing code in ClientClosed() from actually tearing down the poll handler
...
Actually doing the tear down appear to have no ill effects with region crossing and teleport.
2011-10-24 23:16:03 +01:00
Justin Clark-Casey (justincc)
79d5bc9beb
separate out future common setup code from EventQueueTests.AddForClient()
2011-10-24 22:29:13 +01:00
Justin Clark-Casey (justincc)
e28e2d24c7
Add new EventQueueTests with basic test to check that adding a client registers an http poll
2011-10-24 22:23:41 +01:00
Justin Clark-Casey (justincc)
839c1cdcc4
Improve locking when access queue in EventQueueGetModule
2011-09-24 01:10:23 +01:00
Justin Clark-Casey (justincc)
7eca929686
Eliminate pointless checks of SOG.RootPart != null
...
It's never possible for SOG to have no RootPart, except in the first few picosends of the big bang when it's pulled from region persistence or deserialized
2011-09-01 02:11:00 +01:00
Justin Clark-Casey (justincc)
be357f8fee
Fix bug in persisting saved appearances for npcs
...
Assets have to be marked non-local as well as non-temporary to persist. This is now done.
Hopefully addresses http://opensimulator.org/mantis/view.php?id=5660
2011-08-30 01:58:32 +01:00
Justin Clark-Casey (justincc)
33a894f3d2
refactor: move SOP.IsAttachment and AttachmentPoint up into SOG to avoid pointless duplication of identical values
2011-08-27 00:15:21 +01:00
Justin Clark-Casey (justincc)
4b4c5e69e5
Remove forcing of phantom on ground attached objects - attachments can be both non-phantom and flagged as physical.
...
As per Melanie
2011-08-24 22:45:51 +01:00
Justin Clark-Casey (justincc)
940a248c3d
minor: comment out simulator features log line
2011-08-22 22:44:49 +01:00
Justin Clark-Casey (justincc)
7cf4bb5256
Add ISimulatorFeaturesModule so that other modules can register features in addition to the hardcoded ones.
2011-08-22 22:13:07 +01:00
Justin Clark-Casey (justincc)
8d866ae8c3
minor: remove some mono compiler warnings
2011-08-16 21:45:01 +01:00
Justin Clark-Casey (justincc)
cace6eaa8a
comment out some of the currently less useful debug log messages
2011-08-11 02:06:32 +01:00
Justin Clark-Casey (justincc)
f999acd095
minor: remove some mono compiler warnings
2011-08-04 01:46:34 +01:00
Justin Clark-Casey (justincc)
df2a59d31b
refactor: make SceneObjectGroup.GroupScale() a property rather than a mehod
2011-07-16 03:30:14 +01:00
Justin Clark-Casey (justincc)
3e5b2d52ff
minor: method doc for baked texture uploading
2011-07-15 22:58:29 +01:00
Justin Clark-Casey (justincc)
dbd954d701
Fix permissions problem where newly uploaded meshes rezzed from inventory could not be copied by owner.
2011-07-11 22:56:14 +01:00
Justin Clark-Casey (justincc)
5e8900dfd0
minor: code tidy and inserted log lines for future use.
...
Unable to get to the bottom of why resizing a mesh fails to properly reset the physics proxy, when toggling phantom does
After a mesh is generated, the existing sculptdata is set to zero in PrimitiveBaseShape to save memory
When phantom is toggled, the sculptdata is regenerated before remeshing.
But on resize, the sculptdata is not regenerated.
So clearly, resetting sculptdata is possible, but haven't quite been able to pin down how this is being done when phantom is toggled.
2011-07-09 00:35:30 +01:00
Justin Clark-Casey (justincc)
3bda7711b3
Switch the MeshUploadFlag CAP module on and off with the existing config AllowMeshUpload flag in [Mesh] (in OpenSimDefaults.ini)
...
Default is on.
2011-07-07 23:49:19 +01:00
Justin Clark-Casey (justincc)
2fbc98fa5c
Make MeshUploadFlagModule non-shared rather than shared (since each scene needs its own cap)
2011-07-07 23:37:23 +01:00
Michael Cerquoni aka Nebadon Izumi
281e80ccf3
add MeshUploadFlag capability fixed mesh upload with latest mesh viewer thank you dahlia and lkalif for helping to make this happen!
2011-07-07 03:30:37 -07:00
Justin Clark-Casey (justincc)
1a0a9d2290
Implement the latest mesh mechanism so that rezzing the uploaded mesh now works again.
...
Many thanks to the aurora project for pioneering this.
This code is almost certainly not bug free, but it does at least appear to handle simple meshes (except when the viewer crashes - but it is beta!).
2011-06-24 21:54:01 +01:00
Justin Clark-Casey (justincc)
37a7c16734
minor: method documentation
2011-06-24 21:01:48 +01:00
Diva Canto
822b9e085f
Added SimulatorFeatures capability. Thanks Aurora devs for the bootstrap on the contents of the response.
...
Changed the experimental capability introduced a couple of commits ago: now sending that extra information as part of the response in the SimulatorFeatures cap.
2011-06-13 10:21:29 -07:00
Diva Canto
ab11835aeb
Same processing of the "/" in the MapImageService Cap as the one in the login service.
2011-06-13 07:59:28 -07:00
Diva Canto
0e4db3ca39
Added experimental new capability URL called MapImageService meant to work with Kokua viewer if devs are willing to do it.
2011-06-13 07:56:52 -07:00
Diva Canto
e8944d6c31
Test m_Enabled on RemoveRegion.
2011-05-04 20:40:25 -07:00
Diva Canto
ac9697edbe
Fixed: EventQueueGet and other caps were being wrongly deregistered. Also CapabilitiesModule was being instantiated twice (damn Mono.Addins).
2011-05-02 19:45:47 -07:00
Diva Canto
883f21dd02
WebFetchInventoryDescendents working. Tested with robust.
2011-05-02 14:33:34 -07:00
Diva Canto
aba9ffdbd0
Refactored the GetMesh module into a handler and a module, to be the same as GetTexture.
2011-05-02 11:56:40 -07:00
Diva Canto
10180760b7
Works!
2011-05-02 08:48:55 -07:00
Diva Canto
2d21052fa3
Start to drill down on GetTexture. Read the config and do different things.
2011-05-01 19:09:08 -07:00
Diva Canto
f79400e94c
Broke down Caps.cs into a generic Caps object that simply registers/unregisters capabilities and a specific bunch of capability implementations in Linden space called BunchOfCaps.
...
Renamed a few methods that were misnomers.
Compiles but doesn't work.
2011-05-01 18:22:53 -07:00
Diva Canto
275046cf02
Change GetTextureModule.cs to conform to the new IRegion module interface. NOTHING OF THIS WORKS. Compiles.
2011-05-01 12:03:00 -07:00
Diva Canto
126d2adeba
Move CapabilitiesModule back to CoreModules. This one belongs there.
2011-05-01 12:02:07 -07:00
Diva Canto
6b2b036387
Added OpenSim.Capabilities.Handlers. For the moment it has only the GetTexture handler. The region module in Linden space uses it. WARNING: nothing of this works yet, it just compiles.
2011-05-01 09:08:18 -07:00
Diva Canto
e3c27d8527
Nope, that didn't feel right. Moving all those modules to Linden space.
2011-04-30 13:24:25 -07:00
Diva Canto
d8ee0cbe1c
First stab at cleaning up Caps. Compiles. Untested.
2011-04-30 09:24:15 -07:00