aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-10-161-2/+6
|\
| * minor: Add/correct some doc messages associated with entity teleport.Justin Clark-Casey (justincc)2012-10-161-1/+6
* | Merge branch 'master' into careminsterMelanie2012-10-124-28/+93
|\ \ | |/
| * Assign endVector before control leaves ObjectCommandsModule.TryParseVectorRan...Justin Clark-Casey (justincc)2012-10-111-0/+2
| * Add "delete object pos <start-coord> to <end-coord>" console command.Justin Clark-Casey (justincc)2012-10-101-24/+85
| * Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it eas...Justin Clark-Casey (justincc)2012-10-093-4/+6
* | Fix merge issuesMelanie2012-10-072-3/+3
* | Merge branch 'master' into careminsterMelanie2012-10-076-41/+203
|\ \ | |/
| * On receiving TaskInventoryAccepted with a destination folder in the binary bu...Justin Clark-Casey (justincc)2012-10-065-8/+62
| * Fix bug in implementation of "show part pos" that would not filter probably.Justin Clark-Casey (justincc)2012-10-051-40/+25
| * Add "show part pos" console command to match "show object pos"Justin Clark-Casey (justincc)2012-10-051-0/+72
| * refactor: eliminate some now duplicate code in ObjectCommandsModuleJustin Clark-Casey (justincc)2012-10-051-34/+25
| * Add "show object pos <start-coord> to <end-coord>" command to simulator console.Justin Clark-Casey (justincc)2012-10-051-0/+67
| * Finally fix build break by allowing UserManagementModule (which constructs a ...Justin Clark-Casey (justincc)2012-10-051-0/+1
| * Print number of objects found with "show object name" and "show part name" si...Justin Clark-Casey (justincc)2012-10-051-12/+4
* | Merge branch 'master' into careminsterMelanie2012-10-042-3/+4
|\ \ | |/
| * Output monitor data in response to console command on MainConsole.Instance ra...Justin Clark-Casey (justincc)2012-10-041-2/+2
| * Fix the use of the wrong index when locating the assets associatedMic Bowman2012-10-031-1/+2
* | Merge branch 'master' into careminsterMelanie2012-10-033-162/+219
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-10-022-162/+180
| |\
| | * implementing osDropAttachment & osDropAttachmentAtSignpostMarv2012-10-021-1/+10
| | * Add Flush() method to LogWriter. Also correct line endings to Linux form.Robert Adams2012-10-021-161/+170
| * | Attempt to fix Mantis #6311. Honor a destination folder if one is givenMelanie2012-10-021-0/+39
| |/
| * Revert "Added request.Proxy=null everywhere, as discussed in http://stackover...Diva Canto2012-09-306-12/+5
| * Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com...Diva Canto2012-09-306-5/+12
* | Merge branch 'master' into careminsterMelanie2012-09-293-31/+72
|\ \ | |/
| * Fire EventManager.TriggerOnAttach (and hence LSL attach event) when an object...Justin Clark-Casey (justincc)2012-09-292-14/+18
| * Extend attachment regression test to check for appropriate attach event firing.Justin Clark-Casey (justincc)2012-09-291-25/+49
| * Lock GDI+ portion og VectorRenderModule.GetDrawStringSize() to prevent concur...Justin Clark-Casey (justincc)2012-09-281-6/+11
* | Merge branch 'avination' into careminsterMelanie2012-09-276-36/+38
|\ \
| * | just remove the damm thingUbitUmarov2012-09-261-1/+1
| * | Seems nothing actually need the request body for getevents. so changeUbitUmarov2012-09-261-1/+0
| * | UriModule GetEvents also doesn't need a request bodyUbitUmarov2012-09-261-0/+1
| * | add missing transactionID in SendInventoryItemCreateUpdate. and make useUbitUmarov2012-09-241-1/+1
| * | If an asset upload transaction doesn't exist for a CreateInventory request,Melanie2012-09-243-36/+37
| * | Change the close tmeout from 2 to 3 seconds on teleport. This mayMelanie2012-09-161-1/+1
| * | Make the agent being kicked a child agent first so there won't be a ghostMelanie2012-09-161-1/+2
* | | Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminsterMelanie2012-09-275-15/+68
|\ \ \ | | |/ | |/|
| * | Use GridUser properly for foreign users.Diva Canto2012-09-262-3/+5
| * | Show the user's home url too on the console command.Diva Canto2012-09-261-4/+3
| * | Not really a change, just added a reminder to fix something here.Diva Canto2012-09-261-0/+3
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-09-253-199/+183
| |\ \
| | * | Fix very recently introduced race condition where a CreateNewItem outracing a...Justin Clark-Casey (justincc)2012-09-251-19/+18
| | * | Comment out old m_storeLocal from AssetXferUploader.Justin Clark-Casey (justincc)2012-09-251-6/+6
| | * | Insert transaction ID into AssetXferUploader constructor rather than at Uploa...Justin Clark-Casey (justincc)2012-09-252-36/+49
| | * | Move UDP update task item code to AssetXferUploader to match existing create ...Justin Clark-Casey (justincc)2012-09-253-64/+52
| | * | Fix occasional race condition failure when creating new clothing/body parts i...Justin Clark-Casey (justincc)2012-09-253-110/+94
| * | | TOS module. WARNING: migration in GridUser table.Diva Canto2012-09-252-5/+54
| * | | Oops, that should be inside the curly bracket.Diva Canto2012-09-251-3/+3
* | | | Fix very recently introduced race condition where a CreateNewItem outracing a...Justin Clark-Casey (justincc)2012-09-271-19/+18