aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-229-35/+54
| | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
* Merge remote branch 'otakup0pe/mantis5110'Justin Clark-Casey (justincc)2010-10-229-54/+35
|\
| * Merge branch 'hg16' into mantis5110Jonathan Freedman2010-10-229-54/+35
| |\
| | * * change the data exchanged within hypergrid transactionsJonathan Freedman2010-10-215-8/+14
| | |
| | * Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-202-19/+67
| | |\
| | * | * remove some spurious debug infoJonathan Freedman2010-10-201-0/+2
| | | |
| | * | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-202-8/+379
| | |\ \
| | * \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-186-64/+111
| | |\ \ \
| | * \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-1719-322/+2240
| | |\ \ \ \
| | * | | | | * more url / hg cleanupJonathan Freedman2010-10-112-26/+12
| | | | | | |
| | * | | | | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-105-15/+28
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-0713-69/+368
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-053-3/+20
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-0514-43/+76
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-0312-70/+1450
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | * additional serveruri cleanupJonathan Freedman2010-10-033-5/+5
| | | | | | | | | | | |
| | * | | | | | | | | | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-023-22/+9
| | | | | | | | | | | |
| * | | | | | | | | | | Fix llParcelMediaCommandList() so that it applies commands only to the ↵Justin Clark-Casey (justincc)2010-10-221-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parcel that the script is in, not all parcels. Patch from http://opensimulator.org/mantis/view.php?id=2738 Thanks snoopy and fineman.
| * | | | | | | | | | | print IAR version number on console when savingJustin Clark-Casey (justincc)2010-10-221-2/+6
| | | | | | | | | | | |
| * | | | | | | | | | | Implement guard against trying to load incompatible version IARsJustin Clark-Casey (justincc)2010-10-222-3/+20
| | | | | | | | | | | |
| * | | | | | | | | | | start parsing iar control fileJustin Clark-Casey (justincc)2010-10-222-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml
| * | | | | | | | | | | slightly simplify oar control file loading codeJustin Clark-Casey (justincc)2010-10-221-10/+3
| | | | | | | | | | | |
| * | | | | | | | | | | write IAR control file first in the archive rather than lastJustin Clark-Casey (justincc)2010-10-222-5/+8
| | | | | | | | | | | |
| * | | | | | | | | | | Allow region modules to know which agents actually receive chatJustin Clark-Casey (justincc)2010-10-222-8/+71
| | | | | | | | | | | |
| * | | | | | | | | | | This fixes a delay in llSetLinkPrimitiveParamsFastAdelleF2010-10-221-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
| * | | | | | | | | | | Make SImStatsReporter pick ObjectCapacity striaght out of region infoMelanie2010-10-222-9/+3
| | | | | | | | | | | |
| * | | | | | | | | | | Remove a bit of dead code relating to ObjectCapacityMelanie2010-10-221-2/+0
| | | | | | | | | | | |
| * | | | | | | | | | | Fix the OOB error (#5102). Sorry, my bad.Melanie2010-10-221-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Skip empty strings in ParseString* functionsMelanie2010-10-221-0/+6
| | | | | | | | | | | |
* | | | | | | | | | | | Revert "* refactor refactor refactor ServerURI 4 lyfe"Justin Clark-Casey (justincc)2010-10-223-9/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 55974df14b6d64c1e1f9e386a3eacce3ba86dc98.
* | | | | | | | | | | | Revert "* additional serveruri cleanup"Justin Clark-Casey (justincc)2010-10-223-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 19119d7705f8381a3c207d0e64a23243215a12b9.
* | | | | | | | | | | | Revert "* more url / hg cleanup"Justin Clark-Casey (justincc)2010-10-222-12/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 58f75fa19d9aea18283ecdbd44559efb81781c9d.
* | | | | | | | | | | | Revert "* remove some spurious debug info"Justin Clark-Casey (justincc)2010-10-221-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 017b83d0a3e3ac6a1c8bc86b9bef1ee47cba059e.
* | | | | | | | | | | | Fix llParcelMediaCommandList() so that it applies commands only to the ↵Justin Clark-Casey (justincc)2010-10-221-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parcel that the script is in, not all parcels. Patch from http://opensimulator.org/mantis/view.php?id=2738 Thanks snoopy and fineman.
* | | | | | | | | | | | print IAR version number on console when savingJustin Clark-Casey (justincc)2010-10-221-2/+6
| | | | | | | | | | | |
* | | | | | | | | | | | Implement guard against trying to load incompatible version IARsJustin Clark-Casey (justincc)2010-10-222-3/+20
| | | | | | | | | | | |
* | | | | | | | | | | | start parsing iar control fileJustin Clark-Casey (justincc)2010-10-222-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml
* | | | | | | | | | | | slightly simplify oar control file loading codeJustin Clark-Casey (justincc)2010-10-221-10/+3
| | | | | | | | | | | |
* | | | | | | | | | | | write IAR control file first in the archive rather than lastJustin Clark-Casey (justincc)2010-10-222-5/+8
| | | | | | | | | | | |
* | | | | | | | | | | | minor: add some text to the oar abort messages on assets timeout to make it ↵Justin Clark-Casey (justincc)2010-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clear that the oar will not be usable
* | | | | | | | | | | | Allow region modules to know which agents actually receive chatJustin Clark-Casey (justincc)2010-10-222-8/+71
| | | | | | | | | | | |
* | | | | | | | | | | | This fixes a delay in llSetLinkPrimitiveParamsFastAdelleF2010-10-211-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
* | | | | | | | | | | | Deleted a verbose and unneeded log message.Diva Canto2010-10-211-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Make SImStatsReporter pick ObjectCapacity striaght out of region infoMelanie2010-10-212-9/+3
| | | | | | | | | | | |
* | | | | | | | | | | | Remove a bit of dead code relating to ObjectCapacityMelanie2010-10-211-2/+0
| | | | | | | | | | | |
* | | | | | | | | | | | Fix the OOB error (#5102). Sorry, my bad.Melanie2010-10-211-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Skip empty strings in ParseString* functionsMelanie2010-10-211-0/+6
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' of ssh://MyConnection01/var/git/opensimdahlia2010-10-206-46/+21
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | * remove some spurious debug infoJonathan Freedman2010-10-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The last 4 commits are a patch from otakup0pe that's supposed to make URLs better somehow in an effort to make it easier to do hypergrid (I think).. But as it seems that I'm the only one who was able to apply the patch.. and I looked it over and it doesn't look like it breaks anything via the diffs.. I'll sign off on it. Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
| * | | | | | | | | | | * more url / hg cleanupJonathan Freedman2010-10-202-26/+12
| | | | | | | | | | | |