| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote branch 'origin/0.6.9' into 0.6.9-post-fixes | Justin Clark-Casey (justincc) | 2010-06-04 | 65 | -170/+6096 |
| |\ | | | | | | | | | | | | | | | | | 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 | ||||
| | * | switch 0.6.9 flavour to release0.6.9-release | Justin Clark-Casey (justincc) | 2010-05-14 | 1 | -1/+1 |
| | | | |||||
| | * | 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 | 7 | -41/+68 |
| | |\ | |||||
| | * | | 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 | ||||
| | * | | add operation to "nant distbin" to copy StandaloneCommon.ini.example -> ↵ | Justin Clark-Casey (justincc) | 2010-04-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | StandaloneCommon.ini | ||||
| | * | | take out some more sqlite db console debug lines | Justin Clark-Casey (justincc) | 2010-04-30 | 1 | -6/+0 |
| | | | | |||||
| | * | | fix an issue with user appearance where the new sqlite db adapter expects ↵ | Justin Clark-Casey (justincc) | 2010-04-30 | 8 | -81/+25 |
| | | | | | | | | | | | | | directly specification of byte[] type rather than base64 strings | ||||
| | * | | Fix a bunch of issues that crop up after the naive porting of the new sqlite ↵ | Justin Clark-Casey (justincc) | 2010-04-30 | 16 | -774/+24 |
| | | | | | | | | | | | | | db from master to 0.6.9 | ||||
| | * | | take out some debug logging in the sqlite db adaptor | Justin Clark-Casey (justincc) | 2010-04-30 | 1 | -3/+3 |
| | | | | |||||
| | * | | rename SQLiteNG to SQLite and SQLite to SQLiteLegacy this seems the least ↵ | Justin Clark-Casey (justincc) | 2010-04-30 | 72 | -372/+922 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | evil way forward since mono 2.6 and later will see increasing usage, and this only works with what was SQLiteNG MAC USERS WILL NEED TO CHANGE REFERENCES TO "OpenSim.Data.SQLite.dll" to "OpenSim.Data.SQLiteLegacy.dll" in OpenSim.ini and config-include/StandaloneCommon.ini (if using standalone) See the OpenSim.ini.example and StandaloneCommon.ini.example files for more details This commit also temporarily changes unsigned ParentEstateID values in the OpenSim.Data.Tests to signed temporarily, since the new plugin enforces creation of signed fields in the database (which is what the SQL actually specifies). And change data columns in sqlite is a pita. | ||||
| | * | | add Mono.Data.Sqlite.dll | Justin Clark-Casey (justincc) | 2010-04-30 | 1 | -0/+0 |
| | | | | |||||
| | * | | get region prim saving working properly in SQLiteNG | Justin Clark-Casey (justincc) | 2010-04-30 | 1 | -10/+13 |
| | | | | | | | | | | | | | it wasn't working because of debug work that I'd forgotton to take out | ||||
| | * | | dispose of the DbCommand used to execute migrations after we've finished ↵ | Justin Clark-Casey (justincc) | 2010-04-30 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | with it rather than within the loop disposing of it within the loop causes Mono.Data.Sqlite.dll to get upset, and it's the wrong behaviour anyway | ||||
| | * | | put SQLiteNG classes in their own namespace to avoid confusion | Justin Clark-Casey | 2010-04-30 | 12 | -12/+12 |
| | | | | |||||
| | * | | minor: correct the assembly information for SQLiteNG | Justin Clark-Casey (justincc) | 2010-04-30 | 1 | -2/+2 |
| | | | | |||||
| | * | | Change SQLiteNG to work with mono 2.6 and above using the Mono.Data.Sqlite.dll | Justin Clark-Casey (justincc) | 2010-04-30 | 17 | -431/+237 |
| | | | | | | | | | | | | | | | | | | | Include the library so that Windows builds correctly It appears that Windows is okay with either SQLite or SQLiteNG Incorporate the latest fixes made by Diva to OpenSim.Data.SQLite | ||||
| | * | | Duplicate OpenSim.Data.SQLite into OpenSim.Data.SQLiteNG. SQLiteNG will ↵ | Justin Clark-Casey (justincc) | 2010-04-30 | 62 | -0/+6378 |
| | | | | | | | | | | | | | shortly be changed to work under mono 2.6 and above | ||||
| * | | | 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 "Next OSG TEST RELEASE. Join aborted threads." | Melanie | 2010-06-02 | 1 | -3/+0 |
| | | | | | | | | | | | | | This reverts commit 698066d7e3a59281b6b1caa499ad32ff389c8bb6. | ||||
| * | | | Next OSG TEST RELEASE. Join aborted threads. | Melanie | 2010-06-02 | 1 | -0/+3 |
| | | | | |||||
| * | | | 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 | 2 | -26/+19 |
| | | | | | | | | | | | | | needed libraries | ||||
| * | | | 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 | 10 | -23/+123 |
| | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | Apply http://opensimulator.org/mantis/view.php?id=4724 | Justin Clark-Casey (justincc) | 2010-05-21 | 2 | -4/+17 |
| | | | | | | | | | | | | | | | | | | | Tweak to update appearance calls Fix for deleting inventory items from a folder. Thanks StrawberryFride! | ||||
| * | | | 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 | ||||
| * | | | Replace CSJ2K with fixed version (Mantis #3318) | Melanie | 2010-05-21 | 1 | -0/+0 |
| | | | | |||||
| * | | | 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 | ||||
| * | | | When saving an oar/iar, don't attempt to write out the data byte array if ↵ | Justin Clark-Casey (justincc) | 2010-05-20 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | it's empty On Mono 2.6 (and probably before) this causes a non-obvious IOException | ||||
| * | | | 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 | 5 | -12/+19 |
| | | | | | | | | | | | | | do this in callers so that we know who is setting up these things | ||||
| * | | | put out full exception stack if something reaches top of base http server ↵ | Justin Clark-Casey (justincc) | 2010-05-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | OnRequest() on both mono and .net replace Newtonsoft.Json.XML since the updated copy got accidentally reverted by another commit | ||||
| * | | | Upgrade Newtonsoft.Json.dll from 1.3 to 3.5r6 | Justin Clark-Casey (justincc) | 2010-05-20 | 4 | -990/+5828 |
| | | | | | | | | | | | | | Actually using the one built against Net 2.0 (labelled Newtonsoft.Json.Net20.dll) since the 3.5 build is not compatible with Mono 2.4 (though it is with Mono 2.6) | ||||
| * | | | automatically delete %temp% directory after running tests | Justin Clark-Casey (justincc) | 2010-05-20 | 1 | -0/+2 |
| | | | | | | | | | | | | | this prevents a huge cruft buildup | ||||
| * | | | move linden notecard parsing from LSL_Api.cs to SLUtil so that region ↵ | Justin Clark-Casey (justincc) | 2010-05-20 | 5 | -108/+307 |
| | | | | | | | | | | | | | | | | | | | modules can use it backport from master | ||||
| * | | | Make "nant distbin" remove BUILDING.txt | Justin Clark-Casey | 2010-05-15 | 1 | -0/+1 |
| | | | | |||||
| * | | | 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 | ||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |