Commit Graph

10679 Commits (99a6950b3089b7d945d2e7981780e44e469a4ed8)

Author SHA1 Message Date
Melanie a3ebd4db3f Revert "This is a HACK! Downright nasty. For some reason, the devs of the mysql"
Didn't do what it said on the package!

This reverts commit 8643db3ef0.
2010-06-19 23:45:56 +01:00
Melanie 8643db3ef0 This is a HACK! Downright nasty. For some reason, the devs of the mysql
connector have decided that their vision of timeouts is the only valid one.
This uses reflection to show them the finger. Please test.
2010-06-19 22:48:43 +01:00
Diva Canto 24a68e36fb Bug fix: wrong name of requester in local friendship offer. 2010-06-19 12:32:36 -07:00
Diva Canto 1e7ce6dbce Hunting for the problem in #4777 2010-06-19 09:44:02 -07:00
Diva Canto 9b410f5e94 Reverting my last two commits, putting back Melanie's exception handler. Doesn't solve #4777. 2010-06-19 09:25:36 -07:00
Diva Canto f0f684161e Reinstated the behavior of AddPrimShape *exactly* as it was as of December. Trying to fix mantis #4777 2010-06-19 08:57:58 -07:00
Melanie 71a73d83cb Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-06-18 19:50:01 +01:00
Melanie 47d5f90629 Remove an error in meshing error reporting. Now doesn't double-bomb
anymore on a bad sculpt
2010-06-18 19:49:14 +01:00
Justin Clark-Casey (justincc) 71c8bbaf2c Fix problem where iar load would duplicate huge number of folders
This was http://opensimulator.org/mantis/view.php?id=4770
Extend unit tests to check for this scenario too
2010-06-18 17:37:28 +01:00
Justin Clark-Casey (justincc) 11a35d8cda change TestPartExistingIarPath() to check appropriate folder creation
change some names in InventoryArchiveReadRequest in an effort to make the code more comprehendable
2010-06-18 17:10:16 +01:00
Justin Clark-Casey (justincc) cf4721a92d in IAR utils, return all folders that match a particular path rather than just the first one 2010-06-18 16:33:34 +01:00
Melanie e3432b8f63 Revert "Set command timeout to infinity on migrations"
This reverts commit 51d30fd34a.
2010-06-17 17:48:34 +01:00
Melanie 51d30fd34a Set command timeout to infinity on migrations 2010-06-17 17:43:40 +01:00
Melanie 544627c79c Force newly connecting remote consoles to display a prompt 2010-06-17 03:03:55 +01:00
John Hurliman 6c0a372346 * Support salted and unsalted password hashes in SimianAuthenticationServiceConnector 2010-06-15 17:46:36 -07:00
Diva Canto 38f098588c Fixes creation date issue on user accounts. 2010-06-15 16:36:22 -07:00
Melanie 0031d4a618 Readjust master version and flavor 2010-06-15 01:53:11 +01:00
Diva Canto 462a0f24e9 Merge branch 'master' into 0.7-post-fixes 2010-06-14 11:54:40 -07:00
Diva Canto 9c9ce9e8dd * Deleted duplicated migration that was failing anyway.
* Added an error message in initial estate owner creation that makes it clear what needs to happen.
2010-06-14 11:50:42 -07:00
Tom Grimshaw 53c32d8773 osGetAvatarList: Use AbsolutePosition instead of the position of the physics actor, or the avatar disappears when they sit down. 2010-06-14 12:09:35 +01:00
Melanie c75b94f9f9 Merge branch 'master' into 0.7-post-fixes 2010-06-14 04:50:27 +01:00
Diva Canto bd346ab8c7 Fixes attachments coming back upon being detached in neighbouring regions and crossing. 2010-06-13 19:18:17 -07:00
Diva Canto 19558f380a Fixes the long-standing RegionUp bug! Plus lots of other cleanups related to neighbours. 2010-06-13 19:06:22 -07:00
Melanie 9069114d0f Fox my changes to radmin 2010-06-13 21:57:56 +01:00
Melanie 14c587bea1 Thank you, Snoopy2, for a patch to fix RemoteAdmin. Committed with the following
changes:
- Start location is NOT optional. The signature was defined with it being mandataory and there is no reason to change it
- Adjusted comments to remove misleading or no longer true comments. Default
is neuter, according to the code, not male, as the comment stated.
2010-06-13 21:45:39 +01:00
Melanie deaf6bff98 Merge branch 'master' into 0.7-post-fixes 2010-06-13 03:56:47 +01:00
Diva Canto b3594681a4 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2010-06-12 12:09:06 -07:00
Diva Canto 66619b5996 Added checks for failed UpdateAgent calls. 2010-06-12 12:08:45 -07:00
Melanie 59acb37d92 Change name of method to better reflect what it does 2010-06-12 19:14:46 +01:00
Diva Canto b9c01a1c42 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2010-06-12 11:11:48 -07:00
Diva Canto e6efe34b4c * Added CHANGED_TELEPORT event trigger upon inter-sim teleports.
* Cleaned up NewUserConnection.
2010-06-12 11:11:13 -07:00
Melanie ceac35bac1 Log and eat sculpt meshing exceptions caused by bad jp2 data. 2010-06-12 16:25:40 +01:00
Melanie Thielker 3c036934a3 Preserving the link numbers is a serializer's highest duty.
Prevent region crossings from screwing up complex attachments by preserving
link numbers.
2010-06-12 08:28:00 +01:00
Melanie Thielker 4c58ac2c90 Make local teleports send CHANGED_TELEPORT 2010-06-12 07:35:03 +01:00
Melanie 65f03af38f Don't filre CHANGED_INVENTORY if a prim comes in from storage 2010-06-12 07:34:55 +01:00
Melanie 92fea025cb Resume scripts that have been rezzed from a prim 2010-06-12 06:13:27 +01:00
Melanie 85d2e21558 Change trunk versio to 0.7.1 Dev 2010-06-12 02:45:21 +01:00
Teravus Ovares (Dan Olivares) 99f2a1c347 * Tweak the StopFlying() method in LLClientView to fabricate a suitable landing collision plane regardless of the actual physics situation. position.Z - AvatarHeight / 6f 2010-06-11 21:46:01 -04:00
Melanie 4dd9cf1ce4 Change flavor to 0.7-RC1 2010-06-12 02:44:01 +01:00
Melanie c8ed972443 Move "StopFlying()" into LLSpace. Try to reinstate the carefully crafted packet
we used to send before slimupdates and explicitly send it
2010-06-12 01:25:25 +01:00
Melanie ed38b4a140 Some people don't use Simian. Make the connector respect that it's disabled
and not try to send a map tile in that case.
2010-06-12 00:32:54 +01:00
John Hurliman b5bc2816fc Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-06-11 15:43:22 -07:00
John Hurliman d1a324888b * Added a new method to IMapImageGenerator for getting the map tile before it is JPEG2000 compressed
* Aesthetically improved map tile water
* SimianGrid connector now uploads a PNG tile to the AddMapTile API
2010-06-11 15:37:25 -07:00
Melanie c61e998580 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-06-11 22:09:24 +01:00
Justin Clark-Casey (justincc) 0dce4f1997 Revert "Allow IInventoryService.GetFolder(folderId, userId) as well as GetFolder(InventoryFolderBase folder)"
This reverts commit 3525195bc9.
2010-06-11 22:13:36 +01:00
Melanie 694c8ab588 Remove the lastmap stuff from the map module, also remove a bunch of comments
that no longer reflect actual conditions
2010-06-11 22:08:43 +01:00
Justin Clark-Casey (justincc) 3525195bc9 Allow IInventoryService.GetFolder(folderId, userId) as well as GetFolder(InventoryFolderBase folder)
This involves no wire changes since the methods often just construct an InventoryFolderBase under the hood.
This is in line with other methods that alraedy allow requests via uuid
2010-06-11 21:55:18 +01:00
Justin Clark-Casey (justincc) 8531da37d4 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-06-11 21:18:53 +01:00
Justin Clark-Casey (justincc) 1a16a92a62 create inactive test for iar folders/items merged with existing paths
add various helper functions for simplifying test readability
2010-06-11 21:18:09 +01:00
Diva Canto 5d099182c3 Reinstated the check on im.binaryBucket.Length, this time on the local handler for inventory offers. 2010-06-11 13:14:07 -07:00
Diva Canto 556e91d33c Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2010-06-11 12:48:06 -07:00
Diva Canto d184fef4dc Inventory offers and subsequent notifications of acceptance/decline now working across the board. 2010-06-11 12:47:47 -07:00
Melanie Thielker c98b10fc8c Remove the cm* function namespace 2010-06-11 17:48:41 +01:00
Melanie Thielker 7c4cf46bac Rename CM files to LS 2010-06-11 17:42:41 +01:00
Melanie Thielker ad87bab271 Rename cm* function set to ls* (for LightShare) 2010-06-11 17:30:23 +01:00
Melanie Thielker b64f42fa41 Clone cmGetAvatarList into osGetAvatarList for more generic use. 2010-06-11 17:03:45 +01:00
Diva Canto 7f349d61cb Better friends notification: get rid of OnLogout and use OnClientClose for sending notifications. This takes care of crashed sessions. Also, made the notifications themselves asynchronous. 2010-06-11 06:32:24 -07:00
Diva Canto 2e1269e4ca Bug fix on friends notifications. OnClientClose and OnLogout ordering are unpredictable; when OnClientClosed happened first, it was removing the friends list, which would prevent OnLogout notifications to go out. 2010-06-10 21:59:12 -07:00
Diva Canto b2b6799f1c Added more debug messages to try to pinpoint where login is failing for nebadon. 2010-06-10 18:26:04 -07:00
Diva Canto e80cb815df Bug fix on attachments: attach->drop->attach works now. 2010-06-09 12:51:24 -07:00
Diva Canto 2a71df1285 Reverting that last permissions check upon drop. Looks like all dropped attachments are deleted from inventory. 2010-06-09 12:22:25 -07:00
Diva Canto 18bfe58de8 Bug fix on attachments: don't delete the item from inventory when it's dropped on the ground. 2010-06-09 11:24:37 -07:00
Diva Canto 8fc5eda2c9 Bug fix in attachments: when attaching from inworld the item's parentFolderID was wrong. 2010-06-09 10:55:37 -07:00
Melanie 1be53b58a7 Give attachments the same priority as other avatars in BestAvatarResponsiveness
policy
2010-06-09 17:02:01 +01:00
Melanie 008e840cf2 Add the BEGIN; I had missed 2010-06-09 16:37:20 +01:00
Melanie 668c3b4062 Re-add Migration version 32, which apparently got dropped completely. 2010-06-09 16:34:18 +01:00
Melanie 796e9b5cb4 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-06-09 03:52:24 +01:00
Melanie 16439fa354 If a script is deleted before it gets compiled, don't even bother to try
compiling it
2010-06-09 03:51:43 +01:00
Dan Lake ca2abc43ad Refactor SendCoarseLocations for better performance. Instead of computing list of all locations fresh for every scene presence on every frame, we will instead compute the list once every 50 frames and send to all connected presences at that time. Also, we only add 60 items to the list when there are more than 60 presences in the scene. For 1000 users, this change yields a 99.8% reduction in list processing and a 98% reduction in network bandwidth for coarse locations. 2010-06-08 16:44:18 -07:00
Diva Canto 0520b62955 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2010-06-08 15:52:56 -07:00
Diva Canto 5c0068723f Changed XInventoryData's CreatorID to a string. 2010-06-08 15:52:26 -07:00
Diva Canto 9b9804a498 * Changed CreatorIDs consistently to varchar(128)
* Deleted redundant migration for assets in SQLite
* Rewrote XInventory migrations in SQLite in the new style
2010-06-08 15:47:14 -07:00
Melanie 933bfd17f7 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-06-08 22:05:49 +01:00
Melanie Thielker a791689ceb Make the text mode remote console really work. It can now be used to send
multi-word commands with proper quoting, handles arguments with spaces
and allows interactive use, e.g. user creation.
2010-06-08 22:05:06 +01:00
Justin Clark-Casey (justincc) 24c36f26d5 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-06-08 20:07:50 +01:00
Justin Clark-Casey (justincc) 21246395be Comment out the attachment update reordering mechanism in LLClientView since this doesn't appear necessary when the prim priorities are adjusted so that root prim updates are always sent before child prim updates. 2010-06-08 15:38:53 +01:00
Justin Clark-Casey (justincc) db73b1c64e Adjust object update priorities such that root prims are sent to the viewer before child prims.
This was originally a fix for huds, since child prims fail to display if the viewer doesn't receive the root prim update first.
However, on the advice of jhurliman, this has been done for all objects, both ordinary and attachments.
The separate mechanism in LLClientView which prevents child prim updates being sent out first is still present temporarily.
This is a foreport of the equivalent fix in 0.6.9-post-fixes, though that was for attachments only.
2010-06-08 15:32:18 +01:00
Justin Clark-Casey (justincc) b6076d7b33 Reduce number of full updates sent on region crossing for attachments/huds to 1 from 3
This is one step towards reducing hud glitches on region crossing, since the viewer fails to display prims if it receives child full updates before the root prim full update
This commit also introduces a mechanism in LLClientView to stop child attachment updates ever going out before the root one
This is a very temporary mechanism and will be commented out when the next step of the fix (to give root prims higher udpate priority) is committed
This code is a foreport from the equivalent changes in 0.6.9-post-fixes
2010-06-08 15:07:57 +01:00
Melanie a246cbce8d Add a migration to adjust types in the WL table. The new connector likes that
better
2010-06-08 00:37:38 +01:00
Melanie Thielker d91bd7646d Add a call to SOG.ResumeScripts() after region crossing / teleport 2010-06-07 00:11:30 +01:00
Diva Canto ab3afd5f42 * Bug fix in TP home: typo in unpacking of GridUserInfo.
* Bug fix in TPs across neighboring regions: bug was introduced when getting rid of crashed sessions.
2010-06-05 09:39:09 -07:00
Diva Canto fe3e1c67ae Bug fix: update the list of friends upon MakeRoot, because child agents don't get notified of new friendships. 2010-06-05 06:56:36 -07:00
Justin Clark-Casey (justincc) 63797445be various refactorings on methods to replicate IAR paths to user inventory in order to improve readability 2010-06-05 00:48:33 +01:00
Justin Clark-Casey (justincc) 3c3df9f3e9 refactor: do pathname trimming outside of ReplicateArchivePathToUserInventory() 2010-06-04 23:34:42 +01:00
Justin Clark-Casey (justincc) 72bd68a21f add ability for load iar/save iar to take in arbitrary options
not used for anything yet
2010-06-04 22:17:23 +01:00
Justin Clark-Casey (justincc) 0526d3a535 bring TestLoadIarV0_1AbsentUsers() back online 2010-06-04 21:19:37 +01:00
Justin Clark-Casey (justincc) a08ace300b bring TestIarV0_1WithEscapedChars() back online 2010-06-04 21:15:25 +01:00
Justin Clark-Casey (justincc) f523c2033d bring test TestLoadIarV0_1ExistingUsers() back online 2010-06-04 21:11:13 +01:00
Justin Clark-Casey (justincc) df2bcf7b6b remove pointless mock user account service since the real one can now be easily configured for test purposes 2010-06-04 20:56:24 +01:00
Justin Clark-Casey (justincc) f319d2ef5e Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-06-04 20:44:01 +01:00
Justin Clark-Casey (justincc) 75878c8f43 get TestSaveIarV0_1() working again by setting up an OpenSim.Data.Null.UserAuthenticationData plugin
additional tweaks to get this working properly
2010-06-04 20:43:05 +01:00
Diva Canto 281eb0c626 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2010-06-04 11:00:29 -07:00
Diva Canto 952029380a Fixed a couple of buglets in Friendship offers / acceptance / decline when avies are in different sims. 2010-06-04 10:59:59 -07:00
Justin Clark-Casey (justincc) 86f2339b6e remove estate stuff in sqlite region migrations since this also exists in estate migrations, change Sandbox to sandbox in sqlite region migrations
re-enabling the sqlite data tests revealed these errors!
2010-06-04 18:46:58 +01:00
Justin Clark-Casey (justincc) 5c322335e5 add sqlite database back to database tests
this appears to be okay even though we reuse it between runs without deleting it first.
size of the database appears not to be changing though that could be deceptive
2010-06-04 18:27:16 +01:00
Justin Clark-Casey (justincc) 041f253e2b minor: comment out region interface registration log msg I accidentally left in last week
also changes one log message to print out full exception stack trace on both mono/.net instead of just .net
2010-06-04 18:08:40 +01:00
Justin Clark-Casey (justincc) 55040a84a5 Fix bug where prim items were not loaded in the new sqlite database handler
This addresses mantis http://opensimulator.org/mantis/view.php?id=4739
2010-06-04 17:14:12 +01:00
Melanie b198763d67 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-06-02 01:22:10 +01:00
Melanie Thielker aa5a346a68 Add a forgotten security check. Make the new functions only work on prims
owned by the host prim owner.
2010-06-02 01:21:55 +01:00
Melanie Thielker 53e96dccef Add two new osFunctions:
list osGetPrimititveParams(key prim, list rules);
osSetPrimitiveParams(key prim, list rules);
2010-06-02 01:21:50 +01:00
John Hurliman d740035ef4 Applying patch from coyled to fix IAR support with the SimianGrid connectors 2010-06-01 13:32:14 -07:00
Melanie Thielker a863eb9da3 One should not lock null objects. 2010-06-01 19:01:57 +01:00
Melanie 9c3c020697 Lock the object queue when dequeueing 2010-06-01 15:08:45 +01:00
Melanie 5270e54268 Comment and remove JScript support. Mono 2.7Dev and 2.8 no longer include the
needed libraries
2010-06-01 14:20:39 +01:00
Melanie Thielker 4867dd135d Fix prim returns I broke earlier 2010-06-01 02:12:56 +01:00
Melanie Thielker a5728cc91c Fix prim returns I broke earlier 2010-06-01 02:10:53 +01:00
Melanie Thielker f29cb57bf1 Continuing refactor. Refactor DeRezObject to deal with multiple objects 2010-06-01 02:10:22 +01:00
Melanie Thielker bde01e26e1 Add a method to get the bounding box and root prim offsets within it for
a group of prims.
2010-06-01 02:10:11 +01:00
Melanie Thielker 2fce7d9bcf Split GetAxisAlignedBoundingBox into two methods to allow calculation of
combined bounding boxes and offsets
2010-06-01 02:10:08 +01:00
Melanie Thielker be69259981 Change the handling of CreateSelected. Only send it on real creation, not
for each prim coming into view.
2010-06-01 01:39:54 +01:00
Melanie Thielker e515467c5e Fix create selection getting overwritten by multiple updates for the same prim. 2010-05-31 17:55:56 +01:00
Melanie Thielker 8df9f272eb Fix a nullref in EventManager caused by RegionReady not setting the scene 2010-05-30 23:57:13 +01:00
Melanie Thielker f1a1d7a521 Changes osFunction permissions again. Allow_ with a list of UUIDs now again
refers to prim OWNERS. A new option set, Creators_, is added to allow
selection by script creator. For existing installs, this means no functional
change. The warning from my prior commit doesn't apply anymore.
2010-05-30 14:42:58 +01:00
Melanie Thielker bfcac0ede8 Changes OSSL Api permissions for the case of UUID list. In 0.6.9, the UUIDs
would be the IDs of the prim owners in whose prims these functions would
run. This changes it so the UUID is the SCRIPT CREATOR instead. Further,
osfunctions limited by uuid will not run if the creator and owner differ
and the owner has mod rights on the script.
There is still a danger in passing moodifiable scripts to others, as they
can insert a harmful function, then remove the mod rights to make it runnable.
As before, care needs to be taken, but where it was modable prims that were
the risk before, modable scripts are the weak spot now.
In cases where prim owner == script creator == script owner, nothing will
change.
2010-05-30 12:45:16 +01:00
Melanie Thielker cd77648f48 Get the user's DOB back from the server response properly. 2010-05-29 04:09:47 +01:00
Justin Clark-Casey (justincc) 191db0e6a4 get TestSaveIarV0_1() uncommented but not running as a test yet since I didn't get the authentication server to work and my brain is about to fizzle out my ears 2010-05-28 23:14:24 +01:00
Justin Clark-Casey (justincc) a60ca5236c restore InventoryArchiverTests.TestReplicateArchivePathToUserInventory() to work with the new UserAccountService/InventoryService 2010-05-28 21:37:48 +01:00
Justin Clark-Casey (justincc) 0ef41e62bc minor: move a method so that the #regions make more sense 2010-05-28 21:18:55 +01:00
Justin Clark-Casey (justincc) 505cb82dee fission UserAccountService.HandleCreateUser() into two methods, one which handles user command parsing and another which actually does the work 2010-05-28 21:14:15 +01:00
Justin Clark-Casey (justincc) 3c0f34bc2b If a command has descriptive help, add a line above and below the print out for readability 2010-05-28 20:51:02 +01:00
Justin Clark-Casey (justincc) 2e2f73bdd5 minor: remove mono compiler warning 2010-05-28 20:12:06 +01:00
Justin Clark-Casey (justincc) fff5459f4d Add ability to load IARs directly from URIs
So, something like

