Melanie
|
3612a5252b
|
Fix more perms weirdness. Preserve "Locked" status across gives and rez/take.
Preserve "Anyone can move" flag in most cases.
|
2010-06-27 20:23:33 +01:00 |
Melanie
|
121ba7e95c
|
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
|
2010-06-27 20:05:29 +01:00 |
Melanie
|
205d2496f6
|
Fix permission propagation to prevent permanently locked objects from being
created.
|
2010-06-27 20:04:39 +01:00 |
Justin Clark-Casey (justincc)
|
5ce119174e
|
don't report the null uuid as a missing asset on saving oars/iars
|
2010-06-25 21:49:13 +01:00 |
Justin Clark-Casey (justincc)
|
a4a808818f
|
don't report the null uuid as a missing asset on saving oars/iars
|
2010-06-25 21:48:19 +01:00 |
Justin Clark-Casey (justincc)
|
0f3d9e17c6
|
minor: fix spelling mistake interupt -> interrupt in migrations
This is for mantis 4783
|
2010-06-25 21:20:47 +01:00 |
Justin Clark-Casey (justincc)
|
d399bd3eb7
|
minor: fix spelling mistake interupt -> interrupt in migrations
This is for mantis 4783
|
2010-06-25 21:18:52 +01:00 |
Justin Clark-Casey (justincc)
|
4a5979c311
|
minor: remove some mono compiler warnings
|
2010-06-25 21:09:15 +01:00 |
Justin Clark-Casey (justincc)
|
77fc48f2f9
|
fix web request exception reporting properly this time
|
2010-06-25 20:59:24 +01:00 |
Justin Clark-Casey (justincc)
|
c7e7cb04a3
|
fix web request exception reporting properly this time
|
2010-06-25 20:57:38 +01:00 |
Justin Clark-Casey (justincc)
|
8629ba80bf
|
Revert "Report http server onRequest() exception properly."
This reverts commit c09451a034 .
|
2010-06-25 20:51:21 +01:00 |
Justin Clark-Casey (justincc)
|
c09451a034
|
Report http server onRequest() exception properly.
|
2010-06-25 19:11:22 +01:00 |
Justin Clark-Casey (justincc)
|
24785e82a5
|
stop KeyNotFoundException() being thrown in RemoveScenePresence if the agent isn't present in the presence dictionary
the code to do this was there but was being circumvented by newmap[agentID] before the check actually took place
|
2010-06-25 18:57:58 +01:00 |
Justin Clark-Casey (justincc)
|
52b711af82
|
stop KeyNotFoundException() being thrown in RemoveScenePresence if the agent isn't present in the presence dictionary
the code to do this was there but was being circumvented by newmap[agentID] before the check actually took place
|
2010-06-25 18:55:20 +01:00 |
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 |