admin/opensim
1
0
Fork 0
mirror of git://opensimulator.org/git/opensim synced 2026-08-16 18:12:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,451 Commits 112 Branches 81 Tags
dsg
Commit Graph
268 Commits
Author SHA1 Message Date
Dan Lake 1091001cf6 Merge branch 'master' into dev 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
 2011-07-25 16:08:00 -07:00
Melanie 4cdc8806fb Fix LLTextBox to work with the updated libOMV 2011-07-23 11:40:38 +01:00
Dan Lake 32ddcefaca Merge branch 'master' into dev 
Conflicts:
	OpenSim/Region/Framework/Scenes/EventManager.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
	OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
	OpenSim/Region/OptionalModules/ContentManagementSystem/CMModel.cs
 2011-06-14 23:15:34 -07:00
Justin Clark-Casey (justincc) 8129e64e2a Fill in the new OwnerData field in the LLUDP ScriptDialog message. 
If we don't do this then viewer 2.8 crashes.
Resolves http://opensimulator.org/mantis/view.php?id=5510
 2011-05-31 19:25:01 +01:00
Huaiyu (Kitty) Liu 8fa03afb5c Added forwarding of teleport request, if the teleport is within the same region, 
from CM to PSA. Both the hosting CM and PSA will trigger the same region
teleport code, PSA will then sync the new position to other CMs.
 2011-05-25 15:47:00 -07:00
Dan Lake da6044b6be Merge branch 'master' into dev 
Conflicts:
	OpenSim/Data/SQLiteLegacy/SQLiteSimulationData.cs
	OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
 2011-04-19 11:52:25 -07:00
Mic Bowman 69d014e1dc First pass at moving object property requests into a queue similar 
to the entity update queue. The number of property packets can
become significant when selecting/deselecting large numbers of
objects.

This is experimental code.
 2011-04-12 15:58:57 -07:00
Dan Lake f89ae8700d Merge branch 'master' into dev 2011-03-29 16:04:55 -07:00
Justin Clark-Casey (justincc) 6ae04448f7 Start using IPrimCounts populated by PrimCountModule instead of LandData counts populated by LandManagementModule. 
In order to pass ILandObject into IClientAPI.SendLandProperties(), had to push ILandObject and IPrimCounts into OpenSim.Framework from OpenSim.Region.Framework.Interfaces, in order to avoid ci
Counts are showing odd behaviour at the moment, this will be addressed shortly.
 2011-03-25 23:05:51 +00:00
Dan Lake f2013d3c93 Updates for appearance and attachments 2011-01-06 09:20:59 -08:00
Dan Lake adeab48e7e Merge branch 'master' into danmerge 2011-01-02 18:38:58 -08:00
Melanie a32f80b9e3 Implement SendPlacesReply 2010-12-30 01:36:09 +00:00
Teravus Ovares (Dan Olivares) 25ecd62b1f * Adds AbortXfer to the ClientAPI mix 
* Adds an item that checks to see if the top request has been there for longer then 30 seconds without an update and sends an AbortXfer if it encounters one.   This allows the client to cancel the Xfer on it's side so you can re-select the prim and get the inventory when it fails the first time.
* Some interesting locking...    Using NewFiles to lock the rest of them.   We'll see how that goes.
* The goal of this is to ensure that Xfers are restartable when they fail.  The client will not do that on it's own.
 2010-12-21 19:15:44 -05:00
Dan Lake c7923338bc Merge branch 'master' into danmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	bin/OpenSim.exe.config
 2010-12-09 15:49:40 -08:00
Justin Clark-Casey (justincc) 7b6b4501b7 minor: add class doc line to older region module example code pointing towards newer 2010-12-04 02:49:41 +00:00
Justin Clark-Casey (justincc) 0ab774d484 add warning decals and information to RegionModule.cs in probably non-functional OpenSim.Region.Examples.SimpleModule project 2010-12-04 01:06:29 +00:00
Dan Lake 681190f682 Merge branch 'master' into danmerge 
Conflicts:
	.nant/local.include
	OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
	OpenSim/Framework/AvatarAppearance.cs
	OpenSim/Framework/IClientAPI.cs
	OpenSim/Region/Application/OpenSim.cs
	OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
	OpenSim/Region/Framework/Scenes/EventManager.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
	OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	bin/config-include/SimianGrid.ini
	prebuild.xml
 2010-11-30 17:36:36 -08:00
Master ScienceSim b1c8d05888 Major refactoring of appearance handling. 
AvatarService -- add two new methods, GetAppearance and SetAppearance
to get around the lossy encoding in AvatarData. Preseve the old
functions to avoid changing the behavior for ROBUST services.

AvatarAppearance -- major refactor, moved the various encoding
methods used by AgentCircuitData, ClientAgentUpdate and
ScenePresence into one location. Changed initialization.

AvatarAttachments -- added a class specifically to handle
attachments in preparation for additional functionality
that will be needed for viewer 2.

AvatarFactory -- removed a number of unused or methods duplicated
in other locations. Moved in all appearance event handling from
ScenePresence. Required a change to IClientAPI that propogated
throughout all the IClientAPI implementations.
 2010-10-20 16:17:54 -07:00
Diva Canto a8b80ef800 Added SendTeleportProgress to IClientAPI. Ya know what that means... 8 files affected. 2010-08-16 11:39:46 -07:00
Diva Canto 77de28965a Work on TeleportStart: renamed method from TeleportLocationStart to TeleportStart, and now sending this upon all teleports, not just some, and in the right place (EntityTransferModule). 2010-08-16 11:33:59 -07:00
Dan Lake 8f8ef75034 Merged with main AND partial implementation of teleport based load balancing. Did not intend to combine the merge with these changes. 2010-08-16 10:23:50 -07:00
Dan Lake 9ada2a1f34 Client manager changes as of R@I 2010-07-19 13:03:04 -07:00
Melanie e1ea82b329 Major attachments cleanup. Remove unused AttachObject ClientView method 
Clean up use of AttachObject throughout, reduce number of overloads
and number of parameters
 2010-07-14 19:51:12 +01:00
Melanie c8ed972443 Move "StopFlying()" into LLSpace. Try to reinstate the carefully crafted packet 
we used to send before slimupdates and explicitly send it
 2010-06-12 01:25:25 +01:00
Dan Lake 9afa8b990d Merged from master 2010-06-02 14:40:10 -07:00
Mikko Pallari 4e45718833 Added overload of SendGenericMessage to LLClientView with string list as parameter. Now modules themselfs don't necessarily need to convert strings to byte arrays. Added this as it was removed in LightShare patch. 2010-05-21 23:08:07 +01:00
John Hurliman 93ef65c690 * Moving all of the prioritization/reprioritization code into a new file Prioritizer.cs 
* Simplified the interest management code to make it easier to add new policies. Prioritization and reprioritization share code paths now
* Improved the distance and front back policies to always give your avatar the highest priority
 2010-05-21 13:55:36 -07:00
Dan Lake 82a71fb7e2 Adding appearance and animations 2010-05-18 09:05:13 -07:00
unknown bf5c81d77e * Initial commit of the slimupdates2 rewrite. This pass maintains the original behavior of avatar update sending and has a simplified set of IClientAPI methods for sending avatar/prim updates 2010-05-12 15:59:48 -07:00
Dan Lake 79327a6299 Merge branch 'master' into sceneapi 2010-04-20 11:43:03 -07:00
dahlia 3d0860ae61 thanks lkalif for Mantis #4676 - a patch that adds support for inventory links 
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
 2010-04-12 17:10:51 -07:00
Dan Lake bba803e39d Merged from master 2010-03-31 13:13:24 -07:00
Melanie ec637e2b8c Committing the LightShare code, which was developed by TomMeta of Meta7. 
This allows scripts to set WindLight parameters for clients connecting
to a region. Currently, this is only supported by the Meta7 viewer.
 2010-03-31 04:20:20 +01:00
Dan Lake 8027b7c1a5 Merged from master 2010-03-24 10:50:42 -07:00
Dan Lake 4216eacd6c Some work on sceneapi 2010-03-23 16:30:56 -07:00
Dan Lake 859bc717a4 Cleaned up access to scenepresences in scenegraph. GetScenePresences and GetAvatars have been removed to consolidate locking and iteration within SceneGraph. All callers which used these to then iterate over presences have been refactored to instead pass their delegates to Scene.ForEachScenePresence(Action<ScenePresence>). 2010-03-19 15:16:35 -07:00
unknown 98f91a252c - parcel blocking, region crossing blocking, teleport blocking 
Signed-off-by: Melanie <melanie@t-data.com>
 2010-03-09 22:43:55 +00:00
unknown 2dcf73dd93 - supporting llTextBox 
Signed-off-by: Melanie <melanie@t-data.com>
 2010-03-06 20:05:11 +00:00
Melanie 86c621fdc7 Change the signature of SendChangeUserRights, because we have to send 
this to both parties
 2010-02-28 22:56:31 +00:00
Melanie 44e7224b86 Add missing ChangeUserRights packet sender 2010-02-28 22:47:31 +00:00
Diva Canto 5c5966545d Initial Online friends notification seems to be working reliably now. All this needs more testing, but everything is there. 2010-02-28 12:07:38 -08:00
Melanie c033223c63 Merge branch 'master' into presence-refactor 2010-02-15 00:20:48 +00:00
Revolution 9821c4f566 Revolution is on the roll again! :) 
Fixes: Undo, T-pose of others on login, modifiedBulletX works again, feet now stand on the ground instead of in the ground, adds checks to CombatModule. Adds: Redo, Land Undo, checks to agentUpdate (so one can not fall off of a region), more vehicle parts. Finishes almost all of LSL (1 function left, 2 events).

Direct flames and kudos to Revolution, please

Signed-off-by: Melanie <melanie@t-data.com>
 2010-02-14 22:18:46 +00:00
Diva Canto 5001f61c08 * HGGridConnector is no longer necessary. 
* Handle logout properly. This needed an addition to IClientAPI, because of how the logout packet is currently being handled -- the agent is being removed from the scene before the different event handlers are executed, which is broken.
 2010-01-29 18:59:41 -08:00
Teravus Ovares (Dan Olivares) 5e58bca86d * Fix Endlines in MyNpcCharacter.cs 2010-01-26 12:15:49 -05:00
Melanie 063f106cbb Add functionality to estate "Allowed Users" and "Allowed Groups". Allowed users 
will be honored now, while allowed groups will not. This requires additional
groups module integration work
 2010-01-09 14:17:44 +00:00
Revolution c76c80a28a Adds IClientAPI voids for GroupProposals. 
Signed-off-by: Melanie <melanie@t-data.com>
 2010-01-08 18:27:49 +00:00
Revolution b67470af91 Fixes the newly added packets as per Melanie's request. 
Provisionally applied to fix the naming. Signatures are still subject to change.

Signed-off-by: Melanie <melanie@t-data.com>
 2010-01-07 15:09:13 +00:00
Jeff Ames 70d5b1c34c Formatting cleanup. Add copyright headers. 2010-01-04 06:17:30 +09:00
Revolution 234d4e1105 Adds tons of packets. 
Applied with change: Changed spelling to Summary (from Summery)

Signed-off-by: Melanie <melanie@t-data.com>
 2009-12-31 21:24:56 +00:00