aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-10-2913-281/+234
|\
| * Merge branch 'dev-appearance'Melanie2010-10-2911-270/+233
| |\
| | * Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into ↵Melanie2010-10-2111-271/+235
| | |\ | | | | | | | | | | | | dev-appearance
| | | * Major refactoring of appearance handling.Master ScienceSim2010-10-2011-270/+234
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AvatarService -- add two new methods, GetAppearance and SetAppearance to get around the lossy encoding in AvatarData. Preseve the old functions to avoid changing the behavior for ROBUST services. AvatarAppearance -- major refactor, moved the various encoding methods used by AgentCircuitData, ClientAgentUpdate and ScenePresence into one location. Changed initialization. AvatarAttachments -- added a class specifically to handle attachments in preparation for additional functionality that will be needed for viewer 2. AvatarFactory -- removed a number of unused or methods duplicated in other locations. Moved in all appearance event handling from ScenePresence. Required a change to IClientAPI that propogated throughout all the IClientAPI implementations.
| * | | Revert "Preliminary work on appearance layers. No user functionality yet."Melanie2010-10-291-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | This work conflicts with cmickeyb's more extensive, related work This reverts commit 9c829c0410da89fdbb873f706d7ba63cf26b088f.
| * | | Preliminary work on appearance layers. No user functionality yet.Melanie2010-10-291-3/+8
| | | |
| * | | Formatting cleanup.Jeff Ames2010-10-282-2/+1
| | | |
* | | | Fix a LSL issue and a prim naming issueMelanie2010-10-292-7/+16
| | | |
* | | | Revert "Preliminary work on appearance layers. No user functionality yet."Melanie2010-10-292-16/+7
| | | | | | | | | | | | | | | | This reverts commit e6a8d2872c3ff4992cd7e9615f69e0c6773e461f.
* | | | Preliminary work on appearance layers. No user functionality yet.Melanie2010-10-292-7/+16
| | | |
* | | | Fix attached sounds from HUDs erroneously being delivered to other avatarsMelanie2010-10-281-0/+19
| | | |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-2711-73/+68
|\ \ \ \ | |/ / /
| * | | Prevent nullrefs in scene object deletion. Mantis #5156Melanie2010-10-271-1/+4
| | | |
| * | | Merge branch 'master' of ssh://MyConnection01/var/git/opensimdahlia2010-10-269-63/+37
| |\ \ \
| | * | | Formatting cleanup.Jeff Ames2010-10-279-63/+37
| | | | |
| * | | | Overload Scene.NewUserConnection() to facilitate NPCs and other region ↵dahlia2010-10-261-9/+27
| |/ / / | | | | | | | | | | | | specific applications
* | | | 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-2314-54/+176
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | |
| * | | | 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-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
| | | | | | | | | | | | | | |