aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-2225-214/+193
| |/ / / / | | | | | | | | | | | | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
| * | | | Merge remote branch 'otakup0pe/mantis5110'Justin Clark-Casey (justincc)2010-10-2225-193/+214
| |\ \ \ \
| | * \ \ \ Merge branch 'hg16' into mantis5110Jonathan Freedman2010-10-2225-193/+214
| | |\ \ \ \
| | | * | | | * change the data exchanged within hypergrid transactionsJonathan Freedman2010-10-2110-44/+108
| | | | | | |
| | | * | | | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-203-20/+68
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | * | | | * remove some spurious debug infoJonathan Freedman2010-10-203-20/+22
| | | | | | |
| | | * | | | 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-189-66/+115
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-1727-331/+2400
| | | |\ \ \ \ \ \
| | | * | | | | | | * more url / hg cleanupJonathan Freedman2010-10-118-45/+56
| | | | | | | | | |
| | | * | | | | | | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-107-32/+49
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-0714-70/+369
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-0517-30051/+0
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ 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-0528-70/+213
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-0314-71/+1462
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | * additional serveruri cleanupJonathan Freedman2010-10-038-54/+20
| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-0214-94/+72
| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | 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.
| | * | | | | | | | | | | | | | Allow OARs and IARs to save and load meshes.Justin Clark-Casey (justincc)2010-10-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Save and reload appears okay for the duck mesh at https://collada.org/owl/download.php?sess=0&parent=126&expand=1&order=name&curview=0&binary=1&id=698/ However, one attempt at trying to load a more complicated scene failed (errors on console, only triangles appearing in mesh viewer). Not sure if this is really and OAR load problem. Needs more investigation.
| | * | | | | | | | | | | | | | 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-2214-72/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 55974df14b6d64c1e1f9e386a3eacce3ba86dc98.
| * | | | | | | | | | | | | | | Revert "* additional serveruri cleanup"Justin Clark-Casey (justincc)2010-10-228-20/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 19119d7705f8381a3c207d0e64a23243215a12b9.
| * | | | | | | | | | | | | | | Revert "* more url / hg cleanup"Justin Clark-Casey (justincc)2010-10-228-56/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 58f75fa19d9aea18283ecdbd44559efb81781c9d.
| * | | | | | | | | | | | | | | Revert "* remove some spurious debug info"Justin Clark-Casey (justincc)2010-10-223-22/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | | | | | | Allow OARs and IARs to save and load meshes.Justin Clark-Casey (justincc)2010-10-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Save and reload appears okay for the duck mesh at https://collada.org/owl/download.php?sess=0&parent=126&expand=1&order=name&curview=0&binary=1&id=698/ However, one attempt at trying to load a more complicated scene failed (errors on console, only triangles appearing in mesh viewer). Not sure if this is really and OAR load problem. Needs more investigation.
| * | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Change some exception to use ToString(). e.Message is not sufficient to fixMelanie2010-10-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | errors. Please don't use e.Message, devs NEED to see the dumps!
* | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-215-14/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | |