Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Also make prims send the proper position. I hate it when people comment | Melanie Thielker | 2010-06-24 | 1 | -4/+4 |
| | | | | out things just because they're "not yet used". Grrrr. | ||||
* | Add the object owner UUID into the binary bucket of object to user IM | Melanie Thielker | 2010-06-24 | 2 | -1/+3 |
| | |||||
* | Replace the imSessionID, which is useless out of context, with the scope id | Melanie Thielker | 2010-06-24 | 1 | -0/+7 |
| | | | | in saved IMs | ||||
* | New viewers don't set the "save offline IM" flag anymore. Set it serverside | Melanie Thielker | 2010-06-24 | 1 | -0/+6 |
| | | | | so messages get saved | ||||
* | bug fix. 0,0 is a vlid sim coordinate | Melanie Thielker | 2010-06-24 | 1 | -1/+1 |
| | |||||
* | And another | Melanie Thielker | 2010-06-24 | 1 | -2/+0 |
| | |||||
* | And another conflict | Melanie | 2010-06-24 | 1 | -17/+0 |
| | |||||
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-24 | 3 | -8/+38 |
|\ | |||||
| * | Move loading of parcels to before script start. Scripts using parcel functions | Melanie | 2010-06-24 | 1 | -3/+3 |
| | | | | | | | | can fail if no land is loaded | ||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-06-23 | 1 | -4/+13 |
| |\ | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-06-23 | 5 | -18/+59 |
| | |\ | |||||
| | * | | add new [RemoteAdmin] settings from Snoopy's create/update, etc user patch ↵ | Justin Clark-Casey (justincc) | 2010-06-23 | 1 | -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 usage | Melanie | 2010-06-23 | 1 | -10/+12 |
| | |/ | |/| | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-22 | 1 | -14/+14 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-06-22 | 1 | -14/+14 |
| |\ \ | |||||
| | * | | Line ending fix | John Hurliman | 2010-06-22 | 1 | -14/+14 |
| | | | | |||||
| * | | | Guard prioritizer agains null values as those produced by a bullet dying | Melanie Thielker | 2010-06-22 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | before it can be updated | ||||
| * | | | Security fix: Allow only textures to be fetched using HTTP texture cap | Melanie Thielker | 2010-06-22 | 1 | -0/+12 |
| |/ / | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-22 | 3 | -10/+46 |
|\ \ \ | |/ / | |||||
| * | | * Fixed SimianGrid map tile uploads not having any objects in the images | John Hurliman | 2010-06-22 | 2 | -4/+30 |
| |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-06-19 | 1 | -6/+16 |
| |\ | |||||
| | * | fix faulty profile cut parameter checking in llSetPrimitiveParams() - see ↵ | dahlia | 2010-06-19 | 1 | -6/+16 |
| | | | | | | | | | | | | Mantis #4510 | ||||
| * | | Revert "This is a HACK! Downright nasty. For some reason, the devs of the mysql" | Melanie | 2010-06-19 | 1 | -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 mysql | Melanie | 2010-06-19 | 1 | -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 cap | Melanie Thielker | 2010-06-22 | 1 | -0/+12 |
| | | |||||
* | | Cause collisions with the avatar to be sent to attachments. Currently | Melanie Thielker | 2010-06-22 | 1 | -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 dying | Melanie Thielker | 2010-06-22 | 1 | -0/+3 |
| | | | | | | | | before it can be updated | ||||
* | | Correctly update the LastSeen field | Melanie Thielker | 2010-06-21 | 1 | -1/+1 |
| | | |||||
* | | Bump the migration version, ot it would never happen | Melanie Thielker | 2010-06-21 | 1 | -1/+1 |
| | | |||||
* | | Fix build break | Melanie Thielker | 2010-06-21 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie Thielker | 2010-06-21 | 2 | -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 Grimshaw | 2010-06-20 | 1 | -1/+1 |
| | | | |||||
| * | | Fix the sit code to ensure that we use the root prim of a linkset as a ↵ | Tom Grimshaw | 2010-06-20 | 1 | -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 Grimshaw | 2010-06-20 | 11 | -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 Grimshaw | 2010-06-20 | 1 | -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 Migration | Melanie Thielker | 2010-06-21 | 2 | -1/+11 |
| |/ / |/| | | | | | | | | to add a LastSeen field of type "Timestamp" to Presence for MySQL | ||||
* | | | Modify avatar responsiveness policy to send roots before children | Melanie Thielker | 2010-06-20 | 1 | -4/+11 |
| | | | |||||
* | | | Insert a space after the comma on the ToString methos of lsl vectors | Melanie Thielker | 2010-06-20 | 1 | -6/+6 |
| | | | | | | | | | | | | and rotations to match SL. | ||||
* | | | Set the offline flag in inventory offers | Melanie Thielker | 2010-06-20 | 1 | -0/+2 |
| | | | |||||
* | | | Make dataserver() return a 0 when agent id offline, instead of a timeout | Melanie Thielker | 2010-06-20 | 1 | -5/+4 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-19 | 7 | -30/+55 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Bug fix: wrong name of requester in local friendship offer. | Diva Canto | 2010-06-19 | 1 | -1/+4 |
| | | |||||
| * | Hunting for the problem in #4777 | Diva Canto | 2010-06-19 | 2 | -0/+5 |
| | | |||||
| * | Reverting my last two commits, putting back Melanie's exception handler. ↵ | Diva Canto | 2010-06-19 | 1 | -1/+10 |
| | | | | | | | | Doesn't solve #4777. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-06-19 | 0 | -0/+0 |
| |\ | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | ||||
| | * | Reinstated the behavior of AddPrimShape as it was as of December. Trying to ↵ | Diva Canto | 2010-06-19 | 1 | -0/+1 |
| | | | | | | | | | | | | fix mantis #4777 | ||||
| * | | Reinstated the behavior of AddPrimShape *exactly* as it was as of December. ↵ | Diva Canto | 2010-06-19 | 1 | -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-19 | 1 | -1/+0 |
| | | | | | | | | misleading | ||||
| * | minor: correct a spelling mistake | Justin Clark-Casey (justincc) | 2010-06-19 | 1 | -1/+1 |
| | | |||||
| * | Overhaul basic README.txt for new estate setup options on first run. | Justin Clark-Casey (justincc) | 2010-06-19 | 1 | -17/+41 |
| | | | | | | | | Also make some minor changes for clarity. |