aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-12-035-137/+380
|\ | | | | | | Also prevent god takes from ending up in Lost and Found
| * Added some comments. Better than listening to the boring speaker...Diva Canto2010-12-011-0/+12
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-11-293-30/+27
| |\
| * | Fix unit test.Diva Canto2010-11-291-0/+6
| | |
| * | Preservation of creator information now also working in IARs. Cleaned up ↵Diva Canto2010-11-295-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 Canto2010-11-272-30/+229
| | | | | | | | | | | | functions around.
* | | Various bug fixes for appearance handlingMic Bowman2010-11-302-5/+22
| | |
* | | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-11-271-2/+10
|\ \ \ | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-11-271-2/+10
| |\ \ \ | | | |/ | | |/|
| | * | Refactor appearance and avatar data sending code. Paritioning the routines ↵Mic Bowman2010-11-272-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 ↵Marck2010-11-261-2/+10
| | |/ | | | | | | | | | en_US. This fixes Mantis #5177.
* | | Instrument TI Dictionary to finally find that pesky script-caused deadlockMelanie2010-11-271-3/+33
|/ /
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-251-1/+1
|\ \ | |/
| * Change all restarting to use the restart module. Remove hardcoded behaviorMelanie2010-11-251-1/+1
| |
* | Prevent an overlength button label from producing a debug dump and abortingMelanie2010-11-242-28/+17
| | | | | | | | the script.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-231-1/+1
|\ \ | |/
| * 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
| |/
* | Fix some crashes caused by the addition of the CreatorData columnMelanie2010-11-222-0/+2
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-222-0/+106
|\ \ | |/
| * 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).
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-182-3/+16
|\ \ | |/
| * 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.
* | 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 branch 'master' into careminster-presence-refactorMelanie2010-11-094-48/+47
|\ \ | |/
| * Formatting cleanup.Jeff Ames2010-11-084-48/+47
| |
* | Remove "OpenSimulator" from startup messageMelanie2010-11-091-1/+1
| |
* | Change "OpenSim" to "Careminster" and remove CM suffix.Melanie2010-11-091-2/+2
| |
* | Revert "Fix for hanging on "Connecting to region".. caused by packets being ↵Melanie2010-11-051-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-refactorMelanie2010-11-031-0/+1
|\ \ | |/
| * 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>
* | Admin Server can now bind to a private ip addressmores2010-11-031-0/+9
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-028-349/+244
|\ \ | |/
| * 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
| |
| * 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.
| * 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.
| * 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
| |\
| | * 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 branch 'master' into careminster-presence-refactorMelanie2010-10-294-157/+207
|\ \ | |/
generated by cgit v1.1 at 2024-09-25 00:31:15 +0000