aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-03-292-5/+5
|\
| * Added missing functionality (mainly custom headers) to llHTTPRequest.Kevin Cozens2013-03-291-0/+3
| * Check viewer 2/3 attachment calls against avatar appearance attachment data r...Justin Clark-Casey (justincc)2013-03-291-5/+2
* | Merge commit '23ae4c0a4d813763bcc39db7693850a21727d7f2' into careminsterMelanie2013-03-293-1/+33
|\ \ | |/
| * Fix bug where CHANGED_REGION and/or CHANGED_TELEPORT weren't firing for scrip...Justin Clark-Casey (justincc)2013-03-293-1/+30
* | Merge branch 'master' into careminsterMelanie2013-03-291-21/+0
|\ \ | |/
| * Eliminate code which tries to restart attachment scripts in ScenePresence.Mak...Justin Clark-Casey (justincc)2013-03-291-18/+0
* | Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminsterMelanie2013-03-291-2/+4
|\ \ | |/
| * Stop attempts to update/add existing attachments in user inventory when telep...Justin Clark-Casey (justincc)2013-03-281-2/+4
* | Merge commit '03e421bf3d796bf3498f4f3311c59ce04fb1fea1' into careminsterMelanie2013-03-291-27/+27
|\ \ | |/
| * minor: comment out unused Scene.AgentCrossing() to reduce code complexityJustin Clark-Casey (justincc)2013-03-281-27/+27
* | Merge commit '4ad9b275302ee109937512963eab095ff542a0c7' into careminsterMelanie2013-03-292-7/+9
|\ \ | |/
| * If the viewer has already rezzed any attachments itself, then ignore the simu...Justin Clark-Casey (justincc)2013-03-282-7/+9
* | Merge commit '3b377f16b29a6395d73af1cc987cb9abf9935376' into careminsterMelanie2013-03-291-2/+2
|\ \ | |/
| * Fix regression tests by making a new NPC always trigger simulator side attach...Justin Clark-Casey (justincc)2013-03-281-2/+2
* | Merge commit 'c2093ccce16cd5210c8e0759f23b5b4bd205b7af' into careminsterMelanie2013-03-292-44/+38
|\ \ | |/
| * Move the simulator-side RezAttachments call on login to SP.MakeRootAgent with...Justin Clark-Casey (justincc)2013-03-282-38/+31
| * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-266-3/+9
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2013-03-267-6/+11
|\ \
| * | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-246-3/+9
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-03-234-23/+144
| |\ \
| * | | Fix SceneManager to use the new automatic property throughout.Melanie2013-03-211-3/+2
* | | | Merge branch 'master' into careminsterMelanie2013-03-233-6/+22
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Fix teleporting into the non-SW 256x256 corner of a megaregion, though curren...Justin Clark-Casey (justincc)2013-03-231-0/+7
| * | Add "show borders" command to show the borders of a region.Justin Clark-Casey (justincc)2013-03-233-6/+16
* | | Merge branch 'master' into careminsterMelanie2013-03-224-23/+144
|\ \ \ | |/ / | | / | |/ |/|
| * On a teleport, lock m_agentsInTransit whilst we grab the value to check for c...Justin Clark-Casey (justincc)2013-03-211-4/+4
| * minor: disable logging on regression TestCrossOnSameSimulator() that I accide...Justin Clark-Casey (justincc)2013-03-201-1/+1
| * minor: don't bother with the pause before rezzing attachments if we are runni...Justin Clark-Casey (justincc)2013-03-201-1/+15
| * On the later forms of teleport failure, tell the user if this was because vie...Justin Clark-Casey (justincc)2013-03-202-23/+121
| * Insert a short delay on the simulator side rezzing of attachments in order to...Justin Clark-Casey (justincc)2013-03-201-1/+1
| * Force a viewer object update for attachments at the end of the final Scene.Co...Justin Clark-Casey (justincc)2013-03-201-0/+9
| * Merge branch 'master' into newmultiattachMelanie2013-03-186-129/+264
| |\
| * | Multiattach, part 1Melanie2013-03-182-2/+2
* | | Merge branch 'avination' into careminsterMelanie2013-03-191-11/+36
|\ \ \
| * | | * Ignores VolumeDetect enabled prim in the camera raycast call. Note: The ...teravus2013-03-161-11/+36
* | | | Merge branch 'master' into careminsterMelanie2013-03-142-3/+55
|\ \ \ \ | | |_|/ | |/| |
| * | | Make llGetObjectDetails() return the correct world rotation for a sitting avatarJustin Clark-Casey (justincc)2013-03-141-5/+35
| * | | Remove unnecessary instation of DOMap() in SOP from commit 5c53660 since this...Justin Clark-Casey (justincc)2013-03-131-1/+0
| * | | Add prototype dynamic objects map for scene object partsJustin Clark-Casey (justincc)2013-03-131-0/+22
| * | | minor: remove mono compiler warning in SceneObjectUndoRedoTestsJustin Clark-Casey (justincc)2013-03-111-2/+2
* | | | Merge branch 'master' into careminsterMelanie2013-03-111-0/+17
|\ \ \ \ | |/ / /
| * | | * Apparently, sometimes texture entries come in from the wire with no default...teravus2013-03-081-0/+17
* | | | Merge branch 'master' into careminsterMelanie2013-03-084-122/+189
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-03-061-1/+13
| |\ \ \
| | * | | Per discussions with justincc... split the JsonStore typeMic Bowman2013-03-051-1/+13
| | | |/ | | |/|
| * | | Add code for testing event queue messages recevied on region cross.Justin Clark-Casey (justincc)2013-03-061-5/+22
| * | | Add regression test for presence crossing between regions on the same simulator.Justin Clark-Casey (justincc)2013-03-063-121/+159
| |/ /
* | | * Separate two if trees that got merged into one if tree with borked logic.teravus2013-03-061-2/+25
* | | Merge branch 'avination' into careminsterMelanie2013-03-062-2/+2
|\ \ \ | | |/ | |/|
generated by cgit v1.1 at 2025-03-02 21:45:16 +0000