Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow retrieval if admin users in scope mode | Melanie Thielker | 2010-04-30 | 1 | -0/+18 |
| | |||||
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-30 | 80 | -789/+566 |
|\ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-04-30 | 79 | -788/+564 |
| |\ | |||||
| | * | * XInventory fairly tested, including for HG. Almost ready to switch. | Diva Canto | 2010-04-30 | 9 | -365/+140 |
| | | | | | | | | | | | | * Removed a few buglets and added better exception handling. | ||||
| | * | take out some debug logging in the sqlite db adaptor | Justin Clark-Casey (justincc) | 2010-04-30 | 1 | -3/+3 |
| | | | |||||
| | * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-04-30 | 30 | -233/+1420 |
| | |\ | |||||
| | * | | rename SQLiteNG to SQLite and SQLite to SQLiteLegacy | Justin Clark-Casey (justincc) | 2010-04-30 | 70 | -422/+423 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | this seems the least 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. | ||||
| * | | | Fix a null ref from trying to access a dictionary that was never initialized. | Melanie | 2010-04-30 | 1 | -1/+2 |
| | |/ | |/| | |||||
| * | | Fix some symbol errors | Melanie | 2010-04-30 | 1 | -2/+2 |
| | | | |||||
* | | | 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 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-30 | 4 | -281/+284 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-04-30 | 2 | -279/+282 |
| |\ \ | |||||
| | * | | Simplified RemoteXInventoryServiceConnector and HGBroker (2) by a lot. | Diva Canto | 2010-04-29 | 2 | -279/+282 |
| | | | | |||||
| * | | | Fix link security issue | Melanie | 2010-04-30 | 7 | -43/+70 |
| |/ / | |||||
* | | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-04-30 | 7 | -41/+68 |
|\ \ \ | |||||
| * \ \ | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-04-30 | 7 | -41/+68 |
| |\ \ \ | |||||
| | * | | | Fix link security issue | Melanie | 2010-04-30 | 7 | -41/+68 |
| | | | | | |||||
* | | | | | Treat a UserLevel of -1 as an unverified account and refer them to their | Melanie | 2010-04-30 | 2 | -0/+11 |
| | | | | | | | | | | | | | | | | | | | | activation email. | ||||
* | | | | | 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 |
| | | | | |