Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-12-05 | 11 | -178/+438 |
|\ | |||||
| * | Various bug fixes for appearance handling: more aggressive reset of textures ↵ | Mic Bowman | 2010-12-03 | 2 | -10/+30 |
| | | | | | | | | | | | | and vparams when appearance is not cached and when wearables change. Send appearance to the viewer with initial data. Cleaned up (and added) debugging. | ||||
| * | Added some comments. Better than listening to the boring speaker... | Diva Canto | 2010-12-01 | 1 | -0/+12 |
| | | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-11-29 | 3 | -30/+27 |
| |\ | |||||
| | * | Refactor appearance and avatar data sending code. Paritioning the routines ↵ | Mic Bowman | 2010-11-27 | 2 | -28/+17 |
| | | | | | | | | | | | | | | | | | | | | | into "one-to-many" and "many-to-one" makes it possible to call the right function on presence creation (both child and root) and when a child agent is promoted to root. This brings the total number of appearance sends down to one or two on login. Cleaned up the avatar update calls in the groups code. Cleaned up some commented and debugging code, and a few formating fixes. | ||||
| | * | Fix handling of landmarks for systems with culture settings other than ↵ | Marck | 2010-11-26 | 1 | -2/+10 |
| | | | | | | | | | | | | en_US. This fixes Mantis #5177. | ||||
| * | | Fix unit test. | Diva Canto | 2010-11-29 | 1 | -0/+6 |
| | | | |||||
| * | | Preservation of creator information now also working in IARs. Cleaned up ↵ | Diva Canto | 2010-11-29 | 5 | -113/+139 |
| | | | | | | | | | | | | usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function. | ||||
| * | | Changed the parser for InventoryItem deserialization. Moved some utility ↵ | Diva Canto | 2010-11-27 | 2 | -30/+229 |
| |/ | | | | | | | functions around. | ||||
| * | Change all restarting to use the restart module. Remove hardcoded behavior | Melanie | 2010-11-25 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-23 | 2 | -1/+2 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-11-23 | 1 | -1/+1 |
| |\ | |||||
| | * | Initialize InventoryItemBase.creatorData properly. Could throw. | Diva Canto | 2010-11-23 | 1 | -1/+1 |
| | | | |||||
| * | | Fix some crashes caused by the addition of the CreatorData column | Melanie | 2010-11-23 | 1 | -0/+1 |
| |/ | |||||
* | | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 5 | -3/+123 |
|\ \ | |/ | |||||
| * | Added creator info across the board -- TaskInventoryItems and InventoryItems ↵ | Diva Canto | 2010-11-21 | 2 | -0/+106 |
| | | | | | | | | | | | | themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being. New migration in inventory table in order to make CreatorID varchar(255). | ||||
| * | small refactor: reuse existing commandLine string rather than calling ↵ | Justin Clark-Casey (justincc) | 2010-11-17 | 1 | -1/+1 |
| | | | | | | | | cmdline.ToString() again | ||||
| * | save all lines to history, not just those which turn out to be valid ↵ | Justin Clark-Casey (justincc) | 2010-11-17 | 1 | -2/+7 |
| | | | | | | | | | | | | | | comands. does not store passwords also, blank lines are not stored to history this makes it easier to go back and correct a command which was simply mistyped rather than having to type it out again | ||||
| * | minor: add some method comments | Justin Clark-Casey (justincc) | 2010-11-17 | 1 | -0/+8 |
| | | |||||
| * | Change the way attachments are persisted. Editing a worn attachment will now | Melanie | 2010-11-16 | 1 | -0/+1 |
| | | | | | | | | | | | | | | save properly, as will the results of a resizer script working. Attachment positions are no longer saved on each move, but instead are saved once on logout. Attachment script states are saved as part of the attachment now when detaching. | ||||
* | | Merge https://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-21 | 4 | -48/+47 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * | Formatting cleanup. | Jeff Ames | 2010-11-08 | 4 | -48/+47 |
| | | |||||
* | | Merge git://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-05 | 6 | -4/+46 |
|\ \ | |/ | |||||
| * | 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> | ||||
| * | 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 |
| | | |||||
* | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 2 | -16/+58 |
|\ \ | |/ | |||||
| * | 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. | ||||
* | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 1 | -4/+0 |
|\ \ | |/ | |||||
| * | 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. | ||||
* | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 5 | -319/+151 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | ||||
| * | 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 |
| |\ | |||||
| * | | 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 mantis5110 | Jonathan Freedman | 2010-10-29 | 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 | ||||
* | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -19/+116 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | 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. | ||||
| * | | Add my work on top of cmickeyb's | Melanie | 2010-10-29 | 1 | -1/+99 |
| | | | |||||
| * | | 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 | ||||
| | * | | | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 1 | -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 cleanup | Jonathan Freedman | 2010-10-20 | 2 | -4/+29 |
| | | | | | |||||
| | * | | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-20 | 2 | -6/+12 |
| | | | | | |||||
| * | | | | 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. |