aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into mantis5110Jonathan Freedman2010-10-302-5/+1
|\
| * * AbsolutePosition.Get{} returns incorrect result for child prim so switch ↵Teravus Ovares (Dan Olivares)2010-10-301-1/+1
| | | | | | | | to using prim.GetWorldPosition() in the warp renderer.
| * On first login, Ruth is back now. Strangely, inventory items are created forMelanie2010-10-301-4/+0
| | | | | | | | | | tattoo and alpha layers. Any change of appearance in the sim makes the green gnome reappear on next login. Progress of sorts.
* | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-3016-486/+342
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
| * Logins work now, but avatars are green ugly gnomes.Melanie2010-10-301-2/+0
| |
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-301-22/+0
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-10-3011-423/+282
| | |\
| | * | minor: remove some old commented out codeJustin Clark-Casey (justincc)2010-10-301-22/+0
| | | |
| * | | This commit fixes all the appearance related null refs. Still can't log in,Melanie2010-10-304-59/+80
| | |/ | |/| | | | | | | client displays a blank error box.
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-301-1/+1
| |\ \ | | |/
| | * Set async_packet_handling = true by defaultJustin Clark-Casey (justincc)2010-10-301-1/+1
| | | | | | | | | | | | | | | | | | Setting this to true avoids a 500ms or so client freeze when the LLUDP server thread is taken up with processing a UseCircuitCode packet synchronously. Extensive testing on Wright Plaza appeared to show no bad effects and this seems to reduce login lag considerably. Of course, a lot of login lag is still coming from other sources.
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-3011-103/+98
| |\ \ | | |/
| | * Change level of some logging messages, turning some info into arguably more ↵Justin Clark-Casey (justincc)2010-10-302-33/+34
| | | | | | | | | | | | appropriate debug to reduce console spam when log level is info
| * | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.Melanie2010-10-3011-423/+282
| | | | | | | | | | | | | | | | | | | | | | | | | | | It contains a major interface version bump and will NOT work with earlier grid services. This is preliminary work that will lead to layers support. Rest appearance services are commented out completely, they will have to be adapted by someone who actually uses them. Remote admin is working, but has no layers support. There is no layers support in the database. Login likely won't work. You have been warned.
* | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-299-70/+64
|\ \ \ | | |/ | |/|
| * | 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-294-57/+39
| | | | | | | | | | | | commenting out most of them as per Mic
| * | Merge branch 'justincc-dev'Justin Clark-Casey (justincc)2010-10-296-11/+23
| |\ \ | | |/ | |/|
| | * 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-294-6/+6
| | | | | | | | | | | | 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-296-82/+270
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Merge commit 'cmickeyb/dev-appearance'Melanie2010-10-2913-303/+553
| |\ \
| | * | 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-295-81/+132
| | | | | | | | | | | | | | | | | | | | and avatar data are sent. And the number of times they are stored.
| * | | Add my work on top of cmickeyb'sMelanie2010-10-291-1/+99
| | | |
| * | | Merge branch 'dev-appearance'Melanie2010-10-2928-779/+954
| |\ \ \
| | * \ \ Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into ↵Melanie2010-10-2128-780/+956
| | |\ \ \ | | | | | | | | | | | | | | | | | | dev-appearance
| * | | | | Revert "Preliminary work on appearance layers. No user functionality yet."Melanie2010-10-292-201/+261
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-292-261/+201
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-291-23/+29
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: OpenSim/Services/GridService/HypergridLinker.cs
| * | | | HypergridLinker optimizations and enable use of owner_uuid/EstateOwner with ↵Marck2010-10-281-20/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | linked regions. * Added check for already occupied region coordinates. * Optimized Check4096.
* | | | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-2941-934/+1261
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | | Configuration of persistent baked textures and save/send delays.Master ScienceSim2010-10-282-5/+27
| | | | |
| * | | | Merge branch 'opensim-master' into dev-appearanceMaster ScienceSim2010-10-2821-120/+261
| |\ \ \ \ | | |/ / /
| | * | | 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-282-59/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to accommodate batching of the many updates that happen on login and teleport. Fixed handling of the serial property in appearance.
| * | | | Small cleanup and add more debugging informationMaster ScienceSim2010-10-262-8/+23
| | | | |
| * | | | 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-254-21/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Intermediate commit for backward compatability; does not compile yetMic Bowman2010-10-252-62/+73
| | | | |
| * | | | First attempt to get multiple attachments working to support viewer2.Master ScienceSim2010-10-216-111/+100
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 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-2028-779/+955
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
|\ \ \ \ | |/ / /
generated by cgit v1.1 at 2024-11-09 01:29:11 +0000