aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'careminster-presence-refactor' of ↵Mike Rieker2010-05-2753-1219/+1312
|\ | | | | | | www.3dhosting.de:/var/git/careminster into careminster-presence-refactor
| * Prevent a null refMelanie Thielker2010-05-271-0/+3
| |
| * Comment noisy "CONNECTION DEBUGGING" messages, because they push moreMelanie Thielker2010-05-272-14/+14
| | | | | | | | important stuff off screen too fast. Clean this time
| * Just because there is an agent update handler, that doesn't mean there isMelanie Thielker2010-05-261-3/+4
| | | | | | | | a pre agent update handler. Null check these separately.
| * Merge branch 'master' into careminster-presence-refactorMelanie2010-05-2635-1194/+1148
| |\
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-05-261-2/+1
| | |\
| | | * fix sculpt normal direction for mirrored plane sculptsdahlia2010-05-241-2/+1
| | | |
| | * | Merge branch 'unitests'Melanie2010-05-2634-1198/+1147
| | |\ \ | | | |/ | | |/| | | | | Signed-off-by: Melanie <melanie@t-data.com>
| | | * Minor correction to AssetTests.csAlexRa2010-05-261-3/+3
| | | | | | | | | | | | | | | | (forgot to change test descriptions, has no effect on running the tests)
| | | * Ensured that tests are skipped for wrong conn string, also m_log chngAlexRa2010-05-231-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The base test class now tries to connect to DB, ignores all tests in the class if unable to. Also m_log changed to instance field (which in this case shouldn't cause any problems), to avoid having to define it separately in each derived class. Here I touched things that I don't understand well (using log4net), so please review this commit.
| | | * Removed (unused?) empty SQL files from MSSQL resource dirAlexRa2010-05-239-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | There was a whole bunch of these SQL files, all empty and apparently unused. Removing them is just a clean-up, if anybody has a reason for these files to be there, feel free to revert.
| | | * MySQL Migrations: Minor correcton to Region/Estate splitAlexRa2010-05-232-6/+12
| | | | | | | | | | | | | | | | (some Estate SQL left behind in the Region migration)
| | | * MSSQL Migration: CreatorID in InventoryItems changed to VARCHAR(36)AlexRa2010-05-231-0/+70
| | | | | | | | | | | | | | | | Again, the same thing about potentially having non-GUID CreatorID.
| | | * Various minor changes in the data testsAlexRa2010-05-235-16/+18
| | | |
| | | * Further corrections to MS SQL stores (now passes all tests)AlexRa2010-05-232-89/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Besides, AssetData is slightly optimized to StoreAsset in one request ("IF EXISTS() UPDATE ... ELSE INSERT ...") The main change in the MS SQL Inventory implem. is that it now return empty list (or whatever) when called with UUID.Zero, which is consistent with how the code for other DBs work. I did no changes at all in XInventory, as there is no test set for them.
| | | * Split migrations for RegionStore and EstateStore (see WARNING!)AlexRa2010-05-234-103/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ok, so the estate stores now want their own migration files, but as it happened the SQL definition were inside the Region migrations. It seems better/cleaner to keep each 'store' separately updatable. WARNING: any editing in the middle of the migration scripts (as opposite to just appending to them) has the potential of messing up updates of existing databases. As far as I can see, this one is (probably) safe, the worst that could happen is the EstateStore migration silently fail if the estate the tables are already there.
| | | * Unitests: Asset, Estate, Region (the "legacy" one), InventoryAlexRa2010-05-235-173/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests have been modified to work under NUnit 2.4.6 (the one currently used in the project). They will also work with NUnit 2.5+ as is, but will look better if you #define NUNIT25 for them.
| | | * Added MS SQL test conn to INI - only as an example, modify before use!!!AlexRa2010-05-231-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | NOTE that this INI file is currently loaded as a embedded RESOURCE, which is weird and has a disadvantage of having to rebuild the Tests whenever the conn strings are changed. The only reason is that I couldn't figure out a reliable way to put this INI into the correct dir at runtime. If somebody can do it, that would be cool.
| | | * Removed MySql and SQLite-specific asset test filesAlexRa2010-05-232-156/+0
| | | |
| | | * BasicAssetTest.cs replaced by AssetTests.csAlexRa2010-05-231-0/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AssetTests: The name has changed to reflect the fact it is no longer a base class, but the complete asset test for all supported databases. The test can also check storing of CreatorID, but the feature is disabled at this commit!
| | | * Bugfix in tests (must clear db before migrations, not after)AlexRa2010-05-233-3/+3
| | | |
| | | * EstateData tests passing on all DBsAlexRa2010-05-231-28/+2
| | | |
| | | * Corrections in RegionTests.cs. It now fully works!AlexRa2010-05-231-48/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem was that some tests relied on prior tests to leave the DB in a particular state, but the test class cleared the DB every time. The affected tests have been merged into one to remove the dependencies. tested on all 3 Dbs, all tests green.
| | | * Minor corrections in BasicDataServiceTest.csAlexRa2010-05-231-0/+41
| | | | | | | | | | | | | | | | | | | | (added more functions for cleaning up DB from the derived tests)
| | | * MSSQL: added asset_flags, CreatorID to migrationsAlexRa2010-05-231-0/+6
| | | |
| | | * MSSQLAssetData updated to support [CreatorID], [asset_flags]AlexRa2010-05-231-5/+11
| | | |
| | | * MSSQLAssetData: fixed some weirdnessAlexRa2010-05-231-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed unfinished SQL in FetchAssetMetadataSet, fixed SQL in UpdateAsset (must not modify ID). NOT tested! But apparently shouldn't work worse than the previous version, esp. the FetchMetadata thing.
| | | * All data tests made DBMS-independentAlexRa2010-05-2310-610/+160
| | | |
| | | * Added generic base classes for testing database servicesAlexRa2010-05-233-0/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are some generic classes that simplify writing tests for any of the data connectors and databases. Among other things, configuring the connection strings is done once, in a separate resource file. Tests based on the new BasicDataServiceTest class require NUnit 2.5 or better.
| * | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-243-4/+5
| |\ \ \ | | |/ /
| | * | Change the way alpha is interpreted on prim text. Manris #4723Melanie2010-05-241-1/+1
| | | |
| | * | minor: expand upon comments about not scheduling two full updates for ↵Justin Clark-Casey (justincc)2010-05-241-2/+3
| | | | | | | | | | | | | | | | attachments
| | * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-05-2312-7/+130
| | |\ \
| | | * | Remove an unneeded conditionalMelanie2010-05-231-2/+1
| | | |/
| | * | The 8th migration statement in AssetStore.migrations didn't look right.Diva Canto2010-05-231-1/+1
| | | |
| * | | Add the SitGround flag back inMelanie2010-05-231-1/+4
| | | |
| * | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-2312-3/+134
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | * | Apply http://opensimulator.org/mantis/view.php?id=4632Justin Clark-Casey (justincc)2010-05-212-2/+60
| | | | | | | | | | | | | | | | | | | | Adds dialog methods for MRM. Thanks ziah.
| | * | Apply http://opensimulator.org/mantis/view.php?id=4627Justin Clark-Casey (justincc)2010-05-212-0/+20
| | | | | | | | | | | | | | | | Adds OwnerId and CreatorId properties to MRM.IObject
| | * | Apply adaption of patch in http://opensimulator.org/mantis/view.php?id=4628Justin Clark-Casey (justincc)2010-05-211-3/+2
| | | | | | | | | | | | | | | | | | | | This prevents a ground-sitting avatar from being moved about in mouselook Thanks mirceakitsune!
| | * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-05-211-0/+57
| | |\ \ | | | |/
| | * | Added overload of SendGenericMessage to LLClientView with string list as ↵Mikko Pallari2010-05-219-0/+47
| | | | | | | | | | | | | | | | parameter. Now modules themselfs don't necessarily need to convert strings to byte arrays. Added this as it was removed in LightShare patch.
* | | | fix hanging output throttle arithmeticMike Rieker2010-05-271-39/+27
|/ / / | | | | | | | | | had multiply overflow and subtract wrap-around errors
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-2128-420/+544
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-05-212-69/+68
| |\ \ | | |/
| | * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-05-212-17/+32
| | |\
| | | * Added a sanity check before using m_config in the Scene constructorJohn Hurliman2010-05-211-16/+19
| | | |
| | * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-05-2115-315/+207
| | |\ \
| | * | | rearrange SceneGraph.AddSceneObject() to return earlier if an object with ↵Justin Clark-Casey (justincc)2010-05-211-53/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that uuid is already in the scene this means that we don't perform pointless work
| * | | | Add a new priority scheme that works like FrontBack, but completely ↵Melanie2010-05-211-0/+57
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | deprioritizes static prims, creating a hierarchy as follows: 0 == own avatar < other avatars < pysical prims < static prims For a child agent, simply acts like FrontBack