Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-29 | 16 | -150/+875 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | ||||||
| * | | | | Started redoing HGInventoryBroker for XInventory and with multi-protocol in ↵ | Diva Canto | 2010-04-29 | 4 | -3/+648 | |
| | | | | | | | | | | | | | | | | | | | | mind. Unfinished. | |||||
| * | | | | Merge branch 'minor-stuff' | Melanie | 2010-04-28 | 7 | -67/+74 | |
| |\ \ \ \ | ||||||
| | * | | | | Refactoring in Migration.cs: "using()" instead of explicit Dispose() | AlexRa | 2010-04-28 | 1 | -52/+56 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This ensures that 'cmd' gets disposed on errors | |||||
| | * | | | | Fixed comments in Migration.cs: wrong argument order (no change to code) | AlexRa | 2010-04-28 | 1 | -2/+2 | |
| | | | | | | ||||||
| | * | | | | Compiler.cs contained method GetCompilerOutput which, apparently, | unknown | 2010-04-28 | 1 | -4/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | was not used, but exactly the same path was calculated inline. This patch does some minor refactoring by replacing inline path calculation with GetCompilerOutput. This doesn't actually affect anything, just minor prettifying of the code | |||||
| | * | | | | Just a bit of spellchecking in the comments | AlexRa | 2010-04-28 | 1 | -2/+2 | |
| | | | | | | ||||||
| | * | | | | Spelling in FriendsModule.cs: "filed to load" -> "failed to load" | unknown | 2010-04-28 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | Minor spelling corrections in MiniModule: "RetreiveAsset" changed to | unknown | 2010-04-28 | 2 | -5/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | "RetrieveAsset" and 'm_rootSceene' to m_rootScene'. | |||||
| | * | | | | Removed unused var from InventoryService.cs (-1 warning) | AlexRa | 2010-04-28 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Commented verbose debug messages from XInventory handler. | Diva Canto | 2010-04-28 | 1 | -13/+13 | |
| | | | | | | ||||||
| * | | | | | Putting it back to protected; Melanie doesn't like it to be public. | Diva Canto | 2010-04-27 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Changed GetToken from protected to public. This is not exposed at the interface. | Diva Canto | 2010-04-27 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | * Thanks cmickeyb, for a patch that sanity checks if the response from ↵ | John Hurliman | 2010-04-27 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | m_Database.GetAsset(assetID) is null in AssetService.cs | |||||
| * | | | | | * Thanks cmickeyb, for a patch that corrects an invalid construction of ↵ | John Hurliman | 2010-04-27 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Primitive.TextureEntry (a "blank" texture should be initialized with UUID.Zero, not null) | |||||
| * | | | | | XInventory connector/handler showing signs of life. Tested, but needs more ↵ | Diva Canto | 2010-04-27 | 5 | -69/+139 | |
| |/ / / / | | | | | | | | | | | | | | | | testing. | |||||
* | | | | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-04-29 | 2 | -43/+45 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Fix Av jump motion S/W | Kitto Flora | 2010-04-29 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Fix vertical attractor | Kitto Flora | 2010-04-29 | 1 | -41/+43 | |
| | | | | | ||||||
* | | | | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-04-27 | 2 | -11/+21 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Adding some more SNMP events and some refactoring | sacha | 2010-04-23 | 2 | -8/+14 | |
| | | | | | | | | | | | | | | | | | | | | Signed : The Masqued Foxi | |||||
| * | | | | Adding LinkUp/LinkDown when a region is started or stoped. | sacha | 2010-04-23 | 2 | -3/+7 | |
| | | | | | | | | | | | | | | | | | | | | Those two events could be used to compute the region availibility | |||||
| * | | | | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-04-19 | 2 | -17/+48 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
| | * | | | Fix http://opensimulator.org/mantis/view.php?id=4657 where ↵ | Justin Clark-Casey (justincc) | 2010-04-16 | 2 | -17/+48 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenSim.Grid.UserServer.exe fails on startup if no previous config probably appears to occur because mono 2.4.2.3 (and possibly later) erroneously returns a value of 0 for BufferWidth and BufferHeight in some circumstances | |||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-27 | 6 | -18/+442 | |
|\ \ \ \ \ | | |_|/ / | |/| | | | ||||||
| * | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-04-27 | 3 | -1/+400 | |
| |\ \ \ \ | ||||||
| | * | | | | RemoteXInventoryServiceConnector, the plugin region module. Not active in ↵ | Diva Canto | 2010-04-26 | 3 | -1/+400 | |
| | | | | | | | | | | | | | | | | | | | | | | | | default configs yet. | |||||
| * | | | | | Allow a client to pass a scope id to log into in the login XML / LLSD | Melanie | 2010-04-27 | 3 | -17/+42 | |
| |/ / / / | ||||||
| * | | | | Fix build break. | Melanie | 2010-04-27 | 1 | -17/+17 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-27 | 64 | -18/+6179 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Add a parameter to prim inventory update to prevent event firing | Melanie | 2010-04-27 | 2 | -18/+26 | |
| | | | | | ||||||
| * | | | | Better error message. | Diva Canto | 2010-04-26 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | * Commenting SQLiteNG out of prebuild.xml, because it's making compile fail ↵ | Diva Canto | 2010-04-26 | 1 | -2/+2 | |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | in Windows. Justin: you forgot to add Mono.Sqlite.dll, and I can't figure out where to grab it from! * IRegionModule.cs wants to be committed too -- EOF. | |||||
| * | | | minor: eliminate configuration section handling deprecation of ↵ | Justin Clark-Casey (justincc) | 2010-04-23 | 1 | -6/+0 | |
| | | | | | | | | | | | | | | | | OpenSim.DataStore.MonoSqlite.dll, since this hasn't exist for a long, long time | |||||
| * | | | get region prim saving working properly in SQLiteNG | Justin Clark-Casey (justincc) | 2010-04-23 | 1 | -10/+13 | |
| | | | | | | | | | | | | | | | | it wasn't working because of debug work that I'd forgotton to take out | |||||
| * | | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-04-23 | 12 | -11/+14 | |
| |\ \ \ | ||||||
| | * | | | add a comment about deprecating IRegionModule | dahlia | 2010-04-23 | 1 | -0/+3 | |
| | | | | | ||||||
| | * | | | put SQLiteNG classes in their own namespace to avoid confusion | Justin Clark-Casey | 2010-04-23 | 12 | -12/+12 | |
| | | | | | ||||||
| * | | | | dispose of the DbCommand used to execute migrations after we've finished ↵ | Justin Clark-Casey (justincc) | 2010-04-23 | 2 | -2/+3 | |
| |/ / / | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| * | | | minor: correct the assembly information for SQLiteNG | Justin Clark-Casey (justincc) | 2010-04-23 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-04-23 | 5 | -10/+31 | |
| |\ \ \ | ||||||
| | * \ \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-04-22 | 36 | -188/+455 | |
| | |\ \ \ | ||||||
| | | * | | | Insert a ROLLBACK command on migration step failure. This ensures that | Melanie | 2010-04-22 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | updating the Migrations table will not occur in a partial transaction, which would be auto-rolled-back later. | |||||
| | | * | | | Sanitized parsing of floats (x, y, z location) for Culture. | Diva Canto | 2010-04-22 | 1 | -3/+3 | |
| | | | | | | ||||||
| | * | | | | * Better error logging for failed SimianGrid web service calls | John Hurliman | 2010-04-22 | 2 | -7/+17 | |
| | | | | | | ||||||
| * | | | | | Change SQLiteNG to work with mono 2.6 and above using the Mono.Data.Sqlite.dll | Justin Clark-Casey (justincc) | 2010-04-23 | 16 | -429/+236 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-23 | 61 | -0/+6341 | |
| | | | | | | | | | | | | | | | | | | | | | | | | shortly be changed to work under mono 2.6 and above | |||||
* | | | | | | Add a parameter to prim inventory update to prevent event firing | Melanie Thielker | 2010-04-27 | 2 | -1/+8 | |
| | | | | | | ||||||
* | | | | | | Make scripted attachment states work. Finally. Also replace two monitor locks | Melanie Thielker | 2010-04-25 | 3 | -14/+35 | |
| | | | | | | | | | | | | | | | | | | | | | | | | with RWLocks, hunting the 10^3 bug. Not successful, but needed to be done anyway | |||||
* | | | | | | Use the saved script states | Melanie Thielker | 2010-04-24 | 2 | -2/+36 | |
| | | | | | |