aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* This commit fixes all the appearance related null refs. Still can't log in,Melanie2010-10-302-3/+8
| | | | client displays a blank error box.
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-302-23/+16
|\
| * Rationalize the logging messages from the merged appearance branch, ↵Justin Clark-Casey (justincc)2010-10-292-23/+16
| | | | | | | | commenting out most of them as per Mic
* | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.Melanie2010-10-305-316/+145
|/ | | | | | | | | 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 commit 'cmickeyb/dev-appearance'Melanie2010-10-294-157/+207
|\
| * Bunch of fixes that reduce the number of times appearanceMaster ScienceSim2010-10-291-18/+17
| | | | | | | | | | and avatar data are sent. And the number of times they are stored.
| * Configuration of persistent baked textures and save/send delays.Master ScienceSim2010-10-281-1/+13
| |
| * Merge branch 'opensim-master' into dev-appearanceMaster ScienceSim2010-10-281-0/+2
| |\
| * | Added background thread to handle delayed send and save of appearanceMaster ScienceSim2010-10-281-4/+7
| | | | | | | | | | | | | | | | | | | | | 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
| | |
| * | Half of the compatibility is working. Login into a new region withMaster ScienceSim2010-10-253-20/+28
| | | | | | | | | | | | | | | | | | 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-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
| | |
* | | 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.
| * | | * 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
| |/ /
* | | 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 "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.
* | | | | 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>
* | | | | 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.
* | | | 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.
* | | 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.
* | Port ExecutingDirectory from omfOS Util class.Melanie2010-10-031-0/+11
|/
* * 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?
* * More Mundane TestsTeravus Ovares (Dan Olivares)2010-09-172-0/+198
| | | | * SL Util tests of AssetType2ContentType and ContentType2AssetType
* REST Console delivers responses with content type text/xml instead of ↵Marck2010-09-181-2/+2
| | | | | | text/plain. Non-error responses to requests SessionCommand and CloseSession should use the appropriate content type for their XML data payload.
* Add m_syncRoot lock to MapAndArray.ContainsKey(), as discussed with jhurlimanJustin Clark-Casey (justincc)2010-09-181-2/+3
| | | | Though this is actually thread-safe on .net 4.0 and mono today, the .net sdk states that Dictionary instance members are not guaranteed thread-safe
* Move OpenSim/Framework/tests/PrimeNumberHelperTests.cs to ↵Justin Clark-Casey (justincc)2010-09-181-0/+0
| | | | | | OpenSim/Framework/Tests/PrimeNumberHelperTests.cs I'm assuming the lowercase tests was a mistake. Please revert if it actually wasn't
* * Fixed and re-enabled CacheTestsTeravus Ovares (Dan Olivares)2010-09-173-15/+166
| | | | | * Added MundaneFrameworkTests.cs for the really mundane tests like testing properties,constructors, etc in OpenSim.Framework. * Fixed LeftAxis and UpAxis unpacking from OSD to AgentPosition (copy and paste error caught while writing mundane test) (Good thing nobody uses the camera frustum from remote regions yet)
* * Add a few more tests to help our meager code coverage %.Teravus Ovares (Dan Olivares)2010-09-172-0/+242
| | | | | | * Tests Animation Constructors * Tests Animation OSD Packing/Unpacking * Tests the PrimeNumberHelper class which is used in the cache.
generated by cgit v1.1 at 2024-12-27 04:58:46 +0000