Diva Canto
77d892690a
Merge branch 'master' into 0.7-post-fixes
2010-06-19 13:52:21 -07: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
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
Justin Clark-Casey (justincc)
ad5d1d0458
remove link to wiki mysql-config since the page was out-of-date and actively misleading
2010-06-19 01:53:14 +01: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)
672108c29d
minor: correct a spelling mistake
2010-06-19 01:28:14 +01:00
Justin Clark-Casey (justincc)
ad62ca6bab
minor: correct a spelling mistake
2010-06-19 01:27:46 +01:00
Justin Clark-Casey (justincc)
ab95239047
Overhaul basic README.txt for new estate setup options on first run.
...
Also make some minor changes for clarity.
2010-06-19 01:26:25 +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)
4d828eb3c3
minor: try and make the explanations for the AllowScriptCrossing and TrustBinaries settings in OpenSim.ini.example clearer
2010-06-18 23:39:45 +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)
fee3b32f2f
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:23:18 +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
Justin Clark-Casey
5af0d94929
Merge branch '0.7-post-fixes' of ssh://opensimulator.org/var/git/opensim into 0.7-post-fixes
2010-06-18 23:09:35 +01:00
Justin Clark-Casey
c213643ab8
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:07:51 +01:00
Melanie
1032e1142a
Remove an error in meshing error reporting. Now doesn't double-bomb
...
anymore on a bad sculpt
2010-06-18 19:50:56 +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)
165429ff4d
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 18:08:54 +01:00
Justin Clark-Casey (justincc)
701cc35c9f
change TestPartExistingIarPath() to check appropriate folder creation
...
change some names in InventoryArchiveReadRequest in an effort to make the code more comprehendable
2010-06-18 18:08:47 +01:00
Justin Clark-Casey (justincc)
e98109765c
in IAR utils, return all folders that match a particular path rather than just the first one
2010-06-18 18:08:37 +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
Diva Canto
c980326425
Merge branch '0.7-post-fixes' of ssh://diva@opensimulator.org/var/git/opensim into 0.7-post-fixes
2010-06-15 19:57:32 -07:00
Diva Canto
4baf59d2dd
Merge branch 'master' into 0.7-post-fixes
2010-06-15 19:56:09 -07:00
John Hurliman
212a538557
* Support salted and unsalted password hashes in SimianAuthenticationServiceConnector
2010-06-15 17:55:47 -07: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
cf5427e810
Fixed version info again.
2010-06-14 19:13:46 -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
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