| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-06-07 | 11 | -144/+47 |
| |\ | |||||
| | * | Revert "commit code which stops full updates being fired multiple times when ↵ | Justin Clark-Casey (justincc) | 2010-06-04 | 9 | -122/+22 |
| | | | | | | | | | | | | | | | | | attachments cross standalone region boundaries" This reverts commit 5074d290e4aeb583560272cadc8ba09aa8337210. This gets rid of the massive amount of scene object log spam - sorry about that, folks | ||||
| | * | Merge remote branch 'origin/0.6.9' into 0.6.9-post-fixes | Justin Clark-Casey (justincc) | 2010-06-04 | 1 | -1/+1 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | This chiefly brings in the new sqlite adaptor and renames the old one to SQLiteLegacy Existing configuratios should continue to work without changes unless you are using Mac OSX and mono 2.6 or later, in which case you will need to enable SQLiteLegacy instead. Please se the instructions in OpenSim.ini.example and the relevant config/include .ini files Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | ||||
| | | * | Apply patch from http://opensimulator.org/mantis/bug_view_page.php?bug_id=4671 | Justin Clark-Casey | 2010-05-14 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | Fixes a bug where the viewer didn't recieve the uuid of a chat broadcasting object Thanks crystalsgalicia! | ||||
| | | * | Fix linking issue introduced in my earlier commit | Melanie Thielker | 2010-05-14 | 1 | -1/+19 |
| | | | | |||||
| | | * | Merge branch '0.6.9-post-fixes' into 0.6.9 | Justin Clark-Casey (justincc) | 2010-05-03 | 6 | -40/+67 |
| | | |\ | |||||
| | | * | | Address symptom of Mantis 4588 (though not the cause) by moving the avatar ↵ | Justin Clark-Casey (justincc) | 2010-05-03 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | dereference inside the exception catch | ||||
| | * | | | Revert "Next OSG test. Don't remove app domains if they contain running ↵ | Melanie | 2010-06-02 | 1 | -6/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | threads." This reverts commit f831a1778baa766b4810e352f3ae2ab6736e4620. With this, post-fixes is back to normal. | ||||
| | * | | | Next OSG test. Don't remove app domains if they contain running threads. | Melanie | 2010-06-02 | 1 | -4/+6 |
| | | | | | |||||
| | * | | | Next OSG test. Cowardly refuse to save the state of badly behaved scripts, ↵ | Melanie | 2010-06-02 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | instead of forcing the issue. | ||||
| | * | | | Revert "After aborting a thread, wait for it to actually finish. ↵ | Melanie | 2010-06-02 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | EXPERIMENTAL for OSG" This reverts commit 241ed5734ee3c5b1417484dfa22af6cf6ae60b82. | ||||
| | * | | | After aborting a thread, wait for it to actually finish. EXPERIMENTAL for OSG | Melanie | 2010-06-02 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | testing. DO NOT UPDATE TO THIS UNLESS YOU KNOW WHAT YOU'RE DOING! | ||||
| | * | | | Comment and remove JScript support. Mono 2.7Dev and 2.8 no longer include the | Melanie | 2010-06-01 | 1 | -19/+19 |
| | | | | | | | | | | | | | | | | | needed libraries | ||||
| * | | | | Gosh, fixing another nullref issue in cmGetAvatarList. I deserve spanks. | Tom Grimshaw | 2010-06-01 | 1 | -3/+6 |
| | | | | | |||||
| * | | | | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-05-31 | 25 | -205/+357 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Fix a nullref in EventManager caused by RegionReady not setting the scene | Melanie Thielker | 2010-05-30 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | Adjust Scene.DeleteAllSceneObjects() to not delete objects attached to avatars. | Justin Clark-Casey (justincc) | 2010-05-28 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | This is going to be the right behaviour in all cases, I should think. This means that avatars in region when an oar is loaded do not lose their attachments | ||||
| | * | | | commit code which stops full updates being fired multiple times when ↵ | Justin Clark-Casey (justincc) | 2010-05-27 | 9 | -22/+122 |
| | | | | | | | | | | | | | | | | | | | | | | | | | attachments cross standalone region boundaries lots of messy debug code here too which would need to be removed | ||||
| | * | | | backport from master fix for attachment display | Justin Clark-Casey (justincc) | 2010-05-24 | 3 | -3/+5 |
| | | | | | | | | | | | | | | | | | this fix stops two full updates being sent on attachment rather than one. Sending two can stop the client displaying attachments properly | ||||
| | * | | | backport some IGroupsModule method doc and an extra exposed method from git ↵ | Justin Clark-Casey (justincc) | 2010-05-24 | 1 | -2/+31 |
| | | | | | | | | | | | | | | | | | master | ||||
| | * | | | stop "load oar" reporting ignored objects when those objects were actually ↵ | Justin Clark-Casey (justincc) | 2010-05-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loaded just fine this fix also means that loaded scripts are properly/more promptly started here, the fix is only done in the oar module. In master, the underlying problem was fixed instead but this is more invasive. | ||||
| | * | | | Only send dialogs and notices to root agents, not child agents | Justin Clark-Casey (justincc) | 2010-05-21 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Small change for backport Conflicts: OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs | ||||
| | * | | | Change the way the object perms are propagated to attempt to salvage | Melanie | 2010-05-21 | 1 | -21/+23 |
| | | | | | | | | | | | | | | | | | some older content | ||||
| | * | | | minor: correctly print out missing item id when it can't be found rather ↵ | Justin Clark-Casey (justincc) | 2010-05-20 | 2 | -2/+4 |
| | | | | | | | | | | | | | | | | | than a NullReferenceException | ||||
| | * | | | Don't append ACKs to zerocoded packets. Although this should fine in theory, ↵ | John Hurliman | 2010-05-20 | 1 | -15/+20 |
| | | | | | | | | | | | | | | | | | I'm seeing the viewer ignore or fail to parse ACKs appended to our zerocoded packets. This should cut down on viewer->sim resend traffic | ||||
| | * | | | minor: commented out code removal | Justin Clark-Casey (justincc) | 2010-05-20 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | Completely prevent full update packets being sent after kill object packets | Justin Clark-Casey (justincc) | 2010-05-20 | 1 | -3/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | If a full update is sent after the kill, the object remains as in the linden viewer but in an undeletable and unowned state until relog This patch prevents this by recording kills in LLClientView Backport from master | ||||
| | * | | | Completely prevent full update packets being sent after kill object packets | Justin Clark-Casey (justincc) | 2010-05-20 | 1 | -5/+46 |
| | | | | | | | | | | | | | | | | | | | | | If a full update is sent after the kill, the object remains as in the linden viewer but in an undeletable and unowned state until relog This patch prevents this by recording kills in LLClientView | ||||
| | * | | | minor: Print out port that http servers are using | Justin Clark-Casey (justincc) | 2010-05-20 | 2 | -9/+9 |
| | | | | | | | | | | | | | | | | | do this in callers so that we know who is setting up these things | ||||
| | * | | | move linden notecard parsing from LSL_Api.cs to SLUtil so that region ↵ | Justin Clark-Casey (justincc) | 2010-05-20 | 4 | -108/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | modules can use it backport from master | ||||
| | * | | | Address symptom of Mantis 4588 (though not the cause) by moving the avatar ↵ | Justin Clark-Casey (justincc) | 2010-05-15 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | dereference inside the exception catch | ||||
| | * | | | Merge branch '0.6.9-post-fixes' of ↵ | Justin Clark-Casey (justincc) | 2010-05-14 | 1 | -0/+4 |
| | |\ \ \ | | | | | | | | | | | | | | | | ssh://justincc@opensimulator.org/var/git/opensim into 0.6.9-post-fixes | ||||
| | | * | | | Apply patch from http://opensimulator.org/mantis/bug_view_page.php?bug_id=4671 | Justin Clark-Casey | 2010-05-14 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a bug where the viewer didn't recieve the uuid of a chat broadcasting object Thanks crystalsgalicia! | ||||
| | * | | | | * Allows both old and new OpenSim.ini params for the XmlRpc Groups Service ↵ | unknown | 2010-05-14 | 2 | -31/+80 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Connector * Fix problem with RequestingAgentID not being sent correctly to server resulting in failed xmlrpc calls * Improved debug output | ||||
| * | | | | Fix casting in llParcelMediaCommandList so that it actually, you know, works | Tom Grimshaw | 2010-05-31 | 1 | -16/+16 |
| | | | | | |||||
| * | | | | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-05-21 | 5 | -443/+542 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | back port groups changes | unknown | 2010-05-05 | 2 | -1329/+73 |
| | | | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| | * | | | back port groups changes | unknown | 2010-05-05 | 5 | -443/+1798 |
| | | | | | |||||
| | * | | | Revert "Patch from mcortez: Update groups, add ALPHA Siman grid connector ↵ | Melanie | 2010-05-05 | 4 | -1570/+320 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for groups" The patch was for 0.7 This reverts commit 608bb0dfefbbc97aded6d1357dd9d350053411fb. | ||||
| | * | | | Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups | Melanie | 2010-05-05 | 4 | -320/+1570 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Mantis #4646 Signed-off-by: Melanie <melanie@t-data.com> | ||||
| | * | | | Fix linking issue introduced in my earlier commit | Melanie Thielker | 2010-04-30 | 1 | -1/+19 |
| | | |/ | |/| | |||||
| | * | | Fix some symbol errors | Melanie | 2010-04-30 | 1 | -2/+2 |
| | | | | |||||
| * | | | Change the way the object perms are propagated to attempt to salvage | Melanie | 2010-05-21 | 1 | -21/+23 |
| | | | | | | | | | | | | | some older content | ||||
| * | | | Fix a nullref issue in SitAltitudeCallback | Tom Grimshaw | 2010-05-19 | 1 | -50/+53 |
| | | | | |||||
| * | | | Fix a null reference issue in cmGetAvatarList() | Tom Grimshaw | 2010-05-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | Provide interface to prevent the client close function from sending the stop ↵ | Tom Grimshaw | 2010-05-17 | 4 | -3/+30 |
| | | | | | | | | | | | | | packet | ||||
| * | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Kitto Flora | 2010-05-07 | 7 | -40/+88 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | sacha | 2010-05-02 | 6 | -40/+85 |
| | |\ \ \ | |||||
| | | * | | | Fix linking issue introduced in my earlier commit | Melanie Thielker | 2010-04-30 | 1 | -1/+19 |
| | | | | | | |||||
| | | * | | | Fix some symbol errors | Melanie | 2010-04-30 | 1 | -2/+2 |
| | | | | | | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |