aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-04-071-1/+2
|\ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Added missing refresh of group membership client side cache to the groups ↵Snoopy Pfeffer2012-04-051-1/+2
| | | | | | | | module. Before memberships of non active groups often were not stored in the cache (n_groupPowers).
* | Merge branch 'master' into careminsterMelanie2012-03-312-1/+190
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Tests/Common/Mock/TestClient.cs
| * refactor: Rename SOG.GetChildPart() to GetPart() since it can also return ↵Justin Clark-Casey (justincc)2012-03-311-1/+1
| | | | | | | | the 'root' part.
| * minor: remove some now unneeded code from FriendsCommandsModuleJustin Clark-Casey (justincc)2012-03-301-55/+0
| |
| * Make default "show friends" console command show friends fetched from the ↵Justin Clark-Casey (justincc)2012-03-301-4/+83
| | | | | | | | | | | | friends service. There is no a --cache option which will show friends from the local cache if available.
| * refactor: Move "friends show cache" console command out into separate ↵Justin Clark-Casey (justincc)2012-03-301-0/+165
| | | | | | | | | | | | FriendsCommandsModule. Expose required methods on IFriendsModule. Rename GetFriends() -> GetFriendsFromCache() for self-documentation
| * Add back parts of reverted changes that were not concerned with child agent ↵Justin Clark-Casey (justincc)2012-03-292-3/+3
| | | | | | | | | | | | | | caching. This adds ScenePresence to IClientAPI.SceneAgent earlier on in the add client process so that its information is available to EventManager.OnNewClient() and OnClientLogin() Also add a code comment as to why we're caching friend information for child agents.
| * Revert "Simplify friends caching by only doing this for root agents - no ↵Justin Clark-Casey (justincc)2012-03-292-3/+3
| | | | | | | | | | | | | | | | functions require caching for child agents." We need to cache child agents so that friends object edit/delete permissions will work across boarders on regions hosted by different simulators. This reverts commit d9f7b8549b3cb9699eb8bd54242d31aac0f8241a.
* | Merge branch 'master' into careminsterMelanie2012-03-292-3/+3
|\ \ | |/ | | | | | | 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-282-3/+3
| | | | | | | | | | | | | | | | 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.
* | Merge branch 'master' into careminsterMelanie2012-03-281-46/+24
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Framework/Client/IClientInventory.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
| * minor: clean up some code formatting in VivoxVoiceModule.csJustin Clark-Casey (justincc)2012-03-271-54/+25
| |
* | Merge branch 'master' into careminsterMelanie2012-03-271-25/+119
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Two new scripting functions osInviteToGroup(userID) and ↵Snoopy Pfeffer2012-03-271-23/+99
| | | | | | | | osEjectFromGroup(userID) that invite/eject users to/from groups the object containing the script is set to. These functions also work for closed groups.
| * User level based restrictions for HyperGrid teleports, asset uploads, group ↵Snoopy Pfeffer2012-03-271-2/+20
| | | | | | | | creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users.
* | Merge branch 'master' into careminsterMelanie2012-03-261-4/+14
|\ \ | |/
| * Add some more overloads to allow registering overloaded methods and listsMelanie2012-03-261-4/+14
| | | | | | | | of methods.
* | Merge branch 'master' into careminsterMelanie2012-03-261-7/+18
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-03-261-1/+11
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
| | * Fix compile error in ScriptModuelComms and add some debugging into the modInvokeMic Bowman2012-03-251-2/+12
| | | | | | | | | | | | routines to simplify finding method registration issues.
| * | Add a hust UUID to the script invocationsMelanie2012-03-261-7/+8
| |/
* | Fix TypoMelanie2012-03-261-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-03-261-1/+3
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
| * Further simplify ScriptCommsMelanie2012-03-261-1/+3
| |
| * Dynamically create the delegate type to reduce complexity in the callerMelanie2012-03-261-1/+21
| |
| * Correct the design error I introduced into ScriptComms. Untested but about toMelanie2012-03-261-14/+22
| | | | | | | | be.
* | Dynamically create the delegate type to reduce complexity in the callerMelanie2012-03-261-1/+21
| |
* | Correct the design error I introduced into ScriptComms. Untested but about toMelanie2012-03-261-14/+22
| | | | | | | | be.
* | Merge branch 'master' into careminsterMelanie2012-03-252-7/+31
|\ \ | |/
| * Simplify the module invocation registration. The types and method nameMelanie2012-03-251-2/+18
| | | | | | | | can be pulled fromt he delegate so we don't need to pass them explicitly
| * Add support for key, vector, rotation and list types for bothMic Bowman2012-03-241-0/+8
| | | | | | | | | | | | arguments and return values to the modInvoke family of functions. See http://opensimulator.org/wiki/OSSL_Script_Library/ModInvoke
| * Have the PhysicsParameters module output console command responsesRobert Adams2012-03-231-5/+5
| | | | | | | | | | | | | | | | | | directly to the console rather than logging at INFO (which doesn't output anything for WARN). There should really be a WriteLine method on ICommandConsole so all of the different commands don't have to figure out where the command output should go.
* | Merge branch 'master' into careminsterMelanie2012-03-231-10/+5
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-03-221-10/+5
| |\
| | * RegionReady loggingBlueWall2012-03-221-10/+5
| | | | | | | | | | | | Some maintenance to clean up logging messages
* | | Merge branch 'master' into careminsterMelanie2012-03-222-10/+0
|\ \ \ | |/ / | | | | | | | | | | | | 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-212-10/+0
| |/ | | | | | | | | | | | | | | 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-201-7/+5
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Move frame loop entirely within Scene.Update() for better future performance ↵Justin Clark-Casey (justincc)2012-03-201-7/+5
| | | | | | | | | | | | | | | | 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.
* | Merge branch 'master' into careminsterMelanie2012-03-181-2/+97
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Adds a new script command 'modInvoke' to invoke registered functionsMic Bowman2012-03-151-2/+97
| | | | | | | | | | | | | | | | | | from region modules. The LSL translator is extended to generate the modInvoke format of commands for directly inlined function calls. A region module can register a function Test() with the name "Test". LSL code can call that function as "Test()". The compiler will translate that invocation into modInvoke("Test", ...)
* | added ObjectPhysicsProperties http event message to send viewer that data. ↵UbitUmarov2012-03-152-0/+10
| | | | | | | | For now on caps/EventQueue, and still only used on a material change...
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2012-03-111-34/+2
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-03-111-34/+2
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs
| | * Factor out common default animations code into SLUtil. LLClientView now ↵Justin Clark-Casey (justincc)2012-03-091-34/+2
| | | | | | | | | | | | | | | | | | makes use of the SLUtil copy via a method rather than each LLClientView loading a separate copy. As per opensim-users mailing list discussion.
* | | Merge branch 'ubitwork'Melanie2012-03-112-0/+2
|\ \ \ | |/ / |/| |
| * | BIG MESS. changed Iclient interface so only one event is used to inform ↵UbitUmarov2012-03-102-0/+2
| | | | | | | | | | | | 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 'master' into careminsterMelanie2012-03-091-1/+36
|\ \ \ | |/ / |/| / | |/
| * fix for NPC not playing internal animationssatguru srivastava2012-03-091-1/+36
| |
generated by cgit v1.1 at 2024-12-18 08:20:35 +0000