OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
12,657 Commits
104 Branches
0 Tags
299 MiB
Commit Graph

12657 Commits (536699cf43b5c606fdbdbc7c52a1210ca7f614b0)

Author SHA1 Message Date
Justin Clark-Casey (justincc) 2c4df19805 minor: Move log information about SYSTEMIP to the place where it's resolved 2010-06-25 18:29:02 +01:00
Diva Canto 7488f61289 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-06-25 05:15:54 -07:00
Diva Canto 977eccf127 This file wants to be committed. Line endings mess up. 2010-06-25 05:15:26 -07:00
John Hurliman 31b7279095 * SimianAssetServiceConnector Delete() was expecting the wrong type of response, reporting false errors 
* Fixed a typo in a WebUtil error message
 2010-06-24 13:44:34 -07:00
John Hurliman 6848465ae2 * SimianAssetServiceConnector Delete() was expecting the wrong type of response, reporting false errors 
* Fixed a typo in a WebUtil error message
 2010-06-24 13:43:38 -07:00
Melanie 5a071dc798 Move loading of parcels to before script start. Scripts using parcel functions 
can fail if no land is loaded
 2010-06-24 03:24:38 +01:00
Melanie e22eddeee6 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-06-23 21:15:07 +01:00
Melanie c404c5fb54 Thank you, Snoopy, for a patch to reduce sim script startup CPU usage 2010-06-23 21:14:28 +01:00
Justin Clark-Casey (justincc) 1719dc9a9b Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-06-23 01:22:42 +01:00
Justin Clark-Casey (justincc) 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
John Hurliman 4f59a865af * Fixed SimianGrid map tile uploads not having any objects in the images 2010-06-22 16:13:14 -07:00
Melanie 7db5262e35 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-06-22 23:40:12 +01:00
John Hurliman c96a6940a9 Line ending fix 2010-06-22 16:11:36 -07:00
John Hurliman 1e1485de5b * Fixed SimianGrid map tile uploads not having any objects in the images 2010-06-22 16:09:30 -07:00
Melanie Thielker 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
Melanie Thielker 854a8b9172 Security fix: Allow only textures to be fetched using HTTP texture cap 2010-06-22 23:39:25 +01:00
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 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