aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fix playing sound from HUDsMelanie2010-11-031-8/+0
|
* Merge branch 'master' into careminster-presence-refactorMelanie2010-11-032-0/+2
|\
| * Add lsClearWindlightScene() to the lightshare module to remove WL settingsMelanie2010-11-032-0/+2
| | | | | | | | from a region and allow normal day cycles to be reestablished
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-031-0/+9
|\ \ | |/
| * Actually calculate the height before setting it, this isn't done automaticallyMelanie2010-11-031-1/+7
| | | | | | | | on incoming transfers in all cases.
| * Trying to prevent a wrong physical actor sizeMelanie2010-11-031-0/+3
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-021-4/+1
|\ \ | |/
| * Fix avatar height managementMelanie2010-11-021-24/+11
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-022-51/+67
|\ \ | |/
| * Fix sitting and standing upMelanie2010-11-021-5/+14
| |
| * Old deserialization can't deal with commas in flag fields. Making use of ↵Diva Canto2010-11-021-3/+17
| | | | | | | | -version option on save oar command. Bumped archives version to 0.5; version < 0.5 generates flag fields without commas. Everything else is identical.
| * Move physics actor creation to after SetHeight to try and preventMelanie2010-10-301-11/+11
| | | | | | | | bowlegginess. Didn't work but is better this way anyway.
| * 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-291-5/+5
| | | | | | | | commenting out most of them as per Mic
| * Merge branch 'justincc-dev'Justin Clark-Casey (justincc)2010-10-291-3/+9
| |\
| | * add timing report to CompleteScenePresence for diagnostic purposesJustin Clark-Casey (justincc)2010-10-291-1/+8
| | |
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-293-23/+96
|\ \ \ | |/ /
| * | Merge commit 'cmickeyb/dev-appearance'Melanie2010-10-293-23/+96
| |\ \
| | * | 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-292-20/+53
| | | | | | | | | | | | | | | | | | | | and avatar data are sent. And the number of times they are stored.
| | * | Merge branch 'opensim-master' into dev-appearanceMaster ScienceSim2010-10-285-25/+88
| | |\ \ | | | |/
| | * | First attempt to get multiple attachments working to support viewer2.Master ScienceSim2010-10-211-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-293-168/+48
|\ \ \ \ | |/ / /
| * | | Merge branch 'dev-appearance'Melanie2010-10-293-159/+48
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into ↵Melanie2010-10-213-160/+50
| | |\ \ | | | |/ | | | | | | | | dev-appearance
| | | * Major refactoring of appearance handling.Master ScienceSim2010-10-203-159/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 careminster-presence-refactorMelanie2010-10-274-14/+35
|\ \ \ \ | |/ / /
| * | | Prevent nullrefs in scene object deletion. Mantis #5156Melanie2010-10-271-1/+4
| | | |
| * | | Merge branch 'master' of ssh://MyConnection01/var/git/opensimdahlia2010-10-262-4/+4
| |\ \ \
| | * | | Formatting cleanup.Jeff Ames2010-10-272-4/+4
| | | | |
| * | | | Overload Scene.NewUserConnection() to facilitate NPCs and other region ↵dahlia2010-10-261-9/+27
| |/ / / | | | | | | | | | | | | specific applications
* | | | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-10-251-16/+22
|\ \ \ \ | | | | | | | | | | | | | | | 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.
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-251-3/+16
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | 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.
* | | | Change the results from llGetPrimitiveParams to be the same as SL forMelanie2010-10-241-1/+1
| | | | | | | | | | | | | | | | | | | | the prim position. This will make attached resizer scripts work like SL. Existing resizers may be affected adversely.
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-232-2/+35
|\ \ \ \ | |/ / /
| * | | 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-222-7/+2
| |/ / / | | | | | | | | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
| * | | Merge branch 'hg16' into mantis5110Jonathan Freedman2010-10-222-2/+7
| |\ \ \
| | * | | * change the data exchanged within hypergrid transactionsJonathan Freedman2010-10-212-2/+5
| | | | |
| | * | | * remove some spurious debug infoJonathan Freedman2010-10-201-0/+2
| | | |/ | | |/|
| * | | Allow region modules to know which agents actually receive chatJustin Clark-Casey (justincc)2010-10-221-0/+35
| | | |
| * | | Make SImStatsReporter pick ObjectCapacity striaght out of region infoMelanie2010-10-222-9/+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!
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-212-9/+3
|\ \ \ | | |/ | |/|
| * | Make SImStatsReporter pick ObjectCapacity striaght out of region infoMelanie2010-10-212-9/+3
| | |
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-212-8/+52
|\ \ \ | |/ /
| * | * remove some spurious debug infoJonathan Freedman2010-10-201-0/+2
| |/ | | | | | | | | | | * The last 4 commits are a patch from otakup0pe that's supposed to make URLs better somehow in an effort to make it easier to do hypergrid (I think).. But as it seems that I'm the only one who was able to apply the patch.. and I looked it over and it doesn't look like it breaks anything via the diffs.. I'll sign off on it. Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
generated by cgit v1.1 at 2024-12-23 21:33:55 +0000