aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'careminster-presence-refactor' of ↵Melanie2010-10-254-16/+37
|\ | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * Comment repeated add and remove of avatars from the physical scene. It's noMelanie2010-10-251-16/+22
| | | | | | | | longer needed.
| * Implement llGetLinkNumberOfSides(), needed for 1-script sculptie foot shoeMelanie2010-10-253-0/+15
| | | | | | | | scripts.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-252-5/+18
|\ \ | |/ |/|
| * * Updated libomv to r3461Latif Khalifa2010-10-241-2/+2
| | | | | | | | Main reason for upgrade is to revert API change that was introduced in order to support headerless binary LLSD decoding needed for deserialization of the mesh assets, which turned out to be unnecessary as we can transparently decode both kinds.
| * Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCALMelanie2010-10-242-0/+30
| |
| * Added inner exception handling in Shape deserialization processing, so that ↵Diva Canto2010-10-231-3/+16
| | | | | | | | the whole Shape processing returns a valid Shape object.
* | Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCALMelanie2010-10-242-0/+30
| |
* | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-10-241-2/+11
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | Prevent an exception if a string passed into llXorBase64StringsCorrect is notMelanie2010-10-231-2/+11
| | | | | | | | | | | | a base 64 string. Return the empty string in this case.
* | | Change the results from llGetPrimitiveParams to be the same as SL forMelanie2010-10-242-8/+1
|/ / | | | | | | | | the prim position. This will make attached resizer scripts work like SL. Existing resizers may be affected adversely.
* | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-10-231-20/+8
|\ \ | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ Merge branch 'careminster-presence-refactor' of ↵Melanie2010-10-235-37/+49
| |\ \ | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | | Prevent database lookups on every avatar movement when land is set to groupMelanie2010-10-231-20/+8
| | | | | | | | | | | | | | | | access. Fixes a massive performance degradation.
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-2330-156/+298
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-10-221-3/+3
| |\ \
| | * | 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!
| * | | 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.