aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | 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-211-68/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Add my work on top of cmickeyb'sMelanie2010-10-291-1/+99
| | | |
* | | | Add my work on top of cmickeyb'sMelanie2010-10-291-1/+99
| | | |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-298-504/+602
|\ \ \ \ | |/ / /
| * | | Merge branch 'dev-appearance'Melanie2010-10-298-504/+602
| |\ \ \
| | * \ \ Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into ↵Melanie2010-10-218-504/+602
| | |\ \ \ | | | |/ / | | | | | | | | | | dev-appearance
| | | * | Major refactoring of appearance handling.Master ScienceSim2010-10-208-504/+602
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-193/+258
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-258/+193
| | |_|/ | |/| |
* | | | Revert "Preliminary work on appearance layers. No user functionality yet."Melanie2010-10-291-193/+258
| | | | | | | | | | | | | | | | This reverts commit e6a8d2872c3ff4992cd7e9615f69e0c6773e461f.
* | | | Preliminary work on appearance layers. No user functionality yet.Melanie2010-10-291-258/+193
| | | |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-234-38/+9
|\ \ \ \ | |/ / /
| * | | Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-223-38/+7
| | | | | | | | | | | | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
| * | | Merge branch 'hg16' into mantis5110Jonathan Freedman2010-10-223-7/+38
| |\ \ \
| | * | | * remove some spurious debug infoJonathan Freedman2010-10-201-5/+5
| | | | |
| | * | | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-174-6/+146
| | |\ \ \ | | | | |/ | | | |/|
| | * | | * more url / hg cleanupJonathan Freedman2010-10-112-4/+29
| | | | |
| | * | | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-102-17/+21
| | |\ \ \
| | * \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-051-1/+36
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-031-0/+11
| | |\ \ \ \ \
| | * | | | | | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-022-6/+12
| | | | | | | |
| * | | | | | | 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.
* | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-213-7/+38
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | * remove some spurious debug infoJonathan Freedman2010-10-201-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * | | | | | * more url / hg cleanupJonathan Freedman2010-10-202-4/+29
| | | | | | |
| * | | | | | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-202-6/+12
| |/ / / / /
* | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-181-6/+51
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Adding osFunctions for light projectionBlueWall2010-10-171-5/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the projection parameters in the host prim ... osSetProjectionParam(bool Enabled, key TextureMaskUUID, float FOV, float Focus, float Ambiance); Set the projection parameters in a target prim ... osSetProjectionParam(ikey target uuid, bool Enabled, key TextureMaskUUID, float FOV, float Focus, float Ambiance); Threat Level very high Signed-off-by: Melanie <melanie@t-data.com>
| * | | | | Add missing check for !_projectionEntryBlueWall2010-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
* | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-164-4/+99
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Adding projected light filters to prim propetiesBlueWall2010-10-151-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requires the LL Mesh Beta viewer Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
| * | | | | * Tweaked the upload response and now at least uploading the mesh works.Teravus Ovares (Dan Olivares)2010-10-141-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | * Binary error on downloading the mesh though.. so still not yet working.
| * | | | | Kill some magic numbers in the caps moduleMelanie2010-10-141-3/+3
| | | | | |
| * | | | | * Partially complete stuff for Mesh support that Melanie wanted to see ↵Teravus Ovares (Dan Olivares)2010-10-141-1/+2
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | before it was done. * Shouldn't break the build. * Doesn't work yet either.
* | | | | Add a setter to OldItemID so it can be deserializedMelanie2010-10-131-0/+3
| | | | |
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-092-17/+21
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
| * | | | minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2010-10-091-4/+4
| | | | |
| * | | | Limit formatting of local console output to actual logging messages.Marck2010-10-091-13/+17
| | |_|/ | |/| | | | | | | | | | | | | | The formatting of lines with the help of a regular expression match will be done only for output with an explicitly given logging level. This fixes the issue of colons being added to help texts on the local console.
* | | | Make SendKillObject send multiple localIDs in one packet. This avoids theMelanie2010-10-081-1/+1
| | | | | | | | | | | | | | | | halting visual behavior of large group deletes and eliminates the packet flood
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-041-1/+36
|\ \ \ \ | |/ / /
| * | | Added viewer's channel, mac, and id0 to agent circuit data. Also moved ↵Diva Canto2010-10-031-1/+36
| | |/ | |/| | | | | | | client ip address to agent circuit data, so that it's always there.
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-031-0/+11
|\ \ \ | |/ /
| * | Port ExecutingDirectory from omfOS Util class.Melanie2010-10-031-0/+11
| |/
* | When clearing the addin registry, respect a custom pathMelanie2010-09-241-4/+13
| |
* | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-09-211-5/+3
|\ \ | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | Fix a merge artefact that broke script state persistence in XAttachmentsMelanie2010-09-191-5/+3
| | |
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-218-19/+484
|\ \ \ | |/ / |/| / | |/
| * * Tweaked the LocationTests for maximum coverage.Teravus Ovares (Dan Olivares)2010-09-182-1/+60
| | | | | | | | * Added more mundane tests.
| * * Covered the type converters in SLUtil with unit tests.Teravus Ovares (Dan Olivares)2010-09-181-1/+57
| | | | | | | | * Does anyone have an example raw notecard to look at and test the notecard parser?
generated by cgit v1.1 at 2025-01-19 03:32:15 +0000