Commit Graph

14314 Commits (52dd547863c0cdd22f53f0efcaef11ae096855a0)

Author SHA1 Message Date
Melanie 905e5cd991 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-06-19 23:48:09 +01:00
dahlia c571c33b6b fix faulty profile cut parameter checking in llSetPrimitiveParams() - see Mantis #4510 2010-06-19 16:07:35 -07:00
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
Melanie 04b60aa490 Merge branch 'master' into careminster-presence-refactor 2010-06-19 20:32:01 +01:00
Tom Grimshaw 49d7d8534c Allow moving an avatar as part of a linkset using llSetLinkPrimitiveParams. This unlocks an awful lot of poseball-free content, and is a step towards resolving mantis #59. 2010-06-19 10:06:09 -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 2b76dba593 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Conflicts:
	OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
2010-06-19 09:02: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
Diva Canto db046f1fba Reinstated the behavior of AddPrimShape as it was as of December. Trying to fix mantis #4777 2010-06-19 08:51:07 -07:00
Tom Grimshaw 6d8da699b2 Add "AvatarHeight/2" to the Home Position when set to avoid having the avatar fall through the ground when they TP home. 2010-06-19 07:00:01 -07:00
Justin Clark-Casey (justincc) 954906f0bd remove link to wiki mysql-config since the page was out-of-date and actively misleading 2010-06-19 01:52:13 +01:00
Justin Clark-Casey (justincc) ad62ca6bab minor: correct a spelling mistake 2010-06-19 01:27:46 +01:00
Justin Clark-Casey (justincc) 8fc3745e19 Overhaul basic README.txt for new estate setup options on first run.
Also make some minor changes for clarity.
2010-06-19 01:23:52 +01:00
Justin Clark-Casey (justincc) 514732595b minor: try and make the explanations for the AllowScriptCrossing and TrustBinaries settings in OpenSim.ini.example clearer 2010-06-18 23:38:40 +01:00
Justin Clark-Casey (justincc) de84da9e7b eliminate SimianGrid [Groups] section from GridCommon.ini.example as per Nebadon
this is only used by SimianGrid and is now in SimianGrid.ini
2010-06-18 23:20:32 +01:00
Justin Clark-Casey ed01e9162d Change Opensim.Servers.exe comment at top of Robust.HG.ini to Robust.exe
This addresses http://opensimulator.org/mantis/view.php?id=4772
Thanks to aiaustin for pointing this out
2010-06-18 23:11:31 +01:00
Melanie 891214c65b Merge branch 'master' into careminster-presence-refactor 2010-06-18 20:49:21 +01: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
Kitto Flora cea7905602 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-06-17 13:04:32 -04:00
Kitto Flora 958c6c6fde Add rez on water surface. 2010-06-17 13:04:18 -04: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
Tom Grimshaw 33c092781e Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-06-17 04:15:56 -07:00
Tom Grimshaw d1c8b083b8 Fix llRot2Euler with a mathematically sound implementation. The only difference between this an SL is that SL resolves a figure of negative PI into PI, and does the equivalent in the reverse (llEuler2Rot, -1.0 becomes 1.0); 2010-06-17 04:15:07 -07:00
Melanie 8b3042f24f Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-06-17 03:09:17 +01:00
Melanie 7e22be3441 Merge branch 'master' into careminster-presence-refactor 2010-06-17 03:08:55 +01:00
Melanie 544627c79c Force newly connecting remote consoles to display a prompt 2010-06-17 03:03:55 +01:00
Tom Grimshaw b9c40320f1 Fix llAttachToAvatar. This addresses mantis 128 . 2010-06-16 09:20:20 -07:00
Tom Grimshaw 117fd629d6 Allow llMapDestination to be used in any event if the host is an attachment. This fixes Mantis 0000098. 2010-06-16 08:32:47 -07:00
Melanie 0b75f759b4 Merge branch 'master' into careminster-presence-refactor 2010-06-16 04:10: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
Diva Canto 07b8eddb64 Typo corrected in Robust.HG.ini.example 2010-06-14 19:11:49 -07:00
Melanie 0ecb45066d Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-06-15 01:53:32 +01:00
Melanie 0031d4a618 Readjust master version and flavor 2010-06-15 01:53:11 +01:00
Melanie 6dd3f2b8b8 Readusr master version and flavor 2010-06-15 01:52:37 +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 ef1496ca2d Add "alert dialog" for sending dialogs to users from the console 2010-06-14 04:28:38 -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
Tom Grimshaw 704da8c823 osGetAvatarList: Use AbsolutePosition instead of the position of the physics actor, or the avatar disappears when they sit down. 2010-06-14 04:03:54 -07: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