Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-01 | 1 | -0/+1 |
|\ | |||||
| * | Start using IPrimCounts populated by PrimCountModule instead of LandData ↵ | Justin Clark-Casey (justincc) | 2011-03-25 | 1 | -0/+1 |
| | | | | | | | | | | | | | | counts populated by LandManagementModule. In order to pass ILandObject into IClientAPI.SendLandProperties(), had to push ILandObject and IPrimCounts into OpenSim.Framework from OpenSim.Region.Framework.Interfaces, in order to avoid ci Counts are showing odd behaviour at the moment, this will be addressed shortly. | ||||
* | | Remove a spammy debug | Melanie | 2011-03-23 | 1 | -2/+2 |
| | | |||||
* | | Raise the position for lures by 2m to prevent the target avatar getting stuck | Melanie | 2011-03-23 | 1 | -1/+1 |
| | | | | | | | | in a prim. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-14 | 4 | -132/+269 |
|\ \ | |/ | |||||
| * | factor inventory file loading into its own method | Justin Clark-Casey (justincc) | 2011-03-12 | 1 | -57/+80 |
| | | |||||
| * | factor out iar asset load code into its own method | Justin Clark-Casey (justincc) | 2011-03-12 | 1 | -29/+40 |
| | | |||||
| * | refactor: make boolean load indicators on load iars instance fields | Justin Clark-Casey (justincc) | 2011-03-12 | 1 | -8/+11 |
| | | |||||
| * | introduce iar load checks which make sure archive.xml comes first, then ↵ | Justin Clark-Casey (justincc) | 2011-03-12 | 1 | -1/+32 |
| | | | | | | | | | | | | inventory nodes, then assets this is necessary for correct loading. "save iar" always saves in this order so there shouldn't be any problems - these checks are to give better feedback to other systems that may construct IARs. | ||||
| * | Add test for simple case where creator account with appropriate uuid exists ↵ | Justin Clark-Casey (justincc) | 2011-03-10 | 1 | -0/+32 |
| | | | | | | | | on the target system for an iar load | ||||
| * | refactor: rename test user account fields | Justin Clark-Casey (justincc) | 2011-03-10 | 3 | -35/+35 |
| | | |||||
| * | factor out common scene setup code in InventoryArchiveTestCase | Justin Clark-Casey (justincc) | 2011-03-10 | 2 | -41/+33 |
| | | |||||
| * | extend TestLoadIarV0_1AbsentCreator() to check serialized object CreatorId ↵ | Justin Clark-Casey (justincc) | 2011-03-10 | 1 | -0/+6 |
| | | | | | | | | as well | ||||
| * | re-enable item.CreatorId check in TestLoadIarV0_1AbsentCreator() | Justin Clark-Casey (justincc) | 2011-03-10 | 2 | -5/+6 |
| | | |||||
| * | For objects loaded from an IAR, make sure the CreatorID points towards the ↵ | Justin Clark-Casey (justincc) | 2011-03-10 | 2 | -8/+42 |
| | | | | | | | | | | | | | | | | | | OSP resolved ID if newer CreationData is not present. This should resolve issues where the creator for rezzed objects was being shown as "Unknown user" where previous behaviour was to show the OSP resolved account. This is being done by parsing the serialized objects and updating the CreatorID if no CreationData exists. This operation might be expensive for sculpties where the sculpt texture is inlined with the object data. Will just have to see. This relies on the IAR streaming inventory data before asset data (as is currently the case). Will need to introduce more stringent checks for file order on loading (much like JAR zips must start with the manifest file). This is for IAR loading only. Tests updated to check this behaviour. | ||||
| * | When setting up default iar for testing, use iar archiving code rather than ↵ | Justin Clark-Casey (justincc) | 2011-03-10 | 3 | -13/+17 |
| | | | | | | | | constructing the tar manually | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-10 | 5 | -602/+661 |
|\ \ | |/ | |||||
| * | Change existing users load iar test so that it fulfills it's original ↵ | Justin Clark-Casey (justincc) | 2011-03-10 | 2 | -11/+15 |
| | | | | | | | | | | | | intention (i.e. OSPA resolution, which is still active). Will need to write a separate test for the simplest case where creator accounts with appropriate uuids exist on iar load. | ||||
| * | Split the inventory path testing parts of TestLoadIarV0_1ExistingUsers() ↵ | Justin Clark-Casey (justincc) | 2011-03-10 | 2 | -23/+46 |
| | | | | | | | | into a new test TestLoadIarToInventoryPaths() | ||||
| * | Make the item created in the default test iar an object rather than a script | Justin Clark-Casey (justincc) | 2011-03-09 | 1 | -2/+27 |
| | | |||||
| * | minor: change the order of some default iar setup in test case | Justin Clark-Casey (justincc) | 2011-03-09 | 1 | -5/+7 |
| | | |||||
| * | Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately. | Justin Clark-Casey (justincc) | 2011-03-09 | 3 | -3/+0 |
| | | | | | | | | This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement. | ||||
| * | Split out path tests from InventoryArchiveTests. Factor common code into ↵ | Justin Clark-Casey (justincc) | 2011-03-09 | 3 | -531/+562 |
| | | | | | | | | test case parent | ||||
| * | Simplify TestLoadIarV0_1AbsentUsers() to use common IAR test setup. Make ↵ | Justin Clark-Casey (justincc) | 2011-03-09 | 2 | -50/+17 |
| | | | | | | | | static dictionaries on NullUserAccountData instance instead to stop user accounts being carried over between tests | ||||
| * | Make -m shortcut option for --merge on load iar specific. Correct some log ↵ | Justin Clark-Casey (justincc) | 2011-03-08 | 1 | -7/+7 |
| | | | | | | | | message origins. | ||||
| * | Construct test load iar only once and reuse for each test, rather than ↵ | Justin Clark-Casey (justincc) | 2011-03-05 | 1 | -8/+18 |
| | | | | | | | | recreating it every time | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-27 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | change some log messages from info to debug | Justin Clark-Casey (justincc) | 2011-02-25 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2011-02-21 | 1 | -14/+50 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | throttle group notices to max of 4 threads at a time | Mike Rieker | 2011-02-20 | 1 | -14/+50 |
| | | | | | | | | | | | | ...otherwise it can create hundreds of threads and hang | ||||
* | | | Prevent attaching things you don't own from inworld. Simple solution for a | Melanie | 2011-02-21 | 1 | -0/+7 |
|/ / | | | | | | | complex issue | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-19 | 1 | -42/+18 |
|\ \ | |/ | |||||
| * | Changed console command "alert" and added new command "alert-user". | Marck | 2011-02-16 | 1 | -42/+18 |
| | | | | | | | | | | This addresses Mantis #4709. Command "alert" always sends a message to everybody; the variant "alert general" has been removed. Sending messages to one user is done with the dedicated command "alert-user". | ||||
* | | Fix merge issues | Melanie | 2011-02-07 | 1 | -6/+0 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-07 | 2 | -3/+11 |
|\ \ | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs OpenSim/Services/GridService/HypergridLinker.cs | ||||
| * | Addresses mantis #5360: CreatorData was being written as long as it wasn't ↵ | Diva Canto | 2011-02-03 | 1 | -0/+2 |
| | | | | | | | | null. This made iars backwards incompatible when some items had non-null foreign creators. This patch adds an explicit option (-c) to preserve foreign creator information. | ||||
| * | Comment out texture CAPS 'texture not found' message for now | Justin Clark-Casey (justincc) | 2011-02-02 | 1 | -3/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-29 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | minor: remove a few mono compiler warnings | Justin Clark-Casey (justincc) | 2011-01-28 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-27 | 2 | -14/+13 |
|\ \ | |/ | |||||
| * | Removed a few more spurious appearance saves. When an avatar | Mic Bowman | 2011-01-25 | 2 | -13/+13 |
| | | | | | | | | | | | | | | enters a region the attachments module tries to update the appearance with attachments that are already part of the appearance. Just added a check to only save if the attachments weren't there before. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-23 | 6 | -20/+20 |
|\ \ | |/ | |||||
| * | remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-01-21 | 4 | -10/+11 |
| | | |||||
| * | For now, comment out logging messages about IM sending, since these cause ↵ | Justin Clark-Casey (justincc) | 2011-01-19 | 1 | -3/+3 |
| | | | | | | | | high spam for large group messaging | ||||
| * | with mic's permission, reduce appearance, baked texture logging verbosity ↵ | Justin Clark-Casey (justincc) | 2011-01-19 | 1 | -3/+3 |
| | | | | | | | | for now | ||||
| * | With mic's permission, adjust long call time info messages to 500ms from 200ms | Justin Clark-Casey (justincc) | 2011-01-19 | 1 | -1/+1 |
| | | |||||
| * | Downgrade and comment out some other caps messages for now | Justin Clark-Casey (justincc) | 2011-01-19 | 1 | -5/+4 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-18 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Fix build break | Melanie | 2011-01-18 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-18 | 3 | -4/+4 |
|\ \ | |/ |