| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-09 | 4 | -48/+47 |
| |\ | |||||
| | * | Formatting cleanup. | Jeff Ames | 2010-11-08 | 4 | -48/+47 |
| | | | |||||
| * | | Remove "OpenSimulator" from startup message | Melanie | 2010-11-09 | 1 | -1/+1 |
| | | | |||||
| * | | Change "OpenSim" to "Careminster" and remove CM suffix. | Melanie | 2010-11-09 | 1 | -2/+2 |
| | | | |||||
| * | | Revert "Fix for hanging on "Connecting to region".. caused by packets being ↵ | Melanie | 2010-11-05 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | processed before the presence has bound to receive events. Fixed this by adding packets to a queue and then processing them when the presence is ready." This reverts commit 91b1d17e5bd3ff6ed006744bc529b53a67af1a64. Conflicts: OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-03 | 1 | -0/+1 |
| |\ \ | |/ | |||||
| | * | When LightShare is enabled, the standard day cycle is bypassed and replaced by | Melanie | 2010-11-03 | 1 | -0/+1 |
| | | | | | | | | | | | | | midday defaults when no specific LightShare profile is set. This prevents LightShare info being send out when the region has no LightShare profile, allowing normal day/night cycles to happen. | ||||
| | * | Admin Server can now bind to a private ip address | mores | 2010-11-03 | 1 | -0/+9 |
| | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| * | | Admin Server can now bind to a private ip address | mores | 2010-11-03 | 1 | -0/+9 |
| | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-02 | 8 | -349/+244 |
| |\ \ | |/ | |||||
| | * | Fix default club feet | Melanie | 2010-11-02 | 1 | -1/+1 |
| | | | |||||
| | * | Add support for cross-domain AJAX requests to REST console. | Marck | 2010-11-02 | 1 | -0/+31 |
| | | | | | | | | | | | | | Enables RemoteConsole to add the appropriate HTTP header when responding to requests that use Cross-Origin Resource Sharing (CORS with simple requests). The allowed origin is set with configuration option "ConsoleAllowedOrigin" in section [Network]. For a suggestion to make this configuration option more flexible, see the TODO comment in the source code. The WifiConsole uses this functionality with grid mode. | ||||
| | * | Support for CORS with simple requests in BaseHttpServer | Marck | 2010-11-02 | 1 | -0/+4 |
| | | | |||||
| | * | Try to not make avatars switch outfits | Melanie | 2010-11-02 | 1 | -3/+0 |
| | | | |||||
| | * | Fix logins and avatar appearance. Contains a Migration. May contain nuts. | Melanie | 2010-10-30 | 2 | -16/+58 |
| | | | | | | | | | | | | | This will cause visual params to be persisted along with worn items. With this, alpha and tattoo laters will be saved. Multiple layers MAY work, but not tested because I don't use Viewer 2. | ||||
| | * | On first login, Ruth is back now. Strangely, inventory items are created for | Melanie | 2010-10-30 | 1 | -4/+0 |
| | | | | | | | | | | | tattoo and alpha layers. Any change of appearance in the sim makes the green gnome reappear on next login. Progress of sorts. | ||||
| | * | Logins work now, but avatars are green ugly gnomes. | Melanie | 2010-10-30 | 1 | -2/+0 |
| | | | |||||
| | * | This commit fixes all the appearance related null refs. Still can't log in, | Melanie | 2010-10-30 | 2 | -3/+8 |
| | | | | | | | | | client displays a blank error box. | ||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-30 | 2 | -23/+16 |
| | |\ | |||||
| | | * | Rationalize the logging messages from the merged appearance branch, ↵ | Justin Clark-Casey (justincc) | 2010-10-29 | 2 | -23/+16 |
| | | | | | | | | | | | | | commenting out most of them as per Mic | ||||
| | * | | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE. | Melanie | 2010-10-30 | 5 | -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 branch 'master' into careminster-presence-refactor | Melanie | 2010-10-29 | 4 | -157/+207 |
| |\ \ | |/ | |||||
| | * | Merge commit 'cmickeyb/dev-appearance' | Melanie | 2010-10-29 | 4 | -157/+207 |
| | |\ | |||||
| | | * | Bunch of fixes that reduce the number of times appearance | Master ScienceSim | 2010-10-29 | 1 | -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 ScienceSim | 2010-10-28 | 1 | -1/+13 |
| | | | | |||||
| | | * | Merge branch 'opensim-master' into dev-appearance | Master ScienceSim | 2010-10-28 | 1 | -0/+2 |
| | | |\ | |||||
| | | * | | Added background thread to handle delayed send and save of appearance | Master ScienceSim | 2010-10-28 | 1 | -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 information | Master ScienceSim | 2010-10-26 | 2 | -8/+23 |
| | | | | | |||||
| | | * | | Half of the compatibility is working. Login into a new region with | Master ScienceSim | 2010-10-25 | 3 | -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 yet | Mic Bowman | 2010-10-25 | 2 | -62/+73 |
| | | | | | |||||
| | | * | | First attempt to get multiple attachments working to support viewer2. | Master ScienceSim | 2010-10-21 | 1 | -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's | Melanie | 2010-10-29 | 1 | -1/+99 |
| | | | | | |||||
| * | | | | Add my work on top of cmickeyb's | Melanie | 2010-10-29 | 1 | -1/+99 |
| | | | | | |||||
| * | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-29 | 8 | -504/+602 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge branch 'dev-appearance' | Melanie | 2010-10-29 | 8 | -504/+602 |
| | |\ \ \ | |||||
| | | * \ \ | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into ↵ | Melanie | 2010-10-21 | 8 | -504/+602 |
| | | |\ \ \ | | | |/ / | | | | | | | | | | | dev-appearance | ||||
| | | | * | | Major refactoring of appearance handling. | Master ScienceSim | 2010-10-20 | 8 | -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." | Melanie | 2010-10-29 | 1 | -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. | Melanie | 2010-10-29 | 1 | -258/+193 |
| | | |_|/ | |/| | | |||||
| * | | | | Revert "Preliminary work on appearance layers. No user functionality yet." | Melanie | 2010-10-29 | 1 | -193/+258 |
| | | | | | | | | | | | | | | | | | This reverts commit e6a8d2872c3ff4992cd7e9615f69e0c6773e461f. | ||||
| * | | | | Preliminary work on appearance layers. No user functionality yet. | Melanie | 2010-10-29 | 1 | -258/+193 |
| | | | | | |||||
| * | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-23 | 4 | -38/+9 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 3 | -38/+7 |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | ||||
| | * | | | Merge branch 'hg16' into mantis5110 | Jonathan Freedman | 2010-10-22 | 3 | -7/+38 |
| | |\ \ \ | |||||
| | | * | | | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 1 | -5/+5 |
| | | | | | | |||||
| | | * | | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-17 | 4 | -6/+146 |
| | | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | | * more url / hg cleanup | Jonathan Freedman | 2010-10-11 | 2 | -4/+29 |
| | | | | | | |||||
| | | * | | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-10 | 2 | -17/+21 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 1 | -1/+36 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-03 | 1 | -0/+11 |
| | | |\ \ \ \ \ | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |