aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2012-07-161-5/+5
|\
| * Make https work in the poll service managerMelanie2012-07-151-2/+2
| * Fix a double parenthesis typoMelanie2012-07-151-1/+1
| * Set up https to work like http does in the poll handlerMelanie2012-07-151-3/+3
* | Merge branch 'master' into careminsterMelanie2012-07-161-7/+14
|\ \
| * | When generating a Warp3D texture, set the detailTexture[i] variable on resize...Justin Clark-Casey (justincc)2012-07-141-7/+14
* | | Merge branch 'master' into careminsterMelanie2012-07-132-17/+24
|\ \ \ | |/ /
| * | Remove a callstack print out I accidentally left in 2 commits ago in 9ccb578Justin Clark-Casey (justincc)2012-07-131-1/+0
| * | Rather than instantiating a UTF8 encoding everywhere when we want to supress ...Justin Clark-Casey (justincc)2012-07-131-1/+1
| * | Don't cache regions data on the other unused LocalGridServiceConnector that t...Justin Clark-Casey (justincc)2012-07-133-17/+25
* | | Merge branch 'master' into careminsterMelanie2012-07-124-25/+156
|\ \ \ | |/ /
| * | Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than c...Justin Clark-Casey (justincc)2012-07-112-3/+1
| * | Allow XEngine StartDelay to be configured in the [XEngine] config section.Justin Clark-Casey (justincc)2012-07-111-1/+2
| * | Add regression TestDetachScriptedAttachmentToInventory()Justin Clark-Casey (justincc)2012-07-112-20/+127
| * | Add regression TestRezScriptedAttachmentsFromInventory() though this currentl...Justin Clark-Casey (justincc)2012-07-111-1/+26
* | | Merge branch 'avination' into careminsterMelanie2012-07-113-279/+383
|\ \ \ | | |/ | |/|
| * | Reinstate parallel fetching of residents and remove a left over return from d...Melanie2012-07-081-5/+7
| * | Revamp map block sending to eliminate overload of the grid server connectionMelanie2012-07-082-98/+204
| * | Instead of sending 20 records in 2 packets, send just one as we intended in t...Melanie2012-07-081-1/+1
| * | Address map lag issue seen with non-avination viewersMelanie2012-07-082-261/+257
* | | Merge branch 'master' into careminsterMelanie2012-07-114-105/+109
|\ \ \ | | |/ | |/|
| * | When an attachment is detached to inv or derezzed, stop the scripts, update t...Justin Clark-Casey (justincc)2012-07-101-6/+14
| * | Do not allow a script to attach a prim if its being sat upon.Justin Clark-Casey (justincc)2012-07-092-1/+40
| * | Remove duplicate Warp3DImageModule entry in CoreModulePlugin.addin.xmlJustin Clark-Casey (justincc)2012-07-071-1/+0
| * | minor: Make WORLD MAP category log lines consistentJustin Clark-Casey (justincc)2012-07-071-4/+4
| * | minor: Remove some wrong comments in attachments regression testsJustin Clark-Casey (justincc)2012-07-061-2/+0
| * | Add assert to attachment regression tests to check that number of objects in ...Justin Clark-Casey (justincc)2012-07-061-0/+14
| * | refactor: extract method UpdateUserInventoryWithAttachment() from AttachObjec...Justin Clark-Casey (justincc)2012-07-061-29/+38
* | | Merge branch 'avination' into careminsterMelanie2012-07-063-9/+8
|\ \ \ | | |/ | |/|
| * | Add an EventType enum and Type field to the poll service event args. This allowsMelanie2012-07-051-4/+4
| * | added a timeout paramenter to PollServiceEventArgs, so each type can define ...UbitUmarov2012-07-041-2/+2
| * | Remove spammy debugMelanie2012-06-291-1/+1
| * | stop chat being sent to child avs again.Melanie2012-06-291-3/+2
* | | Merge branch 'master' into careminsterMelanie2012-07-053-3/+37
|\ \ \ | | |/ | |/|
| * | porting console commands from raw2sculpt 3.2SignpostMarv2012-07-051-0/+34
| * | Add OSSL function osForceAttachToAvatarFromInventory()Justin Clark-Casey (justincc)2012-07-052-3/+3
* | | Merge branch 'master' into careminsterMelanie2012-07-012-26/+1
|\ \ \ | |/ /
| * | Removing unused handling of incoming create object by userID and itemID only.Justin Clark-Casey (justincc)2012-06-302-26/+1
* | | Merge branch 'master' into careminsterMelanie2012-06-292-53/+46
|\ \ \ | |/ /
| * | Change AttachmentsModule.DetachSingleAttachmentToInv() to accept a SOG direct...Justin Clark-Casey (justincc)2012-06-282-40/+45
| * | Rather than iterating through all SOGs in the scene looking for the one that ...Justin Clark-Casey (justincc)2012-06-281-24/+17
| * | Remove code that tried to delete an attachment back to inventory if RezSingle...Justin Clark-Casey (justincc)2012-06-281-6/+1
* | | Merge branch 'avination' into careminsterMelanie2012-06-293-10/+23
|\ \ \ | | |/ | |/|
| * | Fix llRegionSayTo the right wayMelanie2012-06-282-9/+21
| * | Comment out a spammy message that will spew 4 lines for each request to aMelanie2012-06-271-1/+2
* | | Revert "Mantis 5977 Corrections to llRegionSayTo"Melanie2012-06-282-69/+51
* | | Merge branch 'master' into careminsterMelanie2012-06-286-100/+249
|\ \ \ | | |/ | |/|
| * | Fix issue in InventoryArchiveTestCase where it didn't call down to OpenSimTes...Justin Clark-Casey (justincc)2012-06-271-1/+2
| * | refactor: Move ScenePresence <-> AgentData attachments copying code into Atta...Justin Clark-Casey (justincc)2012-06-271-0/+50
| * | Automatically disable log4net before each regression test so that logging is ...Justin Clark-Casey (justincc)2012-06-272-4/+2