load iar Justin Clark-Casey / PASSWORD http://justincc.org/downloads/iars/my-great-items.iar

Will load my IAR directly from the web.
2010-05-28 20:07:15 +01:00
Justin Clark-Casey (justincc) 14c39461c2 minor: remove mono compiler warning 2010-05-28 19:41:13 +01:00
Justin Clark-Casey (justincc) b1298fca0a tidy up help information on load oar and save oar 2010-05-28 19:36:30 +01:00
Justin Clark-Casey (justincc) d72435693b refactor: move GetStream and URI methods from ArchiveReadRequest -> ArchiveHelpers 2010-05-28 19:21:00 +01:00
Justin Clark-Casey (justincc) 6b568af565 Adjust Scene.DeleteAllSceneObjects() to not delete objects attached to avatars.
This is going to be the right behaviour in all cases, I should think.
This means that avatars in region when an oar is loaded do not lose their attachments
2010-05-28 18:49:32 +01:00
Justin Clark-Casey (justincc) 1042ce7283 comment out large chunks of appearance/inventory region access services to eliminate warnings that this code is unused 2010-05-28 18:42:25 +01:00
Justin Clark-Casey (justincc) 565db4635f add a smidgen more log debug information in the form of the operating system version 2010-05-28 18:30:33 +01:00
Justin Clark-Casey (justincc) 877fe774ef Simplify AddFullUpdateToAvatars()/AddPartialUpdateToAvatars() by calling the object's corresponding single avatar update method, rather than calling the sceneviewer directly 2010-05-28 17:58:51 +01:00
Justin Clark-Casey (justincc) 596001632b remove redundant ScenePresence.QueuePartForUpdate() - every place in the code calls SceneViewer.QueuePartForUpdate() directly 2010-05-28 17:53:57 +01:00
Melanie Thielker 8fb706716b Prevent a null ref 2010-05-27 19:09:06 +01:00
Melanie Thielker ecc77e3886 Comment noisy "CONNECTION DEBUGGING" messages, because they push more
important stuff off screen too fast. Clean this time
2010-05-27 19:09:00 +01:00
Melanie a48d7f62a7 Revert "Comment noisy "CONNECTION DEBUGGING" messages, because they push more"
Some other stuff snuck in.

