aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-05-041-0/+14
| |\
| * | Fixed: migration #2 for SQLite. Problem was that ATTACH cannot be done ↵Diva Canto2010-05-041-3/+2
| | | | | | | | | | | | inside a transaction.
* | | Add events to the estate interface to let interested modules know ofMelanie Thielker2010-05-042-0/+41
| |/ |/| | | | | changes to estate settings
* | Add "reload estate" command to simsMelanie Thielker2010-05-041-0/+14
|/
* Allow reloading of estate settings into a running region. Move sun updateMelanie Thielker2010-05-042-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 estateMelanie Thielker2010-05-041-1/+30
|
* Refix the fixMelanie Thielker2010-05-031-1/+1
|
* Add folder version incrementing to XInventoryService. Fixes offline giveMelanie Thielker2010-05-031-0/+31
| | | | for avatar->avatar
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-05-038-31/+45
|\
| * Assorted bug fixes in hypergrid linking.Diva Canto2010-05-038-31/+45
| |
* | Store given items in correct parent folder. Fixes items given to offline avatarsMelanie Thielker2010-05-031-0/+19
|/ | | | not getting lost.
* Fix a bug in owner change notificationMelanie2010-05-031-1/+3
|
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-05-031-1/+1
|\
| * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-05-021-0/+2
| |\
| * | * Untested Suggestion from lkalif to changeTeravus Ovares (Dan Olivares)2010-05-021-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 againMelanie2010-05-031-0/+3
| | |
* | | Defer sending of CHANGED_OWNER to make it work on rezzed objects andMelanie2010-05-032-3/+15
| |/ |/| | | | | attachments in addition to objects sold in place
* | Add URL_REQUEST_* script constantsMelanie2010-05-031-0/+2
|/
* Make the IUserAccountData properly unpack the god mode data, so grid godsMelanie Thielker2010-05-022-4/+4
| | | | work again
* Renamed HGInventoryBroker2 to HGInventoryBroker.Diva Canto2010-05-022-3/+2
|
* Deleted HGInventoryBroker, so that the new one can take its name.Diva Canto2010-05-021-540/+0
|
* Switched everything to XInventory by default. The old Inventory is still ↵Diva Canto2010-05-024-84/+76
| | | | there for now, in case bugs pop up with XInventory.
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-04-303-3/+11
|\
| * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-04-3011-367/+161
| |\
| * | minor: eliminate more debug Console.WriteLines, convert one to logging insteadJustin Clark-Casey (justincc)2010-04-303-3/+11
| | |
* | | Allow retrieval if admin users in scope modeMelanie Thielker2010-04-301-0/+18
| |/ |/|
* | Fix linking issue introduced in my earlier commitMelanie Thielker2010-04-301-1/+19
| |
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-04-3079-788/+564
|\ \
| * | * XInventory fairly tested, including for HG. Almost ready to switch.Diva Canto2010-04-309-365/+140
| |/ | | | | | | * Removed a few buglets and added better exception handling.
| * take out some debug logging in the sqlite db adaptorJustin Clark-Casey (justincc)2010-04-301-3/+3
| |
| * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-04-3030-233/+1420
| |\
| * | rename SQLiteNG to SQLite and SQLite to SQLiteLegacyJustin Clark-Casey (justincc)2010-04-3070-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.Melanie2010-04-301-1/+2
| |/ |/|
* | Fix some symbol errorsMelanie2010-04-301-2/+2
| |
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-04-302-279/+282
|\ \
| * | Simplified RemoteXInventoryServiceConnector and HGBroker (2) by a lot.Diva Canto2010-04-292-279/+282
| | |
* | | Fix link security issueMelanie2010-04-307-43/+70
|/ /
* | Started redoing HGInventoryBroker for XInventory and with multi-protocol in ↵Diva Canto2010-04-294-3/+648
| | | | | | | | mind. Unfinished.
* | Merge branch 'minor-stuff'Melanie2010-04-287-67/+74
|\ \
| * | Refactoring in Migration.cs: "using()" instead of explicit Dispose()AlexRa2010-04-281-52/+56
| | | | | | | | | | | | This ensures that 'cmd' gets disposed on errors
| * | Fixed comments in Migration.cs: wrong argument order (no change to code)AlexRa2010-04-281-2/+2
| | |
| * | Compiler.cs contained method GetCompilerOutput which, apparently,unknown2010-04-281-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 commentsAlexRa2010-04-281-2/+2
| | |
| * | Spelling in FriendsModule.cs: "filed to load" -> "failed to load"unknown2010-04-281-1/+1
| | |
| * | Minor spelling corrections in MiniModule: "RetreiveAsset" changed tounknown2010-04-282-5/+5
| | | | | | | | | | | | "RetrieveAsset" and 'm_rootSceene' to m_rootScene'.
| * | Removed unused var from InventoryService.cs (-1 warning)AlexRa2010-04-281-1/+1
| | |
* | | Commented verbose debug messages from XInventory handler.Diva Canto2010-04-281-13/+13
| | |
* | | Putting it back to protected; Melanie doesn't like it to be public.Diva Canto2010-04-271-1/+1
| | |
* | | Changed GetToken from protected to public. This is not exposed at the interface.Diva Canto2010-04-271-1/+1
| | |
* | | * Thanks cmickeyb, for a patch that sanity checks if the response from ↵John Hurliman2010-04-271-1/+4
| | | | | | | | | | | | m_Database.GetAsset(assetID) is null in AssetService.cs