aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* And anotherMelanie Thielker2010-06-241-2/+0
|
* And another conflictMelanie2010-06-241-17/+0
|
* Merge branch 'master' into careminster-presence-refactorMelanie2010-06-243-8/+38
|\
| * Move loading of parcels to before script start. Scripts using parcel functionsMelanie2010-06-241-3/+3
| | | | | | | | can fail if no land is loaded
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-06-231-4/+13
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-06-235-18/+59
| | |\
| | * | add new [RemoteAdmin] settings from Snoopy's create/update, etc user patch ↵Justin Clark-Casey (justincc)2010-06-231-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | to OpenSim.ini.exmaple Also tidies up and comments some existing entries
| * | | Thank you, Snoopy, for a patch to reduce sim script startup CPU usageMelanie2010-06-231-10/+12
| | |/ | |/|
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-221-14/+14
|\ \ \ | |/ /
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-06-221-14/+14
| |\ \
| | * | Line ending fixJohn Hurliman2010-06-221-14/+14
| | | |
| * | | Guard prioritizer agains null values as those produced by a bullet dyingMelanie Thielker2010-06-221-0/+3
| | | | | | | | | | | | | | | | before it can be updated
| * | | Security fix: Allow only textures to be fetched using HTTP texture capMelanie Thielker2010-06-221-0/+12
| |/ /
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-223-10/+46
|\ \ \ | |/ /
| * | * Fixed SimianGrid map tile uploads not having any objects in the imagesJohn Hurliman2010-06-222-4/+30
| |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-06-191-6/+16
| |\
| | * fix faulty profile cut parameter checking in llSetPrimitiveParams() - see ↵dahlia2010-06-191-6/+16
| | | | | | | | | | | | Mantis #4510
| * | Revert "This is a HACK! Downright nasty. For some reason, the devs of the mysql"Melanie2010-06-191-7/+0
| |/ | | | | | | | | | | Didn't do what it said on the package! This reverts commit 8643db3ef0c4dca709d85fc37240a18fd9049520.
| * This is a HACK! Downright nasty. For some reason, the devs of the mysqlMelanie2010-06-191-0/+7
| | | | | | | | | | connector have decided that their vision of timeouts is the only valid one. This uses reflection to show them the finger. Please test.
* | Security fix: Allow only textures to be fetched using HTTP texture capMelanie Thielker2010-06-221-0/+12
| |
* | Cause collisions with the avatar to be sent to attachments. CurrentlyMelanie Thielker2010-06-221-0/+140
| | | | | | | | | | ignores collision filter. Physics collisions are still dodgy, so we don't get the events we should be getting.
* | Guard prioritizer agains null values as those produced by a bullet dyingMelanie Thielker2010-06-221-0/+3
| | | | | | | | before it can be updated
* | Correctly update the LastSeen fieldMelanie Thielker2010-06-211-1/+1
| |
* | Bump the migration version, ot it would never happenMelanie Thielker2010-06-211-1/+1
| |
* | Fix build breakMelanie Thielker2010-06-211-1/+1
| |
* | Merge branch 'careminster-presence-refactor' of ↵Melanie Thielker2010-06-212-4/+22
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | Fix the StandUp position to calculate as if we're still using the child prim id.Tom Grimshaw2010-06-201-1/+1
| | |
| * | Fix the sit code to ensure that we use the root prim of a linkset as a ↵Tom Grimshaw2010-06-201-3/+15
| | | | | | | | | | | | reference in the case of an avatar sitting on a child prim. This fixes various camera issues and fixes mantis #0000059.
| * | Merge branch 'careminster-presence-refactor' of ↵Tom Grimshaw2010-06-2011-45/+78
| |\ \ | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | | Update all clients sitting on a linkset if a child prim is moved. This ↵Tom Grimshaw2010-06-201-0/+6
| | | | | | | | | | | | | | | | prevents avatars being "lost in the void" until they stand up when a child prim is moved that they're sitting on.
* | | | Ensure no UUID.Zero region ID is ever written to presence. Add a MigrationMelanie Thielker2010-06-212-1/+11
| |/ / |/| | | | | | | | to add a LastSeen field of type "Timestamp" to Presence for MySQL
* | | Modify avatar responsiveness policy to send roots before childrenMelanie Thielker2010-06-201-4/+11
| | |
* | | Insert a space after the comma on the ToString methos of lsl vectorsMelanie Thielker2010-06-201-6/+6
| | | | | | | | | | | | and rotations to match SL.
* | | Set the offline flag in inventory offersMelanie Thielker2010-06-201-0/+2
| | |
* | | Make dataserver() return a 0 when agent id offline, instead of a timeoutMelanie Thielker2010-06-201-5/+4
| | |
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-197-30/+55
|\ \ \ | |/ / |/| / | |/
| * Bug fix: wrong name of requester in local friendship offer.Diva Canto2010-06-191-1/+4
| |
| * Hunting for the problem in #4777Diva Canto2010-06-192-0/+5
| |
| * Reverting my last two commits, putting back Melanie's exception handler. ↵Diva Canto2010-06-191-1/+10
| | | | | | | | Doesn't solve #4777.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-06-190-0/+0
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
| | * Reinstated the behavior of AddPrimShape as it was as of December. Trying to ↵Diva Canto2010-06-191-0/+1
| | | | | | | | | | | | fix mantis #4777
| * | Reinstated the behavior of AddPrimShape *exactly* as it was as of December. ↵Diva Canto2010-06-191-10/+1
| |/ | | | | | | Trying to fix mantis #4777
| * remove link to wiki mysql-config since the page was out-of-date and actively ↵Justin Clark-Casey (justincc)2010-06-191-1/+0
| | | | | | | | misleading
| * minor: correct a spelling mistakeJustin Clark-Casey (justincc)2010-06-191-1/+1
| |
| * Overhaul basic README.txt for new estate setup options on first run.Justin Clark-Casey (justincc)2010-06-191-17/+41
| | | | | | | | Also make some minor changes for clarity.
| * minor: try and make the explanations for the AllowScriptCrossing and ↵Justin Clark-Casey (justincc)2010-06-181-2/+4
| | | | | | | | TrustBinaries settings in OpenSim.ini.example clearer
| * eliminate SimianGrid [Groups] section from GridCommon.ini.example as per NebadonJustin Clark-Casey (justincc)2010-06-181-8/+0
| | | | | | | | this is only used by SimianGrid and is now in SimianGrid.ini
| * Change Opensim.Servers.exe comment at top of Robust.HG.ini to Robust.exeJustin Clark-Casey2010-06-181-1/+1
| | | | | | | | | | This addresses http://opensimulator.org/mantis/view.php?id=4772 Thanks to aiaustin for pointing this out
* | Allow moving an avatar as part of a linkset using llSetLinkPrimitiveParams. ↵Tom Grimshaw2010-06-193-4/+188
| | | | | | | | This unlocks an awful lot of poseball-free content, and is a step towards resolving mantis #59.
* | Add "AvatarHeight/2" to the Home Position when set to avoid having the ↵Tom Grimshaw2010-06-191-0/+10
| | | | | | | | avatar fall through the ground when they TP home.