Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'iar-merge' | Justin Clark-Casey (justincc) | 2010-08-04 | 4 | -84/+138 |
|\ | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | ||||
| * | Add --merge switch to load iar. | Justin Clark-Casey (justincc) | 2010-06-30 | 4 | -87/+141 |
| | | | | | | | | | | | | When this switch is used, iar folders are merged with existing same-name user inventory folders. This makes it a little easier to back and restore entire individual user inventories, among other things Added unit test to check behaviour | ||||
* | | Clean up some messiness in IM sending. Having offline IM enabled now no longer | Melanie Thielker | 2010-08-04 | 2 | -6/+10 |
| | | | | | | | | suppresses "Inventory Saved" messages. | ||||
* | | remove gods event subscription to gods module from scene | Justin Clark-Casey (justincc) | 2010-07-30 | 1 | -0/+13 |
| | | |||||
* | | move attachment subscription events into AttachmentsModule from scene. | Justin Clark-Casey (justincc) | 2010-07-30 | 1 | -1/+22 |
| | | | | | | | | restored to some heavy casting in order to preserve RegionCombinerModule semantics, pending better events. | ||||
* | | store terrain module trying to load plugins if plugin path does not exist | Justin Clark-Casey (justincc) | 2010-07-30 | 1 | -2/+7 |
| | | |||||
* | | move ChannelDigger from its own project into the main terrain module with ↵ | Justin Clark-Casey (justincc) | 2010-07-30 | 1 | -1/+1 |
| | | | | | | | | the rest of the effects | ||||
* | | convert attachments module from old region module style to new | Justin Clark-Casey (justincc) | 2010-07-30 | 1 | -19/+25 |
| | | |||||
* | | Allow gods and estate managers/owners to be unaffected by parcel bans | Melanie Thielker | 2010-07-29 | 2 | -0/+7 |
| | | |||||
* | | adjust DialogModule to only send broadcast alerts to root agents | Justin Clark-Casey (justincc) | 2010-07-20 | 1 | -2/+3 |
| | | |||||
* | | Allow communicating with blue box dialogs across a region border via a | Melanie Thielker | 2010-07-17 | 1 | -8/+7 |
| | | | | | | | | child agent | ||||
* | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-07-14 | 4 | -157/+213 |
|\ \ | |||||
| * \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-07-14 | 2 | -56/+55 |
| |\ \ | |||||
| * | | | improve closing of load/save iar streams in the event of a problem | Justin Clark-Casey (justincc) | 2010-07-14 | 4 | -157/+213 |
| | | | | |||||
* | | | | Detach attachments displaced by other attachments | Melanie Thielker | 2010-07-14 | 1 | -5/+19 |
| |/ / |/| | | |||||
* | | | Major attachments cleanup. Remove unused AttachObject ClientView method | Melanie | 2010-07-14 | 1 | -54/+47 |
| | | | | | | | | | | | | | | | Clean up use of AttachObject throughout, reduce number of overloads and number of parameters | ||||
* | | | Remove useless quaternion parameter from AttachObject sig | Melanie Thielker | 2010-07-14 | 1 | -4/+4 |
| | | | |||||
* | | | Fixes mantis #4870. | Diva Canto | 2010-07-14 | 1 | -1/+7 |
|/ / | |||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-07-14 | 3 | -37/+54 |
|\ \ | |||||
| * | | Removed some more debug messages. | Diva Canto | 2010-07-14 | 1 | -18/+16 |
| | | | |||||
| * | | Remove getting the object capacity from the money module. It is now set | Melanie Thielker | 2010-07-14 | 1 | -2/+2 |
| | | | | | | | | | | | | directly from the Region Info (and the region ini file) | ||||
| * | | Revamp the permissions propagation. This MAY mess up. Please test. | Melanie | 2010-07-13 | 1 | -18/+36 |
| | | | | | | | | | | | | | | | | | | | | | Change the slam bit from 3 to 4. Assume the old slam bit is always set. The new slam bit is a "changed owner" bit, correcting a bug where an item passed from the creator to another with less than full perms, then back (sale test) would arrive back full perm. Lots of in-code docs. | ||||
| * | | Add CreateSelected flag onto objects rezzed from inventory | Melanie Thielker | 2010-07-13 | 1 | -0/+1 |
| | | | |||||
* | | | Fix obvious bug in XInventoryService.GetFolderItems() which was preventing ↵ | Justin Clark-Casey (justincc) | 2010-07-14 | 2 | -6/+128 |
|/ / | | | | | | | the iar module from being able to save single item iars | ||||
* | | uncomment a load iar code line I accidentally commented in the last commit | Justin Clark-Casey (justincc) | 2010-07-12 | 1 | -1/+1 |
| | | | | | | | | hooray for automated tests | ||||
* | | comment out a lot of the debug log messages when loading an iar | Justin Clark-Casey (justincc) | 2010-07-12 | 1 | -10/+10 |
| | | | | | | | | | | these are very redundant now and cause issues when loading large iars diva, you may want to cherry pick this for 0.7-post-fixes since it only comments out log lines and nothing else | ||||
* | | Make taken items go back to the folder they came from | Melanie Thielker | 2010-07-10 | 1 | -0/+14 |
| | | |||||
* | | Fixes additional bug reported in mantis #4841. | Diva Canto | 2010-07-05 | 2 | -8/+9 |
| | | |||||
* | | Got rid of all hyperassets references. Also fixed accessing textures in ↵ | Diva Canto | 2010-07-04 | 3 | -7/+11 |
| | | | | | | | | user's inventory in foreign grids. | ||||
* | | Started to clean up the mess with HyperAssets in LLClientView. Fixed HG ↵ | Diva Canto | 2010-07-04 | 3 | -0/+67 |
| | | | | | | | | access to Notecards in user's inventory. | ||||
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-07-02 | 1 | -1/+1 |
|\ \ | |||||
| * | | Clean up IMoneyModule and adjust the other modules to the changes | Melanie Thielker | 2010-07-02 | 1 | -1/+1 |
| | | | |||||
| * | | minor: comment out high volume texture serving module debug message | Justin Clark-Casey (justincc) | 2010-06-30 | 1 | -2/+2 |
| |/ | |||||
* | | Fixes mantis #4782 | Diva Canto | 2010-07-02 | 1 | -1/+1 |
| | | |||||
* | | minor: comment out high volume texture serving module debug message | Justin Clark-Casey (justincc) | 2010-06-30 | 1 | -2/+2 |
|/ | |||||
* | Remove the override from DeletToInventory in HGInventoryAccessModule. This ↵ | Diva Canto | 2010-06-29 | 1 | -1/+2 |
| | | | | may be causing the infinite loop, not sure. | ||||
* | Revert "don't report the null uuid as a missing asset on saving oars/iars" | Justin Clark-Casey (justincc) | 2010-06-29 | 1 | -5/+3 |
| | | | | | | | This reverts commit 5ce119174e03715bfc61f7864bd3e7182c5d21ea. This change led to infinite timeout since the expected number of assets no longer matched requests. Rather than introduce yet fresh bugs with another fix, just revert this since the inaccurate report is just inconvenient | ||||
* | Buglet fix in HG inventory. Make sure that GetRootFolder for non-HG ↵ | Diva Canto | 2010-06-29 | 1 | -1/+1 |
| | | | | xinventory is the folder "My Inventory". Also changed the Suitcase folder name to "My Suitcase". | ||||
* | Bug fix in HG standalone: wrong handler in the in module. Fixed a few broken ↵ | Diva Canto | 2010-06-29 | 2 | -12/+3 |
| | | | | comments in InventoryAccessModule. | ||||
* | One more bug fix in FriendsModule: GrantRights. One of the caches was not ↵ | Diva Canto | 2010-06-28 | 1 | -0/+7 |
| | | | | being updated. | ||||
* | Change the way IRegionModule us referenced by IEmailModule to | Melanie Thielker | 2010-06-28 | 1 | -1/+1 |
| | | | | allow later conversion to new style | ||||
* | don't report the null uuid as a missing asset on saving oars/iars | Justin Clark-Casey (justincc) | 2010-06-25 | 1 | -3/+5 |
| | |||||
* | Security fix: Allow only textures to be fetched using HTTP texture cap | Melanie Thielker | 2010-06-22 | 1 | -0/+12 |
| | |||||
* | Bug fix: wrong name of requester in local friendship offer. | Diva Canto | 2010-06-19 | 1 | -1/+4 |
| | |||||
* | Fix problem where iar load would duplicate huge number of folders | Justin Clark-Casey (justincc) | 2010-06-18 | 2 | -29/+52 |
| | | | | | This was http://opensimulator.org/mantis/view.php?id=4770 Extend unit tests to check for this scenario too | ||||
* | change TestPartExistingIarPath() to check appropriate folder creation | Justin Clark-Casey (justincc) | 2010-06-18 | 2 | -32/+45 |
| | | | | change some names in InventoryArchiveReadRequest in an effort to make the code more comprehendable | ||||
* | in IAR utils, return all folders that match a particular path rather than ↵ | Justin Clark-Casey (justincc) | 2010-06-18 | 4 | -27/+36 |
| | | | | just the first one | ||||
* | Fixes the long-standing RegionUp bug! Plus lots of other cleanups related to ↵ | Diva Canto | 2010-06-13 | 8 | -31/+37 |
| | | | | neighbours. | ||||
* | Added checks for failed UpdateAgent calls. | Diva Canto | 2010-06-12 | 1 | -17/+29 |
| | |||||
* | * Added CHANGED_TELEPORT event trigger upon inter-sim teleports. | Diva Canto | 2010-06-12 | 1 | -1/+1 |
| | | | | * Cleaned up NewUserConnection. |