Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2013-07-13 | 20 | -109/+788 |
|\ | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | minor: remove some regression test logging switches accidentally left ↵ | Justin Clark-Casey (justincc) | 2013-07-11 | 1 | -1/+1 |
| | | | | | | | | uncommented. | ||||
| * | minor: Take out unnecessary clumsy sleep at the end of regression ↵ | Justin Clark-Casey (justincc) | 2013-07-11 | 1 | -3/+0 |
| | | | | | | | | | | | | Test404Response(). This wasn't actually necessary in the end but was accidentally left in. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-07-11 | 1 | -7/+5 |
| |\ | |||||
| | * | Changed the UserProfileModule so that it's less greedy in terms of thread usage. | Diva Canto | 2013-07-11 | 1 | -7/+5 |
| | | | |||||
| * | | Fix regression where llHTTPRequests which did not get an OK response ↵ | Justin Clark-Casey (justincc) | 2013-07-11 | 2 | -40/+238 |
| |/ | | | | | | | | | | | | | | | returned 499 and the exception message in the http_response event rather than the actual response code and body. This was a regression since commit 831e4c3 (Thu Apr 4 00:36:15 2013) This commit also adds a regression test for this case, though this currently only works with Mono This aims to address http://opensimulator.org/mantis/view.php?id=6704 | ||||
| * | Revert "minor: remove some mono compiler warnings in UserProfileModule" | Robert Adams | 2013-07-09 | 1 | -13/+16 |
| | | | | | | | | | | | | | | Revert until we understand why all the calls to GetUserProfileServerURI were also commented out. This reverts commit 5f58b9b5526c401e039d27b8c92603ff02421fb8. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-07-09 | 5 | -72/+329 |
| |\ | |||||
| | * | minor: remove some mono compiler warnings in UserProfileModule | Justin Clark-Casey (justincc) | 2013-07-09 | 1 | -16/+13 |
| | | | |||||
| | * | For stat purposes, add names to capability request handlers where these were ↵ | Justin Clark-Casey (justincc) | 2013-07-08 | 1 | -3/+3 |
| | | | | | | | | | | | | not set | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-07-08 | 8 | -52/+102 |
| | |\ | |||||
| | * | | Add "show caps stats by user" and "show caps stats by cap" console commands ↵ | Justin Clark-Casey (justincc) | 2013-07-08 | 3 | -6/+232 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | Make dictionary read/write locking consistent in CapabilitiesModule, rename ↵ | Justin Clark-Casey (justincc) | 2013-07-08 | 1 | -48/+82 |
| | | | | | | | | | | | | | | | | two dictionary fields to standard m_ format | ||||
| * | | | Put guards on a bunch of exception-inducing code, as seen in logs from load ↵ | Diva Canto | 2013-07-09 | 3 | -4/+9 |
| | |/ | |/| | | | | | | | test. | ||||
| * | | Placed a throttle on UserManagementModule for name lookups. Singularity ↵ | Diva Canto | 2013-07-08 | 2 | -11/+57 |
| | | | | | | | | | | | | apparently is flooding the sims with name requests. | ||||
| * | | Revert "WARNING: BRUTE FORCE DEBUG AGAIN. AVOID USING THIS COMMIT" | Diva Canto | 2013-07-06 | 1 | -3/+1 |
| | | | | | | | | | | | | This reverts commit 9b75d757241e87408c50b1f92996bf667960c348. | ||||
| * | | Some more fixes on strange behaviors of Unknown User, esp. related to large ↵ | Diva Canto | 2013-07-06 | 2 | -16/+16 |
| | | | | | | | | | | | | messy inventories and esp. related to kokua | ||||
| * | | MORE DEBUG. DON"T USE THIS. | Diva Canto | 2013-07-06 | 1 | -3/+3 |
| | | | |||||
| * | | WARNING: BRUTE FORCE DEBUG AGAIN. AVOID USING THIS COMMIT | Diva Canto | 2013-07-06 | 1 | -1/+3 |
| | | | |||||
| * | | Changed a few bits in Inventory/Archiver/InventoryArchiveReadRequest.cs to ↵ | Diva Canto | 2013-07-05 | 5 | -25/+29 |
| |/ | | | | | | | be less dependent on a Scene. | ||||
| * | Update thread watchdog on GridServiceRequestThread periodically and turn off ↵ | Justin Clark-Casey (justincc) | 2013-07-06 | 1 | -1/+3 |
| | | | | | | | | | | | | alarming Unfortunately, alarm can spuriously go off if the thread blocks for a long time on an empty queue. | ||||
| * | Delete some verbose debug messages | Diva Canto | 2013-07-04 | 3 | -6/+6 |
| | | |||||
| * | Throttle the viewer's requests for region handles. Apparently Kokua is ↵ | Diva Canto | 2013-07-04 | 1 | -0/+161 |
| | | | | | | | | requesting this for all landmarks in inventory. Not sure why. But this seems to be the root cause of the login freeze mentioned before. This commit adds a blocking queue / process thread pattern. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2013-07-04 | 6 | -33/+80 |
|\ \ | |/ | |||||
| * | Guard against completely unknown user UUIDs. | Diva Canto | 2013-07-04 | 1 | -3/+6 |
| | | |||||
| * | Revert "Same freeze issue, now checking if it's in estate" | Diva Canto | 2013-07-04 | 1 | -1/+0 |
| | | | | | | | | This reverts commit ca380ec0397b28a3d7a3f2c60aeb6eaf1153be31. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-07-04 | 1 | -7/+18 |
| |\ | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-07-04 | 3 | -4/+8 |
| | |\ | |||||
| | * | | With diva's permission, temporarily reinsert Unknown UserUMMAU3 to make sure ↵ | Justin Clark-Casey (justincc) | 2013-07-04 | 1 | -7/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that GUN7 failure has largely disappeared. Unknown UserUMMAU3 insertion should definitely be removed down the line. However, I would like a little more time to check the GUN* reduction first, since removing UMMAU3 will make these failures appear as GUN7 instead. Also bumps GUN6 -> GUN7 and UMMAU2 -> UMMAU3 | ||||
| * | | | Same freeze issue, now checking if it's in estate | Diva Canto | 2013-07-04 | 1 | -0/+1 |
| | |/ | |/| | |||||
| * | | More debug, same issue | Diva Canto | 2013-07-04 | 2 | -1/+3 |
| | | | |||||
| * | | More debug, same issue | Diva Canto | 2013-07-04 | 2 | -3/+5 |
| |/ | |||||
| * | More debug related to the previous commit | Diva Canto | 2013-07-04 | 1 | -1/+1 |
| | | |||||
| * | Now trying to find a cause of freeze at login related to friends status ↵ | Diva Canto | 2013-07-04 | 1 | -2/+5 |
| | | | | | | | | notifications. | ||||
| * | HG Friends: this was commented some commits ago, but it shouldn't have been. | Diva Canto | 2013-07-04 | 1 | -25/+24 |
| | | |||||
| * | Revert "HG Friends: debug an issue where the friends data stored in the DB ↵ | Diva Canto | 2013-07-04 | 1 | -1/+0 |
| | | | | | | | | | | | | is incomplete." This reverts commit 27cdfb7b840423cf8cee08988dc487eeb34d71c7. | ||||
| * | HG Friends: debug an issue where the friends data stored in the DB is ↵ | Diva Canto | 2013-07-04 | 1 | -0/+1 |
| | | | | | | | | incomplete. | ||||
| * | Squoosh one last opportunity for Unknown Users to creep in. | Diva Canto | 2013-07-02 | 1 | -7/+5 |
| | | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-07-02 | 1 | -1/+1 |
| |\ | |||||
| | * | minor: Correct typo of "Descrition" to "Description" in "show object *" ↵ | Justin Clark-Casey (justincc) | 2013-07-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | console commands Thanks to Ai Austin for pointing this out. | ||||
| * | | Deleted debug messages. Fixed a null ref exception on the POST handler of ↵ | Diva Canto | 2013-07-02 | 1 | -3/+2 |
| |/ | | | | | | | GridUserServerPostHandler.cs | ||||
| * | More debug messages | Diva Canto | 2013-07-02 | 1 | -1/+6 |
| | | |||||
| * | This should have a strong effect on the Unknown User issue mantis #6625 | Diva Canto | 2013-07-02 | 1 | -2/+18 |
| | | |||||
| * | HG: close a loophole by which if something was wrong with the ServiceURLs it ↵ | Diva Canto | 2013-07-02 | 2 | -1/+10 |
| | | | | | | | | resulted in never ending asset requests | ||||
| * | Update debug unknown user name UserUMMTGUN3 to UserUMMTGUN4 and UserUMMAU -> ↵ | Justin Clark-Casey (justincc) | 2013-07-01 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | UserUMMAU2 to track any new occurences. This is to see the impact that Diva's fixes related to this issue (last one is currently commit c7383688) You will need to clear your viewer cache for this to have any effect Relates to http://opensimulator.org/mantis/view.php?id=6625 | ||||
* | | Merge branch 'master' into careminster | Melanie | 2013-06-30 | 7 | -41/+77 |
|\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/Framework/Scenes/EventManager.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | ||||
| * | Revert "One more debug mantis #6625" | Diva Canto | 2013-06-30 | 1 | -1/+0 |
| | | | | | | | | | | | | | | This reverts commit 8fa5d12fcb73ffcc7144009e0147febcfa3ce704. Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | ||||
| * | Same fix to LocalInventoryServiceConnector.cs | Diva Canto | 2013-06-30 | 1 | -1/+2 |
| | | |||||
| * | More on mantis #6625 | Diva Canto | 2013-06-29 | 1 | -1/+2 |
| | | |||||
| * | Fixed previous debug message | Diva Canto | 2013-06-29 | 1 | -1/+1 |
| | |