This reverts commit 4cc533e7ad94d148351c16f48afd2a688a64c48a.
2010-05-27 19:02:20 +01:00
Melanie Thielker 6b6425aa5e Comment noisy "CONNECTION DEBUGGING" messages, because they push more
important stuff off screen too fast
2010-05-27 18:44:15 +01:00
Melanie Thielker 9ac8d2de79 Just because there is an agent update handler, that doesn't mean there is
a pre agent update handler. Null check these separately.
2010-05-26 18:25:53 +01:00
Melanie a69c1c7898 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-05-26 10:56:37 +01:00
Melanie 1c7f60ab49 Merge branch 'unitests'
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-26 10:56:24 +01:00
AlexRa 5d65ef2db3 Minor correction to AssetTests.cs
(forgot to change test descriptions, has no effect on running the tests)
2010-05-26 10:25:56 +03:00
dahlia 5e719d13ef fix sculpt normal direction for mirrored plane sculpts 2010-05-24 19:15:04 -07:00
Melanie 7d9b316ce6 Change the way alpha is interpreted on prim text. Manris #4723 2010-05-24 23:37:47 +01:00
Justin Clark-Casey (justincc) c7c9edd049 minor: expand upon comments about not scheduling two full updates for attachments 2010-05-24 20:11:06 +01:00
Diva Canto 30e94cd075 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2010-05-23 12:23:16 -07:00
Diva Canto 1ab826d67c The 8th migration statement in AssetStore.migrations didn't look right. 2010-05-23 12:22:47 -07:00
AlexRa 57f4729eea Ensured that tests are skipped for wrong conn string, also m_log chng
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.
2010-05-23 12:46:33 +03:00
AlexRa b9b6d9c4ea Removed (unused?) empty SQL files from MSSQL resource dir
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.
2010-05-23 11:48:30 +03:00
AlexRa 05d9ca1b26 MySQL Migrations: Minor correcton to Region/Estate split
(some Estate SQL left behind in the Region migration)
2010-05-23 11:48:28 +03:00
AlexRa 52a3dbd076 MSSQL Migration: CreatorID in InventoryItems changed to VARCHAR(36)
Again, the same thing about potentially having non-GUID CreatorID.
2010-05-23 11:48:25 +03:00
AlexRa 89b7c64b6f Various minor changes in the data tests 2010-05-23 11:48:22 +03:00
AlexRa 9976cb93ce Further corrections to MS SQL stores (now passes all tests)
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.
2010-05-23 11:48:19 +03:00
AlexRa ebc2b6d4f6 Split migrations for RegionStore and EstateStore (see WARNING!)
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.
2010-05-23 11:48:16 +03:00