aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge branch 'master' into careminster"Melanie2009-12-302-22/+1
| | | | This reverts commit d49d44923d1be38f6fff12706b156562c6060566.
* Merge branch 'master' into careminsterMelanie2009-12-302-1/+22
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * * Fixes Sitting on the ground.Teravus Ovares (Dan Olivares)2009-12-302-3/+13
| |
* | Revert "Merge branch 'master' into careminster"Melanie2009-12-303-143/+4
| | | | | | | | This reverts commit 596af3f600462fb1e467714e5b898c10aa3d838b.
* | Merge branch 'master' into careminsterMelanie2009-12-303-4/+143
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * * Makes forward and backward key reactions faster by responding to the NUDGE ↵Teravus Ovares (Dan Olivares)2009-12-302-9/+35
| | | | | | | | type movements.
| * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2009-12-299-20/+42
| |\
| | * Fix an omission in LSL that causes a viewer crashMelanie2009-12-301-0/+5
| | |
| * | * Attempts to resolve the megaregion terrain edit rebound.Teravus Ovares (Dan Olivares)2009-12-291-0/+82
| | | | | | | | | | | | | | | | | | * It does this by tweaking the throttles on child agent connection to a megaregion and multiplying the land throttle by 50. (various bit and byte magic ensue) * While, I doubt this will cause terrain crater sized potholes.. since it actually increases the bandwidth available for land in child regions when MegaRegions area active, more testing would be good. * This, in theory, also shouldn't cause missing objects in child regions.. because all objects are in the root region anyway. As I said, more testing would be good.
* | | Fix an omission in LSL that causes a viewer crashMelanie2009-12-301-0/+5
| | |
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2009-12-308-20/+37
|\ \ \
| * \ \ Merge branch 'master' into careminsterMelanie2009-12-298-20/+37
| |\ \ \ | | | |/ | | |/|
| | * | Change teleports so the TeleportFlags are sent to the destination sim. ItMelanie2009-12-298-20/+37
| | |/ | | | | | | | | | | | | can now determine if a connection is from login, teleport or crossing. Needed for a meaningful banlines implementation
| | * One should not copy/paste so much :)Melanie2009-12-271-3/+3
| | |
| | * Fix the spelling :/Melanie2009-12-271-3/+3
| | |
* | | Fix a timer list locking issue causing XMREngine deadlocksMelanie2009-12-301-15/+17
|/ /
* | One should not copy/paste so much :)Melanie2009-12-271-3/+3
| |
* | Fix the spelling :/Melanie2009-12-271-3/+3
| |
* | Merge branch 'master' into careminsterMelanie2009-12-271-0/+3
|\ \ | |/
| * Encode the published and mature checkboxes into the user flags forMelanie2009-12-271-0/+3
| | | | | | | | profiles
* | Convert some remaining legacy lock()s for m_parts in SceneObjectGroup to ↵CasperW2009-12-271-11/+13
| | | | | | | | ReaderWriteLockSlim, hopefully fixes a native crash
* | Make sure that we're not bounds checking attachments. 'Cos otherwise your ↵CasperW2009-12-261-2/+2
| | | | | | | | hair will end up on your bum. Seen that before?
* | Merge branch 'master' into casperCasperW2009-12-2618-7/+662
|\ \
| * \ Merge branch 'master' into careminsterMelanie2009-12-264-0/+29
| |\ \ | | |/
| | * Add AvatarInterestsReplyMelanie2009-12-264-0/+29
| | |
| * | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2009-12-252-1/+27
| |\ \ | | | | | | | | | | | | careminster
| | * | Recover out-of-region objects during db load.Kitto Flora2009-12-242-1/+27
| | | |
| * | | Merge branch 'master' into careminsterMelanie2009-12-252-0/+17
| |\ \ \ | | |/ / | |/| / | | |/
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-12-251-0/+4
| | |\
| | | * Clear Shape.SculptEntry if prim type is not a sculptie in ↵dahlia2009-12-241-0/+4
| | | | | | | | | | | | | | | | llSetPrimitiveParams() - addresses Mantis #4462
| | * | Enable the profile module to be replaced completely, even for the baseMelanie2009-12-251-0/+13
| | |/ | | | | | | | | | profile data
| * | Merge branch 'master' into careminsterMelanie2009-12-243-0/+483
| |\ \ | | |/
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-12-243-0/+483
| | |\
| | | * No-op in this commit. Just increasing the tag number due to weirdnesses.Diva Canto2009-12-231-1/+1
| | | |
| | | * Library Module: allows adding folders/items to the Library from IAR files ↵Diva Canto2009-12-233-0/+483
| | | | | | | | | | | | | | | | placed under bin/Library. This works only for standalones.
| | * | Add the LSL List Size propertyMelanie2009-12-241-1/+40
| | |/
| * | Add the body to the LSL List Size propertyMelanie2009-12-241-2/+36
| | |
| * | Merge branch 'master' into careminsterMelanie2009-12-241-1/+2
| |\ \ | | |/
| | * Fixes the broken build of the previous commit.Diva Canto2009-12-231-1/+2
| | |
| * | Merge branch 'master' into careminsterMelanie2009-12-231-1/+41
| |\ \ | | |/
| | * Add saving assets from gestures to IARMelanie2009-12-231-1/+41
| | |
| * | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2009-12-231-29/+85
| |\ \ | | | | | | | | | | | | careminster
| * \ \ Merge branch 'master' into careminsterMelanie2009-12-235-3/+28
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2009-12-235-3/+23
| | |\ \
| | | * | Thank you kindly, Ziah for a patch that adds the channel to the class ↵Charles Krinke2009-12-234-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ChatEventArgs and retrieves it's value along with the others from the OSChatMessage in HandleChatPackage. With this the MRM Script can check if a ChatEvent is coming in on a specifc Channel. The Second Part adds the Method say(string msg , int channel) to send a chat message on the specified channel. The idea behind this is to enable MRM's to communicate with regular LSL or OSSL Scripts so that they may can act as a Backend to access a Database or do business Logic for those Scripts. Signed-off-by: Charles Krinke <cfk@pacbell.net>
| | | * | Added Close() to Inventory/Archiver/InventoryArchiveReadRequest, so that the ↵Diva Canto2009-12-221-1/+7
| | | | | | | | | | | | | | | | | | | | stream can be closed.
| | * | | Fix a bounds exception I came across in IAR restoreMelanie2009-12-231-0/+5
| | |/ /
* | | | Fix for landing points. Only one scenario is not fully covered by this ↵CasperW2009-12-263-15/+59
| | | | | | | | | | | | | | | | change, and that is people who teleport from neighbouring regions, who won't get affected by the landing point.
* | | | Add a debugger tag to stop Visual Studio from breakingCasperW2009-12-231-0/+1
| |_|/ |/| |
* | | Merge branch 'master' of ssh://TOR/var/git/careminsterCasperW2009-12-2332-233/+10765
|\ \ \ | |/ /