c256447f46
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-07-16 22:22:42 +01:00
d3d877ceca
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-07-16 00:46:22 +02:00
3149eca68f
backkick git
2012-07-15 23:45:47 +01:00
5c145aa539
merge fix
2012-07-16 00:43:35 +02:00
8568771015
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-07-16 00:38:05 +02:00
cdd03acffa
just a kick git
2012-07-15 23:37:31 +01:00
911ca5b806
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2012-07-16 00:34:51 +02:00
13e1635e4d
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2012-07-16 00:01:05 +02:00
337b2e634a
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2012-07-15 23:56:00 +02:00
1b81a2bd49
to stash
2012-07-15 23:54:24 +02:00
668723fab3
Remove instrumentation and fix the message delivery issue
2012-07-15 23:01:58 +02:00
b130dcea21
Testing changes and instrumentation
2012-07-15 22:28:47 +02:00
283df0610d
Save packets received while the client is added and replay them later.
2012-07-15 21:45:06 +02:00
8b4f7604e6
Revert "Experimentally handle UseCircuitCode synchrnonously"
...
This reverts commit e3fa73da96
2012-07-15 19:45:08 +02:00
e3fa73da96
Experimentally handle UseCircuitCode synchrnonously
2012-07-15 17:17:59 +02:00
64393a7ca8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-07-13 02:27:16 +01:00
d6f54b25cd
Stop redundantly passing in the endpoint to the LLClientView constructor.
...
This can always be retrieved via the LLUDPClient and is so done in various places already.
2012-07-12 23:48:42 +01:00
dda999a22c
Remove IClientIPEndpoint client interface for now.
...
This may well come back in the future when this subinterface is actually used but it currently isn't and I feel the name was poor.
Everything uses IClientAPI.RemoveEndPoint which also returned the full endpoint rather than just the ip address.
2012-07-12 23:43:02 +01:00
3b3d9967b1
Remove IClientAPI.GetClientEP() in favour of existing identical IClientAPI.RemoteEndpoint.
2012-07-12 23:29:57 +01:00
26d89777d8
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-07-06 20:51:18 +01:00
5776351f6a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-07-05 22:17:39 +01:00
02cb0bf80a
added a timeout paramenter to PollServiceEventArgs, so each type can define it's timeout
2012-07-04 17:40:02 +01:00
5691a8b860
refactor: rename Watchdog.WATCHDOG_TIMEOUT_MS to DEFAULT_WATCHDOG_TIMEOUT_MS to reflect what it actually is
2012-07-04 00:15:03 +01:00
6137f37028
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-06-29 22:24:53 +01:00
38cdf77cef
in CreateAvatarUpdateBlock() change updateflags to 0. Original flags seem prim related only. This does fix the wrong viewer side move of a avatar in prim edition mode (anv mantis 854), with no apparent side effects .. may need more testing
2012-06-29 03:41:04 +01:00
f202c36106
Add IScene.Name for code clarity to replace the RegionInfo.RegionName used in many, many log messages.
2012-06-29 00:03:22 +01:00
5301648cff
In AttachmentsModule.DetachSingleAttachmentToInvInternal(), remove attachment before changing properties for correct inventory serialization.
...
Serialization of attachments requires IsAttachment = false so that correct positions are serialized instead of avatar position.
However, doing this when a hud is still attached allows race conditions with update threads, resulting in hud artifacts on other viewers.
This change sets SOG.IsDeleted before serialization changes take place (IsDeleted itself is not a serialized property).
LLClientView then screens out any deleted SOGs before sending updates to viewers.
2012-06-25 21:08:19 +01:00
1468b01afc
coment out some of previus debug messaged before forgetting about them...
2012-06-22 18:29:46 +01:00
0de3ad5307
more debug
2012-06-22 18:18:12 +01:00
646b7fb8f2
i more debug
2012-06-22 18:10:53 +01:00
ba58d7a9b2
add a temp debug message
2012-06-22 18:04:12 +01:00
32cc9c6094
Merge branch 'master' into careminster
2012-06-15 15:59:49 +01:00
aaa30dcebc
Add region name to UseCircuitCode log messages
2012-06-15 05:01:36 +01:00
c935f03467
Put all debug console commands into a single Debug section rather than scattering them over other categories
2012-06-15 03:32:43 +01:00
30d872caad
Merge branch 'master' into careminster
2012-06-15 02:53:34 +01:00
257b1b517d
Add main instance to internal MainServer.m_Servers list to simplify internal logic.
...
This does require the server to be added before it is set as the main Instance
2012-06-15 02:03:50 +01:00
2c6555021f
Fix very recent regression in 917d753 where I put the ++updatesThisCall outside the batching part of ProcessEntityUpdates()
...
This stopped any batching happening and since this method is called periodically updates were sent very slowly
2012-06-14 03:49:54 +01:00
3888b9a670
If we're going to discard a terse update block because it's now someone else's hud, then don't still add it to the list of blocks for the update message.
2012-06-14 03:32:44 +01:00
0d2243a393
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-06-14 01:38:41 +01:00
917d753f1c
Fix a race condition where an object update for a hud could be sent to non-owner avatars if the hud was attached directly from within the region.
...
If this happens, then the non-owners would see unremovable huds that they did not own until relog, and sometimes even beyond that.
This was due to a race between the entity update and the attachment code when moving an object from within scene to a hud.
2012-06-14 01:36:37 +01:00
cba8b4f8b8
Fix not sending TransferInfo when an asset is not found. This clogs
...
up the sound pipeline in the viewer.
2012-06-14 00:58:17 +01:00
36117e079a
Merge branch 'master' into careminster
2012-06-14 00:57:05 +01:00
6a77a65675
minor: remove unnecessary IsAttachment = false setting for new object in UploadObjectAssetModule, property always starts as false
2012-06-14 00:35:26 +01:00
d893e54f4b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-06-14 00:10:52 +01:00
16ffc764bf
minor: refactor part of LLClientView.ProcessEntityUpdates() to remove duplicate code
2012-06-13 23:54:32 +01:00
cf080a68d6
Remove long obsolete and unused IClientAPI.KillEndDone()
2012-06-13 23:42:22 +01:00
f726150afd
Add ObjectUpdate as one of the packets that can be screened out when setting debug packet level
2012-06-13 23:39:23 +01:00
dfafb5ca14
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2012-06-12 03:09:52 +01:00
2ca31a9841
Remove accidental timeout left in during earlier debugging. Has been in since two commits ago ( b099f26)
2012-06-12 02:46:14 +01:00
b099f26376
Set IClientAPI.IsActive = false early on client removal due to ack timeout rather than using IsLoggingOut flag.
...
IsActive is more appropriate since unack timeout is not due to voluntary logout.
This is in line with operations such as manual kick that do not set the IsLoggingOut flag.
It's also slightly better race-wise since it reduces the chance of this operation clashing with another reason for client deactivation (e.g. manual kick).
2012-06-12 02:16:36 +01:00
c89db34fc4
If the simulator closes a root agent due to ack timeout, then send the client a kick message with that reason, in case it is somehow still listening.
2012-06-12 02:03:31 +01:00
8c7149063b
In PresenceDetector.OnConnectionClose(), use the IsChildAgent check already available on IClientAPI.SceneAgent rather than retrieving it again by scanning all scenes.
2012-06-12 01:25:09 +01:00
8c91e761c8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2012-06-09 16:28:22 +01:00
794d184c25
Stop sending a DisableSimulator packet in LLClientView.Close(), which is a duplicate for child agents and unnecessary for root agents.
...
Close() already calls Scene.RemoveClient() which sends the right eq or udp DisableSimulator message to child agents.
2012-06-08 04:32:51 +01:00
f94b92df46
Instead of retrieving the known client again in LLUDPServer.RemoveClient(), check the IsLoggingOut flag instead.
...
This is slightly better thread-race wise
2012-06-08 04:12:22 +01:00
c215b1ad16
If logging a client out due to ack timeout, do this asynchronously rather than synchronously on the outgoing packet loop.
...
This is the same async behaviour as normal logouts.
This is necessary because the event queue will sleep the thread for 5 seconds on an ack timeout logout as the client isn't around to pick up the final event queue messages.
2012-06-08 03:53:03 +01:00
5f4f9f0230
Add regression test for client logout due to ack timeout.
2012-06-08 03:12:23 +01:00
d73805d7f4
Remove null checks at top of LLUDPServer.ProcessInPacket(). Neither packet nor client are ever null.
2012-06-08 01:51:28 +01:00
d71c6dea7e
Store already retrieve IClientAPI in IncomingPacket structure for later use rather than doing another retrieve on dequeue.
...
Instead of checking whether the client still exists by trying to retrieve again from the client manager, this patch gets it back from IncomingPacket and checks the IClientAPI.IsActive state.
2012-06-08 01:43:58 +01:00
e8cd9fbbb7
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2012-06-07 23:33:40 +01:00
095dbf0ece
Fix not sending TransferInfo when an asset is not found. This clogs
...
up the sound pipeline in the viewer.
2012-06-07 19:51:32 +02:00
7550b97e65
Log warning if we try to remove a UDP client that has already been removed.
2012-06-07 04:00:29 +01:00
98b46d48fe
Allow the thread watchdog to accept an alarm method that is invoked if the timeout is breached.
...
This alarm can then invoke this to log extra information.
This is used in LLUDPServer to show which client was being processed when incoming and outgoing udp watchdog alarms are triggered.
2012-06-07 02:44:13 +01:00
34cb8a2ab3
Fix not sending TransferInfo when an asset is not found. This clogs
...
up the sound pipeline in the viewer.
2012-06-06 20:35:00 +02:00
e733fb32cf
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
2012-06-06 13:07:05 +01:00
008c6a4610
Mantis 4597 AgentPaused packet is ignored.
...
The packet was actually being handled but not acted on.
This change extends the default timeout for paused clients to 5 minutes
and makes both the paused and non-paused timeout periods configurable.
2012-06-05 01:22:05 +01:00
8e735efff0
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-06-02 02:01:48 +01:00
4b3cb91ce8
Remove the kill record. Core has removed it long ago and it really does more harm than good these days
2012-06-01 00:12:04 +02:00
e696d1d952
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-05-31 03:37:43 +01:00
4358bb8f85
Fix the log standing attach-from-world bug.
2012-05-30 00:50:47 +02:00
ebd9d2618b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
2012-05-19 13:34:44 +01:00
0147dc6302
Fix build break. Comment out EQG deregister/register logging.
2012-05-18 03:50:23 +01:00
45af29291a
Add level 2 debug eq logging which logs event queue polls.
...
Refactor: eq message logging into common method.
2012-05-18 03:43:36 +01:00
6501b1b1bb
refactor: move EventQueueGet path generation into common method. Rename some local variables in line with code conventions. Add commented out EQG log lines for future use.
2012-05-18 00:38:29 +01:00
b4cd8b491b
Merge branch 'avination' into careminster
2012-05-17 13:34:47 +01:00
7652b3a957
udp transfer: make number packets estimation coerent with number actually sent. Use the safer lower max packet size defined in os source (600) and not OMV one (1100).
2012-05-17 13:13:31 +01:00
fe029cf4e8
Merge branch 'avination' into careminster
2012-05-13 01:25:03 +01:00
7461fe4554
TEST MESS* reduce animation packets send. Added onchangeanim event with parameters to define if to add or remove, and if to send anims pack on that evocation, etc
2012-05-12 15:27:37 +01:00
a90822f4b8
Merge branch 'master' into careminster
2012-05-10 00:42:10 +01:00
6987aef38d
Improve logging on the prim inventory script asset request path for future use.
...
This adds name and description of the request handler to http request logging when DebugLevel >= 1
2012-05-09 23:12:30 +01:00
900afbd53e
Merge branch 'avination' into careminster
2012-05-08 00:07:13 +01:00
74eafb78eb
Fix moving no-mod objects. Fixes a regression introduced with the undo fix
2012-05-07 23:03:07 +02:00
31ab8b2fe0
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/WebUtil.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-05-05 10:32:04 +01:00
231a3bf147
Implement optional name and description on http stream handlers so that we can relate a slow request to what the handler actually does and the agent it serves, if applicable.
...
This is most useful for capabilities where the url is not self-describing.
2012-05-03 01:45:49 +01:00
bf630fb808
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
2012-05-02 01:37:51 +01:00
9d2e1c67a8
Add regression test for teleporting between neighbouring regions on the same simulator
...
This adds a non-advertised wait_for_callback option in [EntityTransfer]. Default is always true.
Teleport tests disable the wait for callback from the destination region in order to run within a single thread.
2012-05-01 23:14:12 +01:00
ab71779221
Revert "Revert "Implement bulk inventory update over CAPS (not recursive by design,""
...
This reverts commit a90b0e302c
2012-04-27 23:54:45 +01:00
a90b0e302c
Revert "Implement bulk inventory update over CAPS (not recursive by design,"
...
This reverts commit 6e7f13a72d
2012-04-27 23:46:33 +01:00
90305001de
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-04-27 17:09:49 +01:00
07e62df558
Add regression test for teleporting an agent between separated regions on the same simulator.
...
This involves a large amount of change in test scene setup code to allow test scenes to share shared modules
SetupScene is now an instance method that requires an instantiation of SceneHelpers, though other SceneHelpers methods are still static
May split these out into separate classes in the future.
2012-04-27 00:58:54 +01:00
cb6791fb30
Tweak log messages on local region to region teleport path to help with problem resolution.
2012-04-26 22:35:25 +01:00
fd19601c6b
Help big boobies to dance (avatar visualParams). May not persist and need more lobe ?
2012-04-26 16:17:46 +01:00
f49912f92a
minor: Add more detail to unauthorized caps client message
2012-04-26 16:10:24 +01:00
b0cbf16c19
minor: Add region name to dropped inbound packet message
2012-04-26 16:04:49 +01:00
b39de2425c
Merge branch 'master' into careminster
...
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
2012-04-07 04:52:14 +01:00
cce760dbfc
Rather than having a FromFolderID property on every single prim and only ever using the root prim one, store on SOG instead.
...
This reduces pointless memory usage.
2012-04-07 00:40:55 +01:00
7d8bb33c5b
Store FromItemID for attachments once on SOG instead of on every SOP and only ever using the root part entry.
...
This eliminates some pointless memory use.
2012-04-07 00:33:02 +01:00
8fd86c9156
Packing of folder in SendBulkUpdateInventory always set the folder type to -1. Not sure if there's a reason for it, but I'm changing it to the given folder type.
2012-04-06 11:24:34 -07:00
6e7f13a72d
Implement bulk inventory update over CAPS (not recursive by design,
...
do NOT CHANGE THIS, needed for HG 2.0)
2012-03-31 02:32:47 +01:00
a6c26b093c
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-31 02:31:57 +01:00
f3132c45d9
Merge branch 'master' into careminster
...
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
2012-03-31 02:18:02 +01:00
8728b9ea81
Implement bulk inventory update over CAPS (not recursive by design,
...
do NOT CHANGE THIS, needed for HG 2.0)
2012-03-31 01:34:39 +02:00
bf09d6a22b
refactor: Stop passing both IClientAPI and agentID to friend event listeners, these are redundant. Replace a few magic numbers with FriendRights enum already used elsewhere.
2012-03-29 18:31:57 +01:00
22a85b947a
Add back parts of reverted changes that were not concerned with child agent 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.
2012-03-29 01:26:30 +01:00
93ac47f0d3
Revert "Simplify friends caching by only doing this for root agents - no 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 d9f7b8549b
2012-03-29 01:08:47 +01:00
d9f7b8549b
Simplify friends caching by only doing this for root agents - no functions 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.
2012-03-28 23:40:25 +01:00
7dad1ded2e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
2012-03-29 00:27:35 +01:00
614c404923
Typo fix
2012-03-28 03:45:52 +01:00
b24605d526
Fix typos
2012-03-28 02:55:29 +01:00
0463a00d34
Start on Bulk inventory update via CAPS. Not functional yet. HG v2
2012-03-28 02:45:50 +01:00
8c0f1e9058
Add a corresponding method for items. HG v2
2012-03-28 02:10:07 +01:00
710c14fb57
Add SendRemoveInventoryFolders which allows to remove one or more
...
folders from the viewer's inventory view. For HG v2.0. More to come
2012-03-28 01:49:06 +01:00
4ab63bfe97
Typo fix
2012-03-28 02:33:15 +02:00
caaf25c326
Merge branch 'master' into careminster
2012-03-28 02:56:31 +01:00
300488f862
Merge branch 'master' into careminster
2012-03-28 02:46:54 +01:00
b519cf6383
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Client/IClientInventory.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
2012-03-28 02:20:40 +01:00
2a8b9a47b2
Add SendRemoveInventoryFolders which allows to remove one or more
...
folders from the viewer's inventory view. For HG v2.0. More to come
2012-03-28 01:15:56 +02:00
b18b1b1d70
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-03-27 23:14:43 +01:00
7223b63563
User level based restrictions for HyperGrid teleports, asset uploads, group creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users.
2012-03-27 22:09:58 +02:00
3381899481
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandObject.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-03-22 20:38:49 +00:00
1a8769e6ef
Instead of loading default avatar animations in both SLUtil and 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").
2012-03-21 23:57:39 +00:00
c39fba8f9d
minor: remove some mono compiler warnings
2012-03-20 23:19:11 +00:00
30b2a8c778
Move frame loop entirely within Scene.Update() for better future performance 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.
2012-03-20 23:12:21 +00:00
35c3124c3b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-20 23:39:02 +00:00
efd7ff3146
add some more notifications about changes on physical parameters ( still incomple and there should be a better away )
2012-03-20 16:46:16 +00:00
618244f285
Remove debug output using Console.WriteLine and trim excessive whitespace
2012-03-19 14:39:19 +01:00
ae8e089b9c
some more work on costs
2012-03-16 15:33:49 +00:00
15ad5f492b
Playing with object costs CAPS ...
2012-03-15 10:25:18 +00:00
84ca09f7c5
added ObjectPhysicsProperties http event message to send viewer that data. For now on caps/EventQueue, and still only used on a material change...
2012-03-15 02:24:13 +00:00
cf9ebd301c
bug fixs, added a default physics shape estimator based on being a mesh or 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
2012-03-14 18:24:04 +00:00
d4e6834f99
Hook up the new cap to the SOP changes
2012-03-13 20:49:16 +01:00
f53c322b7e
Merge branch 'ubitwork'
2012-03-13 20:21:26 +01:00
f415eb84e1
Implement the cap to send extra physics params to the viewer. Not functional
...
yet because the parameters are not actually stored anywhere yet.
2012-03-13 20:06:39 +01:00
3de3b9e63c
initial suport for ExtraPhysical parts parameters. Reading from llclientView to SOP including SOPserialization (not to databases). No action on physics still. No send to viewer, etc
2012-03-13 17:56:32 +00:00
ebcd4910a2
Refactor, move OjectChangeData into it's own file and rename
...
ObjectChnageWhat what into ObjectChangeType change. What is
no name for a variable or type!
2012-03-13 13:08:32 +01:00
b0f01cec98
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-11 03:57:59 +00:00
1f7c0c2ea0
cleanup + comments
2012-03-11 03:28:17 +00:00
4f7ec1d691
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-03-11 01:55:36 +01:00
f292e19689
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
2012-03-11 02:29:43 +00:00
908abb1c3d
BIG MESS. changed Iclient interface so only one event is used to inform 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 ****
2012-03-10 20:32:19 +00:00
bdc968f1fc
Factor out common default animations code into SLUtil. LLClientView now makes use of the SLUtil copy via a method rather than each LLClientView loading a separate copy.
...
As per opensim-users mailing list discussion.
2012-03-09 23:57:24 +00:00
e1be1c5263
Merge branch 'ubitwork'
2012-03-09 02:11:25 +01:00
e5786ba043
more changes on undo/redo group scaling seems to work better
2012-03-09 02:56:14 +00:00
05cdf9bda9
more changes in undo/redo. Basicly moved control to llclientview.cs. later 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
2012-03-09 01:53:58 +00:00
b0fc96c17d
Merge branch 'master' into careminster
2012-03-08 19:10:22 +00:00
749c3fef8a
Change "help" to display categories/module list then "help <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.
2012-03-08 01:51:37 +00:00
182f5efbe9
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-04 16:23:46 +00:00
6338996f87
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
2012-03-04 16:23:19 +00:00
98ad6ed255
comment out "[CAPS]: ScriptTaskInventory Request" log spam
2012-03-02 23:29:35 +00:00
37068d17c5
Merge branch 'master' into careminster
2012-02-24 09:56:06 +00:00
f67f37074f
Stop spurious scene loop startup timeout alarms for scenes with many prims.
...
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.
2012-02-24 05:02:33 +00:00
1c0adfa6e0
Correct sit position calculations
2012-02-23 22:26:17 +01:00
dc835717d6
Properly sequence updates of avatars and attachments so that we don't
...
update attachments on child avatars or intermingle agent and attachment
updates, which would render the root prim of huds invisible
2012-02-23 14:08:35 +01:00
56cc573d2f
Show avatars as sitting on proot prims only to avoid motion jitter
...
for passengers
2012-02-23 12:20:20 +01:00
985526b662
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
2012-02-18 22:21:10 +00:00
80ec2ac167
Correct a bug introduced in 1f402fdf (Feb 7 2012) where the delete friends grid call would try and contact the wrong uri. Also fixes the build from df960d5
2012-02-16 01:39:12 +00:00
df960d5767
Add known identity informatio nto log message if an exception is thrown during LLUDPServer.HandleUseCircuitCode()
2012-02-16 01:25:54 +00:00
2d3381b795
Implement region crossing of sitting avatars. Edit mode and llSetPos work
...
but unscripted default sit anim is lost. Still some Gfx glitching. Physical
crossing doesn't work yet.
2012-02-14 23:16:20 +01:00
acfe7e555e
Merge branch 'master' into careminster
2012-02-10 23:59:10 +00:00
a7dc7e636e
Fix: Covenant view fails after updates or cache-clean see mantis http://opensimulator.org/mantis/view.php?id=2879
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-02-10 15:45:03 -05:00
215acbcc96
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
2012-02-10 10:20:51 +00:00
7273e05995
Fix: Unable to remove AV from friend list (sqldb-bug) http://opensimulator.org/mantis/view.php?id=3731
2012-02-10 02:30:55 +00:00
ddca5347c3
When an asset is uploaded (e.g. a mesh) set individual copy/move/transfer permissions, not PermissionMask.All
...
Setting PermissionMask.All will cause next permissions to replace current permissions when the object is rezzed, since bit 4 will be set.
This is not correct behaviour for a freshly uploaded mesh. Freshly rezzed in-world prims also do not have bit 4 set (don't yet know exactly what this is).
Should resolve http://opensimulator.org/mantis/view.php?id=5651
2012-02-10 02:13:15 +00:00
ce5e900721
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2012-02-04 11:48:20 +00:00
5c545d1d2e
Fix: Covenant changed time not set http://opensimulator.org/mantis/view.php?id=5869
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-02-03 18:02:51 -05:00
447a66d660
Replace ParcelAccessEntry with a new struct, LandAccessEntry, which more
...
accurately reflects the data sent by the viewer. Add times bans and the
expiration of timed bans.
Warning: Contains a Migration (and nuts)
2012-02-02 23:40:56 +00:00
07c487a28f
Make ban, eject, freeze and the scripted versions of those work.
2012-02-02 21:36:45 +01:00
727ddffb71
Merge branch 'master' into careminster
2012-01-31 21:53:32 +00:00
2f84d5397b
minor: remove mono compiler warning
2012-01-31 21:14:09 +00:00
0f181fe5d0
Fix displaying landmark and search info properly with long names
2012-01-30 22:30:02 +01:00
ad02e01e77
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-01-30 16:44:26 +00:00
9a86a713d3
Merge branch 'master' into careminster
2012-01-29 22:50:59 +00:00
e8b688b61f
Fix:Get embedded objects in notecard http://opensimulator.org/mantis/view.php?id=2607
...
Signed-off-by: nebadon <michael@osgrid.org>
2012-01-29 12:40:43 -07:00
dac826da4e
Prevent an overlong description from messing up a ParcelInfoReply
2012-01-28 20:38:50 +01:00
428407c5e4
Merge branch 'master' into careminster
2012-01-28 01:01:23 +00:00
7352aea9ac
Remove IClientAPI from the money module. It was only used to pass in the
...
agent id anyway
2012-01-28 00:18:12 +00:00
427ab55058
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
2012-01-25 00:45:57 +00:00
5e445aaf7b
Fix "Abnormal client thread terminations" stat in period CONNECTION STATISTICS to count the number of times clients are disconnected due to ack timeouts.
...
This has been broken for a long period and would only ever show 0.
2012-01-24 22:09:13 +00:00
02572ab1d3
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/RegionSettings.cs
2012-01-22 16:35:14 +00:00
32d58d6e3e
Telehub Support:
...
Telehub settings now persist to the database and are saved across sim restarts. So-far this only works on MySQL. this is a work in progress, teleport routing is not yet implemented.
2012-01-21 23:26:27 -05:00
ba3b0c69f1
Merge branch 'master' into careminster
2012-01-21 19:52:33 +00:00
590f707c42
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-20 23:54:29 -05:00
b6f3de5028
Telehub Support:
...
Support for viewer side of telehub management. Can manupulate Telehubs and SpawnPoints from the viewer estate managemnt tools. This is a work in progress and does not yet persist or affect teleport routing.
2012-01-20 23:50:37 -05:00
ea72428c9d
Allow a viewer UDP image request retry to trigger another asset fetch if an existing fetch hasn't responded before a timeout.
...
This is to stop a high priority image/texture request from blocking the entire download queue if its asset fetch got dropped for some reason.
2012-01-19 23:09:16 +00:00
d38e2c0c91
Add image not in database test for LLImageManager
2012-01-19 21:57:12 +00:00
503faaea62
refactor: separate out common parts of LLImageManagerTests
2012-01-19 21:23:40 +00:00
381f74276b
Add LLImageManager regression test for discard case
2012-01-19 21:14:09 +00:00
c92a9a6640
Add "image queues clear <first-name> <last-name>" console command
...
This allows a way to manually clear pending image queue requests for debug purposes
2012-01-19 19:49:06 +00:00
9356963bd3
Add basic request and send image regression tests for LLImageManager
2012-01-19 19:00:11 +00:00
5afb70b9fe
Fix prim calculations so that > 32767 prims are supported
2012-01-17 15:30:52 +01:00
b14a6acd2f
Merge branch 'master' into careminster
2012-01-16 23:08:47 +00:00
59a0c50d48
Comment out noisy log lines I accidentally included in the nant build target adjustment commit.
...
Left in the method doc.
2012-01-16 23:04:08 +00:00
82ad9d4e04
Remove monocov and other obsolete nant build targets.
...
monocov was a code coverage attempt 3 years ago which no longer works.
other removed targets have been commented out or unused for a very long time
2012-01-16 22:58:58 +00:00
ef074deb52
Add "show image queue <first-name> <last-name>" region console command
...
This is so that we can inspect the image download queue (texture download via udp) for debugging purposes.
2012-01-10 21:30:12 +00:00
8fa1108b72
Merge branch 'master' into careminster
2012-01-10 21:28:59 +00:00
7661a0b2a9
Implement the FetchInventory2 capability. This accompanies the existing FetchInventoryDescendents2 capability.
...
Not yet enabled by default. You can enable this by setting Cap_FetchInventory2 = "localhost" in the [ClientStack.LindenCaps] section of OpenSim.ini
Enabling both FetchInventory2 and FetchInventoryDescendents2 improves the situation with properly fetching attachments and hud objects
Probably because viewers are never expecting the odd situation where FetchInventoryDescendents2 is present but not FetchInventory2
However, for some reason attachments and hud objects occasionally fail to appear, though their status is correct in inventory
For attachments, focussing on the avatar makes them appear. Hud objects have to be reattached.
2012-01-06 21:07:34 +00:00
11c48ac807
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
2012-01-06 21:41:36 +00:00
50e459d265
recomment log messages I accidentally left uncommented
2012-01-05 19:44:06 +00:00
c201b54b85
Improve "app rebake" command to return a better message if no uploaded texture ids were available for the rebake request
2012-01-05 19:40:54 +00:00
1ebc9d04aa
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-01-05 08:15:33 +00:00
3a64522267
Minor formatting changes and commented out log lines for future debugging of image manager (udp texture fetch). No significant functional changes.
2012-01-04 21:40:15 +00:00
82df5de5cf
Remove the pointless LLClientView.m_imageManager null check.
...
Despite the code comments we never actually null it.
2012-01-04 16:15:05 +00:00
a6e305063e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
OpenSim/Services/Interfaces/IUserAccountService.cs
2012-01-02 21:41:36 +00:00
fac8c25851
Reduce accessibility of some J2KImage/LLImageManager properties and methods to reduce potential code complexity and make code reading easier.
2012-01-02 21:31:42 +00:00
014a86c26b
Adding commented out log messages and some minor formatting for future bug hunting. No functional changes.
2012-01-02 19:46:30 +00:00
bde004c08e
Merge branch 'master' into careminster
2011-12-28 09:24:35 +00:00
b6cfe15c7c
HG: more / love for Xmas
2011-12-24 07:44:26 -08:00
efa4284391
Merge branch 'master' into careminster
2011-12-19 21:30:57 +00:00
2899de1a5c
Stop unnecessarily sending the TextureEntry in client avatar updates.
...
As far as I know, viewers don't use this mechanism to recieve new TextureEntry data for avatars. This is done via the AvatarAppearance packet instead.
Tested this back to viewer 1.23.
Replacing with Utils.EmptyBytes since converting the texture entry to bytes on each AvatarUpdate (or which there are many) is not cost-free.
2011-12-19 19:19:05 +00:00
0b91ec8dd2
Migrate detailed "appearance show" report generation up to AvatarFactoryModule from AppearanceInfoModule so that it can be used in debug (inactive).
...
Further filters "debug packet <level>" to exclused [Request]ObjectPropertiesFamily if level is below 25.
Adjust some method doc
Minor changes to some logging messages.
2011-12-19 18:58:05 +00:00
759f1d2dbe
Merge branch 'master' into careminster
2011-12-18 10:49:45 +00:00
a3a17e929e
Stop generating client flags when we send out full object updates.
...
These were entirely unused.
2011-12-16 23:20:12 +00:00
898549d13e
Merge branch 'master' into careminster
2011-12-14 08:57:55 +00:00
b242ceda1e
In AvatarFactoryModule.SetApperance(), perform ValidateBakedTextureCache() in the same thread rather than on another one.
...
The caller is already an async thread from LLClientView so this doesn't hold up the client.
However, launching on a separate thread does remove the effect of m_setAppearanceLock
This was potentially allowing two different SetAppearance threads to interfere with each other, though this probably rarely happens, if at all.
2011-12-13 20:42:39 +00:00
3a91085ac2
Implement handler for TeleportCancel inbound packet
2011-12-10 15:17:34 +00:00
6b080d57cb
Merge branch 'master' into careminster
2011-12-10 15:19:31 +00:00
3f42183797
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
2011-12-10 00:40:41 +00:00
af3cd00048
Get rid of IScene.PresenceChildStatus() which always had to execute a lookup in favour of IClientAPI.ISceneAgent.IsChildAgent instead.
2011-12-09 23:07:53 +00:00
d913303875
Merge branch 'master' into bigmerge
2011-12-09 08:13:57 +00:00
50eebb5cba
Don't reply with an ack packet if the client is not authorized.
2011-12-08 22:00:59 +00:00
32d0ef89c6
Extend TestAddClient() to check that the first packet received is an ack packet
2011-12-08 21:45:02 +00:00
14e407aff3
Add OpenSim.Region.ClientStack.LindenUDP.Tests.dll back into the test suite
2011-12-08 20:55:38 +00:00
bc13855e64
Reactivate BasicCircuitTests.TestAddClient()
...
This checks that the initial UseCircuitCode packet is handled correctly for a normal client login.
2011-12-08 20:52:34 +00:00
0e265889dd
Remove unnecessary AgentCircuitData null check from Scene.AddNewClient().
...
The only caller is the LLUDP stack and this has to validate the UDP circuit itself, so we know that it exists.
This allows us to eliminate another null check elsewhere and simplifies the method contract
2011-12-08 19:25:24 +00:00
f61e54892f
On a new client circuit, send the initial reply ack to let the client know it's live before sending other data.
...
This means that avatar/appearance data of other avatars and scene objects for a client will be sent after the ack rather than possibly before.
This may stop some avatars appearing grey on login.
This introduces a new OpenSim.Framework.ISceneAgent to accompany the existing OpenSim.Framework.ISceneObject and ISceneEntity
This allows IClientAPI to handle this as it can't reference OpenSim.Region.Framework.Interfaces
2011-12-08 18:34:23 +00:00
96539ffc79
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-12-08 18:29:19 +00:00
7c7dd6269a
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-12-08 03:37:48 +01:00
50aa89dae6
Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-12-08 03:24:25 +00:00
b459239833
Recover from an internal mess-up in the outgoing packet queues by creating
...
a new queue object.
2011-12-08 01:08:40 +01:00
e6272b8d56
Stop also adding an ordinary http handler when we set up a poll http handler.
...
It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path.
2011-12-07 12:28:42 +00:00
8e542cfa03
Stop accidentally setting up the UploadTexture caps handler with the same url for all users
...
This meant that if a user exited the region, the UploadTexture handler would be effectively removed for everyone, causing subsequent failures.
This hopefully resolves the recent UploadTexture LLSD problems
This was a regression in 5640f2e (Thu Dec 1 23:24:15 2011 +0000)
2011-12-06 21:42:56 +00:00
4567555c49
Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.
...
This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation.
This is also required to write regression tests that involve the HTTP layer.
If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
2011-12-05 20:44:20 +00:00
bc17e2e9cf
Merge branch 'master' into bigmerge
2011-12-05 20:32:35 +00:00
5ab536a1e9
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-12-05 17:10:51 +00:00
ec8c93aa5e
Implement ChangeInventoryItemFlagsPacket handling
2011-12-04 12:35:01 +01:00
5460f2e035
refactor: Separate the upload baked texture handler out from BunchOfCaps
2011-12-01 23:24:15 +00:00
b60ff651a3
Merge branch 'master' into bigmerge
2011-12-01 12:16:59 +00:00
fa63054c4f
On "show caps", stop excluding the seed cap but do exclude it elsewhere
2011-11-29 20:37:03 +00:00
658d02b5e9
Improve some of the debug help messages
2011-11-29 16:56:31 +00:00
ff0d020007
Correct mistake in "debug eq" help
2011-11-29 16:18:14 +00:00
dc612d0f08
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2011-11-28 11:06:38 +00:00
bafea2282a
Rip out unused Scene.HandleFetchInventoryDescendentsCAPS().
...
This has been handled by WebFetchInvDescHandler.Fetch() for some time.
2011-11-26 01:39:23 +00:00
11c19b0d2e
Use the same web fetch handler for every request from every avatar, since it contains no instance code
2011-11-26 00:29:01 +00:00
95a686dbf5
Fix config so that you can have both WebFetchInventoryDescendents and FetchInvnetoryDescendents2 caps active at once
2011-11-25 23:45:29 +00:00
5b4fe23f7f
Resolve error where an unknown asset type would cause the fetch inventory descendents cap to fail.
...
Introduced just a few commits ago in 0688861
2011-11-25 23:43:57 +00:00
676d32974a
Implement the FetchInventoryDescendents2 capability using the same code as WebFetchInventoryDescendents.
...
Enabling this by setting Cap_FetchInventoryDescendents2 = "localhost" in the [ClientStack.LindenCaps] section of OpenSim.ini downloads inventory via http rather than udp in later viewers.
2011-11-25 22:46:42 +00:00
8c82ff16ad
Fix WebFetchInventoryDescendents cap to use Utils.AssetTypeTostring/InventoryTypeToString to convert types to strings
...
These cover a wider range of types.
2011-11-25 21:54:31 +00:00
a58f5b2f66
When setting packet level logging via "debug packet", apply to all clients, not just root ones.
...
Also adds scene name and client type (root|child) to logged information.
2011-11-24 22:08:34 +00:00
0a60e9537f
comment out a noisy log line I accidentally left in from the last commit
2011-11-24 21:30:40 +00:00
63c137820b
Stop passing a request handler to the initial caps.RegisterHandler in EventQueueGetModule since this is immediatley replaced by a poll server handler.
...
This allows us to comment out a bunch of code and simplify the codebase and readability.
2011-11-24 21:27:35 +00:00
0174e326e3
Add a "debug eq" console command for debugging.
...
This will log outgoing event queue message names if turned on.
2011-11-24 20:27:11 +00:00
afca742392
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
2011-11-14 20:03:47 +00:00
ff36a1bc7b
If a friends identifier which is too short is given to HGFriendsModule.GetOnlineFriends() then spit out a warning rather than failing on the String.Substring().
...
This is to progress http://opensimulator.org/mantis/view.php?id=5789
2011-11-14 16:06:06 +00:00
a4ec97cfdd
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
2011-11-11 23:43:18 +00:00
ce8441132e
Restore sending of OutPacket() for object kills removed in commit c7dd7b1.
...
OutPacket() must be called within the m_killRecord lock. Otherwise the following event sequence is possible
1) LLClientView.ProcessEntityUpdates() passes the kill record check for a particular part suspends before OutPacket()
2) Another thread calls LLClientView.SendKillObject() to delete the same part and modifies the kill record
3) The same thread places the kill packet on the Task queue.
4) The earlier thread resumes and places the update packet on the Task queue after the kill packet.
This results in a ghost part in the sim that only goes away after client relog.
This commit also removes the unnecessary m_entityUpdates.SyncRoot locking in SendKillObject.
2011-11-11 22:37:57 +00:00
323b76cee4
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2011-11-06 20:54:13 +00:00
c7dd7b13a2
Convert SendKillObject to take a list of uint rather than sending one
...
packet per prim. More to come as we change to make use of this.
2011-11-06 20:38:07 +00:00
243acef917
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-11-03 00:06:14 +00:00
e2c51a977d
Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL.
...
UpdateFlag is now referenced/used only within SOP and SOG. Outsiders are
using ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule on
SOP consistently now. Also started working toward eliminating those
calls to ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule
from outside SOP in favor of just setting properties on SOP and let SOP
decide if an update should be scheduled. This consolidates the update
policy within SOP and the client rather than everywhere that makes
changes to SOP. Some places forget to call update while others call it
multiple times, "just to be sure".
UpdateFlag and Schedule*Update will both be made private shortly.
UpdateFlag is intended to be transient and internal to SOP so it has
been removed from XML serializer for SOPs.
2011-11-02 14:59:00 -07:00
c55e161dc4
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-11-02 11:49:25 +00:00
7c8bfac11b
Removed redundant SceneContents property from Scene. It's the same as SceneGraph property.
2011-11-01 17:20:12 -07:00
083b28de8c
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2011-10-30 10:16:25 +00:00
5ae8de3c00
Stop setting _position as well as m_taint_position in ODECharacter.Position
...
setting position at the same time as taint appears to undermine the whole purpose of taint
testing doesn't reveal any obvious regressions in doing this
2011-10-29 01:39:48 +01:00
b975cbcbed
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-10-27 18:14:38 +01:00
e210d95821
Don't blow our brains out if LLClientView.BulkInventoryUpdate() is wrongly passed a null node reference.
...
Addresses worst aspect of http://opensimulator.org/mantis/view.php?id=5752
2011-10-27 02:50:58 +01:00
fd22159d0c
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Framework/Watchdog.cs
2011-10-26 01:27:24 +01:00
8a0a78cbcc
Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.
...
This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes.
Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers
Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer
MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo)
2011-10-25 20:24:21 +01:00
c8dfef1583
Merge commit '9ec672c70b28b8c1d6d81bab7744fcf7bf9b83c7' into bigmerge
2011-10-25 03:26:44 +01:00
a055dd39ac
Merge commit '79d5bc9beb445ca07cff9ecbd91d89b2a57e14da' into bigmerge
2011-10-25 03:26:34 +01:00
740077a291
Merge commit 'e28e2d24c714c3fba1cba60097986a1c1c28c6c0' into bigmerge
2011-10-25 03:26:20 +01:00
dc24ac4f20
Merge commit '120114e96becc6fee1311300359dcefaf4013c0e' into bigmerge
2011-10-25 02:54:34 +01:00
51fd5bac5e
Merge commit '96ff2c63ed47e29a92cc79b6e8753d21e54da061' into bigmerge
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
2011-10-25 02:54:24 +01:00
2895789bd0
Merge commit 'aa19ccf65c9cd235e0ba941e9832c5240df4412c' into bigmerge
2011-10-25 01:51:24 +01:00
747786aac0
Merge commit '20da04fd0c909a00c0cdc2585f242e95c868801a' into bigmerge
2011-10-25 01:43:05 +01:00
9ceb98344a
Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmerge
2011-10-25 01:37:11 +01:00
13d635d1d7
Merge commit 'f5f7ca47ea7a27fb7f82367cc7a4e04e11cb5155' into bigmerge
2011-10-25 01:37:01 +01:00
0b833c458a
Merge commit 'c5826d589ab2f33a71105bc2d3015ffbb7dd2973' into bigmerge
2011-10-25 01:35:51 +01:00
080a41e9f9
Merge commit 'f9ffd2538f3bf300e8f751258a6129fb780b5b0a' into bigmerge
2011-10-25 01:35:30 +01:00
9ec672c70b
Fix bugs in EventQueueGetModule.ClientClosed() and BaseHttpServer.RemovePollServerHTTPHandler() that stopped existing code in ClientClosed() from actually tearing down the poll handler
...
Actually doing the tear down appear to have no ill effects with region crossing and teleport.
2011-10-24 23:16:03 +01:00
79d5bc9beb
separate out future common setup code from EventQueueTests.AddForClient()
2011-10-24 22:29:13 +01:00
e28e2d24c7
Add new EventQueueTests with basic test to check that adding a client registers an http poll
2011-10-24 22:23:41 +01:00
120114e96b
refactor: Make IClientAPI.DebugPacketFormat a property rather than a setter without a getter
2011-10-17 20:50:29 +01:00
96ff2c63ed
Add avatar names to debug packet output
2011-10-17 20:37:01 +01:00
aa19ccf65c
refactor: rename IClientAPI.SendPrimUpdate() to SendEntityUpdate() since it sends entity updates (including presence ones), not just prims.
2011-10-14 01:45:46 +01:00
20da04fd0c
More method doc and formatting changes. Makes DestroyOdeStructures() private
2011-10-13 21:42:24 +01:00
631d5e16ef
Get rid of some traces of the old pre-ROBUST grid architecture config
2011-10-12 21:51:34 +01:00
f5f7ca47ea
Bring LindenUDP.Tests back from the dead. No tests are running.
...
Code drift means that most of this stuff doesn't compile but the structure is still useful.
2011-10-12 21:31:22 +01:00
c5826d589a
minor: insert some commented out log lines which are a blunt but useful instrument to see packet expiry and received acks
2011-10-12 19:35:40 +01:00
f9ffd2538f
Improve some method doc for LLUDPClient, LLUDPServer and UnackedPacketCollection
2011-10-12 19:22:30 +01:00
f4de1a6d9b
HACK: Remove advanced property resending until it is fixed properly in core.
2011-10-12 06:48:40 +02:00
1b3ea64fe9
Merge commit '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-10-11 23:21:36 +01:00
ef9a811ea6
Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
2011-10-11 23:17:47 +01:00
308b6937ad
Merge commit '839c1cdcc4e9ce410636becb5b81190463dec5bf' into bigmerge
2011-10-11 22:53:53 +01:00
652c59c0a9
Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge
2011-10-11 22:42:18 +01:00
cc1fe354d0
Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2011-10-11 21:21:44 +01:00
34026887fe
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-03 23:26:52 +01:00
37ae6451f9
Remove vestigal RegionStatus.SlaveScene.
...
This appears to be code clutter since the code that uses this has long gone.
2011-10-03 23:25:09 +01:00
e77c919290
Remove usage of Linden packet types from inside Attachments Module and interface
2011-10-03 11:55:54 -07:00
839c1cdcc4
Improve locking when access queue in EventQueueGetModule
2011-09-24 01:10:23 +01:00
d358125cac
Reinstate option to land an npc when it reaches a target.
...
This is moved into ScenePresence for now as a general facility
2011-09-22 00:16:05 +01:00
de19dc3024
refactor: rename SOG/SOP.GetProperties() to SendPropertiesToClient() to reflect what it actually does
...
This also makes it consistent with some other methods that send data to the client.
2011-09-15 18:58:58 +01:00
03f6734f43
First set of merge fixes
2011-09-07 09:42:18 -07:00
66dec3b874
Resolve merge commits, stage 1
2011-09-04 07:06:36 -07:00
7eca929686
Eliminate pointless checks of SOG.RootPart != null
...
It's never possible for SOG to have no RootPart, except in the first few picosends of the big bang when it's pulled from region persistence or deserialized
2011-09-01 02:11:00 +01:00
095b3e5756
Remove pointless cluttering SOP.ParentGroup != null checks.
...
The only times when ParentGroup might be null is during regression tests (which might not be a valid thing) and when scene objects are being constructed from the database.
At all other times it's not possible for a SOP not to have a SOG parent.
2011-09-01 01:22:28 +01:00
083ba72b28
Fix a bug where the non-root parts of rezzed objects that had previously been attachments were sending their old attachment values to the client.
...
The root part state is the canonical value, so always send that instead.
Sending conflicting attachments states for non-root parts of a rezzed object is enough to crash the client.
Fixes http://opensimulator.org/mantis/view.php?id=5664 .
Many thanks to mewtwo0641 for some fantastic qa work on this one.
2011-08-31 23:33:01 +01:00
be357f8fee
Fix bug in persisting saved appearances for npcs
...
Assets have to be marked non-local as well as non-temporary to persist. This is now done.
Hopefully addresses http://opensimulator.org/mantis/view.php?id=5660
2011-08-30 01:58:32 +01:00
33a894f3d2
refactor: move SOP.IsAttachment and AttachmentPoint up into SOG to avoid pointless duplication of identical values
2011-08-27 00:15:21 +01:00
4b4c5e69e5
Remove forcing of phantom on ground attached objects - attachments can be both non-phantom and flagged as physical.
...
As per Melanie
2011-08-24 22:45:51 +01:00
940a248c3d
minor: comment out simulator features log line
2011-08-22 22:44:49 +01:00
7cf4bb5256
Add ISimulatorFeaturesModule so that other modules can register features in addition to the hardcoded ones.
2011-08-22 22:13:07 +01:00
c1a34cd8da
Don't try to save changed attachment states when an NPC with attachments is removed from the scene.
...
This is done by introducing a PresenceType enum into ScenePresence which currently has two values, User and Npc.
This seems better than a SaveAttachments flag in terms of code comprehension, though I'm still slightly uneasy about introducing these semantics to core objects
2011-08-18 00:53:05 +01:00
8d866ae8c3
minor: remove some mono compiler warnings
2011-08-16 21:45:01 +01:00
cace6eaa8a
comment out some of the currently less useful debug log messages
2011-08-11 02:06:32 +01:00
5d6c9644fa
early code to allow scripts to force npcs not to fly when moving to target
...
this is to allow walking on prims. it will be up to the script writer to be sure that there is a continuous path.
currently implemented in osNpcMoveToTarget(), but none of this is final.
2011-08-10 01:47:37 +01:00
4cb8d6379d
Stop trying to deregister caps or close child agents when an NPC is removed
2011-08-10 00:59:31 +01:00
92e96d394a
When an NPC is created, stop telling neighbouring regions to expect a child agent
2011-08-09 23:11:07 +01:00
0e9dda91cb
Guard against a bad login leaving us with a null queue
2011-08-09 20:55:06 +02:00
f999acd095
minor: remove some mono compiler warnings
2011-08-04 01:46:34 +01:00
2964467708
get rid of vestigal move to parameters
2011-08-03 22:11:05 +01:00
c122489e09
Partially fix autopilot/go here
...
This now works again except that it requires a click or avatar mvmt to get going
This is because the ScenePresence.HandleAgentUpdate() method doesn't trigger until the client does something significant, at which point autopilot takes over.
Even clicking is enough to trigger.
This will be improved presently.
2011-08-02 23:41:12 +01:00
9fc59e2bf2
minor: remove some mono compiler warnings
2011-07-30 03:19:00 +01:00
c4ffcd4b7d
Ensure that packet headers get parsed correctly
2011-07-27 09:12:00 +01:00
04eaca2af8
Ensure that packet headers get parsed correctly
2011-07-27 08:35:19 +02:00
4cdc8806fb
Fix LLTextBox to work with the updated libOMV
2011-07-23 11:40:38 +01:00
96174595da
Fix LLTextBox to work with the updated libOMV
2011-07-23 11:39:32 +01:00
62325829ec
comment out all kinds of debugging guff
2011-07-19 05:14:58 +01:00
7c468cda36
Stop undo of just the root prim position in the linkset from shifting the whole linkset.
...
However, what happens now is that undo just doesn't do anything when the root prim is selected on its own. This requires more code than just fiddling with undo states.
2011-07-19 03:38:22 +01:00
c94dc95844
fix undo when resizing of non-root individual prims in a linkset
...
undo resize, rotation and position still needs fixing when only editing root prim of a linkset
2011-07-19 03:27:16 +01:00
430a4aeba8
Fix undo for resizing linksets
...
This involves implementing a boolean in UndoState to signal whether the undo needs to be done for an entire group/linkset or just a single prim
Resizing individual components of linksets is still dodgy.
Resizing still has to be down twice, since for some reason the client is sending two multiobjectupdate packets on every resize except the very first. This applies to single prims and linksets. Need to look into this.
2011-07-19 03:01:54 +01:00
6fc74b36d1
Make various tweaks to undo code in an effort to get things working better.
...
Undo rotation and position appear to be working.
Resizing a single prim appears to be working, though the undo has to be done twice.
Resizing a group of prims still does not work properly - possibly because in the UndoState we don't store a knowledge of when we're resizing a whole group rather than individual prims.
This needs to be addressed.
2011-07-18 04:54:21 +01:00
df2a59d31b
refactor: make SceneObjectGroup.GroupScale() a property rather than a mehod
2011-07-16 03:30:14 +01:00
a9ba9d4a9e
change async parameter name in AddLocalPacketHandler since it becomes a reserved keyword in .net 5
...
Also adds some method doc.
2011-07-15 23:51:55 +01:00
3e5b2d52ff
minor: method doc for baked texture uploading
2011-07-15 22:58:29 +01:00
dbd954d701
Fix permissions problem where newly uploaded meshes rezzed from inventory could not be copied by owner.
2011-07-11 22:56:14 +01:00
c920ff9d1d
Merge branch 'master' into careminster-presence-refactor
2011-07-09 01:06:46 +01:00
5e8900dfd0
minor: code tidy and inserted log lines for future use.
...
Unable to get to the bottom of why resizing a mesh fails to properly reset the physics proxy, when toggling phantom does
After a mesh is generated, the existing sculptdata is set to zero in PrimitiveBaseShape to save memory
When phantom is toggled, the sculptdata is regenerated before remeshing.
But on resize, the sculptdata is not regenerated.
So clearly, resetting sculptdata is possible, but haven't quite been able to pin down how this is being done when phantom is toggled.
2011-07-09 00:35:30 +01:00
5700c582ba
refactor: rename bool returning GetAgentInventoryItem() to CanGetAgentInventoryItem() to improve code readability
2011-07-08 22:28:17 +01:00
3bda7711b3
Switch the MeshUploadFlag CAP module on and off with the existing config AllowMeshUpload flag in [Mesh] (in OpenSimDefaults.ini)
...
Default is on.
2011-07-07 23:49:19 +01:00
2fbc98fa5c
Make MeshUploadFlagModule non-shared rather than shared (since each scene needs its own cap)
2011-07-07 23:37:23 +01:00
281e80ccf3
add MeshUploadFlag capability fixed mesh upload with latest mesh viewer thank you dahlia and lkalif for helping to make this happen!
2011-07-07 03:30:37 -07:00
06d5989f4d
Fix parcel prim count and max reporting. Viewer already multiplies.
2011-07-06 09:59:05 +02:00
5f927dc104
Merge branch 'master' into careminster-presence-refactor
2011-06-30 00:26:03 +01:00
1a0a9d2290
Implement the latest mesh mechanism so that rezzing the uploaded mesh now works again.
...
Many thanks to the aurora project for pioneering this.
This code is almost certainly not bug free, but it does at least appear to handle simple meshes (except when the viewer crashes - but it is beta!).
2011-06-24 21:54:01 +01:00
37a7c16734
minor: method documentation
2011-06-24 21:01:48 +01:00
6ae73aea49
Merge branch 'master' into careminster-presence-refactor
2011-06-20 03:11:34 +01:00
822b9e085f
Added SimulatorFeatures capability. Thanks Aurora devs for the bootstrap on the contents of the response.
...
Changed the experimental capability introduced a couple of commits ago: now sending that extra information as part of the response in the SimulatorFeatures cap.
2011-06-13 10:21:29 -07:00
ab11835aeb
Same processing of the "/" in the MapImageService Cap as the one in the login service.
2011-06-13 07:59:28 -07:00
0e4db3ca39
Added experimental new capability URL called MapImageService meant to work with Kokua viewer if devs are willing to do it.
2011-06-13 07:56:52 -07:00
a1c16a4200
Merge branch 'master' into careminster-presence-refactor
2011-06-11 12:08:02 +01:00
b5518dc906
minor: Add some commented out destructor logging messages for potential future use.
...
At the moment, client and scene objects are being garbage collected as expected, at least in simple scenarios.
2011-06-10 20:40:14 +01:00
326c46ba70
Merge branch 'master' into careminster-presence-refactor
2011-06-09 02:05:04 +01:00
623706d988
HG Landmarks bug fix: pull landmark asset data from user's asset server when user is traveling.
2011-06-03 11:33:44 -07:00
e33cedfd42
HG Landmarks now working.
2011-06-03 10:26:58 -07:00
c67fa72d56
When sending an LLUDP MoneyBalanceReply message, fill out the transaction item description even though there is none.
...
This is to deal with a problem in libomv where calling ToBytes() without this crashes because of an ItemDescription.Lnegth dereference.
2011-05-31 19:57:08 +01:00
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
6bac16fd88
Fix up handling of the estate dialog to prevent duplication of ban list names.
...
Allow more than 61 names in ban list without crashing the viewer.
2011-05-15 14:55:36 +02:00
75d4956ee5
Merge branch 'master' into careminster-presence-refactor
2011-05-13 12:05:46 +01:00
5f9edd195c
Fix broken inventory links on viewer 2.
...
It appears that if the viewer requests a folder containing links, we must also send the folders that contain the link targets first.
This was tested with Kokua 0.1.0 WIP though I predict it will also work with other viewer 2s
2011-05-13 03:24:19 +01:00
1bd949614a
Merge branch 'master' into careminster-presence-refactor
2011-05-09 18:37:35 +01:00
8a5f6dc7a5
Fixes gray tiles on map search for viewers 1.
2011-05-09 10:25:42 -07:00
c0a69bfaab
The map is seriously broken. This doesn't fix it, but at least provides one more piece of data that seems to be required -- agent flags, which seem to be different in Viewer 2. WARNING: changes IClientAPI.
2011-05-08 22:50:04 -07:00
b451cc1ebb
Merge branch 'master' into careminster-presence-refactor
2011-05-08 20:23:06 +01:00
74e981e796
One more bug fix concerning library items that weren't being copied to user's inventory. Also commented verbose debug message.
2011-05-06 09:56:27 -07:00
4beb0c9b9b
Merge branch 'master' into careminster-presence-refactor
2011-05-05 09:49:10 +01:00
e8944d6c31
Test m_Enabled on RemoveRegion.
2011-05-04 20:40:25 -07:00
ac9697edbe
Fixed: EventQueueGet and other caps were being wrongly deregistered. Also CapabilitiesModule was being instantiated twice (damn Mono.Addins).
2011-05-02 19:45:47 -07:00
883f21dd02
WebFetchInventoryDescendents working. Tested with robust.
2011-05-02 14:33:34 -07:00
aba9ffdbd0
Refactored the GetMesh module into a handler and a module, to be the same as GetTexture.
2011-05-02 11:56:40 -07:00
10180760b7
Works!
2011-05-02 08:48:55 -07:00
2d21052fa3
Start to drill down on GetTexture. Read the config and do different things.
2011-05-01 19:09:08 -07:00
f79400e94c
Broke down Caps.cs into a generic Caps object that simply registers/unregisters capabilities and a specific bunch of capability implementations in Linden space called BunchOfCaps.
...
Renamed a few methods that were misnomers.
Compiles but doesn't work.
2011-05-01 18:22:53 -07:00
275046cf02
Change GetTextureModule.cs to conform to the new IRegion module interface. NOTHING OF THIS WORKS. Compiles.
2011-05-01 12:03:00 -07:00
126d2adeba
Move CapabilitiesModule back to CoreModules. This one belongs there.
2011-05-01 12:02:07 -07:00
6b2b036387
Added OpenSim.Capabilities.Handlers. For the moment it has only the GetTexture handler. The region module in Linden space uses it. WARNING: nothing of this works yet, it just compiles.
2011-05-01 09:08:18 -07:00
e3c27d8527
Nope, that didn't feel right. Moving all those modules to Linden space.
2011-04-30 13:24:25 -07:00
d8ee0cbe1c
First stab at cleaning up Caps. Compiles. Untested.
2011-04-30 09:24:15 -07:00
Melanie