e22eddeee6
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-23 21:15:07 +01:00
c404c5fb54
Thank you, Snoopy, for a patch to reduce sim script startup CPU usage
2010-06-23 21:14:28 +01:00
1719dc9a9b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-23 01:22:42 +01:00
8c56f04f82
add new [RemoteAdmin] settings from Snoopy's create/update, etc user patch to OpenSim.ini.exmaple
...
Also tidies up and comments some existing entries
2010-06-23 01:21:49 +01:00
7db5262e35
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-22 23:40:12 +01:00
c96a6940a9
Line ending fix
2010-06-22 16:11:36 -07:00
1e1485de5b
* Fixed SimianGrid map tile uploads not having any objects in the images
2010-06-22 16:09:30 -07:00
68551675df
Guard prioritizer agains null values as those produced by a bullet dying
...
before it can be updated
2010-06-22 23:39:39 +01:00
854a8b9172
Security fix: Allow only textures to be fetched using HTTP texture cap
2010-06-22 23:39:25 +01:00
905e5cd991
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-19 23:48:09 +01:00
c571c33b6b
fix faulty profile cut parameter checking in llSetPrimitiveParams() - see Mantis #4510
2010-06-19 16:07:35 -07:00
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
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
24a68e36fb
Bug fix: wrong name of requester in local friendship offer.
2010-06-19 12:32:36 -07:00
1e7ce6dbce
Hunting for the problem in #4777
2010-06-19 09:44:02 -07:00
9b410f5e94
Reverting my last two commits, putting back Melanie's exception handler. Doesn't solve #4777 .
2010-06-19 09:25:36 -07:00
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
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
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
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
ad62ca6bab
minor: correct a spelling mistake
2010-06-19 01:27:46 +01:00
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
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
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
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
71a73d83cb
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-18 19:50:01 +01:00
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
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
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
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
e3432b8f63
Revert "Set command timeout to infinity on migrations"
...
This reverts commit 51d30fd34a
2010-06-17 17:48:34 +01:00
51d30fd34a
Set command timeout to infinity on migrations
2010-06-17 17:43:40 +01:00
544627c79c
Force newly connecting remote consoles to display a prompt
2010-06-17 03:03:55 +01:00
6c0a372346
* Support salted and unsalted password hashes in SimianAuthenticationServiceConnector
2010-06-15 17:46:36 -07:00
38f098588c
Fixes creation date issue on user accounts.
2010-06-15 16:36:22 -07:00
07b8eddb64
Typo corrected in Robust.HG.ini.example
2010-06-14 19:11:49 -07:00
0ecb45066d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-15 01:53:32 +01:00
0031d4a618
Readjust master version and flavor
2010-06-15 01:53:11 +01:00
6dd3f2b8b8
Readusr master version and flavor
2010-06-15 01:52:37 +01:00
462a0f24e9
Merge branch 'master' into 0.7-post-fixes
2010-06-14 11:54:40 -07:00
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
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
c75b94f9f9
Merge branch 'master' into 0.7-post-fixes
2010-06-14 04:50:27 +01:00
bd346ab8c7
Fixes attachments coming back upon being detached in neighbouring regions and crossing.
2010-06-13 19:18:17 -07:00
19558f380a
Fixes the long-standing RegionUp bug! Plus lots of other cleanups related to neighbours.
2010-06-13 19:06:22 -07:00
9069114d0f
Fox my changes to radmin
2010-06-13 21:57:56 +01:00
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
deaf6bff98
Merge branch 'master' into 0.7-post-fixes
2010-06-13 03:56:47 +01:00
eff641ab83
Added Old Guids=true to all MySql connection strings.
2010-06-12 17:08:05 -07:00
b3594681a4
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-06-12 12:09:06 -07:00
Melanie