Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2013-07-04 | 30 | -191/+398 |
|\ | |||||
| * | Guard against completely unknown user UUIDs. | Diva Canto | 2013-07-04 | 1 | -3/+6 |
| | | |||||
| * | Debug the RegionHandle handler (same issue) | Diva Canto | 2013-07-04 | 1 | -0/+1 |
| | | |||||
| * | Revert "WARNING: BRUTE FORCE DEBUG. AVOID USING THIS COMMIT." | Diva Canto | 2013-07-04 | 1 | -4/+0 |
| | | | | | | | | This reverts commit c95a23863ab51810ccc01afd3dd641c18a183305. | ||||
| * | WARNING: BRUTE FORCE DEBUG. AVOID USING THIS COMMIT. | Diva Canto | 2013-07-04 | 1 | -0/+4 |
| | | |||||
| * | 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 |
| | | | |||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-07-04 | 1 | -17/+52 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-07-04 | 3 | -28/+30 |
| | |\ | |||||
| | * | | Add --default option to "debug lludp packet" command to allow packet logging ↵ | Justin Clark-Casey (justincc) | 2013-07-04 | 1 | -17/+52 |
| | | | | | | | | | | | | | | | | to be performed immediately from client start | ||||
| * | | | 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 |
| | | | |||||
| * | | HG Friends: migration #3 is failing on some installations of MySql. Setting ↵ | Diva Canto | 2013-07-04 | 1 | -1/+1 |
| | | | | | | | | | | | | the table to InnoDB seems to fix the problem. | ||||
| * | | Revert "HG Friends: debug an issue where the friends data stored in the DB ↵ | Diva Canto | 2013-07-04 | 2 | -9/+1 |
| | | | | | | | | | | | | | | | | | | is incomplete." This reverts commit 27cdfb7b840423cf8cee08988dc487eeb34d71c7. | ||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-07-04 | 3 | -74/+59 |
| |\ \ | | |/ | |||||
| | * | change "debug packet" command to "debug lludp packet" to conform with other ↵ | Justin Clark-Casey (justincc) | 2013-07-04 | 3 | -74/+59 |
| | | | | | | | | | | | | | | | | | | | | | "debug lludp" options also moves the implementing code into LLUDPServer.cs along with other debug commands from OpenSim.cs gets all debug lludp commands to only activate for the set scene if not root | ||||
| * | | HG Friends: debug an issue where the friends data stored in the DB is ↵ | Diva Canto | 2013-07-04 | 2 | -1/+9 |
| |/ | | | | | | | 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 | 3 | -9/+7 |
| |/ | | | | | | | GridUserServerPostHandler.cs | ||||
| * | Fix SQL statement | Diva Canto | 2013-07-02 | 3 | -3/+3 |
| | | |||||
| * | Do the same for SQLite and MSSQL | Diva Canto | 2013-07-02 | 2 | -2/+2 |
| | | |||||
| * | Really make it call the method with the query interface | Diva Canto | 2013-07-02 | 1 | -1/+1 |
| | | |||||
| * | More debug messages | Diva Canto | 2013-07-02 | 2 | -2/+11 |
| | | |||||
| * | This should have a strong effect on the Unknown User issue mantis #6625 | Diva Canto | 2013-07-02 | 6 | -6/+50 |
| | | |||||
| * | HG: close a loophole by which if something was wrong with the ServiceURLs it ↵ | Diva Canto | 2013-07-02 | 3 | -2/+11 |
| | | | | | | | | 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 | ||||
| * | BulletSim: add the reset of the last commit for flush log file problems. | Robert Adams | 2013-06-30 | 2 | -2/+2 |
| | | | | | | | | Fix small typo in one log message. | ||||
| * | BulletSim: fix an occasional crash with flushing log files. | Robert Adams | 2013-06-30 | 1 | -4/+2 |
| | | |||||
| * | BulletSim: remove the handle to the vehicle actor and cause routines | Robert Adams | 2013-06-30 | 2 | -32/+70 |
| | | | | | | | | that need it to look it up. | ||||
| * | BulletSim: set linkset type to be prim specific rather than a simulator | Robert Adams | 2013-06-30 | 3 | -15/+8 |
| | | | | | | | | | | wide default. This allows individual prims to differ in the underlying linkset implementation. | ||||
| * | BulletSim: a better version of llMoveToTarget that doesn't go crazy. | Robert Adams | 2013-06-30 | 5 | -19/+98 |
| | | | | | | | | | | | | | | | | There is still some overshoot but mostly fixes Mantis 6693. Fix bug where moveToTarget was active for non-physical objects and while selected. Fix bug where move target was not getting changed if the script changed the target during a move. | ||||
| * | BulletSim: add inTaintTime parameter to collision cache clear function. | Robert Adams | 2013-06-30 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2013-06-30 | 23 | -250/+484 |
|\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/Framework/Scenes/EventManager.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | ||||
| * | Groups V2: charge for group creation only after the group has been ↵ | Diva Canto | 2013-06-30 | 1 | -1/+4 |
| | | | | | | | | successfully created | ||||
| * | Revert "More debug mantis #6625" | Diva Canto | 2013-06-30 | 1 | -1/+0 |
| | | | | | | | | This reverts commit 20f2cf876982b2c7589b67ce4c8f09d8fff3e9f1. | ||||
| * | 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 | ||||
| * | Revert "A little more debug for the Unknown User problem mantis #6625" | Diva Canto | 2013-06-30 | 1 | -3/+0 |
| | | | | | | | | This reverts commit ff47cf77ab52d42195fb0f089599618511d4919b. | ||||
| * | 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 |
| | | |||||
| * | More debug mantis #6625 | Diva Canto | 2013-06-29 | 1 | -0/+1 |
| | | |||||
| * | Fixed previous debug message | Diva Canto | 2013-06-29 | 1 | -1/+1 |
| | | |||||
| * | One more debug mantis #6625 | Diva Canto | 2013-06-29 | 1 | -0/+1 |
| | |