Melanie
598f63e984
Make atachment state load work again
2013-08-02 00:06:39 +01:00
Melanie
6fc03c7e6e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-08-01 23:42:19 +01:00
Justin Clark-Casey (justincc)
216e785ca9
Add experimental "debug attachments throttle <ms>" setting (command line) and ThrottlePer100PrimsRezzed in [Attachments] in config
...
This is an experimental setting to control cpu spikes when an attachment heavy avatar logs in or avatars with medium attachments lgoin simultaneously.
It inserts a ms sleep specified in terms of attachments prims after each rez when an avatar logs in.
Default is 0 (no throttling).
"debug attachments <level>" changes to "debug attachments log <level>" which controls logging. A logging level of 1 will show the throttling performed if applicable.
Also adds "debug attachments status" command to show current throttle and debug logging levels.
2013-08-01 21:16:53 +01: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
Justin Clark-Casey (justincc)
056a6ee765
Fix regression tests relating to agent transfer by making simulator use last week's SIMULATOR/0.1 protocol for now.
2013-07-26 19:22:30 +01:00
Melanie
a7eb1b5b85
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2013-07-24 03:50:09 +01:00
Melanie
7830cc9954
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
OpenSim/Services/HypergridService/UserAgentService.cs
2013-07-18 10:08:10 +01:00
Dan Lake
9f129938c9
Attachments module only registers when enabled. This enables alternative attachments module implementations. All calls to Scene.AttachmentsModule are checking for null. Ideally, if we support disabling attachments then we need a null attachments module to register with the scene.
2013-07-16 17:43:36 -07:00
Diva Canto
bc405a6a34
That didn't fix the problem.
...
Revert "Trying to reduce CPU usage on logins and TPs: trying radical elimination of all FireAndForgets throughout CompleteMovement. There were 4."
This reverts commit 6825377380
2013-07-13 11:30:37 -07:00
Diva Canto
6825377380
Trying to reduce CPU usage on logins and TPs: trying radical elimination of all FireAndForgets throughout CompleteMovement. There were 4.
2013-07-13 11:11:18 -07:00
Diva Canto
c4f1ec1fd6
Changed the UserProfileModule so that it's less greedy in terms of thread usage.
2013-07-11 10:21:20 -07:00
Robert Adams
bb6fb65392
Revert "minor: remove some mono compiler warnings in UserProfileModule"
...
Revert until we understand why all the calls to GetUserProfileServerURI were also
commented out.
This reverts commit 5f58b9b552
2013-07-09 18:24:39 -07:00
Justin Clark-Casey (justincc)
5f58b9b552
minor: remove some mono compiler warnings in UserProfileModule
2013-07-09 00:04:46 +01: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)
c3db595944
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-07-08 22:07:27 +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
Diva Canto
c358d5d168
Changed a few bits in Inventory/Archiver/InventoryArchiveReadRequest.cs to be less dependent on a Scene.
2013-07-05 20:17:10 -07:00
Diva Canto
ca26583e6b
Delete some verbose debug messages
2013-07-04 15:17:06 -07:00
Melanie
5ddcc25ee9
Merge branch 'master' into careminster
2013-07-04 22:32:58 +01:00
Diva Canto
bf214122cd
More debug, same issue
2013-07-04 11:53:22 -07:00
Diva Canto
ec9ffbb89a
More debug, same issue
2013-07-04 11:36:10 -07:00
Diva Canto
0cc0a2485c
More debug related to the previous commit
2013-07-04 11:18:05 -07:00
Diva Canto
ae42c93f9a
Now trying to find a cause of freeze at login related to friends status notifications.
2013-07-04 10:59:21 -07:00
Diva Canto
98a2fa8e35
HG Friends: this was commented some commits ago, but it shouldn't have been.
2013-07-04 10:23:20 -07:00
Diva Canto
5eb78aad96
Revert "HG Friends: debug an issue where the friends data stored in the DB is incomplete."
...
This reverts commit 27cdfb7b84
2013-07-04 09:17:01 -07:00
Diva Canto
27cdfb7b84
HG Friends: debug an issue where the friends data stored in the DB is incomplete.
2013-07-04 08:47:45 -07:00
Melanie
ffcee82b1d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Region/Framework/Scenes/EventManager.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2013-06-30 18:27:30 +01:00
Diva Canto
1e97972f78
Revert "One more debug mantis #6625 "
...
This reverts commit 8fa5d12fcb
2013-06-30 07:25:13 -07:00
Diva Canto
c462e0a51c
Fixed previous debug message
2013-06-29 21:30:07 -07:00
Diva Canto
8fa5d12fcb
One more debug mantis #6625
2013-06-29 21:26:58 -07:00
Diva Canto
0c97021565
More debug for mantis #6625 . It looks like the home friends list is being fetched on HG TPs.
2013-06-29 21:05:45 -07:00
Kevin Cozens
3fe5e9057f
Prevent an exception if no offline messages were retrieved.
2013-06-18 23:15:38 +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)
e6cb7b4764
Lock m_classifiedCache and m_classifiedInterest dictionary reads in UserProfileModule since in the presence of writes these are not thread-safe operations.
...
Simplified locking to m_classifiedCache only since r/w of both dictionaries always occurs together
2013-06-15 00:52:57 +01:00
Justin Clark-Casey (justincc)
42b0c68eab
Correct build break in previous commit 9c530d7
2013-06-15 00:46:55 +01:00
Justin Clark-Casey (justincc)
9c530d725f
refactor: In UserProfileModule, change classifiedCache and classifiedInterest to m_classifiedCache and m_classifiedInterest
...
This is the coding standard name style for private fields.
2013-06-15 00:41:02 +01:00
Melanie
162dfd8a38
Merge branch 'avination-current' into careminster
2013-06-11 21:03:02 +01:00
Melanie
a022ee5766
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
2013-06-11 01:03:15 +01:00
BlueWall
75e4af9d39
Catch exception triggered by incoming avatars using legacy profiles
2013-06-08 11:00:05 -04:00
Melanie
8582b2b992
Make objects attached from the ground appear in inventory again. Fixes a number
...
of interaction issues causing client crashes.
2013-06-08 02:32:05 +02:00
BlueWall
1cb1245d84
SQLite support for UserProfiles
2013-06-07 20:14:39 -04:00
BlueWall
1387224821
Ensure selected module is the only active one
2013-06-07 20:09:10 -04:00
Melanie
45e333652c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
2013-06-07 23:09:53 +01:00
Donnie Roberts
045c26f626
In LocalFriendshipTerminated, send the original client's agentId to the friend being removed instead of the friend's own id.
2013-06-07 18:43:00 +01:00
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
ea9e1d1a1e
Merge commit 'e449950030decf7e65e7d9b334ddaed25c1bd629' into careminster
2013-06-06 03:04:47 +01:00
BlueWall
e449950030
Prevent processing for Npc
2013-06-05 18:42:15 -04:00
BlueWall
10572b78f8
Remove a couple of orphaned lines
2013-06-05 15:10:53 -04:00
BlueWall
b4f472c4fa
Make locking more uniform
2013-06-05 15:08:25 -04:00
