Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-05-04 | 1 | -0/+14 | |
| |\ | ||||||
| * | | Fixed: migration #2 for SQLite. Problem was that ATTACH cannot be done ↵ | Diva Canto | 2010-05-04 | 1 | -3/+2 | |
| | | | | | | | | | | | | inside a transaction. | |||||
* | | | Add events to the estate interface to let interested modules know of | Melanie Thielker | 2010-05-04 | 2 | -0/+41 | |
| |/ |/| | | | | | changes to estate settings | |||||
* | | Add "reload estate" command to sims | Melanie Thielker | 2010-05-04 | 1 | -0/+14 | |
|/ | ||||||
* | Allow reloading of estate settings into a running region. Move sun update | Melanie Thielker | 2010-05-04 | 2 | -37/+49 | |
| | | | | | helper into Scene, since that is less evil than exposing m_storageManager to the public. | |||||
* | Allow regions to get the list of the other regions in the estate | Melanie Thielker | 2010-05-04 | 1 | -1/+30 | |
| | ||||||
* | Refix the fix | Melanie Thielker | 2010-05-03 | 1 | -1/+1 | |
| | ||||||
* | Add folder version incrementing to XInventoryService. Fixes offline give | Melanie Thielker | 2010-05-03 | 1 | -0/+31 | |
| | | | | for avatar->avatar | |||||
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-05-03 | 8 | -31/+45 | |
|\ | ||||||
| * | Assorted bug fixes in hypergrid linking. | Diva Canto | 2010-05-03 | 8 | -31/+45 | |
| | | ||||||
* | | Store given items in correct parent folder. Fixes items given to offline avatars | Melanie Thielker | 2010-05-03 | 1 | -0/+19 | |
|/ | | | | not getting lost. | |||||
* | Fix a bug in owner change notification | Melanie | 2010-05-03 | 1 | -1/+3 | |
| | ||||||
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-05-03 | 1 | -1/+1 | |
|\ | ||||||
| * | Merge branch 'master' of ssh://MyConnection/var/git/opensim | Teravus Ovares (Dan Olivares) | 2010-05-02 | 1 | -0/+2 | |
| |\ | ||||||
| * | | * Untested Suggestion from lkalif to change | Teravus Ovares (Dan Olivares) | 2010-05-02 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | remoteClient.SendMapBlock(blocks, 0); to remoteClient.SendMapBlock(blocks, 2); in OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs | |||||
* | | | Make in-place sale send CHANGED_OWNER again | Melanie | 2010-05-03 | 1 | -0/+3 | |
| | | | ||||||
* | | | Defer sending of CHANGED_OWNER to make it work on rezzed objects and | Melanie | 2010-05-03 | 2 | -3/+15 | |
| |/ |/| | | | | | attachments in addition to objects sold in place | |||||
* | | Add URL_REQUEST_* script constants | Melanie | 2010-05-03 | 1 | -0/+2 | |
|/ | ||||||
* | Make the IUserAccountData properly unpack the god mode data, so grid gods | Melanie Thielker | 2010-05-02 | 2 | -4/+4 | |
| | | | | work again | |||||
* | Renamed HGInventoryBroker2 to HGInventoryBroker. | Diva Canto | 2010-05-02 | 2 | -3/+2 | |
| | ||||||
* | Deleted HGInventoryBroker, so that the new one can take its name. | Diva Canto | 2010-05-02 | 1 | -540/+0 | |
| | ||||||
* | Switched everything to XInventory by default. The old Inventory is still ↵ | Diva Canto | 2010-05-02 | 4 | -84/+76 | |
| | | | | there for now, in case bugs pop up with XInventory. | |||||
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-04-30 | 3 | -3/+11 | |
|\ | ||||||
| * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-04-30 | 11 | -367/+161 | |
| |\ | ||||||
| * | | minor: eliminate more debug Console.WriteLines, convert one to logging instead | Justin Clark-Casey (justincc) | 2010-04-30 | 3 | -3/+11 | |
| | | | ||||||
* | | | Allow retrieval if admin users in scope mode | Melanie Thielker | 2010-04-30 | 1 | -0/+18 | |
| |/ |/| | ||||||
* | | Fix linking issue introduced in my earlier commit | Melanie Thielker | 2010-04-30 | 1 | -1/+19 | |
| | | ||||||
* | | 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 | |
| | | ||||||
* | | 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 | |
|/ / | ||||||
* | | 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 |