aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-02-1012-20/+240
|\
| * Fix: Unable to remove AV from friend list (sqldb-bug) http://opensimulator.or...PixelTomsen2012-02-102-8/+8
| * 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
| * Add NPC torture tests for 100, 1000 and 2000 create and delete NPC calls.Justin Clark-Casey (justincc)2012-02-091-0/+185
* | 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-0713-107/+142
|\ \ | |/
| * Add start GC memory and end GC memory to object stress test printouts.Justin Clark-Casey (justincc)2012-02-074-4/+22
| * Add url to logging if SynchronousRestFormsRequester.MakRequest() throws an ex...Justin Clark-Casey (justincc)2012-02-079-103/+120
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-02-0712-46/+332
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-02-0712-46/+332
| |\ \ | | |/
| | * Add TestAddTaskInventoryItem()Justin Clark-Casey (justincc)2012-02-072-4/+34
| | * Remove debug logging if physics actor is null in SOP.ApplyPhysics()Justin Clark-Casey (justincc)2012-02-071-5/+1
| | * Add TestCompileAndStart100Scripts() torture test.Justin Clark-Casey (justincc)2012-02-072-1/+158
| | * Add a regression test to compile and start a script. Remove Path.GetDirector...Justin Clark-Casey (justincc)2012-02-077-37/+137
* | | Experimental. Expand Fire & Forget for NPC deleteMelanie2012-02-061-7/+7
|/ /
* | Merge branch 'master' into careminsterMelanie2012-02-055-10/+10
|\ \ | |/
| * 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
| * Set PhysPrimMax default to 0 so ini files won't be overriddenBlueWall2012-02-041-1/+1
| * change NonPhysicalPrimMax to NonphysicalPrimMax in Scenes.cs to make thenebadon2012-02-041-1/+1
| * Make NonphysicalPrimMax setting work properlyBlueWall2012-02-041-1/+1
| * Quiet the map module loggingBlueWall2012-02-041-2/+2
* | Merge branch 'master' into careminsterMelanie2012-02-0432-254/+526
|\ \ | |/
| * Add default value to TelehubObjectBlueWall2012-02-041-0/+10
| * Supply correct parameters to detailed authentication login fail messageJustin Clark-Casey (justincc)2012-02-041-1/+1
| * Add missing RCERR_UNKNOWN and RCERR_SIM_PERF_LOW LSL constants that would eve...Justin Clark-Casey (justincc)2012-02-041-0/+2
| * Correct RC_* LSL constants used by llCastRay().Justin Clark-Casey (justincc)2012-02-041-12/+12
| * Add TestRegionSettingsDeserializeJustin Clark-Casey (justincc)2012-02-042-1/+135
| * Only look for an uploaded transactional asset in Scene.UpdateTaskInventory if...Justin Clark-Casey (justincc)2012-02-043-22/+21
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-0319-37/+69
| |\
| | * Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensimSnoopy Pfeffer2012-02-0421-146/+278
| | |\
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-0313-17/+50
| | | |\
| | | | * Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-02-0313-17/+50
| | | | |\
| | | | | * Fix: Covenant changed time not set http://opensimulator.org/mantis/view.php?i...PixelTomsen2012-02-0313-17/+50
| | | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-038-123/+223
| | | |\ \ \ | | | | |/ /
| | | * | | Check for null scene in ScheduleFullUpdate and ScheduleTerseUpdate before tri...Dan Lake2012-02-031-4/+7
| | | | |/ | | | |/|
| | * | | Changed save oar and save iar parameter -p|--profile to -h|--home, including ...Snoopy Pfeffer2012-02-035-12/+12
| * | | | Change SceneObjectSerializer to use common ExternalRepresentationUtils.Execut...Justin Clark-Casey (justincc)2012-02-032-83/+57
| | |_|/ | |/| |
| * | | Extend m_avatars lock in NpcModule.CreateNPC over both creation of NPC scene ...Justin Clark-Casey (justincc)2012-02-031-14/+16
| * | | Refactor common deserialization processor code to generic method ExternalRepr...Justin Clark-Casey (justincc)2012-02-033-98/+62
| * | | Change LandDataSerializer deserialization so that in the future it won't care...Justin Clark-Casey (justincc)2012-02-035-75/+209
| |/ /