aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into mantis5110Jonathan Freedman2010-10-296-46/+47
|\
| * tweak a few more scene presence logging messages for consistencyJustin Clark-Casey (justincc)2010-10-291-3/+3
| |
| * Rationalize the logging messages from the merged appearance branch, ↵Justin Clark-Casey (justincc)2010-10-292-34/+23
| | | | | | | | commenting out most of them as per Mic
| * Merge branch 'justincc-dev'Justin Clark-Casey (justincc)2010-10-295-10/+22
| |\
| | * add timing report to CompleteScenePresence for diagnostic purposesJustin Clark-Casey (justincc)2010-10-291-1/+8
| | |
| | * for now, comment out some older or redundant log debug lines to make ↵Justin Clark-Casey (justincc)2010-10-293-5/+5
| | | | | | | | | | | | diagnostics easier
| | * Add number of ms it takes to complete UseCircuitCode packet handling to log ↵Justin Clark-Casey (justincc)2010-10-291-2/+8
| | | | | | | | | | | | for diagnostics
* | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-295-63/+154
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Merge commit 'cmickeyb/dev-appearance'Melanie2010-10-296-116/+327
| |\ \
| | * | Clean up some cruft from the last commit. Re-add the initial updateMaster ScienceSim2010-10-292-2/+41
| | | | | | | | | | | | | | | | | | | | send in the scene presence constructor... need to figure this out later.
| | * | Bunch of fixes that reduce the number of times appearanceMaster ScienceSim2010-10-294-63/+115
| | | | | | | | | | | | | | | | | | | | and avatar data are sent. And the number of times they are stored.
| * | | 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
| * | | | | 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
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-2923-357/+432
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | | Configuration of persistent baked textures and save/send delays.Master ScienceSim2010-10-281-4/+14
| | | | |
| * | | | Merge branch 'opensim-master' into dev-appearanceMaster ScienceSim2010-10-2820-120/+259
| |\ \ \ \ | | |/ / /
| | * | | Formatting cleanup.Jeff Ames2010-10-282-2/+1
| | | | |
| | * | | 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
| * | | | Added background thread to handle delayed send and save of appearanceMaster ScienceSim2010-10-281-55/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to accommodate batching of the many updates that happen on login and teleport. Fixed handling of the serial property in appearance.
| * | | | Made the check for texture assets asynchronous. This is one part ofMaster ScienceSim2010-10-261-7/+10
| | | | | | | | | | | | | | | | | | | | a bigger clean up that needs to happen around locks on appearance.
| * | | | Half of the compatibility is working. Login into a new region withMaster ScienceSim2010-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | old data works. Teleport out of a new region with old data works. Teleport into a new region with old data does not trigger the necessary rebake.
| * | | | First attempt to get multiple attachments working to support viewer2.Master ScienceSim2010-10-212-13/+11
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | The attachment code appears to work correctly for 1.23 viewers so, in spite of some big changes in the internal representation, there don't appear to be regressions. That being said, I still can't get a viewer2 avatar to show correctly.
| * | | 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.
* | | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-251-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | * 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.
* | | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-243-3/+46
|\ \ \ \ | |/ / /
| * | | 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.
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-10-221-3/+3
| |\ \ \
| * | | | 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 branch 'master' into mantis5110Jonathan Freedman2010-10-243-5/+5
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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 remote branch 'otakup0pe/mantis5110'Justin Clark-Casey (justincc)2010-10-229-54/+35
| |\ \ \
| * | | | 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
| | | | |
generated by cgit v1.1 at 2024-08-27 02:41:54 +0000