aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-114-18/+27
|\
| * Fix TestSaveOarNoAssets() by not launch a no-assets request on a separate thr...Justin Clark-Casey (justincc)2012-03-101-1/+1
| * minor: In IAR save, log when we start adding the control file rather than say...Justin Clark-Casey (justincc)2012-03-101-2/+3
| * minor: rearrange some save oar messages so they say what they're about to do ...Justin Clark-Casey (justincc)2012-03-101-8/+7
| * On OAR saving, try fetch assets serially rather than firing all the requests ...Justin Clark-Casey (justincc)2012-03-102-9/+18
* | Merge branch 'master' into careminsterMelanie2012-03-092-2/+77
|\ \ | |/
| * More on inventory transfer hold ups:Diva Canto2012-03-092-2/+77
| * More on HG inventory transfers. Move the FireAndForget higher up.Diva Canto2012-03-091-1/+1
| * More on the freeze on HG inventory transfers: spawn a threadlet on the funct...Diva Canto2012-03-081-1/+1
* | Merge branch 'master' into careminsterMelanie2012-03-091-2/+5
|\ \ | |/
| * Merge branch 'xassetservice'Justin Clark-Casey (justincc)2012-03-091-2/+5
| |\
| | * Merge branch 'master' into xassetserviceJustin Clark-Casey (justincc)2012-03-021-2/+11
| | |\
| | * | Start by adding XAssetService as a copy of the existing AssetService.Justin Clark-Casey (justincc)2012-03-021-2/+5
* | | | Merge branch 'master' into careminsterMelanie2012-03-0815-82/+58
|\ \ \ \ | |/ / /
| * | | Uses shorter AddCommand form for "show estates"Justin Clark-Casey (justincc)2012-03-081-1/+1
| * | | Display help commander topics in capitalized form - the commands themselves a...Justin Clark-Casey (justincc)2012-03-081-40/+7
| * | | Change "help" to display categories/module list then "help <category/module>"...Justin Clark-Casey (justincc)2012-03-0815-44/+53
* | | | Merge branch 'master' into careminsterMelanie2012-03-072-24/+30
|\ \ \ \ | |/ / /
| * | | Remove static m_MainInstance in LocalGridServiceConnector.Justin Clark-Casey (justincc)2012-03-061-24/+10
| * | | Add sensor, dataserver requests, timer and listener counts to "xengine status...Justin Clark-Casey (justincc)2012-03-061-0/+20
| | |/ | |/|
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-03-043-6/+23
|\ \ \
| * | | Make llSetKeyframedMotion prims waut at the borders of down sims and try againMelanie2012-02-261-0/+6
| * | | Move KeyframeMotion from SOG to SOP because we can't persist it anyMelanie2012-02-261-3/+3
| * | | Zero force and torque on take so that items don't run away when rezzedMelanie2012-02-261-0/+2
| * | | Implement llSetKeyframedMotion. No persistence, no region crossing. Yet.Melanie2012-02-262-1/+5
| * | | Delay the sending of the initial werables update until the inventory andMelanie2012-02-251-6/+11
* | | | Merge branch 'master' into careminsterMelanie2012-03-033-18/+27
|\ \ \ \ | | |/ / | |/| |
| * | | Send the right name and creation date on the BasicProfileModule.Diva Canto2012-03-011-2/+11
| | |/ | |/|
| * | Fixed two typos. White space cleanups.Kevin Cozens2012-02-281-16/+16
| * | HG: Remove async in posting assets to foreign grid. Mono hates concurrency th...Diva Canto2012-02-251-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-02-251-3/+0
|\ \ \ | |/ /
| * | Remove EXPERIMENTAL tags from load iar/save iar commands.Justin Clark-Casey (justincc)2012-02-251-3/+0
* | | Merge branch 'master' into careminsterMelanie2012-02-242-1/+2
|\ \ \ | |/ / | | / | |/ |/|
| * Stop spurious scene loop startup timeout alarms for scenes with many prims.Justin Clark-Casey (justincc)2012-02-242-1/+2
| * Try to resolve some problems with viewers crashing after hitting parcel banli...Justin Clark-Casey (justincc)2012-02-231-6/+21
* | Merge branch 'master' into careminsterMelanie2012-02-233-14/+11
|\ \ | |/
| * Add a position parameter to region crossing of objects. This avoids theMelanie2012-02-233-11/+10
* | Merge branch 'master' into careminsterMelanie2012-02-211-19/+3
|\ \ | |/
| * Fix problem with dragging child part inventory item to user inventory.Justin Clark-Casey (justincc)2012-02-211-19/+3
* | Merge branch 'master' into careminsterMelanie2012-02-201-1/+3
|\ \ | |/
| * One more tweak related to the previous 2 commits.Diva Canto2012-02-191-1/+3
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-02-191-5/+8
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-02-191-5/+8
| |\ \ | | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-02-191-1/+2
| | |\
| | * | A few more tweaks on position updates and create child agents. Mono hates con...Diva Canto2012-02-191-4/+8
* | | | Merge branch 'ubitwork'Melanie2012-02-191-1/+1
|\ \ \ \
| * | | | try to make crossings work better. chode no longer prevents crossings i hopeUbitUmarov2012-02-151-15/+18
| * | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-154-119/+90
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-101-1/+16
| |\ \ \ \ \
| * | | | | | initial introdution of physics actor building control.UbitUmarov2012-02-081-1/+1