aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | | Revert "Revert "More hacking around viewer bug""Diva Canto2012-03-151-1/+1
* | | These SLURLs are very confusing! -- reverting the revert. Hack is, indeed, ne...Diva Canto2012-03-151-1/+13
* | | Revert "Hack around https://jira.secondlife.com/browse/VWR-28570"Diva Canto2012-03-151-13/+1
* | | Revert "More hacking around viewer bug"Diva Canto2012-03-151-1/+1
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-154-225/+158
|\ \ \ | |/ /
| * | Remove property/field duplication in ScriptInstance where it's unnecessary.Justin Clark-Casey (justincc)2012-03-152-170/+115
| * | Simplify some logic in the ScriptInstance constructor - running is set to fal...Justin Clark-Casey (justincc)2012-03-151-9/+3
| * | minor: correct indentation levelsJustin Clark-Casey (justincc)2012-03-151-13/+12
| * | Remove duplication of m_RunEvents and RunningJustin Clark-Casey (justincc)2012-03-151-17/+11
| * | Fix a problem where multiple near simultaneous calls to llDie() from multiple...Justin Clark-Casey (justincc)2012-03-152-20/+10
| * | Alleviate an issue where calling Thread.Abort() on script WorkItems can fail ...Justin Clark-Casey (justincc)2012-03-152-4/+15
* | | More hacking around viewer bugDiva Canto2012-03-151-1/+1
* | | Hack around https://jira.secondlife.com/browse/VWR-28570Diva Canto2012-03-151-1/+13
|/ /
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-133-25/+50
|\ \
| * | refactor: rename ScriptInstance.m_CurrentResult to m_CurrentWorkItem to make ...Justin Clark-Casey (justincc)2012-03-143-25/+50
* | | Teleports: bounce off repeated requests of teleporting the same agent. Some s...Diva Canto2012-03-131-0/+13
* | | Minor sanity check on simulation agent handler (content type)Diva Canto2012-03-131-7/+12
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-136-4/+14
|\ \ \ | |/ /
| * | Add max thread and min thread information to "xengine status" region console ...Justin Clark-Casey (justincc)2012-03-122-0/+5
| * | Rename the stream extension method WebUtil.CopyTo() to WebUtil.CopyStream().Robert Adams2012-03-124-4/+9
* | | Datasnapshot: added "secret" to the registration/deregistration query so that...Diva Canto2012-03-132-33/+28
|/ /
* | DataSnapshot: renamed gridserverURL to gatekeeperURL, and normalimzed the cap...Diva Canto2012-03-121-2/+2
* | Added osGetGridGatekeeperURI()Diva Canto2012-03-103-0/+20
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-109-111/+236
|\ \
| * | 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
| * | Add ability to specify a default estate to be used when creating regions.Justin Clark-Casey (justincc)2012-03-101-64/+152
| * | Factor out common default animations code into SLUtil. LLClientView now make...Justin Clark-Casey (justincc)2012-03-094-62/+55
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-03-094-6/+85
| |\ \
| * | | fix for NPC not playing internal animationssatguru srivastava2012-03-091-1/+36
* | | | Serialize all web requests to a particular host:port pair; only applied to th...Mic Bowman2012-03-091-0/+41
| |/ / |/| |
* | | More on inventory transfer hold ups:Diva Canto2012-03-093-5/+84
* | | More on HG inventory transfers. Move the FireAndForget higher up.Diva Canto2012-03-092-2/+2
* | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-084-88/+36
|\ \ \ | |/ /
| * | Simplify minimap coarse location code by just reference SP.AbsolutePositionJustin Clark-Casey (justincc)2012-03-092-12/+3
| * | Get rid of unnecessary ParentID == 0 check on SP.Get_AbsolutePosition since t...Justin Clark-Casey (justincc)2012-03-091-2/+2
| * | Use SP.ParentPart instead of ParentID in places where it's more efficient (sa...Justin Clark-Casey (justincc)2012-03-094-68/+32
| * | refactor: cleanup SP.HandleAgentSit so that everything is done within one if ...Justin Clark-Casey (justincc)2012-03-091-15/+8
* | | More on the freeze on HG inventory transfers: spawn a threadlet on the funct...Diva Canto2012-03-081-1/+1
|/ /
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-086-48/+796
|\ \
| * | Remove a race condition from SP.Set_AbsolutePosition where we assume the Pare...Justin Clark-Casey (justincc)2012-03-091-5/+5
| * | FireAndForget scripted rez - port from AvinationMelanie2012-03-091-41/+46
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-092-29/+32
| |\ \
| * \ \ Merge branch 'xassetservice'Justin Clark-Casey (justincc)2012-03-094-2/+745
| |\ \ \
| | * | | minor: move some compression related var setup inside compression if/then switchJustin Clark-Casey (justincc)2012-03-091-4/+3
| | * | | Put big fat EXPERIMENTAL warning in xassetservice database pluginJustin Clark-Casey (justincc)2012-03-091-0/+10
| | * | | Switch to sha256 from sha1 in order to avoid future asset hash collisions.Justin Clark-Casey (justincc)2012-03-062-9/+17
| | * | | remove unnecessary hash local variableJustin Clark-Casey (justincc)2012-03-051-2/+0