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

13344 Commits (bebbe407ee166a0aa22f0ec8d14ada780924f9af)

Author SHA1 Message Date
Melanie Thielker 9d03271265 And another 2010-06-24 03:43:50 +02:00
Melanie e94cf3d9b7 And another conflict 2010-06-24 03:35:42 +01:00
Melanie e93853623b Merge branch 'master' into careminster-presence-refactor 2010-06-24 03:30:11 +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
Melanie ce6fbd9680 Merge branch 'master' into careminster-presence-refactor 2010-06-22 23:40:59 +01: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 317ac50a97 Merge branch 'master' into careminster-presence-refactor 2010-06-22 23:38:56 +01:00
Melanie Thielker 5c02fb435d Security fix: Allow only textures to be fetched using HTTP texture cap 2010-06-22 17:35:00 +02:00
Melanie Thielker 962dade155 Cause collisions with the avatar to be sent to attachments. Currently 
ignores collision filter. Physics collisions are still dodgy, so we
don't get the events we should be getting.
 2010-06-22 04:04:59 +02:00
Melanie Thielker 3428196631 Guard prioritizer agains null values as those produced by a bullet dying 
before it can be updated
 2010-06-22 02:33:20 +02:00
Melanie Thielker 3ea4e5ccbe Correctly update the LastSeen field 2010-06-21 23:26:27 +02:00
Melanie Thielker 53905cf919 Bump the migration version, ot it would never happen 2010-06-21 22:15:33 +02:00
Melanie Thielker ab023c6a29 Fix build break 2010-06-21 18:06:46 +02:00
Melanie Thielker 9fd45406be Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-06-21 17:06:59 +02:00
Melanie Thielker 973537f819 Ensure no UUID.Zero region ID is ever written to presence. Add a Migration 
to add a LastSeen field of type "Timestamp" to Presence for MySQL
 2010-06-21 17:06:05 +02:00
Tom Grimshaw 9d251b1dc5 Fix the StandUp position to calculate as if we're still using the child prim id. 2010-06-20 15:57:01 -07:00
Tom Grimshaw fc715a092c Fix the sit code to ensure that we use the root prim of a linkset as a reference in the case of an avatar sitting on a child prim. This fixes various camera issues and fixes mantis #0000059. 2010-06-20 15:38:48 -07:00
Tom Grimshaw 33d05ef554 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-06-20 14:45:36 -07:00
Tom Grimshaw a1416612a9 Update all clients sitting on a linkset if a child prim is moved. This prevents avatars being "lost in the void" until they stand up when a child prim is moved that they're sitting on. 2010-06-20 14:45:04 -07:00
Melanie Thielker 13a0b65a80 Modify avatar responsiveness policy to send roots before children 2010-06-20 21:38:06 +02:00
Melanie Thielker 797767da57 Insert a space after the comma on the ToString methos of lsl vectors 
and rotations to match SL.
 2010-06-20 07:16:19 +02:00
Melanie Thielker 95c763201f Set the offline flag in inventory offers 2010-06-20 06:36:46 +02:00
Melanie Thielker 76b59b8df7 Make dataserver() return a 0 when agent id offline, instead of a timeout 2010-06-20 06:23:08 +02: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 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