aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-291-2/+2
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * Simplify friends caching by only doing this for root agents - no functions ↵Justin Clark-Casey (justincc)2012-03-281-2/+2
| | | | | | | | | | | | | | | | require caching for child agents. This allows us to avoid unnecessary multiple calls to the friends service. All friends functions originate from the root agent and only go to other root agents in existing code. This also allows us to eliminate complex ref counting.
| * Typo fixMelanie2012-03-281-1/+1
| |
* | Typo fixMelanie2012-03-281-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-03-281-2/+2
|\ \ | |/
| * Fix typosMelanie2012-03-281-2/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-03-281-0/+48
|\ \ | |/
| * Start on Bulk inventory update via CAPS. Not functional yet. HG v2Melanie2012-03-281-0/+48
| |
* | Merge branch 'master' into careminsterMelanie2012-03-281-0/+38
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Client/IClientInventory.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
| * Add a corresponding method for items. HG v2Melanie2012-03-281-0/+38
| |
| * Add SendRemoveInventoryFolders which allows to remove one or moreMelanie2012-03-281-1/+40
| | | | | | | | folders from the viewer's inventory view. For HG v2.0. More to come
* | Add SendRemoveInventoryFolders which allows to remove one or moreMelanie2012-03-281-1/+40
| | | | | | | | folders from the viewer's inventory view. For HG v2.0. More to come
* | Merge branch 'master' into careminsterMelanie2012-03-272-20/+58
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * User level based restrictions for HyperGrid teleports, asset uploads, group ↵Snoopy Pfeffer2012-03-272-20/+58
| | | | | | | | creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users.
* | Merge branch 'master' into careminsterMelanie2012-03-221-6/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Instead of loading default avatar animations in both SLUtil and ↵Justin Clark-Casey (justincc)2012-03-211-6/+1
| | | | | | | | | | | | | | | | AvatarAnimations, load just in AvatarAnimations instead. This lets us remove the dependency of OpenSim.Framework.dll on data/avataranimations.xml, which is not necessary for ROBUST. This commit also takes care of the odd situation where animations are stored and used internally with uppercase names (e.g. "STAND") but scripts refer to them with lowercase names (e.g. "sit").
* | Merge branch 'master' into careminsterMelanie2012-03-202-2/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2012-03-201-1/+1
| |
| * Move frame loop entirely within Scene.Update() for better future performance ↵Justin Clark-Casey (justincc)2012-03-201-1/+1
| | | | | | | | | | | | | | | | analysis and stat accuracy. Update() now accepts a frames parameter which can control the number of frames updated. -1 will update until shutdown. The watchdog updating moves above the maintc recalculation for any required sleep since it should be accounted for within the frame.
* | add some more notifications about changes on physical parameters ( still ↵UbitUmarov2012-03-201-0/+1
| | | | | | | | incomple and there should be a better away )
* | Remove debug output using Console.WriteLine and trim excessive whitespaceMelanie2012-03-191-8/+0
| |
* | some more work on costsUbitUmarov2012-03-161-22/+34
| |
* | Playing with object costs CAPS ...UbitUmarov2012-03-151-2/+118
| |
* | added ObjectPhysicsProperties http event message to send viewer that data. ↵UbitUmarov2012-03-153-0/+56
| | | | | | | | For now on caps/EventQueue, and still only used on a material change...
* | bug fixs, added a default physics shape estimator based on being a mesh or ↵UbitUmarov2012-03-141-0/+2
| | | | | | | | not and use it on unlink if new root part as type none. Viewer doesn't get updated even with fullupdates we are missing something still
* | Hook up the new cap to the SOP changesMelanie2012-03-131-8/+5
| |
* | Merge branch 'ubitwork'Melanie2012-03-131-4/+25
|\ \
| * | initial suport for ExtraPhysical parts parameters. Reading from llclientView ↵UbitUmarov2012-03-131-4/+25
| | | | | | | | | | | | to SOP including SOPserialization (not to databases). No action on physics still. No send to viewer, etc
* | | Implement the cap to send extra physics params to the viewer. Not functionalMelanie2012-03-131-0/+38
|/ / | | | | | | yet because the parameters are not actually stored anywhere yet.
* | Refactor, move OjectChangeData into it's own file and renameMelanie2012-03-131-16/+16
| | | | | | | | | | ObjectChnageWhat what into ObjectChangeType change. What is no name for a variable or type!
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-111-26/+1
|\ \
| * \ Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-03-111-26/+1
| |\ \
| | * \ Merge branch 'master' into careminsterMelanie2012-03-111-26/+1
| | |\ \ | | | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs
| | | * Factor out common default animations code into SLUtil. LLClientView now ↵Justin Clark-Casey (justincc)2012-03-091-26/+1
| | | | | | | | | | | | | | | | | | | | | | | | makes use of the SLUtil copy via a method rather than each LLClientView loading a separate copy. As per opensim-users mailing list discussion.
* | | | cleanup + commentsUbitUmarov2012-03-111-277/+0
|/ / /
* | | BIG MESS. changed Iclient interface so only one event is used to inform ↵UbitUmarov2012-03-101-13/+143
|/ / | | | | | | scene about position scale or rotation change by client (others can be added). Its served at SceneGraph that does permition checks, undostore and sends down to SOG. changed values are stored in a class (ObjectChangeData) and what is changed as a enum (ObjectChangeWhat) with bit fields and 'macros' of this for better readability (at top of scenegraph.cs lasy to find better place for now) this can be extended for other things clients changes and need undo/redo. SOG process acording to what is changed. Changed UNDO/redo to use this also (warning is only storing what is changed, previus stored all, this must be checked for side efects. to save all PRS change commented line in scenegraph). Still have excessive calls to ScheduleGroupForTerseUpdate. **** UNTESTED ****
* | Merge branch 'ubitwork'Melanie2012-03-091-67/+155
|\ \
| * | more changes on undo/redo group scaling seems to work betterUbitUmarov2012-03-091-2/+3
| | |
| * | more changes in undo/redo. Basicly moved control to llclientview.cs. later ↵UbitUmarov2012-03-091-67/+154
| | | | | | | | | | | | we can move back to a dispatcher function on SOG that handles the several cases( in a viwer independent way (?)) and calls current exec funtions. made cosmetic changes replacing decimals by hexs so bits are easier to read. Changed behavour of case 12 and 28 ( 0x0c and 0x1c) to make identical to 0x0d and 0x1d ( scale only and scale plus position). DOn't see 12 and 28 in use... cases 1c and 1d still broken
* | | Merge branch 'master' into careminsterMelanie2012-03-081-1/+1
|\ \ \ | | |/ | |/|
| * | Change "help" to display categories/module list then "help ↵Justin Clark-Casey (justincc)2012-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <category/module>" to display commands in a category. This is to deal with the hundred lines of command splurge when one previously typed "help" Modelled somewhat on the mysql console One can still type help <command> to get per command help at any point. Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet). Does not affect command parsing or any other aspects of the console apart from the help system. Backwards compatible with existing modules.
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-041-2/+2
|\ \ \ | | |/ | |/| | | | careminster
| * | Correct sit position calculationsMelanie2012-02-231-2/+2
| | |
* | | Merge branch 'master' into careminsterMelanie2012-03-041-1/+1
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
| * | comment out "[CAPS]: ScriptTaskInventory Request" log spamJustin Clark-Casey (justincc)2012-03-021-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-02-241-2/+5
|\ \ \ | |/ / | | / | |/ |/|
| * Stop spurious scene loop startup timeout alarms for scenes with many prims.Justin Clark-Casey (justincc)2012-02-241-2/+5
| | | | | | | | | | | | | | | | On the first frame, all startup scene objects are added to the physics scene. This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame. This commit also slightly changes the behaviour of timeout reporting. Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check. Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout.
* | Properly sequence updates of avatars and attachments so that we don'tMelanie2012-02-231-0/+8
| | | | | | | | | | update attachments on child avatars or intermingle agent and attachment updates, which would render the root prim of huds invisible
* | Show avatars as sitting on proot prims only to avoid motion jitterMelanie2012-02-231-5/+31
| | | | | | | | for passengers
* | Merge branch 'master' into careminsterMelanie2012-02-181-36/+53
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
generated by cgit v1.1 at 2024-12-23 00:52:18 +0000