aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * Change all restarting to use the restart module. Remove hardcoded behaviorMelanie2010-11-251-1/+1
| |
* | Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-232-1/+2
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-11-231-1/+1
| |\
| | * Initialize InventoryItemBase.creatorData properly. Could throw.Diva Canto2010-11-231-1/+1
| | |
| * | Fix some crashes caused by the addition of the CreatorData columnMelanie2010-11-231-0/+1
| |/
* | Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-215-3/+123
|\ \ | |/
| * Added creator info across the board -- TaskInventoryItems and InventoryItems ↵Diva Canto2010-11-212-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-171-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-171-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 commentsJustin Clark-Casey (justincc)2010-11-171-0/+8
| |
| * Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-161-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 mantis5110Jonathan Freedman2010-11-214-48/+47
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Formatting cleanup.Jeff Ames2010-11-084-48/+47
| |
* | Merge git://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-056-4/+46
|\ \ | |/
| * When LightShare is enabled, the standard day cycle is bypassed and replaced byMelanie2010-11-031-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 addressmores2010-11-031-0/+9
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| * Fix default club feetMelanie2010-11-021-1/+1
| |
| * Add support for cross-domain AJAX requests to REST console.Marck2010-11-021-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 BaseHttpServerMarck2010-11-021-0/+4
| |
| * Try to not make avatars switch outfitsMelanie2010-11-021-3/+0
| |
* | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-302-16/+58
|\ \ | |/
| * Fix logins and avatar appearance. Contains a Migration. May contain nuts.Melanie2010-10-302-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 mantis5110Jonathan Freedman2010-10-301-4/+0
|\ \ | |/
| * On first login, Ruth is back now. Strangely, inventory items are created forMelanie2010-10-301-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 mantis5110Jonathan Freedman2010-10-305-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.Melanie2010-10-301-2/+0
| |
| * 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
| |\
| * | 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 branch 'master' into mantis5110Jonathan Freedman2010-10-292-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
* | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-291-19/+116
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * 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.
| * | 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
| | * | | * 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
| | | | |
* | | | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-298-546/+695
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | | 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
| |\ \ \ \ | | |/ / /
| | * | | Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-223-38/+7
| |/ / / |/| | | | | | | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
| * | | 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
| | | |
generated by cgit v1.1 at 2024-11-10 04:17:48 +0000