aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-02-166-11/+66
|\
| * Fix some logic mistakes where firstly osNpcCreate() without options was creat...Justin Clark-Casey (justincc)2012-02-163-5/+20
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-154-23/+101
| |\
| * | In ObjectTortureTests, run garbage collector on Teardown and run scene loop u...Justin Clark-Casey (justincc)2012-02-153-7/+47
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-02-156-163/+237
|\ \ \
| * | | Implement region crossing of sitting avatars. Edit mode and llSetPos workMelanie2012-02-145-157/+221
| * | | Prevent object loss and positioning outside the region with failed object simMelanie2012-02-143-8/+18
* | | | Merge branch 'master' into careminsterMelanie2012-02-1511-43/+179
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Refactor appearance saving for NPC to use AvatarFactoryModule interface.Dan Lake2012-02-143-15/+38
| * | Fix a race condition in the simian groups connector. When requests wereMic Bowman2012-02-131-8/+63
| |/
| * Fix: get embedded objects from Notecard fails with activated FreeSwitchVoiceM...PixelTomsen2012-02-141-3/+3
| * Add some more data to the new user connection logging for debug purposes.Justin Clark-Casey (justincc)2012-02-141-3/+3
| * short circuit the expensive parts of the permission checking codeMic Bowman2012-02-131-1/+6
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-137-20/+101
| |\
| | * correct the default avatar_terminal_velocity value that I accidentally left i...Justin Clark-Casey (justincc)2012-02-111-1/+1
| | * Clamp ODE character velocity. Make ODE falling character 54m/s by default.Justin Clark-Casey (justincc)2012-02-112-1/+53
| | * Make ScenePresence.MovementFlag a private only settable value to reduce compl...Justin Clark-Casey (justincc)2012-02-111-7/+4
| * | On object deserialization, go back to logging errors at DEBUG level rather th...Justin Clark-Casey (justincc)2012-02-131-5/+9
* | | Merge branch 'master' into careminsterMelanie2012-02-104-12/+44
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-02-101-9/+20
| |\ \
| | * | Fix an npc delete race condition with LSL sensors where an initial presence c...Justin Clark-Casey (justincc)2012-02-101-9/+20
| * | | Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-02-102-3/+12
| |\ \ \ | | |/ /
| | * | Fix bug where somebody taking a copy of an object they didn't own that was re...Justin Clark-Casey (justincc)2012-02-102-3/+12
| | |/
| * | Fix: Covenant view fails after updates or cache-clean see mantis http://opens...PixelTomsen2012-02-101-0/+12
| |/
* | Merge branch 'master' into careminsterMelanie2012-02-1010-19/+54
|\ \ | |/
| * Fix: Unable to remove AV from friend list (sqldb-bug) http://opensimulator.or...PixelTomsen2012-02-101-7/+7
| * When an asset is uploaded (e.g. a mesh) set individual copy/move/transfer per...Justin Clark-Casey (justincc)2012-02-106-11/+40
| * If NPCModule.CreateNPC() fails to create the required ScenePresence (which sh...Justin Clark-Casey (justincc)2012-02-092-9/+8
* | Merge branch 'master' into careminsterMelanie2012-02-097-14/+69
|\ \ | |/
| * minor: put in commented out logging statements for future reuseJustin Clark-Casey (justincc)2012-02-092-1/+10
| * Stop a scene object from attempting to link with itself (which results in an ...Justin Clark-Casey (justincc)2012-02-084-10/+54
| * Make WebStats logging report consistently as WEB STATS MODULE instead of VC, ...Justin Clark-Casey (justincc)2012-02-071-6/+5
* | Push more NPC stuff into threadsMelanie2012-02-082-23/+40
* | Merge branch 'master' into careminsterMelanie2012-02-071-1/+2
|\ \ | |/
| * Add start GC memory and end GC memory to object stress test printouts.Justin Clark-Casey (justincc)2012-02-071-1/+2
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-02-078-39/+145
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-02-078-39/+145
| |\ \ | | |/
| | * Add TestAddTaskInventoryItem()Justin Clark-Casey (justincc)2012-02-071-1/+25
| | * Remove debug logging if physics actor is null in SOP.ApplyPhysics()Justin Clark-Casey (justincc)2012-02-071-5/+1
| | * Add a regression test to compile and start a script. Remove Path.GetDirector...Justin Clark-Casey (justincc)2012-02-076-34/+117
* | | Experimental. Expand Fire & Forget for NPC deleteMelanie2012-02-061-7/+7
|/ /
* | Merge branch 'master' into careminsterMelanie2012-02-054-8/+8
|\ \ | |/
| * Revert my two quick fixes for the lag issue and put in the real fix, whichMelanie2012-02-051-1/+2
| * Revert "Remove checks on ban list expiry on every move. To be re-added on par...Melanie2012-02-051-4/+4
| * Revert "Check ban list for a particular parcel only when an avatar moves into...Melanie2012-02-052-17/+4
| * Make configuration uniformBlueWall2012-02-051-3/+3
| * Check ban list for a particular parcel only when an avatar moves into it.Melanie2012-02-052-4/+17
| * Remove checks on ban list expiry on every move. To be re-added on parcelMelanie2012-02-051-4/+4
| * change NonPhysicalPrimMax to NonphysicalPrimMax in Scenes.cs to make thenebadon2012-02-041-1/+1
| * Quiet the map module loggingBlueWall2012-02-041-2/+2