Justin Clark-Casey (justincc)
8755a48cde
fix command display for debugging 'emergency-monitoring'
2011-05-06 00:34:04 +01:00
Sean McNamara
0995fedcac
AutoBackupModule: Implement per-region settings in Regions.ini.
2011-05-02 04:32:31 -04:00
Sean McNamara
fffd42f5cb
Merge git://opensimulator.org/git/opensim
2011-05-02 02:23:18 -04:00
Sean McNamara
2aab033aaa
First pass at fixing justincc's feedback v2 ( http://opensimulator.org/mantis/view.php?id=5440 )
...
Fixing everything here (I think) except the per-region config. That's next.
2011-05-02 02:20:50 -04:00
Diva Canto
3e79842312
Renamed OpenSim.Framework.Capabilities.dll to OpenSim.Capabilities.dll
2011-04-30 11:03:22 -07:00
Diva Canto
d8ee0cbe1c
First stab at cleaning up Caps. Compiles. Untested.
2011-04-30 09:24:15 -07:00
Sean McNamara
c82c7e6ed9
Wait for OnOarFileSaved event callback before executing script
...
We want to execute the (optional) user script after I/O is done on the oar.
I wasn't aware that ArchiveRegion is asynchronous -- now I am.
Should fully resolve comment 0018290 at
http://opensimulator.org/mantis/view.php?id=5440
2011-04-26 11:42:06 -04:00
Mic Bowman
024c12abc3
Cleaned up various configuration options. Removed the category throttle
...
limits because the only ones used now are the defaults (which are overwritten
by the client throttles anyway). Updated the default rates to correspond to
about 350kbps.
Also added a configuration to disable adaptive throttle. The default
is the previous behavior (no adaptation).
2011-04-25 10:44:41 -07:00
Mic Bowman
1d7c83c39f
Merge branch 'master' into queuetest
2011-04-25 08:41:21 -07:00
Sean McNamara
d287e0ac68
Merge git://opensimulator.org/git/opensim
2011-04-23 18:33:08 -04:00
Sean McNamara
440d54a521
AutoBackup: Removed unneeded imports.
2011-04-23 18:32:08 -04:00
Sean McNamara
082fad6dd2
Fix most issues raised by justincc: http://opensimulator.org/mantis/view.php?id=5440
2011-04-23 18:29:13 -04:00
Mic Bowman
3534f4492a
Various clean ups. Removed some debugging code. Added a new "show pqueues"
...
command to look at the entity update priority queue. Added a "name" parameter
to show queues, show pqueues and show throttles to look at data for a specific
user.
2011-04-22 14:01:12 -07:00
Justin Clark-Casey (justincc)
60685c3517
Adjust freeswitch logging to be somewhat less noisy. However, there is still quite a large amount of logging present for debug purposes.
2011-04-21 19:17:38 +01:00
Justin Clark-Casey (justincc)
ccc26f7443
Get Viewer 2 voice working with OpenSim.
...
See http://opensimulator.org/mantis/view.php?id=5336
It turns out that viewer 2 was upset by the lack of a response to viv_watcher.php. This would send it into a continuous login loop.
Viewer 1 was quite happy to ignore the lack of response.
This commit puts in the bare minimum 'OK' message in response to viv_watcher.php. This allows viewer 2 voice to connect and appears to work.
However, at some point we need to fill out the watcher response, whatever that is.
2011-04-20 01:02:40 +01:00
Justin Clark-Casey (justincc)
2fa210243b
Clean up freeswitch config to what is currently required. Add explanation to config parameters. Clean up some log messages.
2011-04-19 21:54:26 +01: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
Sean McNamara
049bce4d00
Fixup the global defaults config parsing code.
2011-04-12 01:14:21 -04:00
Sean McNamara
95a6ee0a37
Fix NREs harder.
2011-04-11 13:20:46 -04:00
Sean McNamara
4ad05fb01d
Fix some NREs on certain paths.
2011-04-11 13:12:26 -04:00
Sean McNamara
4974a1ce69
AutoBackup: Support region-independent settings too.
2011-04-11 12:34:26 -04:00
Sean McNamara
9c0f3c73b1
Merge git://opensimulator.org/git/opensim
2011-04-10 18:28:54 -04:00
Justin Clark-Casey (justincc)
f58941e89f
Make the "All Estates" option work from the client (this makes chosen changes to all the estates that the user owns).
...
This applies to adding/removing estate users, groups, managers and bans.
This is the application of the AllEstates_0.5.patch from http://opensimulator.org/mantis/view.php?id=5420
Thanks very much, Snoopy!
2011-04-05 01:30:13 +01:00
Justin Clark-Casey (justincc)
4f56c732bc
Comment out some startup logging lines to make up for the one I added earlier on.
...
Most of these are where the region modules are telling us they are disabled. Convention is only to log when enabled (even that is really noisy)
2011-04-02 02:29:42 +01: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
Justin Clark-Casey (justincc)
9456bb77fb
Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately.
...
This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement.
2011-03-09 23:25:24 +00:00
Justin Clark-Casey (justincc)
8efb01b3df
minor: remove some mono compiler warnings
2011-03-05 01:15:27 +00:00
Sean McNamara
b3c42e952f
Fix small bug with remove region; update settings docs.
...
Our impl of IRegionModuleBase.RemoveRegion didn't remove the scene from the states map.
2011-02-28 11:54:07 -05:00
Sean McNamara
018645f9f8
First pass at busy heuristics. Compile-tested only.
2011-02-28 11:45:50 -05:00
Sean McNamara
a01c44e74d
Be smarter about stopping timers. Cleanup formatting.
...
Use a boolean flag to tell timers that fire after IRegionModuleBase.Close() is called that they should not execute.
Also, I used MonoDevelop's auto-formatting feature to format the code uniformly. No guarantee about variable names though.
2011-02-28 11:04:54 -05:00
Sean McNamara
34b6904939
First working commit of AutoBackupModule.
...
It seems to do something! Heuristics are still TODO, but this is alpha 1.
2011-02-26 22:09:19 -05:00
Sean McNamara
d3511ca592
Start the timer. (Could it be that simple?)
2011-02-25 09:03:11 -05:00
Sean McNamara
cb049aa15f
s/True/true
2011-02-25 08:58:42 -05:00
Sean McNamara
bb1f03abc6
Make timer auto-respawn.
2011-02-25 08:57:48 -05:00
Sean McNamara
7fa8ed0c47
Config works, but timer isn't firing. Hmm.
2011-02-25 08:48:02 -05:00
Sean McNamara
2da9bb3ca2
Try to fix config one more time.
...
Note that the way we specify settings has changed significantly here.
2011-02-25 08:31:10 -05:00
Sean McNamara
c2658c2f14
More relevant console messages, and maybe fix config problem
2011-02-19 23:14:43 -05:00
Sean McNamara
7eac0af559
Fix an actual bug in the timer interval calculation (minutes -> msec)
2011-02-19 23:07:54 -05:00
Sean McNamara
e5c08a553c
More debug messages
2011-02-19 22:55:32 -05:00
Sean McNamara
3c9bf5c476
Fix config source stuff harder (debug console prints only; no fix yet)
2011-02-19 22:47:05 -05:00
Sean McNamara
06a4810d21
Fix config source by taking it from Initialize
2011-02-19 22:29:45 -05:00
Sean McNamara
99e8260282
Add [Modules] option for unconditionally disabling entire module globally (for easy configuration)
2011-02-19 22:08:19 -05:00
Sean McNamara
dfa63ff031
Let GetNextFile do all the string-building work for SEQUENTIAL.
2011-02-19 20:15:38 -05:00
Sean McNamara
85654f82a5
First cut of AutoBackupModule; only compile-tested so far
2011-02-19 12:25:04 -05:00
Diva Canto
473fac4dc7
Detect negative dripAmounts in TokenBuckets. These negatives result from overflown integer operations. Also added Total to the scene throttles in show throttles.
2011-02-09 08:06:20 -08:00
Diva Canto
ac7bc78555
Added emergency monitoring of UDP Outgoing packets thread. Just type "emergency-monitoring on/off"
2011-02-08 12:06:14 -08:00
Diva Canto
3411d4867d
Honor check of m_Enabled in WorldViewModule.
2011-02-05 19:40:55 -08:00
Justin Clark-Casey (justincc)
2413e9eb3f
Record number of resent packets in LindenUDP stack and display in stats report
2011-02-02 20:00:50 +00:00
Justin Clark-Casey (justincc)
0898be5750
Change SimianGroupsServicesConnectorModule.GetAgentGroupMembership() so that it returns null if the user isn't a member of the group.
...
This matches the behaviour of the same method for Flotsam Groups. This is the behaviour assumed by existing code.
Method doc also added to IGroupsServicesConnector to the make the contract clear.
2011-01-31 22:54:36 +00:00
Justin Clark-Casey (justincc)
5f3f7c3405
minor: remove unnecessary newline from "show throttles" information
2011-01-21 22:48:49 +00:00
Justin Clark-Casey (justincc)
9971fdbcd5
properly format "show throttles" table
2011-01-21 22:31:46 +00:00
Justin Clark-Casey (justincc)
38debbc59f
crudely refactor table generation code for "show queues" and "show throttles"
2011-01-21 00:56:37 +00:00
Justin Clark-Casey (justincc)
c383dbd06d
implement "show throttles" command for showing current agent throttles and the server settings.
...
This is in a very crude state, currently.
The LindenUDPModule was renamed LindenUDPInfoModule and moved to OptionalModules
OptionalModules was given a direct reference to OpenSim.Region.ClientStack.LindenUDP so that it can inspect specific LindenUDP settings without having to generalize those to all client views (some of which may have no concept of the settings involved).
This might be ess messy if OpenSim.Region.ClientStack.LindenUDP were a region module instead, like MXP, IRC and NPC
2011-01-21 00:38:16 +00:00
Justin Clark-Casey (justincc)
4ac58093bf
Make the default for the very verbose XMLRPC groups debug setting false rather than true!
2011-01-04 23:23:42 +00: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
Justin Clark-Casey (justincc)
490d05d212
remove broken and unmaintained subversion serialization module and it's associated libraries and licenses
2010-12-17 23:04:07 +00:00
Justin Clark-Casey (justincc)
81bccd6d13
Start implementing a test for 'share with group' object functionality. Not yet complete.
...
While implementing this, a bug was fixed in scene setup helpers where module RegionLoaded() was called immediately after AddRegion() instead of waiting for all AddRegions() to complete.
Also, XmlRpcGroupsModule non-message functionality will now work without a message transfer module (as indicated in the comments but with a contradictory implementation)
2010-12-14 23:36:34 +00:00
Justin Clark-Casey (justincc)
42c9c30e4c
Add mock group services connector and use this in tests
2010-12-14 22:57:36 +00:00
Justin Clark-Casey (justincc)
c620e4c822
add infrastructure for groups module tests
2010-12-14 22:25:01 +00:00
Justin Clark-Casey (justincc)
f268cd7c53
comment out the extension attribute
2010-12-04 02:47:29 +00:00
Justin Clark-Casey (justincc)
57b5263ecf
add bare bones shared example module
2010-12-04 02:46:59 +00:00
Justin Clark-Casey (justincc)
510b55c7f0
refactor some common code in RegionModulesControllerPlugin
...
also some minor doc changes in BareBonesNonSharedModule
2010-12-04 02:38:26 +00:00
Justin Clark-Casey (justincc)
c010491d34
correct the id of the example module
2010-12-04 01:38:32 +00:00
Justin Clark-Casey (justincc)
a06032d96e
Add the most bare bones non-shared region module example. Not active unless the correct line is uncommented.
2010-12-04 01:36:35 +00:00
Melanie
04ce7de5ed
Fix the build break
2010-11-29 01:15:30 +00:00
Melanie
5aeb83125a
Remove the most spammy XML dumps from the FS voice module
2010-11-28 23:30:55 +00:00
Mic Bowman
541a7660e0
Refactor appearance and avatar data sending code. Paritioning the routines into "one-to-many" and "many-to-one" makes it possible to call the right function on presence creation (both child and root) and when a child agent is promoted to root. This brings the total number of appearance sends down to one or two on login.
...
Cleaned up the avatar update calls in the groups code. Cleaned up
some commented and debugging code, and a few formating fixes.
2010-11-27 01:14:36 +00:00
Melanie
d2aebbe066
Fox case on a method
2010-11-22 14:27:45 +00:00
Melanie
4e0a289a8d
Change FS Voice module to a shared module to avoid gratuitious server handler
...
registrations. Add the missing bits to drive the local connector's HTTP
requests. This makes standalones work.
2010-11-22 14:13:27 +00:00
Melanie
ddf08276f1
Fox the buglets in Freeswitch. Grid mode works now and there is no reason why standalone should not.
2010-11-22 00:46:23 +00:00
Melanie
2105842513
Finish the standalone mode freeswitch work and add config examples
2010-11-21 23:24:39 +00:00
Melanie
6fa24f4671
Convert the Freeswitch module to new style
2010-11-21 22:40:03 +00:00
Melanie
e6c52f38c5
Strip the dialplan and directory methods from the region module
2010-11-21 22:25:50 +00:00
Master ScienceSim
f2c1d0e34f
Merge branch 'opensim-master' into dev-appearance
2010-10-28 09:09:42 -07:00
Jeff Ames
727838f914
Formatting cleanup.
2010-10-28 00:37:32 -04:00
Jeff Ames
a331fd4e24
Formatting cleanup.
2010-10-27 00:01:03 -04:00
Master ScienceSim
267f18925d
First attempt to get multiple attachments working to support viewer2.
...
The attachment code appears to work correctly for 1.23 viewers so, in
spite of some big changes in the internal representation, there don't
appear to be regressions. That being said, I still can't get a viewer2
avatar to show correctly.
2010-10-21 16:48:58 -07:00
Melanie
338e7481f9
Remove a bit of dead code relating to ObjectCapacity
2010-10-21 13:21:46 +01: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
Justin Clark-Casey (justincc)
478b44f231
Pass in requesting agent ID when GetGroupMembers is called in the XMLRPC groups module
...
This allows the groups xmlrpc server to act appropriately if the requesting agent has permission to see all group members
Not sure why this wasn't being done before...
2010-10-19 02:04:23 +01:00
Justin Clark-Casey (justincc)
b9bef50852
Display more information when xmlrpcgroupsserver comms fails
...
Improve debugging messages
2010-10-19 02:04:14 +01:00
Melanie
d45276b3f6
Add and plumb the usetex URL parameter to worldview. Required but not yet
...
functional
2010-10-06 05:44:19 +01:00
Melanie
9a1c8db443
Convert worldview to GET
2010-10-06 05:17:31 +01:00
Melanie
623f57deb5
Change the URL /worldview to /worldview/<region id> to support multiregion
2010-10-06 03:51:55 +01:00
Melanie
752b6a8764
Convert the BMP to a JPEG image and return it. This should be testable.
2010-10-06 03:40:55 +01:00
Melanie
abfcd168fc
Add the parameter plumbing and image generation
2010-10-06 03:32:01 +01:00
Melanie
17316170a5
Add WOrldView request handler and plumbing
2010-10-06 03:03:10 +01:00
Melanie
ce89f08f6b
Add WorldView module skeleton
2010-10-06 02:06:50 +01:00
Jeff Ames
bc9f793a92
Formatting cleanup.
2010-10-04 21:28:17 -04:00
Melanie
6fc1ceb2ee
So, the client can have an old idea of the object properties for the object when it goes to buy. This can cause a problem in the buy process. Additionally Hazim mentioned that the buy packets are spoofable. The core modules are the crowing glory example of best practice :P, so therefore, setting the example here, Validate Client sent Buy Data. WebAppSecurity 101, Never trust a client. Validate Validate Validate! Or you'll have problems whether intentional or not.
2010-10-02 20:11:43 +01:00
Melanie
87c6386884
Reapplying the parts of the prior revert that were not derived from the
...
original patch
2010-10-02 18:47:26 +01:00
Melanie
b01020b84a
Revert "Forward-port 0.6 fix"
...
This reverts commit 90b51dc7d6
.
2010-10-02 18:45:48 +01:00
Melanie
90b51dc7d6
Forward-port 0.6 fix
2010-09-30 15:52:33 +01:00
Justin Clark-Casey (justincc)
b1ab3ea5d9
For all Flotasm group module XMLRPC calls, correct parameter requestingAgentID to RequestingAgentID
...
This was stopping the get group member roles call from working, and may have affected other things
2010-09-17 23:48:44 +01:00
John Hurliman
860b2a502f
Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndArray collection
2010-09-16 17:30:46 -07:00
Justin Clark-Casey (justincc)
39d27fc879
rename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to improve code readability
2010-09-15 22:29:58 +01:00
Jeff Ames
f1f0bc23f4
Formatting cleanup.
2010-09-12 13:43:49 -04:00
John Hurliman
dd277a0d02
First pass at cleaning up thread safety in EntityManager and SceneGraph
2010-09-10 12:04:12 -07:00
Justin Clark-Casey (justincc)
ab875b32c1
Make console backup command do a forced backup rather than non-forced
...
Remove no-arg backup method for simplicity as it only make sense to call non-forced backup internally
2010-09-06 23:12:03 +01:00
Justin Clark-Casey (justincc)
1c0b4457cd
Improve liveness by operating on list copies of SOG.Children where appropriate
2010-08-28 00:40:33 +01:00
Justin Clark-Casey (justincc)
8031f8ec09
Improve consistency of locking for SOG.m_parts in order to avoid race conditions in linking and unlinking
2010-08-26 00:08:53 +01:00
John Hurliman
a8c0b131f9
* Changed a few OSD.FromBinary() calls to the more accurate OSD.FromULong() to fix the build
2010-08-17 13:50:04 -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
Justin Clark-Casey (justincc)
e89f0b3f71
refactor: move Scene.PerformObjectBuy into BuySellModule
2010-08-13 22:29:42 +01:00
Justin Clark-Casey (justincc)
b51534852f
minor: remove mono compiler warning
2010-08-13 21:07:45 +01: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 Thielker
cd8bb316ea
Remove getting the object capacity from the money module. It is now set
...
directly from the Region Info (and the region ini file)
2010-07-14 03:51:00 +01:00
Melanie Thielker
e15f6905a5
Clean up IMoneyModule and adjust the other modules to the changes
2010-07-02 06:13:58 +01:00
Melanie Thielker
fda9d7b75e
Remove GetEconomyData and the economy data structure (unused)
2010-07-02 04:45:03 +01:00
Melanie Thielker
85a9c305a2
Remove AgentID and GroupOD from the signature of SOG.Copy(). They were never
...
used, but made for a very mispleading read of the code in the callers.
2010-06-28 01:43:26 +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
Melanie Thielker
8df9f272eb
Fix a nullref in EventManager caused by RegionReady not setting the scene
2010-05-30 23:57:13 +01:00
Justin Clark-Casey (justincc)
b2197e3b94
Apply http://opensimulator.org/mantis/view.php?id=4632
...
Adds dialog methods for MRM.
Thanks ziah.
2010-05-21 23:37:05 +01:00
Justin Clark-Casey (justincc)
074937e0e5
Apply http://opensimulator.org/mantis/view.php?id=4627
...
Adds OwnerId and CreatorId properties to MRM.IObject
2010-05-21 23:34:47 +01: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
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
Melanie
9ecebcdf13
Revert "Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups"
...
Causes an exception within HttpServer, headers have already been sent.
This reverts commit 8187fccd25
.
2010-05-06 16:39:21 +01:00
Diva Canto
ebc3726d52
Added copying of Viewer field to the agent circuit data that is being passed on TPs and crossings.
...
(XmlRpcGroups files want to be committed too)
2010-05-05 16:54:48 -07:00
Melanie
8187fccd25
Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-05 16:12:52 +01:00
unknown
fb7458be31
Minor spelling corrections in MiniModule: "RetreiveAsset" changed to
...
"RetrieveAsset" and 'm_rootSceene' to m_rootScene'.
2010-04-28 11:47:07 +03:00
Justin Clark-Casey (justincc)
cf46735856
add a missing initialization of the m_memoryCache in XmlRpcGroupsServicesConnectorModule
...
the lack of this caused me a NullReferenceException when calling some groups methods directly though in principle it would also fail in other situations
2010-04-16 21:39:27 +01:00
Justin Clark-Casey (justincc)
5459a90fc6
minor: stop irc bridge warning about not attached to regions if it's not been turned on in the first place
2010-04-16 21:23:01 +01:00
John Hurliman
8fa13e3871
Patch from mcortez to add basic caching to the groups module. This prevents database/network explosions when you have a significant number of group-owned prims in a scene
2010-04-14 19:48:40 -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
Diva Canto
80346ad2e2
* May fix mantis #4603 .
...
* My local git wants to commit the groups files for line endings, I'm gonna let it do it.
2010-04-05 19:56:03 -07:00
Melanie
dc58c985e8
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-04 02:24:52 +01:00
Melanie
936e08e20e
Patch from mcortez. This appears to be a huge change to the groups module
...
and I can't say if this is beneficial or destructive due to the way it
was delivered (zipfile). Pushing this on faith alone.
2010-04-04 02:23:53 +01:00
Diva Canto
6485c576a1
* Made UserAccountService handle UserLevel, UserFlags and UserTitle appropriately.
...
* Removed Store service from the UserAccount handler.
2010-04-03 12:03:34 -07:00
Melanie
a004d88bf3
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-02 14:53:52 +01:00
Melanie
4b98d0db92
Adding the groups update (Mantis #4646 )
...
Thanks, mcortez.
2010-04-02 14:53:33 +01:00
Justin Clark-Casey (justincc)
e0eba26f7b
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-01 23:59:00 +01:00
Justin Clark-Casey (justincc)
938905df1e
oops, add file missing from last commit
...
refactor out redundant method from GroupsMessagingModule
2010-04-01 22:45:01 +01:00
Justin Clark-Casey (justincc)
c33b1de9df
expose methods that allow region modules to send messages to groups
2010-04-01 22:37:20 +01: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
Justin Clark-Casey (justincc)
24fc4703d0
fix build break. First argument of GetGroupRecord is not a uuid
2010-03-29 22:02:02 +01:00
Melanie
e7e56e0143
Remove a redundant method body
2010-03-29 19:50:24 +01:00
John Hurliman
05123c6bd5
* Fixed a dictionary value retrieval in GroupsModule
2010-03-26 12:39:22 -07:00
Justin Clark-Casey (justincc)
87fe96ae2c
replace recent IModule.GetGroup() with better GetGroupRecord(string name)
2010-03-26 00:10:29 +00:00
Justin Clark-Casey (justincc)
857918d3b0
minor: some debugging information and spacing changes to group module
2010-03-25 23:53:05 +00:00
Justin Clark-Casey (justincc)
f0703cad2c
add get group by name method to IGroupsModule
2010-03-25 22:47:52 +00:00
Dan Lake
62e0b53ca4
Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, Scene and SceneGraph. This was the only change in this patch to keep it isolated from other recent changes to the same set of files.
2010-03-19 15:16:44 -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
John Hurliman
df76e95aa2
Changed asset CreatorID to a string
2010-02-22 14:18:59 -08:00
John Hurliman
71c6559a91
Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor
2010-02-22 14:10:19 -08:00
John Hurliman
7665aad002
* Adds CreatorID to asset metadata. This is just the plumbing to support CreatorID, it doesn't modify database backends or OAR files to support storing/loading it
2010-02-22 13:27:17 -08:00
Melanie
1f45e6c649
Merge branch 'master' into presence-refactor
...
This brings presence-refactor up to master again
2010-02-22 03:00:59 +00:00
Jeff Ames
d1f2fae348
Formatting cleanup.
2010-02-20 11:02:06 +09:00
Justin Clark-Casey (justincc)
68b494b2cc
Apply http://opensimulator.org/mantis/view.php?id=4495
...
Adds IsChildAgent property to IAvatar in MRM.
Thanks ziah
2010-02-19 22:44:33 +00: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
Justin Clark-Casey (justincc)
00800c59d3
Apply last two patches from http://opensimulator.org/mantis/view.php?id=3522
...
These patch should allow people using systems that do not have their locale set to En_US or similar to use OpenSim without suffering effects such as being a million miles up in the air on login.
The problem was caused by parsing strings without forcing that parse to be En_US (hence different decimal and digit group symbols were causing problems).
Thanks very much to VikingErik for doing the legwork on this fix and phacelia for spotting it in the first place.
2010-02-12 23:13:35 +00:00
Melanie
baaf660511
Merge branch 'master' into presence-refactor
...
This was a large, heavily conflicted merge and things MAY have got broken.
Please check!
2010-02-08 15:53:38 +00:00
Diva Canto
041594ed07
Cleaned up configuration. 'gridmode' and 'hypergrid' are gone, as well as lots of other obsolete configs.
2010-01-31 13:01:23 -08: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
Justin Clark-Casey (justincc)
4c1365f149
apply http://opensimulator.org/mantis/view.php?id=4486
...
fix compilation of mrm scripts using microthreaded parmeter
Thanks ziah
2010-01-30 00:15:37 +00:00
Melanie
a87a247f05
Revert "Updates all IRegionModules to the new style region modules."
...
This reverts commit ec3c31e61e
.
2010-01-29 07:21:06 +00:00
Teravus Ovares (Dan Olivares)
bc68f77396
* A few other endlines...
2010-01-26 12:41:37 -05:00
Teravus Ovares (Dan Olivares)
8284fc8e22
* Fix Endlines in IRCClientView.cs
2010-01-26 12:19:38 -05:00
Revolution
ec3c31e61e
Updates all IRegionModules to the new style region modules.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-23 15:18:52 +00:00
Melanie
10f8c2ea9b
Merge branch 'master' into presence-refactor
...
This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.
2010-01-16 00:05:08 +00:00
Diva Canto
77e43f4801
Fixed a couple of bugs with Appearance. Appearance is all good now.
2010-01-11 17:30:05 -08:00
dr scofield (aka dirk husemann)
d86c0d406a
more specific config error logging
2010-01-11 17:15:49 +01:00
Diva Canto
c5ea783526
OpenSim/Framework/Communications/Cache deleted. LibraryRootFolder deleted.
2010-01-11 07:51:33 -08:00
Diva Canto
751e70af78
NetworkServersInfo removed from CommsManager.
2010-01-10 21:37:36 -08:00
Diva Canto
0c2946031b
CommunicationsManager is practically empty. Only NetworkServersInfo is there.
2010-01-10 19:42:36 -08:00
Diva Canto
e31131b40f
Some typos fixed related to master avie removal
2010-01-10 15:41:49 -08:00
Melanie
b5f1857d34
Remove a little bit more if master avatar
2010-01-10 22:55:43 +00:00
Melanie
3c90d834ea
Remove all references to master avatar, replacing with estate owner where
...
appropriate. This changes the behavior of the REST plugins and RemoteAdmin's
region creation process.
2010-01-10 22:41:42 +00:00
Diva Canto
1e1b2ab221
* OMG! All but one references to UserProfileCacheService have been rerouted!
...
* HG is seriously broken here
* Compiles. Untested.
2010-01-10 10:40:07 -08: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
Diva Canto
b63405c1a7
Inching ahead... This compiles, but very likely does not run.
2010-01-08 10:43:34 -08: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
Melanie
88b3b98811
Add AvatarInterestsReply
2009-12-26 04:12:51 +00:00
Charles Krinke
fddefff284
Thank you kindly, Ziah for a patch that adds the channel to the class ChatEventArgs and retrieves it's value along with the others from the OSChatMessage in HandleChatPackage. With this the MRM Script can check if a ChatEvent is coming in on a specifc Channel. The Second Part adds the Method say(string msg , int channel) to send a chat message on the specified channel. The idea behind this is to enable MRM's to communicate with regular LSL or OSSL Scripts so that they may can act as a Backend to access a Database or do business Logic for those Scripts.
...
Signed-off-by: Charles Krinke <cfk@pacbell.net>
2009-12-23 10:34:11 -08:00
Melanie
de59910758
Patch from Ziah.
...
Mantis #4456 : Patch to implement some minor MRM Functions : SitTarget,
SitTargetText, TouchText and Text
2009-12-21 14:46:07 +00:00
Justin Clark-Casey (justincc)
e5661e5609
Remove stub Python module and DLLs since this was never fully implemented
...
It may be possible to reintroduce this if someone wants to implement a Python hookup for OpenSim scripting (I'm sure it can't be too hard).
Might be possible to import wholesale from modrex
See http://opensimulator.org/mantis/view.php?id=4395
Thanks mpallari
2009-11-27 19:31:19 +00:00
Justin Clark-Casey (justincc)
1f71523a5a
minor: make irc bridge logging less verbose if it isn't actually enabled
2009-11-27 14:47:49 +00:00
Justin Clark-Casey (justincc)
ee0b5abc62
minor: reduce region ready logging verbosity
2009-11-26 16:51:10 +00:00
Justin Clark-Casey (justincc)
de054bc583
minor: remove mono compiler warning due to unreachable code in GroupsModule
2009-11-17 15:21:29 +00:00
Justin Clark-Casey (justincc)
55a40694e7
minor: remove mono compiler warning
2009-11-12 17:42:26 +00:00
Melanie
ba99081bbe
Add IScriptModuleComms interface and region module to handle dispatch of
...
script messages to region modules and sending back replies.
Hook IScriptModuleComms.OnScriptCommand to see commands and use
DispatchReply to reply to the script. It is recommended to pass the "id"
parameter from the event as the "k" parameter of the reply.
The script will receive the reply as a link message from link -1.
2009-11-10 03:36:43 +00:00
John Hurliman
afef1ac191
Changing the AssetBase constructors to avoid initializing assets with an unknown asset type, and log an error if it ever does happen
2009-11-05 13:10:58 -08:00
Melanie
83b4b4440b
Patch by revolution, thank you. Mantis #1789 . Implement friends permissions.
...
Applied with major changes. Core functionality commented pending review
for possible rights escalation. No user functionality yet.
2009-11-05 02:09:07 +00:00
Melanie
c72f78215b
Backport the fixes to WebFetchInventoryDescendents to the UDP
...
InventoryDescendents packet. Testing has shown that UDP inventory now
works flawlessly and, unlike CAPS inventory, doesn't download the entire
agent inventory on start. Neither does it incessantly re-request folder
NULL_KEY. Therefore, I have disabled CAPS inventory.
2009-11-04 01:56:19 +00:00
John Hurliman
67ac9881fa
Removing duplicate SceneObjectPart.RotationalVelocity property
2009-11-02 11:28:35 -08:00
John Hurliman
d199767e69
Experimental change of PhysicsVector to Vector3. Untested
2009-10-26 18:23:43 -07:00
John Hurliman
4847e62e9f
* Switched all operations on the list of clients that could be either sync or async to use Scene.ForEachClient() instead of referencing ClientManager directly
...
* Added a new [Startup] config option called use_async_when_possible to signal how to run operations that could be either sync or async
* Changed Scene.ForEachClient to respect use_async_when_possible
* Fixing a potential deadlock in Parallel.ForEach by locking on a temporary object instead of the enumerator (which may be shared across multiple invocations on ForEach). Thank you diva
2009-10-26 16:33:04 -07:00
John Hurliman
2c34619aea
* Changed various modules to not initialize timers unless the module is initialized. Ideally, the timers would not initialize unless the module was actually enabled, but Melanie's work on configuring module loading from a config file should make that unnecessary
...
* Wrapped the Bitmap class used to generate the world map tile in a using statement to dispose of it after the JPEG2000 data is created
2009-10-23 14:22:21 -07:00
John Hurliman
b2ed348aa2
Implemented a Watchdog class. Do not manually create Thread objects anymore, use Watchdog.StartThread(). While your thread is running call Watchdog.UpdateThread(). When it is shutting down call Watchdog.RemoveThread(). Most of the threads in OpenSim have been updated
2009-10-22 12:33:23 -07:00
John Hurliman
2b39ff0a39
Merged master into prioritization
2009-10-21 16:24:17 -07:00
Melanie
8dd15fd5a5
Patch by mcortez: Remove lock from scene presence updating in groups module
2009-10-21 18:45:37 +01:00
John Hurliman
fdb2a75ad3
Committing the second part of Jim Greensky @ Intel Lab's patch, re-prioritizing updates
2009-10-17 18:01:22 -07:00
Melanie
cdcbd22ba8
Merge branch 'master' into prioritization
2009-10-17 14:51:17 +01:00
Melanie
c7da13eb23
Adds SendAvatarInterestsUpdate to IClientAPI
...
Thank you, Fly-Man
2009-10-17 14:50:21 +01:00
John Hurliman
4b75353cbf
Object update prioritization by Jim Greensky of Intel Labs, part one. This implements a simple distance prioritizer based on initial agent positions. Re-prioritizing and more advanced priority algorithms will follow soon
2009-10-15 16:35:27 -07:00
John Hurliman
d44b50ee46
* Removed some of the redundant broadcast functions in Scene and SceneGraph so it is clear who/what the broadcast is going to each time
...
* Removed two redundant parameters from SceneObjectPart
* Changed some code in terse update sending that was meant to work with references to work with value types (since Vector3 and Quaternion are structs)
* Committing a preview of a new method for sending object updates efficiently (all commented out for now)
2009-10-15 15:25:02 -07:00
John Hurliman
dc11643c00
* Consolidated adding / removing ClientManager IClientAPIs to two places in Scene
...
* Added some missing implementations of IClientAPI.RemoteEndPoint
* Added a ClientManager.Remove(UUID) overload
* Removed a reference to a missing project from prebuild.xml
2009-10-13 17:33:45 -07:00
John Hurliman
23a334b9f5
* Rewrote ClientManager to remove Lindenisms from OpenSim core, improve performance by removing locks, and replace LLUDPClientCollection
...
* Removed the confusing (and LL-specific) shutdowncircuit parameter from IClientAPI.Close()
* Updated the LLUDP code to only use ClientManager instead of trying to synchronize ClientManager and m_clients
* Remove clients asynchronously since it is a very slow operation (including a 2000ms sleep)
2009-10-13 14:50:03 -07:00
John Hurliman
2519f071f2
Fixing a few compile errors in the previous commit
2009-10-06 02:50:59 -07:00
Michael Cortez
d4a6d9191a
Make sure that keys exist in arrays before trying to access them.
2009-10-05 20:47:00 +01:00
Michael Cortez
544675d0f0
Ensure the specified imSessionID exists in the DroppedSession collection before attempting to access it.
2009-10-05 20:47:00 +01:00
Melanie
6878b26b0d
Merge branch 'diva-textures-osgrid'
2009-10-04 05:49:16 +01:00
John Hurliman
387e9f7a7f
* Creates Util.UTF8 and switches some references of Encoding.UTF8 to Util.UTF8 (not all references were switched since not all OpenSim libraries reference OpenSim.Framework)
...
* Shrinks the largest in-memory object, the LLRAW.HeightmapLookupValue struct (only used for exporting to LLRAW terrain files), to the minimum possible size. This seems to have the odd side effect of cutting the size of the two double[256,256] terrain objects in half. Possibly an alignment optimization?
2009-10-02 18:31:08 -07:00
Melanie
ce8974539e
Merge branch 'master' into diva-textures
2009-10-02 19:03:22 +01:00
dr scofield (aka dirk husemann)
2107b67f1b
- cleaning up LandData/ILandObject capitalization issues
...
- adding LandDataSerializer to OAR mechanics
2009-10-02 11:31:30 +02:00
Melanie
31d8cec0f8
Merge branch 'master' into diva-textures
2009-10-02 08:23:38 +01:00
Jeff Ames
606e831ff5
Formatting cleanup.
2009-10-01 09:38:36 +09:00
John Hurliman
5dfd2643df
* Change the signature of the agent set appearance callback to prevent unnecessary serialization/deserialization of TextureEntry objects and allow TextureEntry to be inspected for missing bakes
...
* Inspect incoming TextureEntry updates for bakes that do not exist on the simulator and request the missing textures
* Properly handle appearance updates that do not have a TextureEntry set
2009-09-30 15:53:03 -07:00
Melanie
400abed271
Add RebakeAvatarTexturesPacket to the client view
2009-09-30 21:33:20 +01:00
Jeff Ames
ee205e7e81
Formatting cleanup.
2009-10-01 01:17:47 +09:00
Jeff Ames
f00126dc2d
Add copyright header. Formatting cleanup.
2009-09-29 08:32:59 +09:00
Michael Cortez
4eb07232e0
Group Membership information is sent out from two different locations, refactored out the filtered membership list code and used it in both locations.
2009-09-18 20:54:03 +01:00
Michael Cortez
65b9084c65
Add a little debugging for filtered groups lists based on requester
2009-09-18 20:54:01 +01:00
Michael Cortez
3b511d5138
Try to filter the groups list returns for User A, when sending to User B, based on User A's preferences for ShowInProfile.
2009-09-18 20:53:58 +01:00
Michael Cortez
247fdd1a4d
Add additional instrumentation so that when there is an xmlrpc call failure, the actual xml that was returned from the groups service can be logged.
2009-09-18 20:53:56 +01:00
Michael Cortez
841cd69af7
Remove debug messages from some areas that have been highly tested, and debug info is no longer nessesary.
2009-09-18 20:53:53 +01:00
Michael Cortez
0e07a7ef10
Adding additional debug to output the group powers specified when updating a group role. This will be used to solve some issues with the Group Powers enum.
2009-09-18 20:53:50 +01:00
Michael Cortez
61699275ed
Add additional debugging to help track down bug with notices not going to group owner/founder.
2009-09-18 20:53:47 +01:00
Michael Cortez
0cb012aae5
Revert "Thank you, mcortez, for a patch to address showing users in group list"
...
This reverts commit 69ef95693a
.
2009-09-18 20:53:44 +01:00
Rob Smart
4f3975f04e
addition of a new script function osSetParcelSIPAddress(string SIPAddress), now including iVoiceModule
...
This patch allows the land owner to dynamically set the SIP address of a particular land parcel from script. This allows predetermined SIP addresses to be used, making it easier to allow non OpenSim users to join a regions voice channel.
Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
2009-09-18 15:47:15 +02:00
Melanie
69ef95693a
Thank you, mcortez, for a patch to address showing users in group list
...
Removed patch 0005, which was unrelated and likely accidental, and further
didn't apply.
2009-09-17 15:38:17 +01:00
John Hurliman
f42d085ab1
SceneObjectGroup cleanup. Removes the default constructor and unnecessary null checks on m_rootPart
2009-09-16 15:06:08 -07:00
Teravus Ovares (Dan Olivares)
dc925416d7
* fix missing lock on XMLRPC GroupsModule
2009-09-14 16:30:14 -04:00
dr scofield (aka dirk husemann)
05756e1fb9
warnings safari.
2009-09-02 11:06:18 +02:00
dr scofield (aka dirk husemann)
ef6c0bd7d8
cleanup.
2009-09-01 10:28:29 +02:00
dr scofield (aka dirk husemann)
3195af39a7
cleaning up RegionReadyModule:
...
- wrong namespace
- converted to "new" region module
2009-08-31 14:59:28 +02:00
Jeff Ames
158ad39df0
Add copyright header. Formatting cleanup.
2009-08-21 15:47:55 +09:00
Adam Frisby
bd7757de22
* oops. Mistake with value return.
2009-08-21 15:15:15 +10:00
Adam Frisby
f7c5eca978
* Moves NPC Creation across AppDomains to prevent a major perfomance issue.
2009-08-21 15:12:50 +10:00
Adam Frisby
98da8e9b16
* Make cache, actually cache.
2009-08-21 14:20:05 +10:00
Adam Frisby
29e2067ec3
* Implements a cache in NPCModule for Appearance.
2009-08-21 14:10:21 +10:00
Adam Frisby
bce98f9670
* Fixing an issue with NPC's and Circuit Codes.
2009-08-21 13:12:51 +10:00
Adam Frisby
01f394d203
* Fleshes more of NPCModule out.
...
* Implements some OSSL commands:
key osNpcCreate(string user, string name, vector position, key cloneFrom);
void osNpcMoveTo(key npc, vector position);
void osNpcSay(key npc, string message);
void osNpcRemove(key npc);
* Untested. Requires ThreatLevel.High.
2009-08-21 11:14:55 +10:00
Adam Frisby
e83b00a3df
* Implements a bunch of stuff in NPCModule
2009-08-21 08:51:43 +10:00
Justin Clark-Casey (justincc)
eb78ac343e
Apply http://opensimulator.org/mantis/view.php?id=3538
...
Add ability to silence IRC relay of region joins and quits from certain users
This is useful for admins who wish to remain hidden, or service bots.
Thanks RemedyTomm
2009-08-17 19:48:32 +01:00
Adam Frisby
30c4aa55e6
Added additional configuration options for MRM Security. See OpenSim.ini.example under the [MRM] section.
2009-08-18 00:58:42 +10:00
Adam Frisby
58d9d6026e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-08-18 00:23:27 +10:00
Adam Frisby
8c101d24df
* Implementing a bunch of Unimplemented MRM stubs.
2009-08-18 00:23:02 +10:00
Jeff Ames
58d2775ff2
Add copyright header. Formatting cleanup.
2009-08-17 02:05:12 +09:00