3d75e9addd
Lock the iteration over the inventory items when saving script states
2010-09-28 02:22:32 +02:00
841c84831f
Try to prevent threading issues in SP.SetAppearance by locking it
2010-09-27 19:34:16 +02:00
5b2aa02fd9
Merge branch 'master' into careminster-presence-refactor
2010-09-27 03:48:15 +01:00
0339d420e7
Restrict top colliders / top scripts to estate managers
2010-09-27 03:45:22 +01:00
41051b3cc6
Prevent setting arbitrary groups on your objects.
2010-09-27 02:13:22 +01:00
8e547d3491
Prevent setting arbitrary groups on your objects.
2010-09-27 02:11:55 +01:00
c2a4bdb2fe
Fix build break
2010-09-27 01:40:29 +01:00
296cf04ce6
Merge branch 'master' into careminster-presence-refactor
2010-09-27 01:32:06 +01:00
84ab4742c8
Quash the region ID on intersim messages. That prevents people from determining
...
another avatars location
2010-09-27 01:31:17 +01:00
aaa4cb64a4
if you can't edit a prim's inventory, you don't need to see the asset ids.
...
Prevents stealing IDs of animations, sounds and textures from prim
inventories. Prevents copybot from gathering the wearable UUIDs needed for
pirating things from vendors.
2010-09-27 00:34:30 +01:00
1f7d68e555
Restrict inventory items added in a transaction to folder belonging
...
to the connected client.
2010-09-27 00:30:26 +01:00
34e8bf45b6
Restrict inventory items added in a transaction to folder belonging
...
to the connected client.
2010-09-27 00:29:27 +01:00
9f17ae580d
Merge branch 'master' into careminster-presence-refactor
2010-09-26 23:57:06 +01:00
6f78358b09
When receiving intersim IM, don't let the spoof protection bomb
2010-09-26 23:50:55 +01:00
dc49057c8a
Consistency patch: use Path.Combine() instead of + and eliminate the need
...
for a trailing slash on exports/
2010-09-26 20:03:00 +01:00
d0c271adc6
Typo fixes
2010-09-26 18:06:23 +01:00
aecac9bba9
Typo fixes
2010-09-26 18:05:55 +01:00
6f689f591a
Merge Master
2010-09-26 17:56:31 +01:00
b0b4782a2b
adding configurable j2kDecodeCache path
...
allowing the decoded sculpt map cache path to be defined in
the configuration files.
Use DecodedSculpMapPath in the [Startup] section to set
the path. The default is still ./bin/j2kDecodeCache
2010-09-26 17:04:11 +01:00
4f25b73b57
Add configurable path to script engine assemblies
...
Adding ability to place script engine assemblies outside
the codebase directories.
Uses new [XEngine] option: ScriptEnginesPath = "path_to_assemblies"
Signed-off-by: Melanie <melanie@t-data.com>
2010-09-26 02:30:46 +01:00
0080f28f1d
Merge branch 'master' into careminster-presence-refactor
2010-09-25 06:57:53 +01:00
d8ae287ebf
Prevent spoofing the agent name on text IM
2010-09-25 06:56:08 +01:00
4fbdcb95a0
Merge branch 'master' into careminster-presence-refactor
2010-09-25 06:19:26 +01:00
3b76d7bbb6
Fix a minor economy issue
2010-09-25 06:09:35 +01:00
83b16612ce
Experimental locking of taint processing
2010-09-25 05:57:08 +02:00
30d3e8a13e
Add prim name to OdePrim Error and Warning messages.
...
This aims to make it easier to identify and remove rogue prims that are causing ODE to fall over.
2010-09-25 01:07:37 +01:00
6325fa515d
Add UUID to physics prim name parameter so that diagnostic messages can be made more useful.
...
If a separate UUID parameter is better for the future then this can be added later on.
2010-09-25 00:51:40 +01:00
b366ad5012
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-25 00:00:00 +01:00
5bcf9ae2f9
If the uuid gatherer fails to find the asset containing gesture metadata, then simply return rather than generating an exception
...
This matches existing behaviour, though better diagnostics for missing assets may be good later on.
This addresses http://opensimulator.org/mantis/view.php?id=4977
2010-09-24 23:58:37 +01:00
1c1f308052
if you can't edit a prim's inventory, you don't need to see the asset ids.
...
Prevents stealing IDs of animations, sounds and textures from prim
inventories. Prevents copybot from gathering the wearable UUIDs needed for
pirating things from vendors.
2010-09-24 23:48:52 +02:00
33bd4fe789
When clearing the addin registry, respect a custom path
2010-09-24 22:00:51 +02:00
8dc59f5b59
Added delay for llSetPrimitiveParams() and llSetLinkPrimitiveParams() functions per the LSL wiki.
...
Signed-off-by: Melanie <melanie@t-data.com>
This patch also fixes a large amount of trailing whitespace. While this is
beneficial, it should really be in a separate patch that fixes whitespace only.
Just good practice.
2010-09-24 16:25:14 +01:00
acd5bbdb71
* One more item for CSharpSqlite
...
* Hopefully this will enable mac people to use SQLite again
* Someone cooler then me will need to figure out how to define CSharpSqlite with Mono so the conditional will pick up.
* There's also an error that occurs when you first load OpenSimulator under CSharpSQLite that goes away after.
* The databases are not byte for byte compatible. Mono.Data.Sqlite is able to read CSharpSqlite made databases but not the reverse way.
2010-09-23 01:45:54 -04:00
983c6a74b1
* Add CSharpSqlite to prebuild
...
* Use a conditional define to determine whether we're using CSharpSqlite or Mono.Data.Sqlite
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
* Hopefully, this will restore sqlite functionality on a Mac. In visual studio, you can edit the OpenSim.Data.SQLite project, go to the Build tab and enter CSharpSqlite in the box. I'm not sure how to define CSharpSqlite in Mono, someone better at it then me will have to take the job of figuring out the best way to define it in Mono.
2010-09-23 01:21:08 -04:00
41847e8fdf
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-21 04:03:40 +01:00
9feef34a81
Merge branch 'master' into careminster-presence-refactor
2010-09-21 04:03:14 +01:00
2b8c99c2fb
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-21 04:02:50 +01:00
14adf90805
Fix a typo
2010-09-21 04:02:34 +01:00
10a37f5be4
Refactor script create permission into the perms module
2010-09-21 04:02:28 +01:00
12f9b1df8c
Fix a typo
2010-09-21 03:57:09 +02:00
7229bc4fbd
Refactor script create permission into the perms module
2010-09-21 02:08:55 +02:00
51207c24a0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-21 01:04:08 +01:00
192bcab987
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-21 01:01:07 +01:00
a85779e477
If the uuid of a SceneObjectGroup (RootPart) is changed before adding to the scene, remove the old uuid reference from m_parts as well as adding the new one.
...
The separate remove and set operations is SOG.set_UUID() are both locked under m_parts.SyncRoot since they are logically atomic (though this isn't such an issue if the SOG isn't part of a scene)
Added unit test for this behaviour.
Also changed the second m_parts.AddOrReplace() to m_parts.Add(). As the old reference is now removed we never end up replacing an identical uuid. And if we replace a uuid that's already there (from a child part) then this is an error.
2010-09-21 00:58:54 +01:00
9cf8795ecf
Fix a merge artefact that broke script state persistence in XAttachments
2010-09-19 22:53:05 +02:00
27d5976b87
* Tweaked the LocationTests for maximum coverage.
...
* Added more mundane tests.
2010-09-18 03:42:37 -04:00
c203fae26b
* Covered the type converters in SLUtil with unit tests.
...
* Does anyone have an example raw notecard to look at and test the notecard parser?
2010-09-18 02:49:42 -04:00
4d83879704
* More Mundane Tests
...
* SL Util tests of AssetType2ContentType and ContentType2AssetType
2010-09-17 23:27:41 -04:00
a22f007246
Improve the explanative text of migration failures
...
When running for the first time, people see migration failures because of sql statements that are trying to move data from old tables (e.g. users). The amended text attempts to calm their nerves.
2010-09-18 03:37:10 +01:00
7ee0a8d30e
Clarify help text for use of file paths with console command "create region".
2010-09-18 02:30:56 +01:00
cd42cdcc89
REST Console delivers responses with content type text/xml instead of text/plain.
...
Non-error responses to requests SessionCommand and CloseSession should use the appropriate content type for their XML data payload.
2010-09-18 02:24:04 +01:00
2501372d3b
Add m_syncRoot lock to MapAndArray.ContainsKey(), as discussed with jhurliman
...
Though this is actually thread-safe on .net 4.0 and mono today, the .net sdk states that Dictionary instance members are not guaranteed thread-safe
2010-09-18 01:57:13 +01:00
889923841c
Stop broadcasting non 0/DEBUG ChatTypeEnum.Region messages to all avatars
...
This allows non public/debug region wide messages to be sent to scripts but not be broadast to avatars
2010-09-18 01:43:22 +01:00
4327c795f8
Move OpenSim/Framework/tests/PrimeNumberHelperTests.cs to OpenSim/Framework/Tests/PrimeNumberHelperTests.cs
...
I'm assuming the lowercase tests was a mistake. Please revert if it actually wasn't
2010-09-18 00:25:22 +01:00
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
33fbf0e329
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-09-17 18:41:29 -04:00
94f35890e7
* Fixed and re-enabled CacheTests
...
* Added MundaneFrameworkTests.cs for the really mundane tests like testing properties,constructors, etc in OpenSim.Framework.
* Fixed LeftAxis and UpAxis unpacking from OSD to AgentPosition (copy and paste error caught while writing mundane test) (Good thing nobody uses the camera frustum from remote regions yet)
2010-09-17 18:41:12 -04:00
3a760ad12b
Overwrite the core version of the string parsing method with ours
2010-09-17 22:20:20 +01:00
bdd4dcf69b
Merge branch 'master' into careminster-presence-refactor
2010-09-17 22:12:48 +01:00
c08b6c2873
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-17 14:35:35 -07:00
e603521fd7
Applying the llParseString2List() patch from #5036 that Melanie claims was already applied
2010-09-17 14:32:49 -07:00
69749b81f9
* Add a few more tests to help our meager code coverage %.
...
* Tests Animation Constructors
* Tests Animation OSD Packing/Unpacking
* Tests the PrimeNumberHelper class which is used in the cache.
2010-09-17 03:11:57 -04:00
256c8cb62d
Send kill packets for avatars, too
2010-09-17 03:56:31 +01:00
87a1e00f05
Remove the now unused partslock
2010-09-17 04:00:00 +02:00
e32855d080
Merge branch 'master' into careminster-presence-refactor
2010-09-17 03:57:15 +01:00
7df4383235
Merge branch 'master' into careminster-presence-refactor
...
Integrate the next large patch.
Don't use this version, it has a ghost avatar issue. Next push
will fix it.
2010-09-17 03:49:30 +01:00
7762301cea
Revert "* Changed 11 calls for session info to the more optimized API method"
...
This reverts commit 5dc9ea2f24
2010-09-17 01:57:26 +01:00
b49cb3355f
Fixed a regression in SOG.Copy()
2010-09-16 17:57:00 -07:00
5321e0e69f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-16 17:31:24 -07:00
860b2a502f
Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndArray collection
2010-09-16 17:30:46 -07:00
e3f1533705
Fix build break by replacing Items.LockItemsForWrite() with lock (Items) {}
2010-09-17 01:21:28 +01:00
5072429263
Send KillPackets on the Task queue rather than the State queue
...
Object updates are sent on the task queue. It's possible for an object update to be placed on the client queue before a kill packet comes along.
The kill packet would then be placed on the state queue and possibly get sent before the update
If the update gets sent afterwards then client get undeletable no owner objects until relog
Placing the kills in the task queue should mean that they are received after updates. The kill record prevents subsequent updates getting on the queue
Comments state that updates are sent via the state queue but this isn't true. If this was the case this problem might not exist.
2010-09-17 01:16:21 +01:00
5b18f8be25
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-17 01:01:12 +01:00
251f2444d0
Revert "* Changed 11 calls for session info to the more optimized API method"
...
This reverts commit 5dc9ea2f24
2010-09-17 01:50:48 +02:00
670357367e
Removing debug
2010-09-16 23:32:18 +01:00
1b2edfe75f
JustinCC is evil. f7b28dd3 broke script persistence. This fixes it.
2010-09-16 23:19:46 +01:00
1e4e978f7f
Removing debug
2010-09-16 23:26:53 +02:00
a0c87b5af6
JustinCC is evil. f7b28dd3 broke script persistence. This fixes it.
2010-09-16 23:12:32 +02:00
d52b2b9ee7
minor: remove some mono compiler warnings
2010-09-16 20:46:24 +01:00
512ded6eb5
Catch a nullref
2010-09-16 21:07:09 +02:00
d50a072336
Suppress the strange "Result not Dictionary" messages that happen when
...
a region queries for a nonexistent presence.
2010-09-16 20:21:30 +02:00
ec89dc99b7
Some small bug fixes
2010-09-16 18:58:25 +02:00
58b1ee8e2c
Merge branch 'master' into careminster-presence-refactor
2010-09-16 18:04:50 +01:00
7383173d3d
extend m_entityUpdates.SyncRoot lock in LLClientView.ProcessEntityUpdates() to reduce scope for kill/update race conditions
...
This is necessary because it was still possible for an entity update packet to be constructed, the thread to pause, a kill to be sent on another thread, and then the original thread to resume and send the update
This would result in an update being received after a kill, which results in undeletable ghost objects until the viewer is relogged
Extending the lock looks okay since its only taken by kill, update and reprioritize, and both kill and update do not take further locks
However, evidence suggests that there is still a kill/update race somewhere
2010-09-15 23:06:38 +01:00
e6bc77d832
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-15 23:03:02 +01:00
39d27fc879
rename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to improve code readability
2010-09-15 22:29:58 +01:00
16f296f489
Instead of locking SOG.Children when a group is being removed from the scene, iterate over an unlocked list instead
...
Previously, deadlock was possible because deleting a group took a SOG.Children lock then an m_entityUpdates.SyncRoot lock in LLClientView
At the same time, a thread starting from LLClientView.ProcessEntityUpdates() could take an m_entityUpdates.SyncRoot lock then later attempt to take a SOG.Children lock in PermissionsModule.GenerateClientFlags() and later on
Taking a children list in SOG appears to be a better solution than changing PermissionsModule to not relook up the prim. Going the permission modules root would require that all downstream modules not take a SOG.Children lock either
2010-09-15 21:51:13 +01:00
571693d7b6
Revert last commit
2010-09-15 08:16:38 -07:00
77eb8ade8c
Don't throw an exception if the authorizationservice is missing a serviceuri config entry. Not every authorization service will need a URI.
2010-09-15 08:08:29 -07:00
1f74f013b2
Don't fart when deserializing a prim with no ParentGroup set yet
2010-09-15 07:59:28 -07:00
3275fbec54
Fix the above
2010-09-14 23:06:44 +01:00
7f7bbbb84a
Fix the above
2010-09-14 23:05:42 +01:00
18beb796bc
Merge branch 'master' into careminster-presence-refactor
2010-09-14 22:50:38 +01:00
585e575d23
Allow to place the connection strings and providers for estate and region
...
in their oqn sections, for those of us who don't want a catch-all
DatabaseService section.
2010-09-14 22:47:45 +01:00
8ed08a10d9
Remove long unused Region/Framework/ThreadTracker
...
All methods had already been deleted, only GetThreads() was left
2010-09-14 22:34:55 +01:00
609375bf37
Fix "show threads" to show threads now being managed by OpenSim.Framework.Watchdog
2010-09-14 22:24:11 +01:00
540a1912ce
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-14 22:14:23 +02:00
356b1ef1d9
Merge branch 'master' into careminster-presence-refactor
2010-09-14 22:16:02 +01:00
e27f59cf42
reorder some code to avoid merge issues in the future
2010-09-14 22:15:16 +01:00
2f41bc4ca7
Fix merge issues
2010-09-14 22:14:08 +01:00
1212cb0c74
Merge branch 'master' into careminster-presence-refactor
2010-09-14 22:03:42 +01:00
cc290abf7a
Adjust the code for ghost prim removal to new information from Kitto
2010-09-14 22:13:44 +02:00
d299f8b55c
Fix a small left over buglet and also add checking of the physics actor
...
position on backup. This way, ant object that has been moved will be
checked for ghost prims as soon as it is persisted.
2010-09-14 19:41:53 +02:00
095d400f5b
fix OpenSim.Tests.ConfigurationLoaderTest to satisfy requirement that OpenSimDefaults.ini is present
...
this should allow the testsuite to run again and the autobuild to complete
2010-09-14 17:01:53 +01:00
5d48e3c0bb
Revert "Move OpenSimDefaults,ini into config-include in order to put it with all the other default files"
...
This reverts commit c3259e9c26
2010-09-14 03:30:07 +01:00
ec305a4825
LSL compatibility: Don't throw an exception if an invalid key is passed to llInstantMessage, instead shout about it and apply the usual delay. This now matches SL.
2010-09-13 17:43:45 -07:00
c3259e9c26
Move OpenSimDefaults,ini into config-include in order to put it with all the other default files
2010-09-14 01:38:53 +01:00
b2e50474dc
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-13 23:35:27 +01:00
36f81c66e5
Comment out SOG storing debug log message
...
This can get very spammy with regularly changing objects. Please uncomment if required.
2010-09-14 00:05:38 +01:00
96a2ce5db0
Add a missing parenthesis
2010-09-13 23:33:55 +01:00
0de2f0567d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-13 23:28:36 +01:00
4aadfc3007
Change the help message to point to copying OpenSimDefaults.ini.example.
...
Provide a mostly empty OpenSim.ini.example
2010-09-13 23:27:56 +01:00
2cf98e77fc
Output an error and quit if the master file is missing. Also rename
...
OpenSim.ini.example to bin/OpenSimDefaults.ini.example
2010-09-13 23:27:47 +01:00
8febba7717
Make the inimaster option default to OpenSimDefaults.ini.
2010-09-13 23:27:31 +01:00
656e64b3ed
Change the help message to point to copying OpenSimDefaults.ini.example.
...
Provide a mostly empty OpenSim.ini.example
2010-09-13 23:22:25 +01:00
8e51ca3a7b
Output an error and quit if the master file is missing. Also rename
...
OpenSim.ini.example to bin/OpenSimDefaults.ini.example
2010-09-13 23:17:42 +01:00
5e1aab92f5
Make the inimaster option default to OpenSimDefaults.ini.
2010-09-13 23:12:48 +01:00
dd803b4f0c
minor: Add comments which explain what's going on wrt avatar movements at various points in the main scene loop and associated methods
2010-09-13 21:53:25 +01:00
fbe72e30eb
Improve generic message exception logging. Quieten down complaints about unhandled GenericMessages
2010-09-13 21:52:36 +01:00
e4858b0eeb
Add client name to packet resend log messages to make them a bit more informative
2010-09-13 21:29:04 +01:00
7ae9266186
Remove SceneGraph.DetachObject() which was accidentally left around after being migrated to AttachmentsModule
2010-09-13 21:20:31 +01:00
ae1a0150a1
Rename now protected method SetAttachmentInventoryStatus() to ShowAttachInUserInventory() to match ShowDetachInUserInventory()
2010-09-13 21:15:12 +01:00
cd153a20b7
Remove IAttachmentsModule.SetAttachmentInventoryStatus() from public interface
...
No core module is calling and it makes more sense to call methods such as AttachObject() which attach both to the avatar and update inventory appropriately
2010-09-13 21:05:03 +01:00
366de0a7b5
If attachment fails (e.g. because asset wasn't found) then don't try to set attachment as shown in inventory
...
Doing this results in a null reference exception
2010-09-13 20:58:50 +01:00
ff098ae110
minor: Clean up log messages generated when an item is attached
2010-09-13 20:44:32 +01:00
5ef2da39d8
* Fixing length calculations for HTTP texture downloads (the end byte is inclusive in Range: headers)
2010-09-13 11:23:45 -07:00
6a1ce17cdb
Merge branch 'master' into careminster-presence-refactor
...
The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.
2010-09-13 16:17:38 +01:00
18a9ac6b39
Fix unit test SceneSetupHelpers to load the mock simulation data store
2010-09-12 15:04:51 -07:00
c03b24cbfd
Merged
2010-09-12 14:21:51 -07:00
0db1ed0b5a
* Added ISimulationDataService and IEstateDataService
...
* Removed StorageManager
* CONFIG CHANGE: There are no more database settings in OpenSim.ini. Check the config-include configuration files for region store and estate store database settings
2010-09-12 14:20:26 -07:00
f1f0bc23f4
Formatting cleanup.
2010-09-12 13:43:49 -04:00
20cd1da6bf
Add copyright headers.
2010-09-12 12:54:31 -04:00
16d782eaa2
Added a stub for OpenSim.Services.Connectors.Simulation.SimulationDataServiceConnector
2010-09-12 00:30:13 -07:00
007912d6f4
Shuffling fields and properties around in Scene to make Scene.cs more readable
2010-09-11 23:41:48 -07:00
e2544584ad
Changed all string references of "IRegionDataStore" to "ISimulationDataStore"
2010-09-11 22:02:34 -07:00
109b517583
Fixed the naming mess around data connectors for simulation data
2010-09-11 20:43:06 -07:00
47ac9f97b1
Re-enabled asset last access time logging in MySQL
2010-09-11 18:29:38 -07:00
47a5e2633c
Prevent child agents from being blacklisted in the kill record.
2010-09-11 20:24:14 +01:00
d264f0d301
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-11 20:22:53 +01:00
5e5260ad1b
Prevent child agents from being blacklisted in the kill record.
2010-09-11 20:22:10 +01:00
220f82a0f0
Make it clear that the "create region" command will reference ini files in the regions directory (usually Regions/)
...
Also convert some tabs into spaces.
2010-09-11 00:27:52 +01:00
30306a775a
Made it impossible to create a user with names containing spaces and prevented passwords from being echoed after enter is pressed.
2010-09-10 23:19:18 +01:00
a7f4e10f42
Remove parenthesis around the release flavour to get the version string back under 27 chars
...
Can't quite remember why this has to be <=27 chars, maybe something to do with the space available for the version string in a typical client
2010-09-10 21:56:04 +01:00
b597a295c4
Second pass at cleaning up thread safety in EntityManager and SceneGraph
2010-09-10 12:41:36 -07:00
dd277a0d02
First pass at cleaning up thread safety in EntityManager and SceneGraph
2010-09-10 12:04:12 -07:00
9609faa8eb
* Run SimianGrid session updates asynchronously instead of from the main heartbeat thread
...
* Minor dead code cleanup
2010-09-09 15:05:22 -07:00
8415b98806
Over a dozen thread safety fixes in FriendsModule
2010-09-09 14:45:10 -07:00
972ef92590
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-08 15:09:34 -07:00
5dc9ea2f24
* Changed 11 calls for session info to the more optimized API method
2010-09-08 15:08:49 -07:00
ae6682036d
Made the HG asset and inventory brokers use the Helo service in order to instantiate the right network connectors. Tested on Robust only.
2010-09-08 14:13:01 -07:00
d301f3fd6a
Renamed the Helo server connector to a consistent name. Added this in connector to both Robust.HG.ini.example and HypergridServiceInConnectorModule.
2010-09-08 14:12:01 -07:00
8cc3d60e59
Added constructor that takes an URL to asset and inventory simian connectors.
2010-09-08 14:09:43 -07:00
3fb4a17f10
No need for a config var for the HELO message on the server-side. It's robust.
2010-09-08 11:30:38 -07:00
904d6b787a
First version of the Hypergrid HELO service that will enable different backends to interoperate.
2010-09-08 09:53:57 -07:00
b8d14fcc4a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-08 01:05:56 +01:00
319007783c
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-08 00:50:31 +02:00
7a1b1dd419
Make AddRestoredSceneObject reset the IsDeleted flag so we can take an
...
object out of the scene and then put it back in.
2010-09-08 00:49:32 +02:00
0bebe94231
Rolling back the recent libomv update but keeping the ExpiringCache cleanups (as much as is possible). There was a report of non-finite avatar positions after the update
2010-09-07 15:45:33 -07:00
9be1c0ff44
* Cache null account responses in the SimianUserAccountServiceConnector to avoid repeated requests for missing avatar IDs
...
* Updated to OpenMetaverse r3442 to fix a timezone issue with ExpiringCache
2010-09-07 14:41:13 -07:00
587bab79b4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-07 13:43:52 -07:00
029c954804
* Added sanity checks to the SimianAssetServiceConnector so it will throw a sensible error message when it is misconfigured instead of a mysterious "Uri is empty" error
2010-09-07 13:43:36 -07:00
b28d1b6ccd
Fix Simian regression
2010-09-07 20:21:05 +01:00
342c64b7ac
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-07 20:20:16 +01:00
50cc22c9e6
Fix Simian regression
2010-09-07 20:19:52 +01:00
5ca4c238e0
SimianUserAccountServiceConnector was not initializing the user cache
2010-09-07 11:33:46 -07:00
8ab4b277c1
Fix some issues with unlinking
2010-09-07 17:12:28 +02:00
2684ca0838
Merge branch 'master' into careminster-presence-refactor
2010-09-07 11:51:26 +01:00
8fda08d858
Make sure unlinked child prims get persisted
2010-09-07 11:48:28 +01:00
f7b28dd321
If a scene object part UUID is changed (only possible when not in a scene), then adjust the inventory items to point to the new uuid as well
2010-09-07 03:41:29 +01:00
84ad9e4d4e
minor: comment out some excessive test logging
2010-09-07 02:05:44 +01:00
90cd035693
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-07 02:01:38 +01:00
3284356bba
Merge branch 'master' into careminster-presence-refactor
2010-09-07 01:48:00 +01:00
99bfb0d2a2
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-07 01:45:08 +01:00
3d033520fa
Fix deletion persistence when freshly delinked prims are removed
...
Previously, Scene.Inventory.DeRezObjects() forced the persistence of prims before deletion.
This is necessary so that freshly delinked prims can be deleted (otherwise they remain as parts of their old group and reappear on server restart).
However, DeRezObjects() deleted to user inventory, which is not required by llDie() or direct region module unlink and deletion.
Therefore, forced persistence has been pushed down into Scene.UnlinkSceneObject() to be more general, this is still on the DeRezObjects() path.
Uncommented TestDelinkPersistence() since this now passes.
Tests required considerable elaboration of MockRegionDataPlugin to reflect underlying storing of parts.
2010-09-07 01:43:20 +01:00
11f4a65f42
Fix deletion persistence when freshly delinked prims are removed
...
Previously, Scene.Inventory.DeRezObjects() forced the persistence of prims before deletion.
This is necessary so that freshly delinked prims can be deleted (otherwise they remain as parts of their old group and reappear on server restart).
However, DeRezObjects() deleted to user inventory, which is required by llDie() or direct region module unlink and deletion.
Therefore, forced persistence has been pushed down into Scene.UnlinkSceneObject() to be more general, this is still on the DeRezObjects() path.
Uncommented TestDelinkPersistence() since this now passes.
Tests required considerable elaboration of MockRegionDataPlugin to reflect underlying storing of parts.
2010-09-07 01:12:06 +01:00
e55f6d47e9
Add test that checks correct persistence when an unlink is quickly followed by deletion of a linked part
...
This test is temporarily not running since it currently fails due to a bug in this area
2010-09-06 23:28:52 +01:00
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
537fefa3f2
extend TestNewSceneObjectLinkPersistence() to check for presence of non-root linked prim
2010-09-06 23:06:23 +01:00
953b7f4917
Add test to check persistence of newly added pre-linked objects
...
Added a MockRegionDataPlugin to do in-memory persistence for tests since adding this to OpenSim.Data.Null.NullDataStore doesn't seem appropriate
NullDataStore can do nothing because OpenSim only ever retrieve region objects from the database on startup. Adding an in-memory store here would be unecessary overhead.
2010-09-06 23:00:24 +01:00
cfaefad754
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-06 21:45:17 +00:00
c719e016ed
Falling animation fix, comment out instrumentation.
2010-09-06 21:45:07 +00:00
36cb6208b5
Fix yet another cause of "Ghost attachments"
2010-09-06 22:08:15 +01:00
8886afd319
Fix yet another cause of "Ghost attachments"
2010-09-06 21:59:52 +02:00
f4f9a2cb45
Don't turn off the sale settings on child prims when linking, and on copy
...
of prims anymore. The behavior now matches SL and can be used to link
vendor prims for transport
2010-09-06 18:14:24 +02:00
06adbc1324
Revert "Workaround for mono bug #312968"
...
This reverts commit f2e343d530
2010-09-06 17:24:10 +02:00
f2e343d530
Workaround for mono bug #312968
2010-09-06 14:09:46 +02:00
0246edc2ea
Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, because
...
modules need to see it (Search!) even if it comes in via CAPS
2010-09-06 04:09:51 +01:00
00a23eea0e
Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, because
...
modules need to see it (Search!) even if it comes in via CAPS
2010-09-06 03:59:48 +02:00
b9c20fbaa7
Merge branch 'master' into careminster-presence-refactor
2010-09-05 19:15:49 +01:00
7f9f9f9246
Fix a handful of copypaste errors
2010-09-05 19:14:45 +01:00
1b770d3afc
Change UserAccountService to match
2010-09-05 19:09:30 +01:00
4243701d22
Make Simian profiles respect the module chosen in [Profile]
2010-09-05 19:06:50 +01:00
55d3c98917
Fix up presence connector in SimianGrid
2010-09-05 18:24:16 +01:00
0ca48b2486
Fix up Simian inentory
2010-09-05 18:14:31 +01:00
b2486df67c
Friends works differently, it' snot even a region module at all, but a connector
...
that is loaded by the core friends module. Change Simian to match.
2010-09-05 18:06:42 +01:00
1238b27d64
And the avatar services :)
2010-09-05 17:53:15 +01:00
a407ad38f6
Add the m_Enabled pattern to Simian Auth
2010-09-05 17:44:02 +01:00
d9e9c41e13
Add m_Enabled pattern to SimianGridConnector
2010-09-05 17:34:51 +01:00
4025b85a07
As an exmple, add the code to disable connectors intot he simian asset
...
connector
2010-09-05 17:24:05 +01:00
64ec14c8c4
Add missing IDwellModule interface
2010-09-05 17:08:57 +01:00
09c75b30f3
Fix build break
2010-09-05 16:45:24 +01:00
e4c2b44e5c
Merge branch 'master' into careminster-presence-refactor
2010-09-05 15:06:00 +01:00
6a0a878f7c
Remove "Dwell" support from core and replace it with calls to methods
...
on IDwellModule
2010-09-05 14:28:33 +01:00
e593607171
Remove "Dwell" support from core and replace it with calls to methods
...
on IDwellModule
2010-09-05 14:16:42 +02:00
68f107b27e
Logout the presence if client IP verification fails.
2010-09-04 18:46:27 -07:00
953a487f5e
One more debug message to track an issue on Danger grid.
2010-09-04 18:09:17 -07:00
9fd9836841
Make User Agent Service and Login Service separable.
2010-09-04 16:39:03 -07:00
c0b16f09bf
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-04 01:38:11 +01:00
1e8e98a07f
Move code that allows llGiveInvetory() to move item into appropriate system folder up from connectors into Scene.Inventory.cs
...
This fixes the problem for all architectures (hg as well as local and grid) and means we don't have to dupe code between connectors.
Not ideal in that it becomes non-modular, but methods in Scene.Inventory.cs should eventually be modularized anyway.
2010-09-04 01:36:26 +01:00
8fc68c6d98
Added XFF header processing. Untested, for lack of proxy.
2010-09-03 17:18:53 -07:00
107052b23d
Create Scene.Inventory.cs.AddInventoryItem(InventoryItemBase item)
...
The agentID in AddInventoryItem(UUID agentID, InventoryItemBase item) is redundant since it's contained in item.Owner, and it doesn't make sense for agentID != item.Owner, hence the method is deprecated.
2010-09-04 00:09:53 +01:00
d4b572d2a5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 23:29:59 +01:00
63617c79d8
minor: remove mono compiler warnings
2010-09-03 23:29:39 +01:00
1e552e88e8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 14:50:42 -07:00
fc062a23af
Make SimianFriendsServiceConnector initialize like the other connectors and gracefully handle the case where it is loaded but disabled #monoaddinslol
2010-09-03 14:50:26 -07:00
b8da15c104
In RemoveAdminPlugin, use a .ini file template in XmlRpcCreateRegionMethod rather than an older XML one
...
This is a patch from http://opensimulator.org/mantis/view.php?id=4973 . Thanks randomhuman
2010-09-03 22:38:40 +01:00
9b95bd259f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 22:27:01 +01:00
fe63fad394
minor: remove mono compiler warning
2010-09-03 22:26:15 +01:00
83f6550bcc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 13:37:30 -07:00
aadbffffb1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 13:36:59 -07:00
4f79143f3f
* Removed Simian.IsSimianEnabled() call, changed the SimianGrid connectors to handle initialization as graceful as possible with the current broken way region module initialization is done
...
* Added config-include/HyperSimianGrid.ini option for connecting to SimianGrid with HyperGrid enabled (work in progress on the SimianGrid side)
2010-09-03 13:36:35 -07:00
d6deebdd63
Add another variant of password hash construction to SimianAuthenticationServiceConnector.CheckPassword()
...
This might be unique to the inventory archiver password check, though at the time it was written, hash construction there should have been identical to other parts of opensim
This is from patch http://opensimulator.org/mantis/view.php?id=4983 . Thanks cmickeyb.
2010-09-03 21:34:31 +01:00
8d2e8b7d5c
minor: remove mono compiler warnings
2010-09-03 21:28:57 +01:00
71c0fc10df
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 21:14:23 +01:00
8daea4d7c0
llRot2Euler Tests
2010-09-03 21:11:13 +01:00
5cbc4e2a5f
Merge branch 'master' into careminster-presence-refactor
2010-09-03 19:18:03 +01:00
0a0f38b23c
Last+2 tweak
2010-09-03 10:31:16 -07:00
a5cce8d6d7
Last+1 tweak.
2010-09-03 10:13:41 -07:00
5bbf793f9e
One last tweak, hopefully.
2010-09-03 10:01:18 -07:00
77384eb28b
Another tweak. Sux^2
2010-09-03 09:26:33 -07:00
85e9160552
More tweaks related to my previous commit. Tweaks sux.
2010-09-03 09:02:08 -07:00
4e0d6e8e41
Merge branch 'master' into careminster-presence-refactor
2010-09-03 03:37:18 +01:00
18213d26ec
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-03 03:27:47 +01:00
17a26c3701
Fix an issue with rezzing scripted objects.
2010-09-03 03:27:26 +01:00
457160afc3
Fix an issue with rezzing scripted objects.
2010-09-03 03:16:08 +02:00
21c5377af9
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-09-02 16:36:43 -07:00
d96f5fa57d
Quick fix for making global references for gatekeepers that are not domain:port work. This needs a serious rewrite, as the assumption domain:port doesn't hold from here on. Just quick-fixing for now.
2010-09-02 16:36:05 -07:00
24c73aa8b2
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-02 21:51:27 +00:00
16814dd8f1
Fixes to JUMP system.
2010-09-02 21:51:19 +00:00
1c8bc9b7b6
Remove commented code and the comment, as the change has proven out
2010-09-02 21:02:09 +01:00
7720419fc7
Experimentally comment the sending of unbaked avatars
2010-09-02 20:17:49 +01:00
ed72396d9b
Show when appearance is sent to an avatar to help track down failure
...
\to display avatars
2010-09-02 19:59:12 +01:00
5ea979d515
Remove commented code and the comment, as the change has proven out
2010-09-02 20:51:27 +02:00
eea5d8368a
Experimentally comment the sending of unbaked avatars
2010-09-02 20:08:39 +02:00
713c666827
Show when appearance is sent to an avatar to help track down failure
...
\to display avatars
2010-09-02 19:49:42 +02:00
7128e1a4ba
Implement UploadBakedTexture cap
2010-09-02 16:20:44 +01:00
0f40ec5c65
Implement UploadBakedTexture cap
2010-09-02 16:10:44 +02:00
db015963a9
Remove the annoying "Script saved" popups when saving scripts in task
...
inventory. They cause spam when using recompile scripts in selection
and are redundant because that message is also shown in the script window
message pane. These popups were a legacy from when we couldn't drive the
message pane and their finest hour has now come.
2010-09-02 14:17:33 +02:00
bbdf6cab50
Fix cast issue
2010-09-02 00:20:57 +01:00
203b7de266
Allow increasing the version in system folders
2010-09-02 00:04:17 +01:00
7efe7feef5
Update: Allow the version to increase only
2010-09-02 00:02:07 +01:00
93edc75147
Disallow modification of system folders. Prevent changing the type of folders
...
and prevent resetting the version number
2010-09-02 00:00:54 +01:00
b9db495d91
Fix sqlite migration problems by moving migrations in 019_RegionStore.sql and 020 into RegionStore.migrations
...
This shows that panda is still not running the sqlite database tests since this change fixes the test failure in that area when "nant test" is executed locally
2010-09-01 22:06:56 +01:00
09fba16094
Prevent Meta7 plants from being treated like dropped attachments and removed
...
from the sim.
2010-09-01 20:10:44 +02:00
2232e6f273
Improve sim health reporting. Output error message if heartbeat thread is restarted by scene. This may help to find out why this recovery mechanism isn't working.
2010-09-01 14:08:52 +02:00
6cbf66827b
refactor: move SOG.AttachToAgent() into AttachmentsModule
2010-09-01 01:11:52 +01:00
c947a67b23
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-01 00:17:23 +01:00
c47de94263
Adjust the "Magic numbers" we use because we can't reference the actual
...
script state enum to reflect recent changes.
2010-08-31 22:36:46 +01:00
01276ef433
refactor: change AttachmentsModule.AttachObject to use sp.GetAttachments rather than filter sp.Attachments list directly
2010-08-31 22:22:45 +01:00
9c1c378aa1
Add ScenePresence.GetAttachments(uint attachmentPoint)
2010-08-31 22:16:23 +01:00
aca10cb027
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-31 22:26:17 +02:00
b973fe5297
Adjust the "Magic numbers" we use because we can't reference the actual
...
script state enum to reflect recent changes.
2010-08-31 22:24:11 +02:00
b8c58e5f9f
reinsert functionality to debug log more levels of incoming and outgoing client protocol packets
...
These levels correspond to packets that one isn't usually interested in when debugging (e.g. regular outgoing SimStats packets)
This is equivalent to what we had a year ago before it was removed. It's extremely crude since it doesn't allow one to pick individual clients or packets. However, it can still be useful when debugging packet race conditions.
2010-08-31 18:27:10 +01:00
7b03cb09e4
minor: Add some method doc to BaseHttpServer.HandleRequest()
2010-08-30 22:33:45 +01:00
dd14c539af
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-30 21:24:08 +01:00
3cd7761d65
Report exception message as well as stack trace if a region fails to register with the grid service in grid mode
2010-08-30 21:23:19 +01:00
35d6181b78
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-30 11:42:17 -07:00
4cf5ef3cd4
Kick the user from the region in the circumstance that the TP home failed - ONLY if it was triggered by an estate ban. This makes baby jesus cry, and should be fixed to search for alternative regions if the home region is unavailable.
2010-08-30 11:41:20 -07:00
79bfa275da
Merge branch 'master' into careminster-presence-refactor
2010-08-30 02:30:28 +01:00
8ee31d97a8
Remove CRLF endings
2010-08-30 02:19:21 +01:00
eefb207c1b
Fix a casting operation to use ToString()
2010-08-30 02:10:11 +01:00
0a83fde85c
Implements parcel media setting persistence and packet / CAPS handling
...
properly for the new media settings.
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-30 02:07:55 +01:00
374807d194
Replace hardcoded 0 with KickFlags provided by the client.
...
This finally completes http://opensimulator.org/mantis/view.php?id=4356 where this change had been accidentally removed. Thanks Revolution.
2010-08-28 02:45:28 +01:00
83fbf66444
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-28 02:41:00 +01:00
def6b1544f
very minor log message and var name tweaking for iar saving
2010-08-28 02:40:21 +01:00
0f95cd209e
Addresses mantis #4991 -- HG between two regions with the same map coordinates fails with no warning
2010-08-27 17:25:04 -07:00
1c0b4457cd
Improve liveness by operating on list copies of SOG.Children where appropriate
2010-08-28 00:40:33 +01:00
4f9931ec10
minor: reduce log chattiness of "load iar" for IARs with lots of folders
2010-08-27 23:23:55 +01:00
86937d0a0f
allow inventory path specified in "load iar" to start with a / (e.g. /Objects is now valid where it wasn't before)
2010-08-27 23:22:49 +01:00
b4278510f2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-27 22:53:02 +01:00
8f875700ef
refactor: Make IAR tests set up standard iar for loading
2010-08-27 22:52:26 +01:00
1f1d72eba5
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-26 23:39:20 +01:00
5b4e0b72bc
Send a null result search packet when no results are passsed in
2010-08-26 23:38:35 +01:00
436fdc2ea8
More on mantis #4985
2010-08-26 14:48:29 -07:00
6198fe53e6
Addresses mantis #4985 -- exceptions in DataSnapshot
2010-08-26 14:19:52 -07:00
fb6d761e19
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-26 22:13:46 +01:00
7f5501d3ab
minor: remove mono compiler warning
2010-08-26 22:13:31 +01:00
2b0f924557
refactor: Move Scene.Inventory.UpdateKnownItem() into Attachments module since this appears to relate solely to attachments
2010-08-26 22:09:52 +01:00
f3f4428700
refactor: break out attachment position change code in Scene.UpdatePrimPosition() and move into AttachmentsModule
...
This allows region modules to change attachment positions.
2010-08-26 21:50:19 +01:00
8571a55d29
minor: change log message from info to debug
2010-08-26 20:42:56 +01:00
26fd673e20
Addresses mantis #4984 -- Datasnapshot exceptions.
2010-08-26 12:26:09 -07:00
df702417dc
Remove mono compiler warnings
2010-08-26 16:27:41 +01:00
d99c60164d
Reinstate kill record check that prevents an entity update being sent to a client after it has been told that the entity has been deleted.
...
On Linden Lab clients and some derivatives, receiving an entity update after an entity deletion notice results in an undeleteable prim that disappears upon client relog.
This check was dropped in 0.7 for unknown reasons but renewed testing demonstrates that queued updates can still be present after a scene object has been deleted.
2010-08-26 16:06:34 +01:00
a6869fbc3e
Use SOP.ParentGroup in Prioritizer instead of Scene.GetGroupByPrim()
...
By the time a scheduled update is triggered, a sog may have been removed from the scene. This change prevents NullReferenceExceptions in these situations.
2010-08-26 15:33:42 +01:00
87a6554d4b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
...
Resolve merge conflicts
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
2010-08-26 00:35:03 +01:00
692cf3c657
Remove parts locking from data classes since these are using a copy of the scene object
2010-08-26 00:17:26 +01:00
166ab59420
replace m_parts.Count linknum with 0 in CopyRootPart since m_parts.Count is always 0 (and any other number would cause an error anyway)
2010-08-26 00:15:26 +01:00
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
47818a2db3
Fix a horrible bug in SG, where iteration of scene objects is carried
...
out in a fashion that causes the delegate to be invoked once per child
prim for a given group.
2010-08-26 01:06:50 +02:00
4b47008d30
Correct whitespace
2010-08-26 00:37:54 +02:00
fc8d2be632
Merge branch 'master' into careminster-presence-refactor
...
This was rather conflicted. Please test linking.
2010-08-26 00:11:07 +01:00
252e159340
Merge branch 'master' into careminster-presence-refactor
2010-08-25 23:22:23 +01:00
75e2a2b3ce
Prevent an object disposed exception that made forms comms unreliable. After
...
starting an asynchronous write, one should not close the channel it will
be written to synchrnously, that leads to grief.
2010-08-25 23:19:55 +01:00
604423d52b
Make scene object directories more robust and prevent deleted SOP's from
...
sticking around
2010-08-25 23:19:30 +01:00
739eb14741
Change some e.Message to e.ToString. Don't use e.Message, it doesn't carry
...
any useful information. Error messages are useless without location information.
It looks more elegant, but is totally pointless.
2010-08-25 23:18:15 +01:00
22fd00b002
minor: remove mono compiler warning
2010-08-25 23:07:43 +01:00
24d06b12c2
If setting SOG.UUID, update the SOG.m_parts index as well as the root part UUID
...
Being able to change a SOG.UUID is useful for region modules that want to supply their own UUID, before the object is rezzed
2010-08-25 23:05:54 +01:00
46c6c35d48
refactor: Push item retrieval and fixing part of Scene.RezObject() down into SceneObjectPartInventory
2010-08-25 22:46:49 +01:00
1096f43f0d
Prevent an object disposed exception that made forms comms unreliable. After
...
starting an asynchronous write, one should not close the channel it will
be written to synchrnously, that leads to grief.
2010-08-25 23:34:39 +02:00
dc1baf8025
Change object cleanup again. Make scene object directories more robust and
...
prevent deleted SOP's from sticking around
2010-08-25 23:11:00 +02:00
1bcb2e788f
Change some e.Message to e.ToString. Don't use e.Message, it doesn't carry
...
any useful information. Error messages are useless without location information.
It looks more elegant, but is totally pointless.
2010-08-25 23:04:12 +02:00
c13045b25e
Correct a logic error in attachment cleanup
2010-08-25 20:11:47 +02:00
314d1171ef
Lock the attachment cleanup so it doesn't go into an endless deletion frenzy
2010-08-25 16:06:06 +02:00
d69e992665
Split out actual scene object insertion code from Scene.Inventory.RezObject and move into SceneGraph.AddNewSceneObject()
...
The new SceneGraph method is more consumable by region modules that want to extract objects from inventory and add them to the scene in separate stages.
This change also reduces the number of redundant client updates scheduled when an object is rezzed directly by a script or region module
This code does not touch direct rez by a user
2010-08-24 23:25:19 +01:00
78f452050a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-24 22:29:32 +01:00
07d5a0779a
refactor: make RezObject() more readable
2010-08-24 20:53:25 +01:00
ef5b628191
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-24 19:22:00 +01:00
7296286267
Merge branch 'master' into careminster-presence-refactor
2010-08-24 19:20:43 +01:00
a7a45cb22c
Patch by Apelsin that fixes behaviour of llSetPos and llGetLocalPos for attachments.
...
This fixes Mantis #3923 .
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-24 19:19:26 +01:00
4e324ae3cb
Call the cleanup after saving attachment states, so that the attachments
...
don't get killed before they can be saved
2010-08-24 19:07:42 +02:00
512a13dbe7
Call the Cleanup when an agent logs out, when an agent leaves and just
...
before an agent logs in directly. Intentionally not calling this from MakeRoot
as that would mess up attachment transfer in teleport
2010-08-24 18:52:00 +02:00
5a05de0eec
Call attachment cleanup when an agent crosses out
2010-08-24 18:38:54 +02:00
483fc88b07
Merge branch 'master' into careminster-presence-refactor
2010-08-24 17:37:11 +01:00
b9e12ed3b7
Add a method to delete left over / dropped attachments
2010-08-24 18:20:24 +02:00
46d06b6c4c
add test to check move of task item to user inventory when a target folder is explicitly given
2010-08-24 17:10:52 +01:00
8bb073d99a
minor: stop test using obsolete property
2010-08-24 17:06:04 +01:00
35f719ae2f
refactor TestMoveTaskInventoryItemNoParent()
2010-08-24 17:04:54 +01:00
289c21099c
Add automated test at the opensim 'api' level to check that a given item goes to the correct directory
...
Also removes some mono compiler warnings
2010-08-24 16:50:31 +01:00
de85aabcbe
Plumb the region type through to the ProductName field in estate messages
2010-08-24 12:41:21 +01:00
1bfec00a88
Merge branch 'master' into careminster-presence-refactor
2010-08-23 23:55:15 +01:00
c72d298202
Add system lookup folder fix to the RemoveXInventoryServiceConnector as well since this presumably suffers from the same problem.
2010-08-23 23:25:36 +01:00
1d01c91095
minor: some doc for the MoveTaskInventoryItem method in Scene.Inventory.cs
2010-08-23 23:21:44 +01:00
704a53fb9b
Fix bug in llGiveInventory() where items were disappearing on relog
...
This was a regression - the code to look up the correct type folder was no longer being called if items were added without a parent folder set
This may have been broken since commit bd49985a
2010-08-23 23:16:48 +01:00
74e5fe5aa9
Remove various warnings and improve logging messages. No functional changes.
2010-08-23 22:24:23 +01:00
8a1640f0a1
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-22 09:32:49 -07:00
46412f4931
Fix llGetLinkKey and llGetNumberOfPrims to play nice with avatars in the linkset (emulated)
2010-08-22 09:32:40 -07:00
5c368c8d38
Refix the fix
2010-08-22 16:44:22 +02:00
0ca771c185
Provide a better implementation of llList2Float
2010-08-22 16:23:36 +02:00
98b2d3a7f2
Revert "Fix a typecasting issue in llList2Float. This addresses mantis #262"
...
This reverts commit 810840b862
2010-08-22 15:55:23 +02:00
32ddeab5e3
Add printing the default script engine name. Report real exceptions when
...
there is an issue with the config file, as a typo could cause configuration to
silently fail.
2010-08-22 14:26:58 +02:00
071edaff49
Suppress error messages about scripts not foind if they're in fact disabled
2010-08-22 13:51:15 +02:00
a0a25bb8ca
A stab at making a better bounding box calculation
2010-08-22 13:42:29 +02:00
f445659dd3
Finally putting estate_settings.xml to rest. There will be no more attempts
...
to read or write this file.
2010-08-21 17:38:47 +01:00
954329ec85
Don't allow oversized search reply packets
2010-08-21 17:30:41 +01:00
8613336674
Don't allow oversized search reply packets
2010-08-21 17:48:49 +02:00
3ffdadef70
Add support for attached avatars in llGetLinkKey()
2010-08-21 07:22:41 -07:00
839b08c32b
Removed the NotImplementedException from llSetSoundQueueing, because the function not working won't actually stop the script from working, firing an exception will.
2010-08-21 06:30:53 -07:00
f8ff98577e
Merge branch 'master' into careminster-presence-refactor
2010-08-21 00:32:26 +01:00
ea1df09fa4
Forward-port a small improvement to the land out connector
2010-08-21 00:29:27 +01:00
f7c4be1fa1
Forward-port a small improvement to the land out connector
2010-08-21 00:46:16 +02:00
c448151f6b
Someone from germany broke the build :P mentioning no names
2010-08-20 11:38:59 -07:00
5155915de1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-20 19:36:04 +01:00
7aad5af498
Some code cleanup for console command "create region".
...
Make region name an optional command parameter.
Avoid question for region name if it has already been specified.
Extend help text.
2010-08-20 19:35:52 +01:00
4463ebfbc2
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-08-20 11:09:21 -07:00
f347d25675
Unit test breakage fix.
2010-08-20 11:09:02 -07:00
86a61696d7
minor: remove mono compiler warning
2010-08-20 17:58:02 +01:00
4708083434
Use the database mthod directly to delete items in a single sql swoop
2010-08-20 18:53:33 +02:00
b1790ba56e
Delete items as well as folders in XInventoryService.PurgeFolder - this should make emptying the trash work properly.
2010-08-20 11:25:31 -07:00
187ccd72f0
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-20 11:01:03 -07:00
cc8864b0e3
Get maturity level from access number. This addresses mantis #269
2010-08-20 11:00:14 -07:00
bb5dd9fbbc
Some code cleanup for console command alert.
...
Made parsing of parameters more robust.
Allow general alerts without specifying keyword 'general'.
Extended help texts.
2010-08-20 17:53:21 +01:00
6f83b0ee46
Cleaned up a few more things related to incoming agents.
2010-08-20 09:02:05 -07:00
82abaadd55
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-20 08:36:54 +01:00
ae554a48d0
Add some maptile options, change maptile generation from OpenSimBase to Scene
...
to make it more configurable.
2010-08-20 08:36:23 +01:00
47838e5fb3
Add some maptile options, change maptile generation from OpenSimBase to Scene
...
to make it more configurable.
2010-08-20 08:46:46 +02:00
b4e7c62fbc
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-08-19 19:55:03 -07:00
a39ea07158
Finished implementing ViaLogin vs ViaHGLogin. Removed lookup on myipaddress.com. Also removed client IP verification upon UDP connection that had been left there -- we can't do that in general.
2010-08-19 19:54:40 -07:00
1955b79759
Partial rewrite of client IP verification. Not completely finished yet, and untested. Committing to move to my other computer.
2010-08-19 18:55:30 -07:00
1ab631f015
Merge branch 'master' into careminster-presence-refactor
2010-08-19 20:25:17 +01:00
f639a9e5ae
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-19 20:24:46 +01:00
22fdd7b1f1
Short-circuit the grid server lookup for RequestSimulatorData if the region
...
info is requested for is the local region
2010-08-19 20:24:34 +01:00
a1074cad5c
Short-circuit the grid server lookup for RequestSimulatorData if the region
...
info is requested for is the local region
2010-08-19 20:41:55 +02:00
2b172bef72
Revert "One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943."
...
Reverting mostly because of the texture asset files that got committed and cause grief with the 0.7-post-fixes branch. But also because I'm going to go at those mantises in another way.
This reverts commit e47608fc62
2010-08-19 09:14:20 -07:00
77705145a0
Merge branch 'master' into careminster-presence-refactor
2010-08-19 11:47:50 +01:00
ee7c799699
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-19 11:46:07 +01:00
f58a809536
Skip conversion if fields that are null in the database. This may
...
uncover errors elsewhere.
2010-08-19 11:45:56 +01:00
1a8a11140c
Revert "Adding Group managment to the offline system"
...
This reverts commit 7c673c79d4
2010-08-19 12:04:46 +02:00
fdc59ee802
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-19 12:02:26 +02:00
0344395776
Skip conversion if fields that are null in the database. This may
...
uncover errors elsewhere.
2010-08-19 12:01:40 +02:00
7c673c79d4
Adding Group managment to the offline system
...
Sending a group invite is offlined now
2010-08-19 08:31:51 +00:00
d547007e73
Improve some logging in LandConnector
...
This also eliminate the last 'OGS1' logging message (in this case, an erroneous one)
2010-08-19 01:57:07 +01:00
a72c7812f4
remove ancient and unused OpenSim.GridLaunch GUI code.
...
Current policy is that OpenSim core is not the place for gui tools
2010-08-19 01:11:10 +01:00
5e3d53bef2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-19 00:54:48 +01:00
85f448642b
minor: Correct string format in "Can't find linkset root prim" message
2010-08-19 00:54:09 +01:00
e47608fc62
One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943 .
...
(Files .xml and .txt also want to be committed)
2010-08-18 16:22:50 -07:00
6ddf124c8a
Prevent a bad cast in llCreateLink().
2010-08-18 20:00:19 +01:00
fb2deb0d45
Prevent a bad cast in llCreateLink().
2010-08-18 20:17:20 +02:00
810840b862
Fix a typecasting issue in llList2Float. This addresses mantis #262
2010-08-18 04:23:56 -07:00
ca8b1e488c
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-18 02:53:27 -07:00
e74809ff4c
Merge branch 'master' into careminster-presence-refactor
2010-08-18 00:59:20 +01:00
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
d7824b86d9
Fixes mantis #4954 for the xml-rpc calls of the UserAgentServiceConnector. Basically, let's not let the xml-rpc library do the DNS conversion...
2010-08-16 14:36:20 -07:00
69ad04cdf6
Attempt at sending TeleportProgress, but it doesn't seem to be doing anything at all. Left it commented, just as a reminder for where those messages could be sent.
2010-08-16 12:03:13 -07:00
a8b80ef800
Added SendTeleportProgress to IClientAPI. Ya know what that means... 8 files affected.
2010-08-16 11:39:46 -07:00
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
f219e320bc
Increased the timeout on AgentUpdate to 30 sec and improved error message to try to catch some weirdnesses going on in HG TPs (and maybe non-HG TPs too).
2010-08-16 08:51:56 -07:00
a5044e08fb
Better comment (related to previous commit)
2010-08-15 18:13:09 -07:00
5d29c0ec9d
Addresses mantis #4929 . Agent was being logged off the grid too soon -- things may still fail.
2010-08-15 18:10:54 -07:00
30d0bf4207
Fix SQLite database plugin for UserAccountData queries with a single word.
2010-08-15 17:27:06 -07:00
d5c24241b7
Thanks Marck for the patch to mantis #4941 (shortening avies' names on HG)
2010-08-15 17:25:27 -07:00
f2d7f3e731
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-14 14:00:12 +02:00
a32b0ce0ae
Fix a possible nullref in BestAvatarResponsiveness policy
2010-08-14 13:59:36 +02:00
042eb80a62
clearing some debugmessages
2010-08-14 08:59:57 +00:00
96e4099564
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-13 17:40:18 -07:00
d806741e9d
* Cleaned up the magic UUID definitions in AvatarWearable.cs
2010-08-13 17:39:45 -07:00
e1cff5f8c9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-14 00:58:12 +01:00
46d0690b31
* Fixed a casing typo for Simian profile data
...
* Minor logging tweak in Simian asset connector
2010-08-13 16:56:01 -07:00
1463691cb6
In EventQueueHelper.uintToByteArray, fetch big end-ian bytes directly from libomv rather than little endian then swapping
...
This avoids a problem with failing to swap on big-endian machines.
This addresses http://opensimulator.org/mantis/view.php?id=4849
Thanks to Valy- for pointing this out and submitting a suggestion patch
2010-08-14 00:48:12 +01:00
fcc83f2305
Unit test for ConfigurationLoader.
...
Adds a new test assembly for OpenSim.
2010-08-13 23:59:33 +01:00
ae43a07f3b
Configuration files can read include files from relative paths.
2010-08-13 23:59:30 +01:00
8eeb3f2fd2
Updated the create_region command in the RemoteAdmin plugin to properly support estates without seeking further input on the console.
2010-08-13 23:29:01 +01:00
8acb401a14
minor: remove mono compiler warnings
2010-08-13 23:28:28 +01:00
c64bef146b
minor: remove mono compiler warnings
2010-08-13 23:18:05 +01:00
ab6dc47818
refactor: move binary statistics logging from scene into separate region module
2010-08-13 23:15:11 +01:00
e89f0b3f71
refactor: move Scene.PerformObjectBuy into BuySellModule
2010-08-13 22:29:42 +01:00
9d84dfb687
minor: remove mono compiler warning
2010-08-13 21:44:44 +01:00
b30635a454
Establish new Objects/BuySellModule
...
Move Scene.ObjectSaleInfo() to this
2010-08-13 21:39:43 +01:00
feba3164af
minor: remove mono compiler warning
2010-08-13 21:19:32 +01:00
5d20f04e08
refactor: move Scene.TerrainUnAcked() handling into TerrainModule
2010-08-13 21:18:26 +01:00
b51534852f
minor: remove mono compiler warning
2010-08-13 21:07:45 +01:00
fd23f270c6
refactor: remove Scene.SetRootAgentScene() in favour of existing event with same name
2010-08-13 21:01:10 +01:00
5f5c65e4ba
refactor: move more map tile generation code from scene to IWorldMapModule
2010-08-13 20:34:46 +01:00
39a748b47a
refactor: Use SOP.Flags rather than SOP.ObjectFlags
2010-08-13 20:23:53 +01:00
b43a731beb
Fix a nullref exception in the prioritizer
2010-08-12 05:40:41 -07:00
c98c6a2930
File wants to be committed
2010-08-11 20:38:10 -07:00
251be8a1be
Prettify console output for long avatar names.
2010-08-11 20:22:01 -07:00
576faee203
minor: change some logging levels
2010-08-11 23:17:29 +01:00
686f44c575
minor: change "no [GridInfo] config" warning to refer to "configuration files" rather than "OpenSim.ini"
2010-08-11 23:16:33 +01:00
7aac4d650f
Fix the llRemoveInventory recursive lock error (again)
2010-08-11 14:30:09 -07:00
24577876be
Add some console debug to help fix a threadlock issue.
2010-08-11 14:10:47 -07:00
ac581b532e
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-11 13:40:31 -07:00
fa393cb13a
Fix Omega getting overwritten on startup.
2010-08-11 13:39:36 -07:00
d00a954d35
Log the state of the prejump flag
2010-08-11 03:09:56 +02:00
a5a60df687
Change chat packets to bypass the throttles. This should alleviate chat lag
2010-08-11 02:52:52 +02:00
af60b8ac16
Set triggering the texture and height update on a two second timer. This fixes
...
the texture rubberbanding.
2010-08-10 22:52:51 +02:00
4f62f00ca0
Changing prim color generates event CHANGED_COLOR.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-10 19:38:39 +01:00
3f942a4f74
Removed abstract SetText method from EntityBase to make cleaner API.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-10 19:37:15 +01:00
75f92faeb4
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-10 19:34:57 +01:00
158604a733
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-10 20:17:47 +01:00
2a1c11fda9
On shift-copy of an object, set up a new physics actor (as appropriate) for every copied prim, not just the root
...
This addresses http://opensimulator.org/mantis/view.php?id=4295
2010-08-10 20:15:44 +01:00
6147efdad9
Avoid truncation of error message during region creation.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-10 19:34:09 +01:00
a299fa4849
This file wants to be committed
2010-08-10 11:18:39 -07:00
7741143fb5
Enforce DB limits on region name to 32 chars, or else (not good). Removed a piece of code from Hyperlinker that didn't work anyway. Shortened the hyperlink region name.
2010-08-10 11:17:38 -07:00
1582e05ac7
Fix a nullref issue in the AgentSetAppearance packet handler when removing the physactor from the scene
2010-08-10 09:55:40 -07:00
48c52d6e48
Fix a dangling lock issue in llRemoveInventory
2010-08-10 09:50:18 -07:00
0a81038dd5
Reduce number of paths in SOP code by setting flags via Flags property rather than _flags
...
Both ObjectFlags and Flags are effectively exactly the same property, except that ObjectFlags is uint and Flags is PrimFlags
Both reference the PrimFlags _flags underneath, so you couldn't set a non PrimFlags uint anyway.
Deprecated ObjectFlags in favour of Flags.
2010-08-10 17:26:31 +01:00
fb14390fb0
Note to self: don't break the build
2010-08-10 09:17:30 -07:00
9fba4b66bb
Resolve merge failure
2010-08-10 09:11:55 -07:00
5e8c3f8325
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-10 20:12:13 +01:00
7fead01786
remoning debug messages
2010-08-10 19:43:32 +00:00
d0a22fb359
fixed ground texture issues ( it seems )
2010-08-10 19:35:17 +00:00
24b9a2885f
Resolve merge issues
2010-08-10 20:11:55 +01:00
c2e5d1d203
Merge branch 'master' into careminster-presence-refactor
2010-08-10 19:49:35 +01:00
383ee0d647
Remove 4000+ DOS line endings. Grrr!
2010-08-10 19:48:45 +01:00
d98d5ee6be
Remove windows line endinge
2010-08-10 19:42:18 +01:00
1ead2ed5ee
Add a stack trace to the error output on the recursive read lock warning on my RWlocks. Whilst recursive locks are safe, coupled with other issues we're experiencing with the TaskInventoryDictionary it implies that somewhere the lock is not being freed possibly due to a merge error somewhere, and thus it needs to be looked into.
2010-08-10 09:07:17 -07:00
7203feb83c
Extend DuplicateObject() test to check flags on the duplicated object
2010-08-10 16:50:36 +01:00
85fc2dfe3c
extend TestDuplicateObject() to a two prim object
2010-08-10 16:16:57 +01:00
a5dab074a0
Handle incoming ObjectImage (TextureEntry) updates synchronously rather than asynchronously
...
At least on stock Linden clients, updating the texture on all faces of the prim will actually send an ObjectImage packet for each update.
There is a race condition if these are handled async, meaning that occasionally not all of the faces are correctly updated.
2010-08-10 16:00:35 +01:00
912bfba20c
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-09 23:36:59 -07:00
eb5c508f8b
Add a DebuggerSafe option to the ini to help with debugging in visual studio. This essentially silences exceptions in the script engine. Disabled by default, naturally.
2010-08-09 23:35:40 -07:00
f0bad66d41
For my own sanity, fix a bug in xengine
2010-08-09 23:34:37 -07:00
0f9eebdfb1
Change prejump from hardcoded true to default true so it can be disabled.
...
It completely destroys roleplay jumping
2010-08-10 03:52:00 +02:00
3b26baf282
Even if all data migratios are up to date, still print the current revision to the log
2010-08-09 22:54:13 +01:00
bef6fa37b9
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-08 18:57:16 -07:00
32ccc19a62
Make fallbacks work, the destination was never actually updated with the fallback details.
2010-08-08 18:56:47 -07:00
144fc20e87
Make fallbacks work, the destination was never actually updated with the fallback details.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-09 02:23:59 +01:00
f20dc512e8
Whitespace conflict
2010-08-09 02:46:09 +02:00
1f052520ae
Merge branch 'master' into careminster-presence-refactor
2010-08-09 02:27:54 +01:00
680e801bf2
Print a console message when we deny access because of no valid parcel found.
2010-08-08 17:32:20 -07:00
603b3a1606
Fix minimap issues. This addresses mantis #228 .
2010-08-08 17:31:29 -07:00
b0795bcfef
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-09 00:49:40 +01:00
52f49b2a78
Merge branch 'master' into careminster-presence-refactor
2010-08-09 00:49:15 +01:00
bc7ee7ba88
Remove "Could not authorize your session into the region" message in favor
...
of sending back the actual error message provided by the sim.
2010-08-09 00:48:08 +01:00
ca2a4bbded
Add debug messages to attachment receiving and cowardly refuse to create
...
them if the owner can't be determined.
2010-08-08 19:35:20 +02:00
321e1148da
Merge branch 'master' into careminster-presence-refactor
2010-08-08 18:24:33 +01:00
a5e4a2bb3b
Add distance sort for null, too
2010-08-08 18:18:42 +01:00
f216fd8136
Tests for distance-sorted fallback regions.
...
With some extensions to existing grid service tests.
2010-08-08 18:12:07 +01:00
1f25b9e8db
Thank you, Marck00, for a patch that implemented region distance sorting
...
for fallback regions. Applied with changes.
2010-08-08 17:37:50 +01:00
6cb50c49b5
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-08 17:53:25 +02:00
1cde77293e
Thank you, Marck00, for a patch that implemented region distance sorting
...
for fallback regions. Applied with changes.
2010-08-08 17:51:43 +02:00
a1f2be5e69
The real fix for unscripted sit positions. This one doesn't fuck everything else up. Promise.
2010-08-07 22:25:37 -07:00
f9b5f23383
Reverted: * Fix the unscripted sit rotation being incorrect .. will commit a proper fix now.
2010-08-07 22:19:26 -07:00
12dd97c9f8
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-07 20:14:58 -07:00
0794c6a941
Implement parcel group access control. This addresses mantis #158 .
2010-08-07 20:13:45 -07:00
cd2c7b9ac9
In my crusade against facelights, I am striking the killing blow. Add a
...
DisableFacelights option to OpenSim.ini to finally kill those immersion-
breaking, silly vanity lights that destroy nighttime RP. Girls, you look
just fine without them. Guys, you too. Thank you. Melanie has left the building.
2010-08-08 01:57:02 +01:00
aa54e8d95e
Increase sit distance to 256 meters, but leave the initial autopilot process in the picture so sit position can still be raycast by the existing code.
2010-08-07 17:35:16 -07:00
b771965f28
Get rid of some debug chatter that someone who can't spell left behind. ;)
2010-08-07 17:33:27 -07:00
acb1590cf0
Fix the unscripted sit rotation being incorrect (relative to the prim). Note that unscripted sit offset is still really poor but this is not something i'm prepared to spend time on fixing.
2010-08-07 17:32:36 -07:00
d2b3d45d76
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-08 02:04:37 +02:00
50ac61e17f
In my crusade against facelights, I am striking the killing blow. Add a
...
DisableFacelights option to OpenSim.ini to finally kill those immersion-
breaking, silly vanity lights that destroy nighttime RP. Girls, you look
just fine without them. Guys, you too. Thank you. Melanie has left the building.
2010-08-08 02:01:24 +02:00
19ab4c9508
Fix a rather nasty issue where the Backup() process causes objects and avatars sitting on them to be pushed to the corner of the sim.
2010-08-07 16:52:03 -07:00
8d3a73d126
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-07 16:32:18 -07:00
a6048518b7
Repair lsGetWindlightScene, the constant was added to the list as a uint, which is bad - convert to LSL_Integer first.
2010-08-07 16:18:44 -07:00
ab5a461c5c
Add search URL to Login Service
2010-08-07 22:25:29 +01:00
903cfa8c7e
minor: Remove overly verbose schedule full update log message for attachments
2010-08-07 22:28:42 +01:00
4c5788c4c0
Add search URL to Login Service
2010-08-07 22:24:17 +01:00
68e4b1115a
Dumb error in fix
2010-08-07 22:23:51 +01:00
71f2cec1bd
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-07 22:11:18 +02:00
4900d39b7d
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-07 21:05:18 +00:00
478d835392
removing more stains ...
2010-08-07 21:04:16 +00:00
7bac069976
Mantis #229 . Fix Global sim ccordinates
2010-08-07 22:10:46 +02:00
cabbd187e7
Fix the distance from which autopilot is negated when sitting on an unscripted prim - and also add some more Velocity code to ensure it gets set to zero in all cases
2010-08-07 11:13:05 -07:00
413b0525db
It seems hippo disregards velocities in full updates, so also send a terse update when an agent sits to avoid drifting off
2010-08-07 11:06:07 -07:00
19debab060
Fix the general alert message so it doesn't get sent to child agents
2010-08-07 08:17:11 -07:00
b017d985ab
Add some nullref checks to the UnackedPacketCollection.
2010-08-07 08:06:41 -07:00
b58a47c373
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-07 13:41:56 +00:00
00cc42a607
and another endless debug cleaning
2010-08-07 13:40:38 +00:00
bcb3b57f8d
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-07 06:33:51 -07:00
4f80d75bf3
Add a CHANGED_POSITION event so scripts don't have to run expensive loops to check for position changes
2010-08-07 06:28:04 -07:00
047a4764f2
and another one...
2010-08-07 13:19:53 +00:00
e69efdd4ce
Clean the loo after use please !!!!!
...
No need to keep useless debug message !
Never heard of wasted cpucycle you darn kid !
2010-08-07 13:13:27 +00:00
8fd3f6cf7f
Merge branch 'master' into careminster-presence-refactor
2010-08-07 05:41:41 +01:00
a04efe4a4d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-07 05:39:20 +01:00
00fd2e0446
Correct display of landmark about info. Also correct region maturity rating
...
in LM info. Maturity is NOT the parcel's setting, that is only for the
image and text. Parcel maturity is governed by region maturity.
2010-08-07 05:33:49 +01:00
59af886680
Change the (hackish) constant to match the changed enum for attachs
2010-08-07 05:33:41 +01:00
2cedfba67c
Make the landmark properties work again
2010-08-07 05:33:21 +01:00
c554de7501
Correct display of landmark about info. Also correct region maturity rating
...
in LM info. Maturity is NOT the parcel's setting, that is only for the
image and text. Parcel maturity is governed by region maturity.
2010-08-07 05:45:52 +02:00
fa11ac8c85
Change the (hackish) constant to match the changed enum for attachs
2010-08-07 05:42:30 +02:00
7477d7a036
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-07 03:40:01 +02:00
a783f048a3
Make the landmark properties and search places work again
2010-08-07 03:38:35 +02:00
5e93a83ecd
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-08-06 17:43:41 -07:00
0090534793
Added Check4096 config var under [GridService], at the request of many. Changed the iteration that Marck had on the Hyperlinker.
...
ATTENTION! CONFIGURATION CHANGE AFFECTING Robust.HG.ini.example and StandaloneCommon.ini.example.
2010-08-06 17:43:09 -07:00
4e2caab756
Add new SceneGraphTests class. Add simple TestDuplicateObject()
2010-08-07 01:06:47 +01:00
7e47ab746e
Allow creation of link regions if there is an existing region within a 4096 range.
...
Also add GetHyperlinks() to the grid service.
2010-08-06 17:02:03 -07:00
8d520f4525
Remove old test classes that don't actually test anything not done elsewhere
...
Also comment out log4net line in InventoryArchiverTests
2010-08-07 00:50:01 +01:00
6c8c8d669b
minor: a few miscellaneous comments
2010-08-07 00:45:04 +01:00
85d7d0583e
Fix XStats formatting:
...
Recent libomv update broke the json serialization for
XStats. This uses String.Format to convert all data to
strings with fixed decimal (2 places ), or integer formats
as appropriate.
2010-08-06 23:27:57 +01:00
f9f776e407
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-06 11:44:57 -07:00
330343505c
Implement CreateNewOutfitAttachments. This addresses mantis #199 .
2010-08-06 11:39:10 -07:00
2369063640
HACK ALERT! There's some underlying bug in the HTTP server that makes requests come up with Accept headers from previous requests. Until that gets fixed, this hack goes in.
2010-08-06 10:59:19 -07:00
26387252f5
Merge branch 'master' into careminster-presence-refactor
2010-08-06 18:08:40 +01:00
cc05fc43b9
Fix a parenthesis in prior commit
2010-08-06 17:55:41 +01:00
e941da205b
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-06 09:54:09 -07:00
03da22378e
Estate managers should be allowed to add and remove new users, groups and bans to/from the estate settings.
2010-08-06 09:53:40 -07:00
1cd441d5de
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-06 17:47:55 +01:00
1270727c96
Merge branch 'moap'
2010-08-06 18:29:30 +01:00
54dcfe3f2d
Fixes: llSetLinkPrimitiveParams - PRIM_POSITION is not relative to root, causes unexpected movement of child prims
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-08-06 17:38:29 +01:00
0d4086e602
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-06 08:09:10 -07:00
52e2360e91
Since i've narrowed the fault down to one function, add some spammy debug to try and fix ghost prims on HUDs in future. Note, the console only gets messages if there is a problem, so it's harmless.
2010-08-06 08:08:43 -07:00
e1e897ac11
Change XEngine to use the new constant
2010-08-06 15:18:46 +01:00
120f3a18f2
Correct some script constants.
2010-08-06 15:11:18 +01:00
5559422d32
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-06 16:09:45 +02:00
c48be64d9a
Remove posting region restart event from SOP, as it's now in XMRe
2010-08-06 16:08:50 +02:00
c1ad8a3c17
People can't leave their hands ooff "well enough". StateSource 0 was region
...
start, and they started at 1 for real values. Whoever changed that enum
to start at 0 should bow their head in shame. They broke the region start
event. This puts it right again. Meow!
2010-08-06 15:05:35 +01:00
f809797d62
Allow the trash folder itself to be passed to PurgeFolder
2010-08-06 15:04:25 +01:00
3ce335c6f8
Fix StateSource constants, provide RegionStart
2010-08-06 06:41:25 -07:00
a636af13e7
Make sure the avatar position gets moved along with a prim it is sitting on. This fixes mantis #208 and (maybe) issues with chat and sound coming from the wrong place when sat on a vehicle.
2010-08-06 06:37:40 -07:00
696c2c429b
Change XEngine to use the new constant
2010-08-06 15:33:22 +02:00
42613ec536
Allow the trash folder itself to be passed to PurgeFolder
2010-08-06 15:18:48 +02:00
5da272d042
reverese my last commit
2010-08-06 14:45:54 +00:00
23d1f0978e
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-06 14:39:34 +00:00
a390541e1c
Allowing the expected purge trash folder...
...
Please validate !!!
2010-08-06 14:38:11 +00:00
0a004f8c44
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-06 02:43:26 -07:00
c5c6627adb
Implement CHANGED_REGION_(RE)START and also fix various CHANGED_* constants which had the wrong values (checked using LSL in SL). This addresses mantis #217 and mantis #53 .
2010-08-06 02:40:31 -07:00
db2f63706d
Prevent users from becoming stuck online. This affects only 0.7
2010-08-05 23:49:07 +01:00
d7fe9f7b44
Prevent users from becoming stuck online. This affects only 0.7
2010-08-06 00:02:38 +02:00
7368992ee9
Actually cache positives
2010-08-05 23:48:55 +02:00
1cae505ea1
Prevent hammering the grid services with llRequestAgentData requests. Cache the
...
user information permanently, and the online status for 20 seconds. Also
cache negatives.
2010-08-05 22:36:43 +01:00
d8f9b98c4a
Prevent hammering the grid services with llRequestAgentData requests. Cache the
...
user information permanently, and the online status for 20 seconds. Also
cache negatives.
2010-08-05 22:50:09 +02:00
8bdbcda2b7
We already have a record of killed prims. It just wasn't used by the new
...
JHurlicane code anymore. Use it to prevent sending updates after kills.
2010-08-05 18:50:17 +02:00
05520d676c
Revert "Enforce a 0.2 second sleep on llDie() before the command is executed - this should get rid of ghost prims (which are much rarer, but still occuring)"
...
This reverts commit 85fd2def9c
2010-08-05 18:45:17 +02:00
847008ee07
Addresses http://opensimulator.org/mantis/view.php?id=4919
2010-08-05 09:43:19 -07:00
0eda6714f3
llRequestSimulatorData DATA_SIM_POS : Divide by RegionSize, don't multiply. This resolves mantis #215
2010-08-05 08:41:08 -07:00
85fd2def9c
Enforce a 0.2 second sleep on llDie() before the command is executed - this should get rid of ghost prims (which are much rarer, but still occuring)
2010-08-05 08:15:05 -07:00
9e9296848d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-08-05 08:20:32 +01:00
1869572297
Prevent setting the hovertext from firing changed_color
2010-08-05 08:19:46 +01:00
8689cdd4dc
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-04 19:47:47 -07:00
663e25fd3a
Pacify osGetAvatarList to provide LSL types instead of omv types
2010-08-04 19:46:41 -07:00
0871d20adb
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-04 21:08:14 +00:00
cb3b124df9
Fixes fresh hollowed prim collision shape.
2010-08-04 21:08:00 +00:00
a133acbd5f
Merge branch 'iar-merge'
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
2010-08-04 20:56:52 +01:00
7f3f1bfe88
fix mysql/mssql prim serialization problem
2010-08-04 20:23:18 +01:00
a1d7911feb
Better debug messages
2010-08-04 11:19:23 -07:00
4a33210771
Send attachment updates only to the owner if it's a HUD
2010-08-04 18:12:31 +02:00
f72ab53699
Removed a few more obsolete default configs.
2010-08-04 07:50:34 -07:00
a48c493210
Cost Reduction : Removing verbose message....
2010-08-04 08:16:55 +00:00
463fbb4990
If a user has no home position set, tell them so instead of leaving the request dangling
2010-08-04 00:17:02 -07:00
c8f09f7fcb
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-03 22:42:32 -07:00
cd9506e842
Don't know HOW we missed this, llSetPos was broken in child prims (and in the llSetPrimitveParams family), it was using the global coordinate as a start location. This resolves mantis #204
2010-08-03 22:41:02 -07:00
6076eb5558
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-03 19:55:57 -07:00
604ea5fa90
remove more useless defaults
2010-08-04 03:53:51 +01:00
f1c51c8bb4
Scripted sit target fixes
2010-08-03 19:51:32 -07:00
09ab32c21e
Remove StandAlone from default hardcoded config
2010-08-04 03:10:10 +01:00
bda83715e4
Clean up some messiness in IM sending. Having offline IM enabled now no longer
...
suppresses "Inventory Saved" messages.
2010-08-04 02:46:30 +01:00
b38d69287a
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-04 03:24:06 +02:00
0020dbee23
Remove StandAlone from default hardcoded config
2010-08-04 03:23:19 +02:00
9ee712459b
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-08-03 18:20:08 -07:00
53fb799778
Further bug fixing, still related to the issue earlier.
2010-08-03 18:19:40 -07:00
5ff9db7388
Clean up some messiness in IM sending. Having offline IM enabled now no longer
...
suppresses "Inventory Saved" messages.
2010-08-04 02:51:41 +02:00
3c5983d8bd
Another bug fixed. Same issue.
2010-08-03 17:29:17 -07:00
d57bfec702
A god is a god is a god is a god. Right? Right. You're a god from 200, let's
...
show it!
2010-08-04 02:16:46 +02:00
757929012e
Merge branch 'master' into careminster-presence-refactor
2010-08-04 01:11:47 +01:00
71cd4d6e84
Revert "remove long unused OpenSim/Framework/Configuration/* projects"
...
This reverts commit cdd3f17b2b
2010-08-04 01:10:01 +01:00
dd0ebbfb1f
this is so bad, brain is beyond fried. must stop.
2010-08-03 17:05:48 -07:00
dd688a5994
sigh. fried brain.
2010-08-03 16:59:34 -07:00
87046652b1
One more buglet related to the issue at hand.
2010-08-03 16:33:56 -07:00
e12993ed22
Merge branch 'master' into careminster-presence-refactor
2010-08-04 00:33:02 +01:00
16bdb53683
Allow specifying default region flags. Correct a typo.
2010-08-04 00:31:25 +01:00
ee068dd243
One more thing related to the previous commit. Must avoid all in-process remote calls.
2010-08-03 16:27:11 -07:00
239478f3a9
Bug fix (HG): mantis #4891 . This doesn't actually fix the underlying bug, but it clears up the circular dependency issue between Gatekeeper and UserAgents that had made me resort to in-process remote calls, which, in turn, were hitting bugs down there somewhere in mono.
...
NOTE: CONFIGURATION CHANGE IN ROBUST.HG.INI.EXAMPLE !!!###!!!
2010-08-03 16:02:52 -07:00
d9ae837063
Allow specifying default region flags. Correct a typo.
2010-08-04 00:45:15 +02:00
e3cea888fb
Fix some more issues causing regions with corrupt sculpts to freeze.
2010-08-03 16:07:18 -07:00
ae99c1393d
Fix scripted sit offset in child prims
2010-08-03 15:31:04 -07:00
2221517935
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-03 14:12:05 -07:00
1d1da5069c
Catch a meshing exception caused by corrupt or missing sculpt maps, and mark the prim as "mesh failed" so it doesn't try meshing continuously
2010-08-03 14:11:11 -07:00
6e3c79f31e
don't mask current time reads (since we don't mask the corresponding subtract)
...
if you mask the reads you have to mask the subtract as well.
simplest is just don't mask any of it.
2010-08-03 20:09:00 +00:00
f04d51378f
Drop the RestClient timeout from 15 minutes to 30 seconds. This does not address the problem, but it will allow the regions to recover in the event that the remote server goes away.
2010-08-03 11:06:41 -07:00
2a0254f2da
Implement MediaUrl persistence for MySQL and MsSQL
...
Not sure how I forgot this. This may resolve problems with media textures not persisting over restart for these databases.
2010-08-03 17:54:40 +01:00
99c0f4c9c7
Simplify serialized version string. Change element capitalization for consistency
...
THIS CHANGE ALTERS THE SERIALIZATION FORMAT, HOPEFULLY FOR THE LAST TIME. If you're testing, please start with a new database.
This commit also improves locking for manipulation of media entries.
2010-08-03 17:09:20 +01:00
9d8a67fe13
get rid of PrimitiveBaseShape.MediaRaw staging post
...
using an OSD serialization rather than auto forces serialization code to be placed in OpenSim.Framework
this makes the media texture raw data staging post in PrimitiveBaseShape redundant, now we just directly call the code in PrimitiveBaseShape.MediaList itself
2010-08-03 16:26:27 +01:00
ac07d853b8
remove duplicated serialization code
2010-08-03 15:58:17 +01:00
60df76314f
serialize media textures to inventory with a largely osd representation rather than .net auto-serialization
...
THIS WILL BREAK ANY EXISTING MEDIA TEXTURE SERIALIZATIONS. If you're testing this, please start with new databases.
This makes media textures serialized in the same way, which is probably better in the long term.
2010-08-03 15:45:49 +01:00
e3184753a6
Log the UUID of a prim that fails meshing and set the prim to phantom during
...
region startup
2010-08-03 05:25:23 +02:00
d2d1c63b17
Revert "Catch meshing error in Meshmerizer"
...
This reverts commit 8f2986bc6a
2010-08-03 05:25:01 +02:00
ecfea5fa69
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-02 21:56:30 -07:00
8f2986bc6a
Catch meshing error in Meshmerizer
2010-08-02 21:54:47 -07:00
8e37e7eb07
Remove the (wrong) implementation if llPointAt. It never worked on the LL
...
grid and is officially deprecated. There is no way to rotate an avatar
programmatically.
2010-08-02 00:41:40 +01:00
16e90809a9
Remove the (wrong) implementation if llPointAt. It never worked on the LL
...
grid and is officially deprecated. There is no way to rotate an avatar
programmatically.
2010-08-02 00:54:58 +02:00
d2d56494b2
Fix the XmlRpcRouterModule so it reads from the correct config section ([XMLRPC] not [Startup]) and disable by default (since it's disabled in the ini by default)
2010-08-01 10:24:43 -07:00
763dc8bb76
Add an m_enabled flag to XmlRpcRouterModule so it won't try to bind the xmlrpc_uri event if it's not mentioned in the ini.
2010-08-01 10:24:17 -07:00
b860c8021e
First, change DefaultPermissionsModule so it returns the correct name...
...
... Then, make sure we also check the old-style module stack before we throw a tantrum
2010-08-01 10:23:48 -07:00
d5f497478a
Add config option securePermissionsLoading which will stop the region from loading if the specified permissions modules fail to load.
2010-08-01 10:21:56 -07:00
5f94b98cb2
Merge branch 'master' into careminster-presence-refactor
2010-08-01 18:00:04 +01:00
5e759338ca
Renamed variables in RemoteAdmin plugin to be closer to the coding standards.
2010-08-01 17:20:09 +01:00
93532a9cd2
Changed all method names in the RemoteAdmin plugin to use the correct capitalization.
2010-08-01 17:20:09 +01:00
c4ecbd1fb1
White space from previous commit.
2010-07-31 16:40:58 -07:00
f91ec19224
Implemented console command "show hyperlinks".
2010-07-31 16:38:23 -07:00
ed59dcd422
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-07-30 18:07:50 -07:00
8c7fd12d5d
Bug fix: make m_HypergridLinker static.
2010-07-30 18:07:14 -07:00
dd2d9a68a7
Merge branch 'master' into careminster-presence-refactor
2010-07-31 01:05:13 +01:00
168a8e9ae5
Thank you, Snoopy, for a patch to fix child prim movement. This still doesn't
...
address limiting link distance, but at least it makes the UI and LSL
match.
2010-07-31 01:03:14 +01:00
3302e8ddc4
Merge branch 'master' into careminster-presence-refactor
2010-07-31 00:57:50 +01:00
86bc25b84f
Slight improvement on previous commit.
2010-07-30 14:27:53 -07:00
f3fa10fa15
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-07-30 14:04:29 -07:00
8ab7d80b09
Changed the way HG client verification is done: now transforming local and LAN client IPs into external IPs. This addresses some issues related to running both the user agents service and the viewer in the same machine/LAN, which then presents a problem when the user agent goes to an external network.
2010-07-30 14:04:13 -07:00
f84dbafb0c
remove gods event subscription to gods module from scene
2010-07-30 21:58:24 +01:00
63f3a16b72
remove empty, unused and uncalled UnsubscribeToClientEvents()
2010-07-30 21:44:50 +01:00
424b4b2b86
move attachment subscription events into AttachmentsModule from scene.
...
restored to some heavy casting in order to preserve RegionCombinerModule semantics, pending better events.
2010-07-30 21:41:44 +01:00
4d83b2d8a6
remove unused BasicQuadTreeNode
2010-07-30 21:06:45 +01:00
f37ec933ae
store terrain module trying to load plugins if plugin path does not exist
2010-07-30 20:54:02 +01:00
c6bc1d28ec
move ChannelDigger from its own project into the main terrain module with the rest of the effects
2010-07-30 20:34:14 +01:00
cdd3f17b2b
remove long unused OpenSim/Framework/Configuration/* projects
2010-07-30 20:19:46 +01:00
68b1d6f0af
Remove unused ILoginServiceToRegionsConnector
2010-07-30 20:02:00 +01:00
315b065bce
Remove unused LLFileTransfer
2010-07-30 19:58:29 +01:00
ce358db159
remove long superseded HGNetworkServersInfo
2010-07-30 19:54:27 +01:00
4596c78073
remove unused FriendRegionInfo
2010-07-30 19:50:47 +01:00
c7652d287b
remove now unused GridConfig, MessageServerConfig, UserConfig
2010-07-30 19:44:39 +01:00
f393e10ea4
remove unused ACL class
2010-07-30 19:34:55 +01:00
5b80e3fc18
convert attachments module from old region module style to new
2010-07-30 19:26:54 +01:00
f9280374d2
Bannination fixes. Objects in nonpublic parcels were muted by default. Gods
...
were muted, too.
2010-07-30 15:03:03 +02:00
b83910f12a
* Added debug logging to SimianGrid inventory service response parsing
2010-07-29 16:42:00 -07:00
e0de8fa308
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-07-29 23:20:50 +01:00
2257e39eda
Make dataserver() return a 0 when agent id offline, instead of a timeout
2010-07-29 23:20:38 +01:00
550c3572a1
* Tweaked WebUtil.PostToService() to help debug an object disposed exception
2010-07-29 14:39:08 -07:00
7a9e246ccd
Merge branch 'master' into careminster-presence-refactor
2010-07-29 16:20:59 +01:00
696b6c727f
Allow gods and estate managers/owners to be unaffected by parcel bans
2010-07-29 16:20:40 +01:00
7871dd606e
Allow gods and estate managers/owners to be unaffected by parcel bans
2010-07-29 16:33:20 +02:00
f067f733ea
add userExposed parameter to part copy event
2010-07-28 19:38:20 +01:00
0f15ccb2cf
relocate moap specific cloning code to MoapModule
2010-07-28 19:23:30 +01:00
5aa56b1274
Fix problem where changes to media textures for prims duplicated by shify copy would change both prims until server restart
...
I also found out that you can crash the current viewer by giving it more media entrys than it's expecting
2010-07-28 18:55:29 +01:00
a349703279
comment out further debug line in BaseHttpServer
2010-07-27 22:51:57 +01:00
b149d8970e
comment out verbose debug logging
2010-07-27 22:49:45 +01:00
30ac67fb3d
make MoapModule ignore possible future media texture data that it can't handle
2010-07-27 20:15:43 +01:00
ac542a907b
Make MoapModule ignore non-sl media texture data
2010-07-27 18:59:05 +01:00
109ddd1bd5
add mssql support for media on a prim
...
compiles but not tested. please test and correct if necessary!
2010-07-26 23:34:23 +01:00
849fc0483f
add mysql support for media on a prim
2010-07-26 23:34:23 +01:00
4d23749241
provide config option for media on a prim
2010-07-26 23:34:23 +01:00
412fed975f
relocate serialization code from SQLiteRegionData to MoapModule using load and save events.
...
This is better modularity. It also allows MoapModule to be replaced with some other media module that may behave completely differently in the future.
Remaining non-modularity:
PrimitiveBaseShape needs explicit Media and MediaRaw fields. MediaRaw is required in order to shuttle the pre-serialization data back and forth from the database layer.
The database also needs to know about MediaRaw though not about Media.
IMO, it would be extremely nice to remove these hard codings but this is a bridge too far at the present time.
2010-07-26 23:34:23 +01:00
b51b2efdc8
Add EventManager.OnSceneObjectPreSave() for future use. This is triggered immediately before a copy of the group is persisted to storage
2010-07-26 23:34:22 +01:00
586ae0f6a0
Add EventManager.OnSceneObjectLoaded() for future use. This is fired immediately after a scene object is loaded from storage.
2010-07-26 23:34:22 +01:00
afdbeba4e4
Put a wrapper around the media texture region serialization
...
THIS WILL BREAK EXISTING MEDIA TEXTURE PERSISTENCE. Please delete your existing sqlite databases if you are experimenting with this branch.
This wrapper will make it easier to maintain compatibility if the media texture data evolves.
This will also make it easier to store non-sl media texture data.
2010-07-26 23:34:22 +01:00
d764c95d09
also add avatar id to an updated media url - not just new ones
2010-07-26 23:34:22 +01:00
b06308e1d3
Properly set TextureEntry.MediaFlags when a media texture is set
...
Media flags is cleared via a direct TextureEntry update from the client. If the clearing leaves no media textures on the prim, then a CAP ObjectMediaUpdate is not received. If there are still media textures present then one is received.
This change fixes drag-and-drop on Windows (and Mac?) clients. It may also fix problems with clearing and then subsequently setting new media textures.
2010-07-26 23:34:22 +01:00
60c52ac0c4
start adding user ids to the media urls
2010-07-26 23:34:22 +01:00
f872a2af11
add missing regionstore migration file for new fields. D'oh!
...
this should enable persistence now
2010-07-26 23:34:22 +01:00
cd985ab71b
Handle checking of line starting "*" wildcard for whitelist patterns
...
A line starting * can only be applied to the domain, not the path
2010-07-26 23:34:21 +01:00
664cbe2357
refactor: simplify current whitelist url checking by using System.Uri
2010-07-26 23:34:21 +01:00
0edabffb7d
Implement * end wildcard for whitelist urls
2010-07-26 23:34:21 +01:00
dce7307aa2
properly expose prim media LSL functions to scripts
...
scripts using these functions should now compile but I don't know how well the methods themselves work yet
llSetPrimMedia(), at least, appears to have problems when a current url is set for a face that doesn't yet have a texture
2010-07-26 23:34:21 +01:00
fc76ce0f46
fix bug where prim persistence would fail if media had never been set
2010-07-26 23:34:21 +01:00
049ccba8d3
fix previous media interact serverside checking. perform very basic serverside url whitelist checks
...
at the moment, only checking for the exact name prefix is implemented
for some reason, whitelists are not persisting
this commit also fixes a very recent problem where setting any media texture parameters after the initial configuration would not work
2010-07-26 23:34:21 +01:00
cf7573c8fd
implement code to deregister users on DeregisterCaps
2010-07-26 23:34:21 +01:00
ee6cd884c9
implement serverside checks for media texture navigation in order to stop naughty clients
2010-07-26 23:34:21 +01:00
a9101feb10
factor out soon to be common media permissions check code
2010-07-26 23:34:20 +01:00
51b208e96c
implement prim media control permissions serverside in order to stop bad clients
2010-07-26 23:34:20 +01:00
e5615d3a9b
discard an object media update message if it tries to set more media textures than the prim has faces
2010-07-26 23:34:20 +01:00
eb5e39d6ef
Fire CHANGED_MEDIA event if a media texture is set or cleared
2010-07-26 23:34:20 +01:00
39a38c4901
implement llClearPrimMedia()
...
untested
2010-07-26 23:34:20 +01:00
d1a879927c
fix issue with GetMediaEntry if the face requested wasn't set to a media texture
2010-07-26 23:34:20 +01:00
43f480864b
fix problem persisting when only one face had a media texture
2010-07-26 23:34:20 +01:00
c76e2ce250
factor out common code for updating the media url
2010-07-26 23:34:19 +01:00
74bc4f61fd
factor out common face parameter checking code
2010-07-26 23:34:19 +01:00
cfb79cd411
minor: correct a few method names and change accessability
2010-07-26 23:34:19 +01:00
a5ad792e6c
implement llSetPrimMediaParams()
...
Untested
2010-07-26 23:34:19 +01:00
8f403cb4b8
Implement llGetPrimMediaParams()
...
Exposes method to get media entry via IMoapModule
As yet untested.
2010-07-26 23:34:19 +01:00
9682e0c733
Implement media texture persistence over server restarts for sqlite
...
This is currently persisting media as an OSDArray serialized to LLSD XML.
2010-07-26 23:34:19 +01:00
4ebae14a53
handle ObjectMediaNavigateMessage
...
Other avatars can now see the webpages that you're navigating to.
The requirement for an initial prim click before the texture displayed has gone away.
Flash (e.g. YouTube) appears to work fine.
Still not persisting any media data so this all disappears on server restart
2010-07-26 23:34:18 +01:00
468450a94d
send a full object update out to avatars when a media texture is initially set
...
this allows other avatars to see it, but still only after they've clicked on the face
still not handling navigation yet
2010-07-26 23:34:18 +01:00
b1eb83ed6c
start sending media url in object full updates
2010-07-26 23:34:18 +01:00
4a6adff4cd
start storing a mediaurl on the scene object part
...
not yet persisted or sent in the update
2010-07-26 23:34:18 +01:00
c290cdd997
replace hand parsing of incoming object media messages with parsing code in libopenmetaverse
2010-07-26 23:34:18 +01:00
acac47830e
start storing incoming MediaEntry on a new Media field on PrimitiveBaseShape
...
This allows the media texture to persist in memory - logging in and out will redisplay it (after a click) though navigation will be lost
Next need to implement media uri on prim and delegate more incoming llsd parsing to libomv
2010-07-26 23:34:18 +01:00
9301e36fbc
have a stab at sending the correct number of media entries to shapes
...
actually, this is probably wrong anyway if there's a default texture
it's going to be easier just to gather the object media updates and retain those in-memory now
but what the hell
2010-07-26 23:34:17 +01:00
701f39c8c2
do a whole load of crappy hacking to get cubes to display google.com
...
currently, for smoe reason the page only appears when you click a face.
also, actually navigating anywhere always snaps you back to the google search box, for some unknown reason
you can still change the url and normal navigation will work again
2010-07-26 23:34:17 +01:00
2be7d0cdd4
Register ObjectMedia and ObjectMediaNavigate capabilities from moap module.
...
Not sure if these are correct, but just supplying these to the viewer is enough to allow it to put media textures on prims (previously the icons were greyed out).
This is not yet persisted even in-memory, so no other avatars will see it yet.
2010-07-26 23:34:17 +01:00
ede446cad6
add stub media-on-a-prim (shared media) module
2010-07-26 23:34:17 +01:00
516ec4acd0
Eat a lockign exception that kills scripts. May bear more investigation
...
in the long run.
2010-07-25 08:11:39 +02:00
aa7cadca52
Add some options
2010-07-24 23:36:07 +01:00
a9b7774fe0
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-07-24 23:15:38 +01:00
4dbff62ef5
Fix some inventory issues
2010-07-24 23:15:06 +01:00
83aec1ec94
Fix a little infinite recursion i added just for sh.ts and giggles. NOT.
2010-07-22 23:47:10 +02:00
7ebabf185e
change the delay to 0.2s. My bad.
2010-07-22 19:31:02 +02:00
ce8b9b4181
LSL compatibility fix. Add 0.1 s sleep to llSetLinkPrimitiveParams so fade scripts will time correctly. The -Fast version works without a delay
2010-07-22 19:20:09 +02:00
0c0ac65d38
Added ': ' to password prompt. Mantis #4851
2010-07-22 04:00:24 -07:00
a70c7756b3
Add sending of the avatar interests and configuration of the profiles
...
module as an OpenSim profile module to Simian grid services.
Patch by Dimentox, thank you.
Applied with changes.
2010-07-22 03:01:50 +01:00
fb89d0ff4e
Allow megaregions to be used in M7, should we so decide
2010-07-21 12:32:23 +02:00
d4022becc3
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-21 12:16:30 +02:00
f63a4c8f2f
Merge branch 'master' into careminster-presence-refactor
2010-07-21 12:03:44 +01:00
c72c84b455
Refine autoreturn a bit
2010-07-21 12:16:17 +02:00
ac1a34714d
Allow Megaregions to start properly after an unclean shutdown
2010-07-20 23:24:04 +01:00
f08afc4f87
Restore lines that have been removed due to previous merge conflict.
2010-07-20 14:28:17 -07:00
4ccc141764
Resync with master
2010-07-20 21:49:31 +01:00
c0b8cbd85b
Merge branch 'master' into careminster-presence-refactor
2010-07-20 21:47:53 +01:00
dcf7973c9b
Merge branch 'master' into careminster-presence-refactor
2010-07-20 21:39:20 +01:00
176cb01130
Remove a merge artefact
2010-07-20 21:38:31 +01:00
686837d9ed
Merge branch 'master' into careminster-presence-refactor
2010-07-20 21:18:27 +01:00
120d7014fd
When a god uses mass permission setting, the V bit is cleared from next
...
perms, rendering the item unmoveable for the next owenr. Make god mods
conform to the rules, too.
2010-07-20 21:01:46 +01:00
ea51bea508
prevent hacked viewers from being able to delete arbitrary items from any
...
prim. Allow friends with perms and shared group members to move or copy
things out of prims
2010-07-20 21:01:14 +01:00
78605baab3
Fix a few permissions vulnerability. Owners could cause permissions
...
escalation on items contained in prims using a hacked viewer
2010-07-20 21:00:56 +01:00
e46c0a0fc9
adjust DialogModule to only send broadcast alerts to root agents
2010-07-20 21:32:13 +01:00
7c124a5543
Relaxed the ultra-conservative lock on m_items. Needs testing under linux and stress.
2010-07-20 05:59:18 -07:00
fd66ee57f3
When a god uses mass permission setting, the V bit is cleared from next
...
perms, rendering the item unmoveable for the next owenr. Make god mods
conform to the rules, too.
2010-07-20 14:45:46 +02:00
b7f1288361
Adding it again.
...
Revert "Reverting this for now, but this needs to go in again."
This reverts commit c0d9ab941d
2010-07-20 04:23:39 -07:00
c0d9ab941d
Reverting this for now, but this needs to go in again.
...
Revert "Another stab at http://opensimulator.org/mantis/view.php?id=4858 . Eliminated more nested locks."
This reverts commit ffbae52a13
2010-07-19 16:22:29 -07:00
191bee2ed0
Remove the null checks altogether
2010-07-20 00:55:31 +02:00
54da64acac
Remove exception badness in the LSL Types. Who ever came up with that.....?!
2010-07-20 00:46:39 +02:00
ffbae52a13
Another stab at http://opensimulator.org/mantis/view.php?id=4858 . Eliminated more nested locks.
2010-07-19 15:20:34 -07:00
5c0c7fda6c
One more stab at http://opensimulator.org/mantis/view.php?id=4858 .
...
Eliminated the nested locks of m_Scripts and m_PrimObjects.
2010-07-19 13:59:11 -07:00
cd2bb7daf3
Deleted Snoopy's patch completely, including Thread.Sleep. Preliminary tests indicate that this is what causes deadlock. More tests needed.
2010-07-19 08:07:37 -07:00
a974704a3e
re-add the sleep lost in the revert.
2010-07-19 14:37:27 +01:00
575f7d3366
Revert "Thank you, Snoopy, for a patch to reduce sim script startup CPU usage"
...
This reverts commit c404c5fb54
2010-07-19 14:36:53 +01:00
fa45d5b5fa
Revert "A stab in the dark. Revert the compile lockout temporarily. If you know what"
...
This reverts commit f798679b80
2010-07-19 01:10:57 +01:00
f798679b80
A stab in the dark. Revert the compile lockout temporarily. If you know what
...
this is, you should test it. If you don't, don't use it.
2010-07-19 00:06:23 +01:00
c263fc54ac
Add a state change method to the Async commands handler to allow timers
...
and http requests to survive state changes
2010-07-18 21:05:50 +02:00
c088397ec7
If the client requests that an object be deleted, and the SOG/SOP is null and/or is marked as deleted, just send the KillObject
2010-07-18 06:01:26 -07:00
fabe2206db
Ensure that packets do NOT get delivered to a client before the modules that can deal with the client's response have finished loading.
2010-07-17 15:08:59 -07:00
17412389f3
Revert 233c872.. "* Call client.Start() sunchronously. Calling thos async avoids some stuttering", pending fix for the core issue
2010-07-17 14:34:35 -07:00
7b62c25cfb
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-07-17 16:25:56 +01:00
e157dd630e
Allow communicating with blue box dialogs across a region border via a
...
child agent
2010-07-17 16:25:30 +01:00
d52fb4d2e9
Shorten LLEmail delay to 15s. With the external spam protection, we can
...
afford to do that
2010-07-17 16:35:14 +02:00
c41d418380
Allow communicating with blue box dialogs across a region border via a
...
child agent
2010-07-17 16:32:55 +02:00
d1040c9ff9
Replace the screenful of code i deleted.
2010-07-17 02:46:04 +02:00
e06b7ee368
Make webloading more robust by addign retries
2010-07-17 02:38:00 +02:00
85f454e3ae
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-17 02:26:34 +02:00
9bf6179d24
Fix scripted give of items
2010-07-17 02:26:09 +02:00
9cfa71d1bf
Allow use of old angle rules PSYS_SRC_INNERANGLE and PSYS_SRC_OUTERANGLE in llParticleSystem()
...
This is a patch from http://opensimulator.org/mantis/view.php?id=3201
Thanks Micheil Martin!
2010-07-17 00:35:51 +01:00
e05f01e70f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-07-17 00:27:52 +01:00
f5bdf0d9b9
Fix bugs in llRot2Euler()
...
Applies patch in http://opensimulator.org/mantis/view.php?id=4482 .
Thanks Micheil Merlin!
2010-07-17 00:26:26 +01:00
236c0f8e8b
Fix llSetForecAndTorque([0]) stops linear motion. Mantis #187
2010-07-16 22:17:06 +00:00
2e5f200b3b
Fix showing CreateSelected on all parts of a rez
2010-07-16 20:23:41 +02:00
3f91805afb
prevent hacked viewers from being able to delete arbitrary items from any
...
prim. Allow friends with perms and shared group members to move or copy
things out of prims
2010-07-15 20:28:18 +02:00
8d2b4b7b48
Fix a few permissions vulnerability. Owners could cause permissions
...
escalation on items contained in prims using a hacked viewer
2010-07-15 20:03:08 +02:00
99a6950b30
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-07-14 23:29:04 +01:00
466254105c
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-07-14 23:04:25 +01:00
264f4f07cd
Detach attachments displaced by other attachments
2010-07-14 23:04:05 +01:00
0d8c0811d3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-07-14 14:48:14 -07:00
6afa55d446
Removed a few obsolete mono addin references. Mantis #4854
2010-07-14 14:47:01 -07:00
8c10cb5ffe
improve closing of load/save iar streams in the event of a problem
2010-07-14 20:43:35 +01:00
ddfff55cc7
Preserve attachment data while a prim is in world. Allows attachment
...
editing on the ground without losing attachpoint and position
2010-07-14 21:06:49 +02:00
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
a7b5fe6a88
Remove useless quaternion parameter from AttachObject sig
2010-07-14 19:49:54 +01:00
d665f0ae66
Detach attachments displaced by other attachments
2010-07-14 20:46:26 +02:00
0b74662ce2
Merge branch 'master' into careminster-presence-refactor
2010-07-14 19:53:15 +01:00
b8aa81635f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-07-14 11:04:57 -07:00
12858122d5
Fixes mantis #4870 .
2010-07-14 11:02:41 -07:00
bebbe407ee
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:58:23 +02:00
0c445239a6
Remove useless quaternion parameter from AttachObject sig
2010-07-14 19:21:01 +02:00
5b03e05035
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-07-14 17:55:06 +01:00
5d83b3f991
comment out obsolete assert that 'item has been passed to another user since it was last set' perms flag was set when a prim item was added to a scene object
2010-07-14 17:53:43 +01:00
0080c3b1f4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-07-14 17:13:04 +01:00
71433075a9
Fix obvious bug in XInventoryService.GetFolderItems() which was preventing the iar module from being able to save single item iars
2010-07-14 17:12:12 +01:00
39cd57598b
Fix a permissions issue
2010-07-14 16:12:44 +01:00
d1f94b5d58
Merge branch 'master' into careminster-presence-refactor
2010-07-14 16:12:14 +01:00
cbb3a8ab94
Fix a permissions issue
2010-07-14 16:21:55 +02:00
33aa7ba7dc
Revert "More on mantis #4869 . This fixes the problem of objects showing up as no copy when they are copy-able. It works, but I have no idea what I'm doing."
...
Cuauses a permission escalation. do NOT USE the preceding commit
2010-07-14 14:59:34 +01:00
bec1d7cc36
Removed left-over debug messages.
2010-07-14 07:00:24 -07:00
87fb19162e
More on mantis #4869 . This fixes the problem of objects showing up as no copy when they are copy-able. It works, but I have no idea what I'm doing.
2010-07-14 06:57:56 -07:00
d64c09160c
Removed some more debug messages.
2010-07-14 04:18:13 -07:00
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
af13c80d68
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:59:26 +02:00
c5891c14c7
Bail out in AttachToBackup if the group is an attachment
2010-07-13 15:32:35 -07:00
7270cd0ade
Second part of the fix for llGetLocalPos; get attachment offset in the root prim of an attachment. This function now behaves in line with SL.
2010-07-13 14:57:50 -07:00
8c2e1c6c29
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-13 21:12:01 +00:00
8c26c8bbc6
adding the 'wearble' case for llGetLocalPos.
...
Still not working cause the offsets are not updated (always <0,0,0>)
2010-07-13 21:10:26 +00:00
84227fd558
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-13 20:37:45 +00:00
7ab103c96f
Rewrite collision dictionary handling, cleans up deleted obects/avs. Fixes occasional collision event failure. ChOde only.
2010-07-13 20:37:13 +00:00
eacf3d9221
Merge branch 'master' into careminster-presence-refactor
2010-07-13 20:46:21 +01:00
dd14016885
Revamp the permissions propagation. This MAY mess up. Please test.
...
Change the slam bit from 3 to 4. Assume the old slam bit is always set.
The new slam bit is a "changed owner" bit, correcting a bug where an item
passed from the creator to another with less than full perms, then back (sale
test) would arrive back full perm. Lots of in-code docs.
2010-07-13 20:45:16 +01:00
bed36901d1
Add CreateSelected flag onto objects rezzed from inventory
2010-07-13 20:37:12 +01:00
89c1c5c35a
Revamp the permissions propagation. This MAY mess up. Please test.
...
Change the slam bit from 3 to 4. Assume the old slam bit is always set.
The new slam bit is a "changed owner" bit, correcting a bug where an item
passed from the creator to another with less than full perms, then back (sale
test) would arrive back full perm. Lots of in-code docs.
2010-07-13 20:40:23 +02:00
31cbd6d113
Add CreateSelected flag onto objects rezzed from inventory
2010-07-13 18:23:23 +02:00
86f3f83250
uncomment a load iar code line I accidentally commented in the last commit
...
hooray for automated tests
2010-07-12 23:37:08 +01:00
3156f4bbeb
comment out a lot of the debug log messages when loading an iar
...
these are very redundant now and cause issues when loading large iars
diva, you may want to cherry pick this for 0.7-post-fixes since it only comments out log lines and nothing else
2010-07-12 23:00:01 +01:00
5f4105d48c
Removed the CHANGED_COLOR event post from the Color accessor in SOP. This is not the correct usage of this changed event - it's only supposed to be posted when the /textures/ change colour or alpha transparency, not the floating text. This fixes several race conditions in scripts ported from SL.
2010-07-12 13:55:56 -07:00
26621ca500
Add scripted controllers into agent intersim messaging
2010-07-11 14:50:14 +01:00
7f0f11304f
Add scripted controllers into agent intersim messaging
2010-07-11 14:26:57 +02:00
922e874653
Merge branch 'master' into careminster-presence-refactor
2010-07-11 13:32:10 +01:00
eaea89bbb7
Remove localID from script controls data. It won't transfer to another
...
region anyway
2010-07-11 13:09:11 +01:00
cea856cfc2
Fix the synchronousrestformsrequester so it will successfully handle a response from a server which does not provide a valid content length header
2010-07-10 19:00:12 -07:00
cecd660388
Fix an issue where the SynchronousRestObjectRequester will fail if a webserver does not report a content length (-1), but the content is still valid
2010-07-10 18:48:49 -07:00
1169bfeaf3
Make taken items go back to the folder they came from
2010-07-10 10:43:34 +01:00
8aa5f30082
Make taken items go back to the folder they came from
2010-07-10 10:51:49 +02:00
6352fc5f57
Bug in 0.6.9 sometimes restoring script state causes region console to crash due to unhandled file lock exception. Attempt to resolve by wrapping several instances of file create / read logic in using statements and added some error handling for locked file exceptions. If it is IDisposable, it must be disposed! The close statements are unnecessary but harmless so I have left those in. The end of the using block will close and dispose automagically.
2010-07-09 18:23:48 +01:00
fe60b6783d
Hopefully fixes mantis #4852
2010-07-08 16:21:01 -07:00
d2fea2bb29
These 2 files want to be committed.
2010-07-08 16:05:59 -07:00
05b35eb57c
Correct a merge artefact
2010-07-08 18:17:02 +01:00
df9d4cd9b2
llVecNorm() now returns a zero-length vector when one is supplied as input. Addresses Mantis #4752
2010-07-08 10:06:08 -07:00
815dd73cf3
fix a potential division by zero
2010-07-08 10:01:23 -07:00
5f400a50be
Merge branch 'master' into careminster-presence-refactor
2010-07-08 17:32:57 +01:00
baebefeb05
Handle a specific exception without spewing red ink.
2010-07-08 16:30:36 +01:00
32cfdb0f6a
Switched order of conditionals.
2010-07-07 02:40:51 -07:00
07559707c5
Fixes problem where "Adult" regions were reported as being of type "Unknown".
2010-07-07 02:37:22 -07:00
faaef1b498
minimizes temp garbage for llParseStringKeepNulls()
...
and uses common routine for llParseStringKeepNulls()/llParseString2List()
2010-07-06 23:59:06 +00:00
6e7f1a3ac1
Merge branch 'careminster-presence-refactor' of www.3dhosting.de:/var/git/careminster into careminster-presence-refactor
2010-07-06 02:23:10 +00:00
90c5555d6d
rewrote hanging llParseStringKeepNulls()
2010-07-06 02:22:47 +00:00
657056a73f
Fixes mantis #4845
2010-07-05 08:48:02 -07:00
debc780654
Fixes additional bug reported in mantis #4841 .
2010-07-05 07:14:32 -07:00
e947d04038
Undo fix is now complete. This commit repairs the special case of the root prim moving or rotating independently of the rest of the group.
2010-07-05 05:44:35 -07:00
7525f3a556
Don't include hyperlinks as neighbors, even if grid operators have done the mistake of placing them as neighbors. This will not prevent further mess ups coming from that unsupported action.
2010-07-05 04:19:53 -07:00
be5dd04150
Bring "Redo" up to date with "Undo" so it works too
2010-07-05 03:58:18 -07:00
c7e4880a5e
One more buglet fixed related to mantis #4841 -- auto-returns were still chocking on a null pointer exception.
2010-07-05 03:36:26 -07:00
8849b9af8b
Fix single prim rotation undo. All UNDO functions are now working correctly except for when the root prim is moved or rotated as a single prim (coming soon).
2010-07-04 20:45:11 -07:00
c616335019
Rotation undo fix and remove a debug chatter i missed. Still not working: Individual child prim rotational undo and special cases where the root prim was moved or rotated (all the children then need to restore their offsets). Coming shortly.
2010-07-04 19:58:52 -07:00
5b68343361
The majority of the Undo fix. There is still an issue with Rotation which i'll address next; however position undo and scale undo should be working just fine now. Also removed some residual debug logging.
2010-07-04 19:28:39 -07:00
7665013ad8
Correct positioning of timeout modifier in the SynchronousRestObjectRequester
2010-07-04 19:25:54 -07:00
b84f72df0b
Got rid of all hyperassets references. Also fixed accessing textures in user's inventory in foreign grids.
2010-07-04 14:59:15 -07:00
02a15bc787
Started to clean up the mess with HyperAssets in LLClientView. Fixed HG access to Notecards in user's inventory.
2010-07-04 13:56:03 -07:00
14ab22dcd4
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-04 06:51:01 -07:00
3368e3853a
Check cached asset to make sure it contains data, and if not, re-request
2010-07-04 06:45:04 -07:00
8a45191aa9
Merge branch 'master' into careminster-presence-refactor
2010-07-04 11:02:21 +01:00
abe0a9ff49
Fixes the obvious problem in mantis #4841 . Melanie needs to look at other potential problems there, though.
2010-07-04 02:59:38 -07:00
baa20a10c3
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-03 20:29:06 +02:00
edcfaf60c9
Fix IMs the right way. This sets it up so that timestamps are actually
...
in PST (to match viewer time), does correct storage and retrieval of
IMs, corrects the session ID and makes sure IMs don't get marked "saved"
if they're live. Removes the group IM save option, which our group IM
module never had in the first place, as saving group chatter makes no
sense at all.
2010-07-03 20:27:00 +02:00
4cd5e64231
Use SendTransferAbort in a more sensible place
2010-07-03 09:22:58 -07:00
e4739523d3
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-03 06:11:46 -07:00
fe2b044d38
Fix Undo! Made a lot of changes to Undo state saving; it now considers that groups of objects can be moved and not just individual prims..
2010-07-03 06:10:55 -07:00
39ae1def85
Re-implement the Undo stack as a List; the old implementation was buggy
2010-07-03 06:10:02 -07:00
2b49cb9227
Make sure the AssetServiceConnector times out within 30 seconds. If it doesn't, the client will get bored and give an upload error, instead of granting success and entering the asset into our retry queue.
2010-07-03 06:09:20 -07:00
3d495b709e
Implement a timeout value in the SynchronousRestObjectRequester. Default is 100 seconds.
2010-07-03 06:08:18 -07:00
028303c3e1
Fixes mantis #4835
2010-07-03 02:44:28 -07:00
86a82e6ecb
Now, fix the slash issue the right way. Our URLs now work like SL's
2010-07-03 08:33:08 +02:00
721d8a7298
Re-add the slashes at the end of the URL. Too much depends on them
2010-07-03 07:09:27 +02:00
79c1eb1e39
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-07-02 06:36:08 -07:00
490f1c144c
Fixes mantis #4782
2010-07-02 06:35:38 -07:00
233c872d24
Call client.Start() sunchronously. Calling thos async avoids some stuttering
...
when people log in, but fatally screws up money.
2010-07-02 09:40:58 +02:00
e15f6905a5
Clean up IMoneyModule and adjust the other modules to the changes
2010-07-02 06:13:58 +01:00
c87e6a289c
Clean up IMoneyModule and adjust the other modules to the changes
2010-07-02 06:20:36 +02:00
fda9d7b75e
Remove GetEconomyData and the economy data structure (unused)
2010-07-02 04:45:03 +01:00
9e0b562c6e
Fox another scripting nasty. Stuff no system.string objects into lists
2010-07-02 04:21:07 +01:00
e328c23355
Add MapTileURL to robust to supply the url needed by snowglobe
2010-07-02 04:03:35 +01:00
beb5259cd1
Remove GetEconomyData and the economy data structure (unused)
2010-07-02 04:51:31 +02:00
a7c4cb95aa
Fox another scripting nasty. Stuff no system.string objects into lists
2010-07-02 04:26:55 +02:00
848623eea5
Fix a dumb little sign error that makes a LSL wiki example fail
2010-07-02 03:04:43 +01:00
120c9a4ebb
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-02 03:11:18 +02:00
ec73074aac
Merge branch 'master' into careminster-presence-refactor
2010-07-02 03:02:53 +01:00
60c15d7c28
Fix a dumb little sign error that makes a LSL wiki example fail
2010-07-02 03:05:40 +02:00
54d7f6ef43
Add region name on the end of script startup debug messages
2010-07-01 21:34:53 +01:00
68281b356c
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-01 09:47:18 -07:00
071d601dcb
Cache all assets on upload so that the client can still retrieve the asset if it enters a retry queue
2010-07-01 09:46:57 -07:00
b38a22506b
Fix build break
2010-07-01 08:57:13 -07:00
38384cc79c
Report asset upload success if it has previously failed
2010-07-01 08:52:30 -07:00
4851706d35
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-01 08:49:53 -07:00
1cb7695fb0
Catch newid == null which is what happens if the asset service is offline (seems a connection failure does not throw an exception)
2010-07-01 08:48:02 -07:00
3d5d44279b
ANother stab at LSL compatibility
2010-07-01 17:06:29 +02:00
2312504b04
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-07-01 16:41:03 +02:00
d5cbe4cb75
Remove trailing slash from HTTP URLs to be compatible with SL
2010-07-01 16:40:26 +02:00
3940a4dbc7
Avoid a spurious error message when taking a friend's no copy item
2010-07-01 16:11:10 +02:00
8326f36cda
minor: comment out high volume texture serving module debug message
2010-06-30 22:07:28 +01:00
46a531d865
Merge branch 'master' into careminster-presence-refactor
2010-06-30 21:35:05 +01:00
dd579cf615
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-30 21:26:43 +01:00
1db2921782
Fix scripts in rezzed objects not starting (Mantis #4775 )
2010-06-30 21:25:39 +01:00
b6264e60d3
Removed opportunity for exception in BaseHttpServer. (mantis #4825 )
2010-06-30 06:35:22 -07:00
9012084d11
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-29 23:19:08 -07:00
8dc7c0849e
The other half of the asset fix. Implement an exponentially incrementing retry timer for asset upload failures. Total queue time in the ballpark of 24 hours, which should be a reasonable time for any grid admin to get their asset service back online. This should stop lost assets.
2010-06-29 23:18:48 -07:00
5925aac859
Add --merge switch to load iar.
...
When this switch is used, iar folders are merged with existing same-name user inventory folders.
This makes it a little easier to back and restore entire individual user inventories, among other things
Added unit test to check behaviour
2010-06-30 00:10:44 +01:00
be0af01061
Revert "stop exceptions in setting and getting state from propogating since they aren't fatal to operations"
...
This reverts commit 94cb6fc916
2010-06-29 23:43:38 +01:00
714367efb9
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-29 21:51:56 +01:00
d06b977ed1
Remove the override from DeletToInventory in HGInventoryAccessModule. This may be causing the infinite loop, not sure.
2010-06-29 14:21:48 -07:00
6701fc2ffa
Fix the XML serializationt to provide an empty script state element if
...
the script hasn't yet saved state, or can't save state because of a loop
2010-06-29 21:50:52 +01:00
5d11833ae1
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-29 20:36:36 +01:00
94cb6fc916
stop exceptions in setting and getting state from propogating since they aren't fatal to operations
...
this will hopefully stop "save oar" from failing if a script asset is corrupt
2010-06-29 21:08:09 +01:00
5964084d25
Fix a nullref on autoreturn
2010-06-29 20:36:17 +01:00
c607e6f3b8
Revert "don't report the null uuid as a missing asset on saving oars/iars"
...
This reverts commit 5ce119174e
2010-06-29 20:30:22 +01:00
cf15558c9e
This file wants to be committed.
2010-06-29 06:25:12 -07:00
fa3f448324
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-29 04:40:02 -07:00
08e3389790
Buglet fix in HG inventory. Make sure that GetRootFolder for non-HG xinventory is the folder "My Inventory". Also changed the Suitcase folder name to "My Suitcase".
2010-06-29 04:38:15 -07:00
9fde9085a0
Bug fix in HG standalone: wrong handler in the in module. Fixed a few broken comments in InventoryAccessModule.
2010-06-29 02:07:10 -07:00
3cd717d929
Comment the "Notecard saved" notification that pops up when a notecard
...
is saved into a prim. Sl doesn't have it, and for good reason: It also
happens on scripts in our version. Which is wrong. Better no message
than a wrong one.
2010-06-29 04:09:14 +02:00
6f4d4543b9
Make newly created prims be named "Object" and make newly created scripts
...
have a default touch handler. Compatibility patch
2010-06-29 03:51:16 +02:00
621195e4f1
Thanks Micheil Merlin for Mantis #4784 : [PATCH] llRotBetween does not return correct rotations for a 180 degree angle between vectors
...
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-06-28 17:33:47 -07:00
d123350164
One more bug fix in FriendsModule: GrantRights. One of the caches was not being updated.
2010-06-28 16:04:12 -07:00
20fc35399b
Fixes mantis #4815 and #4812
2010-06-28 14:10:22 -07:00
06fa038875
Return a UUID.Zero if the asset fails to upload
2010-06-28 07:09:05 -07:00
a5a1df68c2
Provide the interface for StoreAsset to report success or failure
2010-06-28 04:02:33 -07:00
3e908023b2
Force IM timestamps to current server time to prevent "Saved on" headers
...
while the sender is online
2010-06-28 08:58:51 +02:00
7807d11807
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-27 22:23:08 -07:00
827d9be48f
Fix the sound issue. It was caused by missing assets; once the client has made one request, it continued to wait for asset before requesting any new ones, until the TransferRequest timed out. Fixed by adding a TransferAbortPacket if the asset cannot be retrieved.
2010-06-27 22:23:01 -07:00
0a82d10fc4
Change the way IRegionModule us referenced by IEmailModule to
...
allow later conversion to new style
2010-06-28 03:14:05 +01:00
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
4cdda2cae9
Fix Copy on Ray, Drag Copy and other little things. Removed the wrong and
...
nonworking ownership assignment in SOG, which messed things up before.
No longer trust the client to send the ID of the person something is copied
as, since it allows to run a script with someone else's permissions. Properly
adjust inventory ownership and perms.
2010-06-28 01:36:40 +01:00
4fa1d4896c
Change the way IRegionModule us referenced by IEmailModule to
...
allow later conversion to new style
2010-06-28 02:30:36 +02:00
a817f6b48c
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:48:24 +02:00
d570cffa39
Fix Copy on Ray, Drag Copy and other little things. Removed the wrong and
...
nonworking ownership assignment in SOG, which messed things up before.
No longer trust the client to send the ID of the person something is copied
as, since it allows to run a script with someone else's permissions. Properly
adjust inventory ownership and perms.
2010-06-28 01:29:30 +02:00
1499fd85c4
Fix a simian compiler warning
2010-06-27 21:02:03 +01:00
660a560d3b
Make drag copy and copy-on-ray handle friends list perms properly
2010-06-27 20:59:51 +01:00
6cf0b8f6fe
Add command-script to the Robust console
2010-06-27 13:28:27 -07:00
3dbc736049
Addresses mantis #4789 . Not really a fix, because the event is harmless anyway. Just shouldn't happen normally.
2010-06-27 13:23:51 -07:00
a61d817978
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-27 13:07:44 -07:00
7868f1f650
Fixed Robust.32BitLaunch.exe
2010-06-27 13:06:39 -07:00
76d2f0f68e
Same patch as before but for SQLite.
2010-06-27 12:40:17 -07:00
b0129b35f8
Added checks to XInventory DB layer to truncate names and descriptions.
2010-06-27 12:37:16 -07:00
3612a5252b
Fix more perms weirdness. Preserve "Locked" status across gives and rez/take.
...
Preserve "Anyone can move" flag in most cases.
2010-06-27 20:23:33 +01:00
121ba7e95c
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-27 20:05:29 +01:00
2cced72d70
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-27 21:05:06 +02:00
9c553cd254
Fix more perms weirdness. Preserve "Locked" status across gives and rez/take.
...
Preserve "Anyone can move" flag in most cases.
2010-06-27 20:20:08 +01:00
ba38c697e8
Merge branch 'master' into careminster-presence-refactor
2010-06-27 20:05:55 +01:00
205d2496f6
Fix permission propagation to prevent permanently locked objects from being
...
created.
2010-06-27 20:04:39 +01:00
19f18c8a1b
Make drag copy and copy-on-ray handle friends list perms properly
2010-06-27 21:04:30 +02:00
ef0ac7c403
Deal with incoming land objects properly so they don't just stack up
2010-06-26 23:20:28 -07:00
9f00f141fe
Restore "AllowCareminsterFunctions" as an alias to the new "AllowLightshareFunctions".
2010-06-26 18:54:55 -07:00
592ff1288d
Add a new global event : OnTerrainUpdate
2010-06-26 18:51:19 -07:00
c97e9f8621
Reverting the ITerrainModule changes. Turns out this was useless.
2010-06-26 18:43:01 -07:00
3bcee57e3e
add HasChanged to ITerrainModule
2010-06-26 17:34:19 -07:00
c3e806a2ea
Add a new accessor for the TerainModule : "HasChanged"
2010-06-26 17:25:45 -07:00
49272657d7
Make RegionLightShareData serializable
2010-06-26 15:30:47 -07:00
8f0adfbfb2
Trigger the RegionLightShareData OnSave event properly when the profile is saved
2010-06-26 15:15:19 -07:00
d188ed8ed8
Return everything at once, it's more efficient that way
2010-06-26 13:07:17 -07:00
ed5dac7e82
Fix another nullref issue in DeRezSceneObject
2010-06-26 13:06:47 -07:00
bd19cf739a
Fix a bug with DeRezObjects (check for a null remoteClient)
2010-06-26 12:38:08 -07:00
acab2a159d
Return objects which are NoCopy instead of just leaving them when cleaning the scene, if exceptNoCopy = true.
2010-06-26 11:24:36 -07:00
70d3b9aeca
Add a DeleteAllSceneObjects(bool exceptNoCopy) method to allow NoCopy objects to be retained when the scene is cleared.
2010-06-26 11:14:58 -07:00
06fd49bda9
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-26 06:17:09 +02:00
6274317e63
Fix loading of attachments on login
2010-06-26 06:16:24 +02:00
f64d1cb396
Add new event: OnChangedBackup
2010-06-25 14:39:15 -07:00
30397b6fbc
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-25 14:26:07 -07:00
96e649189f
Add two events: OnAttachToBackup and OnDetachFromBackup.
2010-06-25 14:25:39 -07:00
a4a808818f
don't report the null uuid as a missing asset on saving oars/iars
2010-06-25 21:48:19 +01:00
d399bd3eb7
minor: fix spelling mistake interupt -> interrupt in migrations
...
This is for mantis 4783
2010-06-25 21:18:52 +01:00
4a5979c311
minor: remove some mono compiler warnings
2010-06-25 21:09:15 +01:00
c7e7cb04a3
fix web request exception reporting properly this time
2010-06-25 20:57:38 +01:00
8629ba80bf
Revert "Report http server onRequest() exception properly."
...
This reverts commit c09451a034
2010-06-25 20:51:21 +01:00
dc9e9931eb
Merge branch 'master' into careminster-presence-refactor
2010-06-25 20:26:48 +01:00
c09451a034
Report http server onRequest() exception properly.
2010-06-25 19:11:22 +01:00
52b711af82
stop KeyNotFoundException() being thrown in RemoveScenePresence if the agent isn't present in the presence dictionary
...
the code to do this was there but was being circumvented by newmap[agentID] before the check actually took place
2010-06-25 18:55:20 +01:00
2c4df19805
minor: Move log information about SYSTEMIP to the place where it's resolved
2010-06-25 18:29:02 +01:00
3101d53064
Make "Allow other residents to edit terrain" default to FALSE
2010-06-25 05:25:41 -07:00
afff74a835
Add DwellModule interface
2010-06-25 01:44:17 +02:00
8a0ec60c8f
Unhook the dwell request from the land module (and therefore local storage)
2010-06-25 01:41:00 +02:00
6848465ae2
* SimianAssetServiceConnector Delete() was expecting the wrong type of response, reporting false errors
...
* Fixed a typo in a WebUtil error message
2010-06-24 13:43:38 -07:00
f186882c0f
Also make prims send the proper position. I hate it when people comment
...
out things just because they're "not yet used". Grrrr.
2010-06-24 20:51:04 +02:00
cbca58401a
Add the object owner UUID into the binary bucket of object to user IM
2010-06-24 20:46:24 +02:00
2cc1f14b0c
Replace the imSessionID, which is useless out of context, with the scope id
...
in saved IMs
2010-06-24 19:37:02 +02:00
b012e963d7
New viewers don't set the "save offline IM" flag anymore. Set it serverside
...
so messages get saved
2010-06-24 18:48:40 +02:00
6c37a02c0f
bug fix. 0,0 is a vlid sim coordinate
2010-06-24 06:02:44 +02:00
5a071dc798
Move loading of parcels to before script start. Scripts using parcel functions
...
can fail if no land is loaded
2010-06-24 03:24:38 +01:00
9d03271265
And another
2010-06-24 03:43:50 +02:00
e94cf3d9b7
And another conflict
2010-06-24 03:35:42 +01:00
e93853623b
Merge branch 'master' into careminster-presence-refactor
2010-06-24 03:30:11 +01:00
c404c5fb54
Thank you, Snoopy, for a patch to reduce sim script startup CPU usage
2010-06-23 21:14:28 +01:00
ce6fbd9680
Merge branch 'master' into careminster-presence-refactor
2010-06-22 23:40:59 +01:00
7db5262e35
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-22 23:40:12 +01:00
c96a6940a9
Line ending fix
2010-06-22 16:11:36 -07:00
1e1485de5b
* Fixed SimianGrid map tile uploads not having any objects in the images
2010-06-22 16:09:30 -07:00
68551675df
Guard prioritizer agains null values as those produced by a bullet dying
...
before it can be updated
2010-06-22 23:39:39 +01:00
854a8b9172
Security fix: Allow only textures to be fetched using HTTP texture cap
2010-06-22 23:39:25 +01:00
317ac50a97
Merge branch 'master' into careminster-presence-refactor
2010-06-22 23:38:56 +01:00
5c02fb435d
Security fix: Allow only textures to be fetched using HTTP texture cap
2010-06-22 17:35:00 +02:00
962dade155
Cause collisions with the avatar to be sent to attachments. Currently
...
ignores collision filter. Physics collisions are still dodgy, so we
don't get the events we should be getting.
2010-06-22 04:04:59 +02:00
3428196631
Guard prioritizer agains null values as those produced by a bullet dying
...
before it can be updated
2010-06-22 02:33:20 +02:00
3ea4e5ccbe
Correctly update the LastSeen field
2010-06-21 23:26:27 +02:00
53905cf919
Bump the migration version, ot it would never happen
2010-06-21 22:15:33 +02:00
ab023c6a29
Fix build break
2010-06-21 18:06:46 +02:00
9fd45406be
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-21 17:06:59 +02:00
973537f819
Ensure no UUID.Zero region ID is ever written to presence. Add a Migration
...
to add a LastSeen field of type "Timestamp" to Presence for MySQL
2010-06-21 17:06:05 +02:00
9d251b1dc5
Fix the StandUp position to calculate as if we're still using the child prim id.
2010-06-20 15:57:01 -07:00
fc715a092c
Fix the sit code to ensure that we use the root prim of a linkset as a reference in the case of an avatar sitting on a child prim. This fixes various camera issues and fixes mantis #0000059 .
2010-06-20 15:38:48 -07:00
33d05ef554
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-20 14:45:36 -07:00
a1416612a9
Update all clients sitting on a linkset if a child prim is moved. This prevents avatars being "lost in the void" until they stand up when a child prim is moved that they're sitting on.
2010-06-20 14:45:04 -07:00
13a0b65a80
Modify avatar responsiveness policy to send roots before children
2010-06-20 21:38:06 +02:00
797767da57
Insert a space after the comma on the ToString methos of lsl vectors
...
and rotations to match SL.
2010-06-20 07:16:19 +02:00
95c763201f
Set the offline flag in inventory offers
2010-06-20 06:36:46 +02:00
76b59b8df7
Make dataserver() return a 0 when agent id offline, instead of a timeout
2010-06-20 06:23:08 +02:00
905e5cd991
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-19 23:48:09 +01:00
c571c33b6b
fix faulty profile cut parameter checking in llSetPrimitiveParams() - see Mantis #4510
2010-06-19 16:07:35 -07:00
a3ebd4db3f
Revert "This is a HACK! Downright nasty. For some reason, the devs of the mysql"
...
Didn't do what it said on the package!
This reverts commit 8643db3ef0
2010-06-19 23:45:56 +01:00
8643db3ef0
This is a HACK! Downright nasty. For some reason, the devs of the mysql
...
connector have decided that their vision of timeouts is the only valid one.
This uses reflection to show them the finger. Please test.
2010-06-19 22:48:43 +01:00
24a68e36fb
Bug fix: wrong name of requester in local friendship offer.
2010-06-19 12:32:36 -07:00
04b60aa490
Merge branch 'master' into careminster-presence-refactor
2010-06-19 20:32:01 +01:00
49d7d8534c
Allow moving an avatar as part of a linkset using llSetLinkPrimitiveParams. This unlocks an awful lot of poseball-free content, and is a step towards resolving mantis #59 .
2010-06-19 10:06:09 -07:00
1e7ce6dbce
Hunting for the problem in #4777
2010-06-19 09:44:02 -07:00
9b410f5e94
Reverting my last two commits, putting back Melanie's exception handler. Doesn't solve #4777 .
2010-06-19 09:25:36 -07:00
f0f684161e
Reinstated the behavior of AddPrimShape *exactly* as it was as of December. Trying to fix mantis #4777
2010-06-19 08:57:58 -07:00
6d8da699b2
Add "AvatarHeight/2" to the Home Position when set to avoid having the avatar fall through the ground when they TP home.
2010-06-19 07:00:01 -07:00
891214c65b
Merge branch 'master' into careminster-presence-refactor
2010-06-18 20:49:21 +01:00
71a73d83cb
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-18 19:50:01 +01:00
47d5f90629
Remove an error in meshing error reporting. Now doesn't double-bomb
...
anymore on a bad sculpt
2010-06-18 19:49:14 +01:00
71c8bbaf2c
Fix problem where iar load would duplicate huge number of folders
...
This was http://opensimulator.org/mantis/view.php?id=4770
Extend unit tests to check for this scenario too
2010-06-18 17:37:28 +01:00
11a35d8cda
change TestPartExistingIarPath() to check appropriate folder creation
...
change some names in InventoryArchiveReadRequest in an effort to make the code more comprehendable
2010-06-18 17:10:16 +01:00
cf4721a92d
in IAR utils, return all folders that match a particular path rather than just the first one
2010-06-18 16:33:34 +01:00
cea7905602
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-17 13:04:32 -04:00
958c6c6fde
Add rez on water surface.
2010-06-17 13:04:18 -04:00
e3432b8f63
Revert "Set command timeout to infinity on migrations"
...
This reverts commit 51d30fd34a
2010-06-17 17:48:34 +01:00
51d30fd34a
Set command timeout to infinity on migrations
2010-06-17 17:43:40 +01:00
33c092781e
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-17 04:15:56 -07:00
d1c8b083b8
Fix llRot2Euler with a mathematically sound implementation. The only difference between this an SL is that SL resolves a figure of negative PI into PI, and does the equivalent in the reverse (llEuler2Rot, -1.0 becomes 1.0);
2010-06-17 04:15:07 -07:00
8b3042f24f
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-17 03:09:17 +01:00
7e22be3441
Merge branch 'master' into careminster-presence-refactor
2010-06-17 03:08:55 +01:00
544627c79c
Force newly connecting remote consoles to display a prompt
2010-06-17 03:03:55 +01:00
b9c40320f1
Fix llAttachToAvatar. This addresses mantis 128 .
2010-06-16 09:20:20 -07:00
117fd629d6
Allow llMapDestination to be used in any event if the host is an attachment. This fixes Mantis 0000098.
2010-06-16 08:32:47 -07:00
0b75f759b4
Merge branch 'master' into careminster-presence-refactor
2010-06-16 04:10:55 +01:00
6c0a372346
* Support salted and unsalted password hashes in SimianAuthenticationServiceConnector
2010-06-15 17:46:36 -07:00
38f098588c
Fixes creation date issue on user accounts.
2010-06-15 16:36:22 -07:00
0031d4a618
Readjust master version and flavor
2010-06-15 01:53:11 +01:00
462a0f24e9
Merge branch 'master' into 0.7-post-fixes
2010-06-14 11:54:40 -07:00
9c9ce9e8dd
* Deleted duplicated migration that was failing anyway.
...
* Added an error message in initial estate owner creation that makes it clear what needs to happen.
2010-06-14 11:50:42 -07:00
ef1496ca2d
Add "alert dialog" for sending dialogs to users from the console
2010-06-14 04:28:38 -07:00
53c32d8773
osGetAvatarList: Use AbsolutePosition instead of the position of the physics actor, or the avatar disappears when they sit down.
2010-06-14 12:09:35 +01:00
704da8c823
osGetAvatarList: Use AbsolutePosition instead of the position of the physics actor, or the avatar disappears when they sit down.
2010-06-14 04:03:54 -07:00
c75b94f9f9
Merge branch 'master' into 0.7-post-fixes
2010-06-14 04:50:27 +01:00
bd346ab8c7
Fixes attachments coming back upon being detached in neighbouring regions and crossing.
2010-06-13 19:18:17 -07:00
19558f380a
Fixes the long-standing RegionUp bug! Plus lots of other cleanups related to neighbours.
2010-06-13 19:06:22 -07:00
fdf648bcf3
Merge branch 'master' into careminster-presence-refactor
2010-06-14 02:49:15 +01:00
9b30f44672
D.U.H. #2 . Inverted test. Again. Argh!
2010-06-14 02:28:31 +02:00
1532dbca0a
Guard against a potential nullref
2010-06-14 00:12:39 +02:00
f9b4f5f594
Revert "Introduce SOP.UpdateSitters() to update sitting avatars' chat position if"
...
This reverts commit f59e272643
2010-06-14 00:05:01 +02:00
5fda89fdb5
Revert "D.U.H."
...
This reverts commit 3058761806
2010-06-14 00:04:02 +02:00
093cc047cd
Revert "Try it witht he root prim"
...
This reverts commit d520360cb8
2010-06-14 00:03:43 +02:00
62763cc0fb
Report current position instead of position at the time we sat down
2010-06-14 00:02:17 +02:00
d520360cb8
Try it witht he root prim
2010-06-13 23:01:15 +02:00
9069114d0f
Fox my changes to radmin
2010-06-13 21:57:56 +01:00
14c587bea1
Thank you, Snoopy2, for a patch to fix RemoteAdmin. Committed with the following
...
changes:
- Start location is NOT optional. The signature was defined with it being mandataory and there is no reason to change it
- Adjusted comments to remove misleading or no longer true comments. Default
is neuter, according to the code, not male, as the comment stated.
2010-06-13 21:45:39 +01:00
3058761806
D.U.H.
...
un-reverse a reversed condition
2010-06-13 22:43:14 +02:00
520b0e131c
Try to make prims stop moving. Reset velocity, etc, unconditionally. Although
...
the phys actor may be new, the prim fields could still be set and the
slimupdates system would continue sending that data out.
2010-06-13 22:37:11 +02:00
3d319d6c3f
Actually update the SP. EXPERIMENTAL
2010-06-13 22:23:07 +02:00
f59e272643
Introduce SOP.UpdateSitters() to update sitting avatars' chat position if
...
needed
2010-06-13 22:21:05 +02:00
deaf6bff98
Merge branch 'master' into 0.7-post-fixes
2010-06-13 03:56:47 +01:00
b3594681a4
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-06-12 12:09:06 -07:00
66619b5996
Added checks for failed UpdateAgent calls.
2010-06-12 12:08:45 -07:00
5e4bee0f34
Merge branch 'master' into careminster-presence-refactor
2010-06-12 19:15:59 +01:00
59acb37d92
Change name of method to better reflect what it does
2010-06-12 19:14:46 +01:00
b9c01a1c42
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-06-12 11:11:48 -07:00
e6efe34b4c
* Added CHANGED_TELEPORT event trigger upon inter-sim teleports.
...
* Cleaned up NewUserConnection.
2010-06-12 11:11:13 -07:00
4950ee5f3b
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-12 16:27:55 +01:00
d2342319da
Merge branch 'master' into careminster-presence-refactor
2010-06-12 16:27:37 +01:00
ceac35bac1
Log and eat sculpt meshing exceptions caused by bad jp2 data.
2010-06-12 16:25:40 +01:00
63531b1df5
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-12 04:36:14 -07:00
3ea11fe2e6
Get rid of spamming SOG debug message
2010-06-12 04:35:51 -07:00
3c036934a3
Preserving the link numbers is a serializer's highest duty.
...
Prevent region crossings from screwing up complex attachments by preserving
link numbers.
2010-06-12 08:28:00 +01:00
4c58ac2c90
Make local teleports send CHANGED_TELEPORT
2010-06-12 07:35:03 +01:00
65f03af38f
Don't filre CHANGED_INVENTORY if a prim comes in from storage
2010-06-12 07:34:55 +01:00
03a48f87e4
Preserving the link numbers is a serializer's highest duty.
...
Prevent region crossings from screwing up complex attachments by preserving
link numbers.
2010-06-12 08:29:20 +02:00
e337c9130f
Make local teleports send CHANGED_TELEPORT
2010-06-12 07:34:22 +02:00
57a60282f5
Don't filre CHANGED_INVENTORY if a prim comes in from storage
2010-06-12 06:57:10 +01:00
0ece71f8d1
Merge branch 'master' into careminster-presence-refactor
2010-06-12 06:14:10 +01:00
92fea025cb
Resume scripts that have been rezzed from a prim
2010-06-12 06:13:27 +01:00
3c3ad08868
Merge branch 'master' into careminster-presence-refactor
...
0.7.1CM Dev
2010-06-12 02:46:11 +01:00
85d2e21558
Change trunk versio to 0.7.1 Dev
2010-06-12 02:45:21 +01:00
99f2a1c347
* Tweak the StopFlying() method in LLClientView to fabricate a suitable landing collision plane regardless of the actual physics situation. position.Z - AvatarHeight / 6f
2010-06-11 21:46:01 -04:00
4dd9cf1ce4
Change flavor to 0.7-RC1
2010-06-12 02:44:01 +01:00
ae0a7e2c37
Merge branch 'master' into careminster-presence-refactor
2010-06-12 02:19:57 +01:00
508bfa1de8
Merge branch 'master' into careminster-presence-refactor
2010-06-12 01:26:55 +01:00
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
6a2e0c707c
Merge branch 'master' into careminster-presence-refactor
2010-06-12 00:34:26 +01:00
ed38b4a140
Some people don't use Simian. Make the connector respect that it's disabled
...
and not try to send a map tile in that case.
2010-06-12 00:32:54 +01:00
836728e5de
Merge branch 'master' into careminster-presence-refactor
2010-06-12 00:08:20 +01:00
b5bc2816fc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-11 15:43:22 -07:00
d1a324888b
* Added a new method to IMapImageGenerator for getting the map tile before it is JPEG2000 compressed
...
* Aesthetically improved map tile water
* SimianGrid connector now uploads a PNG tile to the AddMapTile API
2010-06-11 15:37:25 -07:00
c61e998580
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-11 22:09:24 +01:00
0dce4f1997
Revert "Allow IInventoryService.GetFolder(folderId, userId) as well as GetFolder(InventoryFolderBase folder)"
...
This reverts commit 3525195bc9
2010-06-11 22:13:36 +01:00
694c8ab588
Remove the lastmap stuff from the map module, also remove a bunch of comments
...
that no longer reflect actual conditions
2010-06-11 22:08:43 +01:00
3525195bc9
Allow IInventoryService.GetFolder(folderId, userId) as well as GetFolder(InventoryFolderBase folder)
...
This involves no wire changes since the methods often just construct an InventoryFolderBase under the hood.
This is in line with other methods that alraedy allow requests via uuid
2010-06-11 21:55:18 +01:00
8531da37d4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-11 21:18:53 +01:00
1a16a92a62
create inactive test for iar folders/items merged with existing paths
...
add various helper functions for simplifying test readability
2010-06-11 21:18:09 +01:00
5d099182c3
Reinstated the check on im.binaryBucket.Length, this time on the local handler for inventory offers.
2010-06-11 13:14:07 -07:00
4e34770aba
Merge branch 'master' into careminster-presence-refactor
2010-06-11 20:56:43 +01:00
556e91d33c
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-06-11 12:48:06 -07:00
d184fef4dc
Inventory offers and subsequent notifications of acceptance/decline now working across the board.
2010-06-11 12:47:47 -07:00
1cfebca48d
Merge branch 'master' into careminster-presence-refactor
2010-06-11 20:35:00 +01:00
c98b10fc8c
Remove the cm* function namespace
2010-06-11 17:48:41 +01:00
7c4cf46bac
Rename CM files to LS
2010-06-11 17:42:41 +01:00
ad87bab271
Rename cm* function set to ls* (for LightShare)
2010-06-11 17:30:23 +01:00
b64f42fa41
Clone cmGetAvatarList into osGetAvatarList for more generic use.
2010-06-11 17:03:45 +01:00
be71a2e5bc
Revert "Remove the cm* function namespace"
...
This reverts commit ef93ac4452
2010-06-11 17:52:19 +02:00
b1224c3540
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-11 17:47:34 +01:00
aa2f5bdd77
Merge branch 'master' into careminster-presence-refactor
2010-06-11 17:46:29 +01:00
ef93ac4452
Remove the cm* function namespace
2010-06-11 17:48:33 +02:00
10ef80cf15
Rename CM files to LS
2010-06-11 17:42:16 +02:00
97d83c87ec
Rename cm* function set to ls* (for LightShare)
2010-06-11 17:23:06 +02:00
8d5cec5e0d
Remove cmGetAvatarList()
2010-06-11 17:08:18 +02:00
b3cf5ccf6d
Clone cmGetAvatarList into osGetAvatarList for more generic use.
2010-06-11 17:04:54 +02:00
7f349d61cb
Better friends notification: get rid of OnLogout and use OnClientClose for sending notifications. This takes care of crashed sessions. Also, made the notifications themselves asynchronous.
2010-06-11 06:32:24 -07:00
2e1269e4ca
Bug fix on friends notifications. OnClientClose and OnLogout ordering are unpredictable; when OnClientClosed happened first, it was removing the friends list, which would prevent OnLogout notifications to go out.
2010-06-10 21:59:12 -07:00
b2b6799f1c
Added more debug messages to try to pinpoint where login is failing for nebadon.
2010-06-10 18:26:04 -07:00
e80cb815df
Bug fix on attachments: attach->drop->attach works now.
2010-06-09 12:51:24 -07:00
1dce243661
Merge branch 'master' into careminster-presence-refactor
2010-06-09 20:25:05 +01:00
2a71df1285
Reverting that last permissions check upon drop. Looks like all dropped attachments are deleted from inventory.
2010-06-09 12:22:25 -07:00
18bfe58de8
Bug fix on attachments: don't delete the item from inventory when it's dropped on the ground.
2010-06-09 11:24:37 -07:00
8fc5eda2c9
Bug fix in attachments: when attaching from inworld the item's parentFolderID was wrong.
2010-06-09 10:55:37 -07:00
1be53b58a7
Give attachments the same priority as other avatars in BestAvatarResponsiveness
...
policy
2010-06-09 17:02:01 +01:00
30d3ea3d4b
Give attachments the same priority as other avatars in BestAvatarResponsiveness
...
policy
2010-06-09 17:00:24 +01:00
6b2d2413f7
Merge branch 'master' into careminster-presence-refactor
2010-06-09 16:48:37 +01:00
008e840cf2
Add the BEGIN; I had missed
2010-06-09 16:37:20 +01:00
668c3b4062
Re-add Migration version 32, which apparently got dropped completely.
2010-06-09 16:34:18 +01:00
796e9b5cb4
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-09 03:52:24 +01:00
16439fa354
If a script is deleted before it gets compiled, don't even bother to try
...
compiling it
2010-06-09 03:51:43 +01:00
ca2abc43ad
Refactor SendCoarseLocations for better performance. Instead of computing list of all locations fresh for every scene presence on every frame, we will instead compute the list once every 50 frames and send to all connected presences at that time. Also, we only add 60 items to the list when there are more than 60 presences in the scene. For 1000 users, this change yields a 99.8% reduction in list processing and a 98% reduction in network bandwidth for coarse locations.
2010-06-08 16:44:18 -07:00
0520b62955
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-06-08 15:52:56 -07:00
5c0068723f
Changed XInventoryData's CreatorID to a string.
2010-06-08 15:52:26 -07:00
9b9804a498
* Changed CreatorIDs consistently to varchar(128)
...
* Deleted redundant migration for assets in SQLite
* Rewrote XInventory migrations in SQLite in the new style
2010-06-08 15:47:14 -07:00
20ea823c19
Merge branch 'master' into careminster-presence-refactor
2010-06-08 22:07:01 +01:00
933bfd17f7
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-08 22:05:49 +01:00
a791689ceb
Make the text mode remote console really work. It can now be used to send
...
multi-word commands with proper quoting, handles arguments with spaces
and allows interactive use, e.g. user creation.
2010-06-08 22:05:06 +01:00
7d75dc1294
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-08 22:04:09 +02:00
54209907f3
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-08 16:15:45 -04:00
6e2cc98eac
Fixed llMoveToTarget() and Rotation Lock/Enable (ChODE/ODEPrim only)
2010-06-08 16:15:16 -04:00
4921d5ac2d
Make the text mode remote console really work. It can now be used to send
...
multi-word commands with proper quoting, handles arguments with spaces
and allows interactive use, e.g. user creation.
2010-06-08 22:03:08 +02:00
24c36f26d5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-08 20:07:50 +01:00
21246395be
Comment out the attachment update reordering mechanism in LLClientView since this doesn't appear necessary when the prim priorities are adjusted so that root prim updates are always sent before child prim updates.
2010-06-08 15:38:53 +01:00
db73b1c64e
Adjust object update priorities such that root prims are sent to the viewer before child prims.
...
This was originally a fix for huds, since child prims fail to display if the viewer doesn't receive the root prim update first.
However, on the advice of jhurliman, this has been done for all objects, both ordinary and attachments.
The separate mechanism in LLClientView which prevents child prim updates being sent out first is still present temporarily.
This is a foreport of the equivalent fix in 0.6.9-post-fixes, though that was for attachments only.
2010-06-08 15:32:18 +01:00
b6076d7b33
Reduce number of full updates sent on region crossing for attachments/huds to 1 from 3
...
This is one step towards reducing hud glitches on region crossing, since the viewer fails to display prims if it receives child full updates before the root prim full update
This commit also introduces a mechanism in LLClientView to stop child attachment updates ever going out before the root one
This is a very temporary mechanism and will be commented out when the next step of the fix (to give root prims higher udpate priority) is committed
This code is a foreport from the equivalent changes in 0.6.9-post-fixes
2010-06-08 15:07:57 +01:00
d2dfbbe339
Merge branch 'master' into careminster-presence-refactor
2010-06-08 00:44:53 +01:00
a246cbce8d
Add a migration to adjust types in the WL table. The new connector likes that
...
better
2010-06-08 00:37:38 +01:00
74d62901c8
Merge branch 'master' into careminster-presence-refactor
2010-06-07 00:44:36 +01:00
d91bd7646d
Add a call to SOG.ResumeScripts() after region crossing / teleport
2010-06-07 00:11:30 +01:00
fad5158ab4
Add a call to SOG.ResumeScripts() after region crossing / teleport
2010-06-07 00:09:44 +02:00
ab3afd5f42
* Bug fix in TP home: typo in unpacking of GridUserInfo.
...
* Bug fix in TPs across neighboring regions: bug was introduced when getting rid of crashed sessions.
2010-06-05 09:39:09 -07:00
fe3e1c67ae
Bug fix: update the list of friends upon MakeRoot, because child agents don't get notified of new friendships.
2010-06-05 06:56:36 -07:00
e962c44749
Fix support for PRIM_SCULPT_FLAG_INVERT and PRIM_SCULPT_FLAG_MIRROR in the llSetPrimitiveParams series of functions. This makes it possible to mirror a sculpt by script.
2010-06-04 19:36:31 -07:00
63797445be
various refactorings on methods to replicate IAR paths to user inventory in order to improve readability
2010-06-05 00:48:33 +01:00
3c3df9f3e9
refactor: do pathname trimming outside of ReplicateArchivePathToUserInventory()
2010-06-04 23:34:42 +01:00
72bd68a21f
add ability for load iar/save iar to take in arbitrary options
...
not used for anything yet
2010-06-04 22:17:23 +01:00
0526d3a535
bring TestLoadIarV0_1AbsentUsers() back online
2010-06-04 21:19:37 +01:00
a08ace300b
bring TestIarV0_1WithEscapedChars() back online
2010-06-04 21:15:25 +01:00
c5878b6610
Merge branch 'master' into careminster-presence-refactor
2010-06-04 21:11:15 +01:00
f523c2033d
bring test TestLoadIarV0_1ExistingUsers() back online
2010-06-04 21:11:13 +01:00
df2bcf7b6b
remove pointless mock user account service since the real one can now be easily configured for test purposes
2010-06-04 20:56:24 +01:00
f319d2ef5e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-04 20:44:01 +01:00
75878c8f43
get TestSaveIarV0_1() working again by setting up an OpenSim.Data.Null.UserAuthenticationData plugin
...
additional tweaks to get this working properly
2010-06-04 20:43:05 +01:00
281eb0c626
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-06-04 11:00:29 -07:00
952029380a
Fixed a couple of buglets in Friendship offers / acceptance / decline when avies are in different sims.
2010-06-04 10:59:59 -07:00
86f2339b6e
remove estate stuff in sqlite region migrations since this also exists in estate migrations, change Sandbox to sandbox in sqlite region migrations
...
re-enabling the sqlite data tests revealed these errors!
2010-06-04 18:46:58 +01:00
5c322335e5
add sqlite database back to database tests
...
this appears to be okay even though we reuse it between runs without deleting it first.
size of the database appears not to be changing though that could be deceptive
2010-06-04 18:27:16 +01:00
041f253e2b
minor: comment out region interface registration log msg I accidentally left in last week
...
also changes one log message to print out full exception stack trace on both mono/.net instead of just .net
2010-06-04 18:08:40 +01:00
55040a84a5
Fix bug where prim items were not loaded in the new sqlite database handler
...
This addresses mantis http://opensimulator.org/mantis/view.php?id=4739
2010-06-04 17:14:12 +01:00
dda7185b43
Change the admin kick message to something more generic, "OpenSim Manager" is not really accurate
2010-06-03 17:55:50 -07:00
293f775fa5
Always provide at least 2 packets of a texture (if the texture is larger than 1 packet). This fixes compatibility with the newer (broken) SnowGlobe and Emerald viewer(s), but also matches the behaviour of SL.
2010-06-02 07:59:18 -07:00
b198763d67
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-02 01:22:10 +01:00
aa5a346a68
Add a forgotten security check. Make the new functions only work on prims
...
owned by the host prim owner.
2010-06-02 01:21:55 +01:00
53e96dccef
Add two new osFunctions:
...
list osGetPrimititveParams(key prim, list rules);
osSetPrimitiveParams(key prim, list rules);
2010-06-02 01:21:50 +01:00
655f02b695
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-02 01:05:36 +02:00
70aa965c26
Add a forgotten security check. Make the new functions only work on prims
...
owned by the host prim owner.
2010-06-02 01:04:17 +02:00
d8962ef415
Add two new osFunctions:
...
list osGetPrimititveParams(key prim, list rules);
osSetPrimitiveParams(key prim, list rules);
2010-06-02 01:01:56 +02:00
d740035ef4
Applying patch from coyled to fix IAR support with the SimianGrid connectors
2010-06-01 13:32:14 -07:00
90c814a7ca
Fix nullref in cmGetAvatarList() (ported from 0.69)
2010-06-01 13:29:12 -07:00
a863eb9da3
One should not lock null objects.
2010-06-01 19:01:57 +01:00
6668c789d3
One should not lock null objects.
2010-06-01 19:01:21 +02:00
9c3c020697
Lock the object queue when dequeueing
2010-06-01 15:08:45 +01:00
c900134f91
Lock the object queue when dequeueing
2010-06-01 16:03:53 +02:00
5270e54268
Comment and remove JScript support. Mono 2.7Dev and 2.8 no longer include the
...
needed libraries
2010-06-01 14:20:39 +01:00
16d8602d3c
Fix prim returns I broke earlier
2010-06-01 03:17:21 +02:00
4867dd135d
Fix prim returns I broke earlier
2010-06-01 02:12:56 +01:00
a5728cc91c
Fix prim returns I broke earlier
2010-06-01 02:10:53 +01:00
f29cb57bf1
Continuing refactor. Refactor DeRezObject to deal with multiple objects
2010-06-01 02:10:22 +01:00
bde01e26e1
Add a method to get the bounding box and root prim offsets within it for
...
a group of prims.
2010-06-01 02:10:11 +01:00
2fce7d9bcf
Split GetAxisAlignedBoundingBox into two methods to allow calculation of
...
combined bounding boxes and offsets
2010-06-01 02:10:08 +01:00
eca15cfbf2
Change the handling of CreateSelected. Only send it on real creation, not
...
for each prim coming into view.
2010-06-01 02:45:14 +02:00
be69259981
Change the handling of CreateSelected. Only send it on real creation, not
...
for each prim coming into view.
2010-06-01 01:39:54 +01:00
bf233ea0dc
Continuing refactor. Refactor DeRezObject to deal with multiple objects
2010-06-01 02:27:30 +02:00
f57f2370f1
Add a method to get the bounding box and root prim offsets within it for
...
a group of prims.
2010-06-01 01:25:24 +02:00
70f7790413
Split GetAxisAlignedBoundingBox into two methods to allow calculation of
...
combined bounding boxes and offsets
2010-06-01 01:07:46 +02:00
9d4913224f
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-05-31 19:00:36 +02:00
d4b4cbf5a5
Fix create selection getting overwritten by multiple updates for the same prim.
2010-05-31 19:00:02 +02:00
e515467c5e
Fix create selection getting overwritten by multiple updates for the same prim.
2010-05-31 17:55:56 +01:00
6c1665bf46
Fix casting in llParcelMediaCommandList so that it actually, you know, works
2010-05-31 08:38:41 -07:00
bbb4d6e4c9
Fix a nullref in EventManager caused by RegionReady not setting the scene
2010-05-31 01:02:04 +02:00
8df9f272eb
Fix a nullref in EventManager caused by RegionReady not setting the scene
2010-05-30 23:57:13 +01:00
890f3cc54c
Changes osFunction permissions again. Allow_ with a list of UUIDs now again
...
refers to prim OWNERS. A new option set, Creators_, is added to allow
selection by script creator. For existing installs, this means no functional
change. The warning from my prior commit doesn't apply anymore.
2010-05-30 15:46:54 +02:00
f1a1d7a521
Changes osFunction permissions again. Allow_ with a list of UUIDs now again
...
refers to prim OWNERS. A new option set, Creators_, is added to allow
selection by script creator. For existing installs, this means no functional
change. The warning from my prior commit doesn't apply anymore.
2010-05-30 14:42:58 +01:00
59a5367433
Changes OSSL Api permissions for the case of UUID list. In 0.6.9, the UUIDs
...
would be the IDs of the prim owners in whose prims these functions would
run. This changes it so the UUID is the SCRIPT CREATOR instead. Further,
osfunctions limited by uuid will not run if the creator and owner differ
and the owner has mod rights on the script.
There is still a danger in passing moodifiable scripts to others, as they
can insert a harmful function, then remove the mod rights to make it runnable.
As before, care needs to be taken, but where it was modable prims that were
the risk before, modable scripts are the weak spot now.
In cases where prim owner == script creator == script owner, nothing will
change.
2010-05-30 13:46:05 +02:00
bfcac0ede8
Changes OSSL Api permissions for the case of UUID list. In 0.6.9, the UUIDs
...
would be the IDs of the prim owners in whose prims these functions would
run. This changes it so the UUID is the SCRIPT CREATOR instead. Further,
osfunctions limited by uuid will not run if the creator and owner differ
and the owner has mod rights on the script.
There is still a danger in passing moodifiable scripts to others, as they
can insert a harmful function, then remove the mod rights to make it runnable.
As before, care needs to be taken, but where it was modable prims that were
the risk before, modable scripts are the weak spot now.
In cases where prim owner == script creator == script owner, nothing will
change.
2010-05-30 12:45:16 +01:00
84e30bee6d
Revert "Meta7 Communities : Authorization service added, skeleton, not yet functional"
...
This reverts commit 31439293cc
2010-05-29 12:34:02 +02:00
31439293cc
Meta7 Communities : Authorization service added, skeleton, not yet functional
2010-05-29 03:56:34 -07:00
e3dac1292e
Implement suspended updates - When an operation is occurring on lots of prims in a single group, don't schedule any updates until the operation has completed. This makes things like llSetAlpha(LINK_SET,0.0,ALL_SIDES); a *lot* faster, more efficient and less buggy, and also makes unlinking a lot better. Linking is still treacherous.. this needs to be analysed.
2010-05-29 02:10:34 -07:00
3a5d379db8
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-05-29 01:07:19 -07:00
2f409116db
Stop IGridService from throwing a fatal exception when an IPEndPoint cannot be resolved, and add some handlers to deal with this cleanly; a condition was observed on OSGrid where a neighbouring region with an invalid (unresolveable) hostname would prevent a region from starting. This is bad.
2010-05-29 01:03:59 -07:00
e7bf6afd3a
Get the user's DOB back from the server response properly.
2010-05-29 05:14:18 +02:00
cd77648f48
Get the user's DOB back from the server response properly.
2010-05-29 04:09:47 +01:00
191db0e6a4
get TestSaveIarV0_1() uncommented but not running as a test yet since I didn't get the authentication server to work and my brain is about to fizzle out my ears
2010-05-28 23:14:24 +01:00
542e6b8af4
Merge branch 'master' into careminster-presence-refactor
2010-05-28 21:56:42 +01:00
a60ca5236c
restore InventoryArchiverTests.TestReplicateArchivePathToUserInventory() to work with the new UserAccountService/InventoryService
2010-05-28 21:37:48 +01:00
0ef41e62bc
minor: move a method so that the #regions make more sense
2010-05-28 21:18:55 +01:00
505cb82dee
fission UserAccountService.HandleCreateUser() into two methods, one which handles user command parsing and another which actually does the work
2010-05-28 21:14:15 +01:00
3c0f34bc2b
If a command has descriptive help, add a line above and below the print out for readability
2010-05-28 20:51:02 +01:00
2e2f73bdd5
minor: remove mono compiler warning
2010-05-28 20:12:06 +01:00
fff5459f4d
Add ability to load IARs directly from URIs
...
So, something like
load iar Justin Clark-Casey / PASSWORD http://justincc.org/downloads/iars/my-great-items.iar
Will load my IAR directly from the web.
2010-05-28 20:07:15 +01:00
14c39461c2
minor: remove mono compiler warning
2010-05-28 19:41:13 +01:00
b1298fca0a
tidy up help information on load oar and save oar
2010-05-28 19:36:30 +01:00
d72435693b
refactor: move GetStream and URI methods from ArchiveReadRequest -> ArchiveHelpers
2010-05-28 19:21:00 +01:00
6b568af565
Adjust Scene.DeleteAllSceneObjects() to not delete objects attached to avatars.
...
This is going to be the right behaviour in all cases, I should think.
This means that avatars in region when an oar is loaded do not lose their attachments
2010-05-28 18:49:32 +01:00
1042ce7283
comment out large chunks of appearance/inventory region access services to eliminate warnings that this code is unused
2010-05-28 18:42:25 +01:00
565db4635f
add a smidgen more log debug information in the form of the operating system version
2010-05-28 18:30:33 +01:00
877fe774ef
Simplify AddFullUpdateToAvatars()/AddPartialUpdateToAvatars() by calling the object's corresponding single avatar update method, rather than calling the sceneviewer directly
2010-05-28 17:58:51 +01:00
596001632b
remove redundant ScenePresence.QueuePartForUpdate() - every place in the code calls SceneViewer.QueuePartForUpdate() directly
2010-05-28 17:53:57 +01:00
9ea42fdfab
Merge branch 'careminster-presence-refactor' of www.3dhosting.de:/var/git/careminster into careminster-presence-refactor
2010-05-27 21:31:10 -04:00
7d6680b38a
fix hanging output throttle arithmetic
...
had multiply overflow and subtract wrap-around errors
2010-05-27 21:28:47 -04:00
8fb706716b
Prevent a null ref
2010-05-27 19:09:06 +01:00
ecc77e3886
Comment noisy "CONNECTION DEBUGGING" messages, because they push more
...
important stuff off screen too fast. Clean this time
2010-05-27 19:09:00 +01:00
ba49319c07
Prevent a null ref
2010-05-27 20:08:48 +02:00
ac5373427f
Comment noisy "CONNECTION DEBUGGING" messages, because they push more
...
important stuff off screen too fast. Clean this time
2010-05-27 20:08:12 +02:00
a48d7f62a7
Revert "Comment noisy "CONNECTION DEBUGGING" messages, because they push more"
...
Some other stuff snuck in.
This reverts commit 4cc533e7ad94d148351c16f48afd2a688a64c48a.
2010-05-27 19:02:20 +01:00
6b6425aa5e
Comment noisy "CONNECTION DEBUGGING" messages, because they push more
...
important stuff off screen too fast
2010-05-27 18:44:15 +01:00
f90d81a864
Just because there is an agent update handler, that doesn't mean there is
...
a pre agent update handler. Null check these separately.
2010-05-26 19:26:30 +02:00
9ac8d2de79
Just because there is an agent update handler, that doesn't mean there is
...
a pre agent update handler. Null check these separately.
2010-05-26 18:25:53 +01:00
97501495eb
Merge branch 'master' into careminster-presence-refactor
2010-05-26 17:19:02 +01:00
a69c1c7898
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-26 10:56:37 +01:00
1c7f60ab49
Merge branch 'unitests'
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-26 10:56:24 +01:00
5d65ef2db3
Minor correction to AssetTests.cs
...
(forgot to change test descriptions, has no effect on running the tests)
2010-05-26 10:25:56 +03:00
5e719d13ef
fix sculpt normal direction for mirrored plane sculpts
2010-05-24 19:15:04 -07:00
00737f1c13
Merge branch 'master' into careminster-presence-refactor
2010-05-24 23:40:22 +01:00
7d9b316ce6
Change the way alpha is interpreted on prim text. Manris #4723
2010-05-24 23:37:47 +01:00
c7c9edd049
minor: expand upon comments about not scheduling two full updates for attachments
2010-05-24 20:11:06 +01:00
30e94cd075
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-05-23 12:23:16 -07:00
1ab826d67c
The 8th migration statement in AssetStore.migrations didn't look right.
2010-05-23 12:22:47 -07:00
57f4729eea
Ensured that tests are skipped for wrong conn string, also m_log chng
...
The base test class now tries to connect to DB, ignores all tests in the
class if unable to.
Also m_log changed to instance field (which in this case shouldn't cause
any problems), to avoid having to define it separately in each derived
class. Here I touched things that I don't understand well (using log4net),
so please review this commit.
2010-05-23 12:46:33 +03:00
b9b6d9c4ea
Removed (unused?) empty SQL files from MSSQL resource dir
...
There was a whole bunch of these SQL files, all empty and apparently
unused. Removing them is just a clean-up, if anybody has a reason for these
files to be there, feel free to revert.
2010-05-23 11:48:30 +03:00
05d9ca1b26
MySQL Migrations: Minor correcton to Region/Estate split
...
(some Estate SQL left behind in the Region migration)
2010-05-23 11:48:28 +03:00
52a3dbd076
MSSQL Migration: CreatorID in InventoryItems changed to VARCHAR(36)
...
Again, the same thing about potentially having non-GUID CreatorID.
2010-05-23 11:48:25 +03:00
89b7c64b6f
Various minor changes in the data tests
2010-05-23 11:48:22 +03:00
9976cb93ce
Further corrections to MS SQL stores (now passes all tests)
...
Besides, AssetData is slightly optimized to StoreAsset in one request
("IF EXISTS() UPDATE ... ELSE INSERT ...")
The main change in the MS SQL Inventory implem. is that it now return
empty list (or whatever) when called with UUID.Zero, which is consistent
with how the code for other DBs work.
I did no changes at all in XInventory, as there is no test set for them.
2010-05-23 11:48:19 +03:00
ebc2b6d4f6
Split migrations for RegionStore and EstateStore (see WARNING!)
...
ok, so the estate stores now want their own migration files, but as it
happened the SQL definition were inside the Region migrations.
It seems better/cleaner to keep each 'store' separately updatable.
WARNING: any editing in the middle of the migration scripts (as opposite
to just appending to them) has the potential of messing up updates of
existing databases. As far as I can see, this one is (probably) safe,
the worst that could happen is the EstateStore migration silently fail
if the estate the tables are already there.
2010-05-23 11:48:16 +03:00
2537acc04d
Unitests: Asset, Estate, Region (the "legacy" one), Inventory
...
The tests have been modified to work under NUnit 2.4.6
(the one currently used in the project).
They will also work with NUnit 2.5+ as is, but will look better
if you #define NUNIT25 for them.
2010-05-23 11:48:10 +03:00
330ad501a5
Added MS SQL test conn to INI - only as an example, modify before use!!!
...
NOTE that this INI file is currently loaded as a embedded RESOURCE, which is weird and has a
disadvantage of having to rebuild the Tests whenever the conn strings are changed.
The only reason is that I couldn't figure out a reliable way to put this INI into the correct
dir at runtime. If somebody can do it, that would be cool.
2010-05-23 11:48:08 +03:00
40031e6d37
Removed MySql and SQLite-specific asset test files
2010-05-23 11:48:05 +03:00
b1e6e99506
BasicAssetTest.cs replaced by AssetTests.cs
...
AssetTests: The name has changed to reflect the fact it is no longer a base class,
but the complete asset test for all supported databases.
The test can also check storing of CreatorID, but the feature is
disabled at this commit!
2010-05-23 11:48:02 +03:00
749cf0f6eb
Bugfix in tests (must clear db before migrations, not after)
2010-05-23 11:47:59 +03:00
f527584ed3
EstateData tests passing on all DBs
2010-05-23 11:47:56 +03:00
94f4c20866
Corrections in RegionTests.cs. It now fully works!
...
The problem was that some tests relied on prior tests
to leave the DB in a particular state, but the test class
cleared the DB every time. The affected tests have been
merged into one to remove the dependencies.
tested on all 3 Dbs, all tests green.
2010-05-23 11:47:54 +03:00
6322a085b3
Minor corrections in BasicDataServiceTest.cs
...
(added more functions for cleaning up DB from the
derived tests)
2010-05-23 11:47:51 +03:00
187a98615b
MSSQL: added asset_flags, CreatorID to migrations
2010-05-23 11:47:48 +03:00
49f4cc4246
MSSQLAssetData updated to support [CreatorID], [asset_flags]
2010-05-23 11:47:45 +03:00
f7bf3facff
MSSQLAssetData: fixed some weirdness
...
Fixed unfinished SQL in FetchAssetMetadataSet, fixed SQL
in UpdateAsset (must not modify ID).
NOT tested! But apparently shouldn't work worse than the previous version,
esp. the FetchMetadata thing.
2010-05-23 11:47:42 +03:00
7f70ae0ebd
All data tests made DBMS-independent
2010-05-23 11:47:39 +03:00
91ad1f4ee7
Added generic base classes for testing database services
...
These are some generic classes that simplify writing tests
for any of the data connectors and databases. Among other
things, configuring the connection strings is done once,
in a separate resource file.
Tests based on the new BasicDataServiceTest class require
NUnit 2.5 or better.
2010-05-23 11:47:36 +03:00
f84f0dbd51
Remove an unneeded conditional
2010-05-23 06:12:40 +01:00
72b96e8121
Add the SitGround flag back in
2010-05-23 06:12:11 +01:00
a9dad99432
Merge branch 'master' into careminster-presence-refactor
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2010-05-23 06:09:54 +01:00
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
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
e5bcd8b341
Apply adaption of patch in http://opensimulator.org/mantis/view.php?id=4628
...
This prevents a ground-sitting avatar from being moved about in mouselook
Thanks mirceakitsune!
2010-05-21 23:29:37 +01:00
9e61e120a1
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-05-21 23:12:47 +01:00
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
6918446fcd
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-05-21 22:17:58 +01:00
d0eecf0398
Added a sanity check before using m_config in the Scene constructor
2010-05-21 14:17:03 -07:00
abd5d1f747
* Added code comments to Prioritizer.cs that document how to add a new update priority policy
2010-05-21 14:04:10 -07:00
89f1ddb0a5
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-05-21 21:58:55 +01:00
5287c5f7fb
rearrange SceneGraph.AddSceneObject() to return earlier if an object with that uuid is already in the scene
...
this means that we don't perform pointless work
2010-05-21 21:57:56 +01:00
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
4b518e0288
minor: remove LongRunning test designator from TestAddSceneObject() since it isn't, really
2010-05-21 21:48:47 +01:00
76135eec5b
add test to make sure that adding an object where one already exists in the scene with that uuid fails
2010-05-21 21:46:41 +01:00
8d968249ec
extend TestAddSceneObject() to check Scene.AddNewSceneObject() return boolean
...
improve test to retrieve object by known uuid rather than dynamically assigned local id
2010-05-21 21:38:47 +01:00
f83acf533b
Fix a problem where SceneGraph.AddSceneObject() would return false on successfully adding an object rather than true, in defiance of its method documentation
...
This meant that the returns were inconsistent - false would be returned both for various scene object failure conditions (e.g. root part was null) and if the object was successfully added.
2010-05-21 21:22:53 +01:00
297bcb5c3d
Merge branch 'master' into careminster-presence-refactor
2010-05-21 21:16:04 +01:00
4e23acb133
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-21 21:04:17 +01:00
2b5b2f4e60
Add a new priority scheme that works like FrontBack, but completely deprioritizes
...
static prims, creating a hierarchy as follows:
0 == own avatar < other avatars < pysical prims < static prims
For a child agent, simply acts like FrontBack
2010-05-21 21:02:26 +01:00
721c1085da
make oar object filename/pathname creation a helper method
...
reused in both tests and oar code
reduction in checking is outweighed by greater test clarity
2010-05-21 20:43:11 +01:00
682efe9463
minor: refactor CreateAsset to eliminate dupe code
2010-05-21 19:41:00 +01:00
74ef1ed36f
add prim item and test asset save in save oar unit test
2010-05-21 19:36:39 +01:00
78a0fd5281
Only send dialogs and notices to root agents, not child agents
2010-05-21 17:22:39 +01:00
c0cb66e602
Merge branch 'master' into careminster-presence-refactor
2010-05-21 15:58:34 +01:00
1d6ab445ab
Change the way the object perms are propagated to attempt to salvage
...
some older content
2010-05-21 15:31:27 +01:00
9f2d1e9294
* Made PriorityQueue non-generic so it natively understands EntityUpdate structs
...
* Replaced the per-avatar seen update tracking with update flag combining, to avoid overwriting full updates with terse updates
2010-05-20 23:53:27 -07:00
344f209565
Merge branch 'master' into careminster-presence-refactor
2010-05-21 06:28:13 +01:00
af5eeab7cf
Ensure that the first update sent out for any given prim is a full update
2010-05-21 07:37:55 +02:00
792e149c7e
Ensure that the first update sent out for any given prim is a full update
2010-05-21 05:13:31 +01:00
213e372253
Cleaned up MySql migrations a bit more, got rid of all old-form migration files. Restored Presence table to its taboo-breaking form.
2010-05-20 20:24:50 -07:00
a92780fe5f
Merge branch 'master' into careminster-presence-refactor
2010-05-21 03:51:58 +01:00
d28da5e5ce
Refactor scene presence list for lockless iteration. Lock contention will now only be for simultaneous add/removes of scene presences from the scene.
2010-05-21 03:41:32 +01:00
b6674c9b76
Merge branch 'careminster' into careminster-presence-refactor
2010-05-21 03:03:35 +01:00
ddd072b3fb
Merge branch '0.6.9-post-fixes' into careminster
2010-05-21 02:44:20 +01:00
147c2d6f80
Change the way the object perms are propagated to attempt to salvage
...
some older content
2010-05-21 02:31:14 +01:00
13c22015e5
Removed sessionID from GridUserservice again. Removed parcel crossing detection from Robust connector. Fixed Simian to continue to send those location updates upon parcel crossing, without changing the interface.
2010-05-20 15:14:14 -07:00
beed74096c
Merging slimupdates2
2010-05-20 12:28:13 -07:00
56f3cb6da0
* Don't send texture data for prims in ImprovedTerseObjectUpdate packets unless we were asked to
2010-05-20 12:04:12 -07:00
59dec2f989
* Added sessionID to IGridUserService.SetLastPosition(), as some connectors will want to track position against sessionID instead of userID
...
* Updated SimianPresenceServiceConnector to use the new LoggedOut/SetHome/etc methods and only update session position on parcel crossing
2010-05-20 11:51:57 -07:00
859beaf830
Revert one of the previous patches' hunks. The new code looked better, but
...
was less efficient.
2010-05-20 11:03:38 +01:00
ce787a4c41
Series of patches to include creator ID in assets.
...
Contains a migration.
SQLite: May contain nuts.
The SQLite migration copies the entire asset table. Be prepared for quite a wait. Don't interrupt it. Back up your assets db.
BasicAssetTest checks CreatorID storage, new test for weird CreatorID
(now also checks that non-GUID or empty CreatorID gets stored correctly)
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-20 11:01:51 +01:00
5532341bf9
Initialise m_initialSitTarget to ZERO_VACTOR for safety's sake as per convo with kitto
2010-05-19 14:04:44 -07:00
6933b48a7e
Fix a nullref issue in SitAltitudeCallback
2010-05-19 13:49:34 -07:00
f77f9ecd8f
Fix a nullref issue in SitAltitudeCallback
2010-05-19 13:44:59 -07:00
d6a6668bd7
Scrambled asset type in BasicAssetTest.cs!
...
The asset type wasn't in the list of "DontScramble" fields,
so the test assets were stored with randomized type, which
caused exception on reading them.
Also the scrambler was moved from local var to the class level,
so it could be used in the new tests I've added (see the next commit).
2010-05-19 21:50:34 +03:00
64fe823b92
MySQLAssetData.cs now supports asset_flags, CreatorID
2010-05-19 21:50:32 +03:00
eacd8d0263
MySQL: added CreatorID, moved asset_flag to migration script
2010-05-19 21:50:30 +03:00
accf8c420d
SQLite: CreatorID added (and asset_flags moved) to the migration script
2010-05-19 21:49:30 +03:00
c6977cbd4d
Added CreatorID to SQLite asset data
2010-05-19 21:49:24 +03:00
ccee95552f
A bit of harmless refactoring in SQLiteAssetData.cs
2010-05-19 21:49:22 +03:00
527a257b9f
Kind of fixed Melanie's "Exception(sql)" correction
...
Throwing an Ex. with SQL command in the message looks weird,
this is a bit better, but I'm still not sure if that's the
proper way to handle. Also, there is a catch one level up,
so is this one necessary?
2010-05-19 21:49:18 +03:00
fc76b5f589
Fix a null reference issue in cmGetAvatarList()
2010-05-19 00:24:54 -07:00
71a95900fd
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-05-19 00:21:38 -07:00
ba36c62caa
Fix a null reference issue in cmGetAvatarList()
2010-05-19 00:20:51 -07:00
e4b8d76b10
Change appender to deal with line feeds more intelligently.
...
Change migration error reporting to not truncate the statement when
reporting. It's a bit messier than the old error reporting, but at least
one gets an idea of what could be wrong again. And things look a lot
neater now.
2010-05-19 04:17:56 +01:00
0c209a469b
Clean up output a bit
2010-05-19 03:48:03 +01:00
20642f2f21
Fix the migration message to say "Continuing" again. Remove line feed, which
...
prevented the full message from displaying.
2010-05-19 03:26:37 +01:00
9fa8013ca5
Remove the return that was inserted in the last merge to allow
...
migrations to continue in the face of an error
2010-05-19 03:07:31 +01:00
dedc0c0bd4
Revert "Allow migration steps to fail again without bringing down the house"
...
This reverts commit 167db50259
2010-05-19 02:47:31 +01:00
167db50259
Allow migration steps to fail again without bringing down the house
2010-05-19 02:33:23 +01:00
298368dd99
Merge commit 'alex/mssql-estate-bugfix'
...
This fixes some type conversion bugs and also makes the estate lists
work properly for MSSQL. Strawberry, please check this.
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-18 23:39:09 +01:00
d2bc673667
Make m_log in migrations private. Define new m_log in derived class
2010-05-18 23:33:05 +01:00
caf61ab7d8
Binary Guids are 16 chars long. Fix parser.
2010-05-18 23:22:30 +01:00
deae030145
Some more corrections after MySQL connector update
2010-05-19 02:28:19 +03:00
8a0c5d14d4
All (?) MySQL stores fixed to use DBGuid.FromDB()
...
This was needed if we want to update to the latest MySQL
connector dll. It automatically converts CHAR(36) to
Guids, so getting them as strings no longer works.
By using DBGuid.FromDB(), we unlink from any particular
storage format of GUIDs, could even make them BINARY(16)
if we like.
Actually not all MySql units are touched, but the remaining ones don't
seem to be affected (they don't read GUIDs from DB)
2010-05-19 01:33:02 +03:00
a27d49b188
Added DBGuids.cs (static func DBGuid.FromDB()
...
This DBMS-independent function to be used converting UUIDs
from whatever format used in the DB (string/binary/Guid).
This is mostly needed for MySQL, as in MSSQL they are always
UNIQUEIDENTIFIERs and in SQLite always strings (but would look
better if we use it there anyway).
2010-05-19 01:32:50 +03:00
d95f232629
Massive bugfix in MSSQLEstateData (now works!)
2010-05-18 21:08:51 +03:00
e260610c00
Merge branch 'Migrations'
...
This merges AlexRa's work on migration streamlining. This merge is experimental.
If it causes issues, feel free to back out.
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-18 19:03:16 +01:00
55f124745f
Allow remote admin to be used on a different port from the main region port
2010-05-18 19:25:40 +02:00
3e1f2ddb8e
Allow remote admin to be used on a different port from the main region port
2010-05-18 17:01:44 +01:00
1c3790a70d
Merge branch 'master' into careminster-presence-refactor
2010-05-18 15:31:19 +01:00
df04ccfdc3
Change an exception reporting to include the stack trace. "e.Message" just
...
_won't_ do. Might look more elegant, but it's too little information.
2010-05-18 15:30:08 +01:00
bb0806c61e
Don't send kill packets to child agents as we close them
2010-05-18 03:44:09 -07:00
1c040d8c1e
Fix to the scenario where we send an agent to a neighbouring sim (via teleport), then tell our neighbours to close the agents.. thereby disconnecting the user. Added a new CloseChildAgent method in lieu of CloseAgent. This has been a long standing problem - with any luck this will cure it.
2010-05-18 03:24:43 -07:00
ed1cfb5245
Missed a nullref in the previous commit
2010-05-18 02:33:41 -07:00
91b1d17e5b
Fix for hanging on "Connecting to region".. caused by packets being processed before the presence has bound to receive events. Fixed this by adding packets to a queue and then processing them when the presence is ready.
2010-05-18 01:09:47 -07:00
eb5a95d26b
Prevent an "index out of range" error on login
2010-05-18 03:02:36 +02:00
c25c40a3f9
Following on from the last commit, the stop/disconnect packet should NOT be sent when the user logs out. This eliminates the annoying "crash on log out" bug, and allows the client to commit important information at the last moment (attachment data!)
2010-05-17 15:24:28 -07:00
6bc7e3429f
Provide interface to prevent the client close function from sending the stop packet
2010-05-17 14:32:21 -07:00
8f838c722d
When killing a zombie session, don't send the stop packet since it often has the effect of killing a newly connected client.
2010-05-17 14:14:19 -07:00
a003c36de5
Merge branch 'master' into careminster-presence-refactor
2010-05-16 20:32:58 +01:00
a6023ea89e
Prevent a crash when the two agent dictionaries get out of sync
2010-05-16 20:31:02 +01:00
2fb79646c6
Fixes mantis #4691 for real. This time I tested it, and it works.
2010-05-16 10:32:57 -07:00
d8bf370fd6
Merge branch 'master' into careminster-presence-refactor
2010-05-16 17:22:38 +01:00
0b43b263d4
Fixes mantis #4691
2010-05-16 09:12:40 -07:00
b7e6b58857
Fixes mantis #4622 .
2010-05-16 09:01:27 -07:00
49f4becdae
* Fixed configs in StandaloneHypergrid.ini, it still had the SQLite connection strings.
...
* Added a comment in LLLoginService.cs, for future reference
2010-05-16 08:10:57 -07:00
dfeb9a0b5c
MS SQL migrations converted to the new format
2010-05-16 17:04:50 +03:00
1ad12851d0
Migrations for SQLite converted to new format
2010-05-16 17:04:39 +03:00
ee713cb253
Converted MySQL migration history to the new format
...
Replaced all NNN_StoreName.sql migration resources with a more
readable, single-file-per-store
2010-05-16 17:04:13 +03:00
a723225179
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-05-16 15:02:23 +01:00
b94cace547
Merge branch 'master' into careminster-presence-refactor
2010-05-16 15:01:56 +01:00
b49fb3db7c
Added MySqlMigrations.cs (supports stored proc/funcs)
...
Uses MySqlScript class to correctly run proc/func definitions
that need delimiter change. Requires MySql.Data.dll 6.2 or later.
2010-05-16 16:25:08 +03:00
8b6a295874
Migration.cs supports single-file migration history format
...
Scans for migration resources in either old-style "scattered" (one file per version)
or new-style "integrated" format (single file "Resources/{StoreName}.migrations[.nnn]") with ":VERSION nnn" sections).
In the new-style migrations it also recognizes ':GO' separators for parts of the SQL script
that must be sent to the server separately. The old-style migrations are loaded each in one piece
and don't support the ':GO' feature.
Status: TESTED and works fine in all modes!
2010-05-16 16:22:38 +03:00
a974146921
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-05-16 01:48:28 -04:00
d4192dcb2e
* Revert last commit for now at Melanie_T's request.
...
* Additional ways of configuring opensim break with this
2010-05-16 01:47:53 -04:00
ff4f50396a
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-05-15 20:28:14 -07:00
e5e52e4072
This combination is working. It all points to not being able to use 127.0.0.1/localhost in testing HG situations. The login server must have the LAN IP address, and the regions must show ExternalHostname as SYSTEMIP. Working, but this needs more testing.
2010-05-15 20:27:25 -07:00
019925bb2f
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-05-15 23:22:07 -04:00
dc1a3e9787
* Add User Friendly Configuration File Exists check. If OpenSim.ini and either StandaloneCommon.ini or GridCommon.ini don't exist in various casings then offer to copy the files for the user while warning them that they're missing out if they don't read the files.
2010-05-15 23:21:36 -04:00
74b23ff9c6
Almost, but not quite. Commenting verification again, until I understand where 127.0.0.1 is being transformed to the local IP address. I suspect it's Adam's NAT snippets.
2010-05-15 19:58:30 -07:00
2a1e45f657
Finalized the client's TCP IP address verification process for HG1.5.
2010-05-15 19:25:14 -07:00
9dbe90801b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into slimupdates2
2010-05-15 02:20:47 -07:00
36bcab5f07
Refactor scene presence list for lockless iteration. Lock contention will now only be for simultaneous add/removes of scene presences from the scene.
2010-05-15 02:20:23 -07:00
4b755c6d80
delete now unused MessageServerInfo
2010-05-15 02:17:10 +01:00
98f2b798ff
Address symptom of Mantis 4588 (though not the cause) by moving the avatar dereference inside the exception catch
2010-05-15 01:07:45 +01:00
3d72a73b22
Apply patch from http://opensimulator.org/mantis/bug_view_page.php?bug_id=4671
...
Fixes a bug where the viewer didn't recieve the uuid of a chat broadcasting object
Thanks crystalsgalicia!
2010-05-14 21:25:14 +01:00
231cc64709
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into slimupdates2
2010-05-13 14:23:16 -07:00
4c740e1717
Implements three new OSSL functions for parcel management: osParcelJoin joins parcels in an area, osParcelSubdivide splits parcels in an area, osParcelSetDetails sets parcel name, description, owner and group owner. Join and Subdivide methods in LandChannel are exposed.
2010-05-13 14:22:48 -07:00
9079ad5ceb
Add some debug output to GetAgent to try and track down our presence problems
2010-05-13 12:40:18 -07:00
4e7013d5d5
Made fields consistently protected.
2010-05-13 07:59:30 -07:00
5d8638ed88
Minor tweak in ProcessEntityUpdates (mostly just confirming the git push is working)
2010-05-12 16:05:48 -07:00
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
fd37a21b59
Kill some locks that have crept into SOG
2010-05-12 08:34:47 -07:00
7705012ee7
Optimise the heavily used GetScenePresences; eliminate the array->list conversion on every call and transition from hard locks to ReaderWriter locks.
2010-05-12 08:25:40 -07:00
98bd3e1f34
Don't convert UUID -> ToString for every friend (Minor optimisation based on profiler feedback)
2010-05-12 07:14:06 -07:00
40e05f4109
Spin the AddNewClient process off into a new thread to avoid locking up the LLUDPServer (and therefore the entire scene)
2010-05-11 09:28:46 -07:00
14a86de115
Fix another ReaderWriterLockSlim issue
2010-05-10 12:45:33 -07:00
739b5e2c08
Fixed a typo in the Friends packaging (Pricipal -> Principal) that was making offline friendship offers fail in grids.
2010-05-10 08:01:00 -07:00
5814d16b58
Merge branch 'master' into careminster-presence-refactor
2010-05-10 15:57:32 +01:00
3cda854ef3
Fix overlooked readLock which was left open
2010-05-10 08:47:41 -07:00
ab716125d7
Correct an odd merge anomaly
2010-05-10 05:51:49 -07:00
2e94c75729
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-05-10 05:44:24 -07:00
2fe669448f
Greatly improve login time for users with large friends lists by requesting all unknown UUID's in one go rather than individually
2010-05-10 05:43:16 -07:00
fada4cb6c4
Merge branch 'master' into careminster-presence-refactor
2010-05-10 04:05:04 +01:00
31dc77d8a1
Return agents when angle is PI
...
Fixes Mantis #4703
2010-05-10 04:02:56 +01:00
3e8ceb3509
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-10 03:57:44 +01:00
89c762209c
Fix a null ref on region crossing
2010-05-10 03:57:17 +01:00
6f2f0fa0ca
OK, this really fixes it, I promise.
2010-05-09 14:12:59 -07:00
9cf6b81256
Yey for unit tests. The previous commit had a couple of bugs on SQL statements. Fixed here.
2010-05-09 14:02:02 -07:00
b233a4b2ca
* Fixed spamming the assets table with map tiles. The tile image ID is now stored in regionsettings. Upon generation of a new tile image, the old one is deleted. Tested for SQLite and MySql standalone.
...
* Fixed small bug with map search where the local sim regions weren't found.
2010-05-09 13:39:56 -07:00
6a3e1734e6
Merge branch 'master' into careminster-presence-refactor
2010-05-09 18:03:57 +01:00
bc6995f921
Add Delete handler to SQLite (NG)
2010-05-09 18:02:36 +01:00
60357d3778
Implement the "delete" path for assets. Adds a new option to allow remote asset deletion in robust handler.
2010-05-09 17:56:52 +01:00
4e0d62547d
Merge branch 'master' into careminster-presence-refactor
2010-05-09 17:04:23 +01:00
9b22393cf3
Add a field asset_flags and a corresponding enum to the asset database. This
...
CHANGES THE ASSET SERVER PROTOCOL and means you CAN NOT MIX PRIOR VERSIONS
WITH LATER ONES. It may also eat your babies, yada, yada, yada.
The usual cautions for migrations to the assets table apply.
Coding: Can not guarantee nut free.
2010-05-09 17:02:22 +01:00
c1fe07b022
* Added missing loggout notification to home grid upon agents logging out in foreign grids.
...
* Added missing config in StandaloneHypergrid.ini
2010-05-08 12:21:17 -07:00
d72769930a
More cleaning on presence. Friends online/offline works again.
2010-05-08 07:44:07 -07:00
420dd78fb7
Merge branch 'careminster' into careminster-presence-refactor
2010-05-08 14:17:43 +01:00
14fcc2510e
Merge branch 'master' into careminster-presence-refactor
2010-05-08 13:31:36 +01:00
bfb7a49990
Fixed Presence unit test. Removed unnecessary packing/unpacking of obsolete fields.
2010-05-07 21:56:14 -07:00
15562017f2
These files are part of the GridUserService write-up.
2010-05-07 21:32:02 -07:00
a58859a0d4
GridUserService in place. Replaces the contrived concept of storing user's home and position info in the presence service. WARNING: I violated a taboo by deleting 2 migration files and simplifying the original table creation for Presence. This should not cause any problems to anyone, though. Things will work with the new simplified table, as well as with the previous contrived one. If there are any problems, solving them is as easy as dropping the presence table and deleting its row in the migrations table. The presence info only exists during a user's session anyway.
...
BTW, the Meshing files want to be committed too -- EOFs.
2010-05-07 21:29:56 -07:00
bc7d84b75c
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-05-07 15:16:59 -04:00
add7abc1de
Fix Mouse+WASD makes Av rise; Fix PREJUMP.
2010-05-07 14:12:07 -04:00
eb6d63ab8e
improve handling of undersize sculpt textures
2010-05-06 23:02:24 -07:00
39c5ddc837
corrections for face numbering and uv mapping, mostly for spheres - sync with PrimMesher r56
2010-05-06 22:08:59 -07:00
5d1e9947ed
Sculpt meshing refactoring - improves mesh accuracy and UV mapping
...
Sync with PrimMesher r55
2010-05-06 21:36:27 -07:00
b309781f2d
Merge branch 'master' into careminster-presence-refactor
2010-05-07 01:00:58 +01:00
6182d71326
Also remove sale and search flags on god owner change.
2010-05-07 00:52:52 +01:00
907fce8406
Remove land that is being abandoned from search. This is now consistent with
...
sale and reclaim.
2010-05-07 00:50:26 +01:00
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
69d0201d4c
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:38:23 +01:00
11971fb302
Merge branch 'master' into careminster-presence-refactor
2010-05-06 16:09:36 +01:00
533bd1bd9b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-06 16:08:24 +01:00
adc34c7129
Ensure the show in search flag is cleared on ownership change. Also, when
...
land is reclaimed, reset it's for sale flags so it can't be bought again right
away.
2010-05-06 16:07:15 +01:00
53594e599e
* Fixes Library bugs in grid mode. Partly a missing check and partly a missing configuration.
...
* Made previous Robust config changes consistent in Robust.HG.ini.example
2010-05-05 21:12:13 -07:00
4183cef409
* Fixes LandDataSerializerTests on Windows by stripping CR from the serialization result since the reference serialization has LF only.
...
* Added a bool result and then an Assert.That(result) because resharper was having a hard time with the equality compare in Assert.That.
2010-05-05 21:22:29 -04:00
02dea4ce58
Remove the m_Viewer variable and make the property a shortcut to the
...
proper field in AgentCircuitData instead
2010-05-06 02:02:12 +02:00
8b4f729a21
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-05 23:58:14 +01:00
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
2b48ed60ec
Remove the m_Viewer variable and make the property a shortcut to the
...
proper field in AgentCircuitData instead
2010-05-05 23:41:57 +01:00
7e0d5b8665
Merge branch 'master' into careminster-presence-refactor
2010-05-05 22:50:11 +01:00
2d9a20529d
Plumb Viewer version into ScenePresence for initial login. It's still not
...
carried along
2010-05-06 00:54:21 +02:00
733a07e061
Plumb the viewer version string through into AgentCircuitData. Now all that
...
is left os to figure out what black magic turns AgentCircuitData into
AgentData and then copy that into the ScenePresence, where m_Viewer is
already added with this commit and waits for the data.
2010-05-06 00:34:49 +02:00
ad2039a8c4
Stab a test fail
2010-05-05 22:48:05 +01:00
e45f5ac126
Plumb Viewer version into ScenePresence for initial login. It's still not
...
carried along
2010-05-05 22:33:22 +01:00
2ebe148266
Plumb the viewer version string through into AgentCircuitData. Now all that
...
is left os to figure out what black magic turns AgentCircuitData into
AgentData and then copy that into the ScenePresence, where m_Viewer is
already added with this commit and waits for the data.
2010-05-05 22:15:32 +01:00
65775b87e5
Add a XMLRPC method to remotely set the login level for the LLLoginService.
...
This requires a special XMLRPC call, which has to supply the credentials of
a god user (User level >= 200). Disabled by default. Also Adds a configuration
option to set the initial permitted login level.
2010-05-05 23:06:36 +02:00
fe8399d1bf
Add a XMLRPC method to remotely set the login level for the LLLoginService.
...
This requires a special XMLRPC call, which has to supply the credentials of
a god user (User level >= 200). Disabled by default. Also Adds a configuration
option to set the initial permitted login level.
2010-05-05 20:46:53 +01:00
e0f9b1a699
Removed a test for a "can't happen" case. ParentGroup is never null anymore.
2010-05-05 21:12:02 +02:00
7aed89a8d0
Removed a test for a "can't happen" case. ParentGroup is never null anymore.
2010-05-05 18:51:01 +01:00
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
91cfce3758
back port groups changes
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-05 16:11:00 +01:00
8a69070b51
back port groups changes
2010-05-05 16:09:53 +01:00
6fdd5bfe2d
Revert "Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups"
...
The patch was for 0.7
This reverts commit 608bb0dfef
2010-05-05 16:03:20 +01:00
608bb0dfef
Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups
...
Mantis #4646
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-05 14:37:05 +01:00
a9db266d93
* Added an important comment to warn people not to use MockConsole for anything but testing.
2010-05-04 22:16:07 -04:00
f005e570aa
* This should fix the tests failing because of a MainConsole.Instance null reference
...
* Added a MockConsole that doesn't require a handle to System.Console
2010-05-04 22:13:25 -04:00
efc3241541
Add perms check to the teleport home client command handlers.
2010-05-05 01:32:55 +02:00
34d882b70d
Add perms check to the teleport home client command handlers.
2010-05-04 23:15:07 +01:00
49efec2ef1
Strip estate message sending out from the estate management module and
...
the dialog module. Convert it to an event on the estate module interface.
The old implementation did the same as message to region, a button that
is right next to it on the UI. This implementation prevented people from
adding a more sane one in a module.
2010-05-04 23:45:59 +02:00
3761f79971
Strip estate message sending out from the estate management module and
...
the dialog module. Convert it to an event on the estate module interface.
The old implementation did the same as message to region, a button that
is right next to it on the UI. This implementation prevented people from
adding a more sane one in a module.
2010-05-04 21:26:10 +01:00
07e0732a10
make the events more useful by providing the source region
2010-05-04 21:16:20 +02:00
5a4cef6b36
make the events more useful by providing the source region
2010-05-04 18:55:24 +01:00
9ca79df802
Merge branch 'careminster' into careminster-presence-refactor
2010-05-04 18:41:20 +01:00
585259ef08
Merge branch 'master' into careminster-presence-refactor
2010-05-04 18:39:04 +01:00
97bbce92a8
Add events to the estate interface to let interested modules know of
...
changes to estate settings
2010-05-04 20:57:31 +02:00
1d75450743
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-04 18:37:11 +01:00
d997fc7b76
Add events to the estate interface to let interested modules know of
...
changes to estate settings
2010-05-04 18:36:45 +01:00
61ce4ca9c7
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-05-04 09:44:56 -07:00
484584b83c
Fixed: migration #2 for SQLite. Problem was that ATTACH cannot be done inside a transaction.
2010-05-04 09:44:30 -07:00
ce86d39c70
Add "reload estate" command to sims
2010-05-04 18:31:52 +02:00
4f93d30790
Allow reloading of estate settings into a running region. Move sun update
...
helper into Scene, since that is less evil than exposing m_storageManager
to the public.
2010-05-04 18:10:13 +02:00
da849aea78
Allow regions to get the list of the other regions in the estate
2010-05-04 17:56:30 +02:00
9cf0077bf9
Add "reload estate" command to sims
2010-05-04 16:11:06 +01:00
6eea0a3931
Allow reloading of estate settings into a running region. Move sun update
...
helper into Scene, since that is less evil than exposing m_storageManager
to the public.
2010-05-04 15:52:36 +01:00
9635af61f0
Allow regions to get the list of the other regions in the estate
2010-05-04 15:52:29 +01:00
dbce360566
Fix full circle sensors
2010-05-04 02:43:22 +02:00
c86259c671
Fix scripted give and interactive give to offline avatars. Both folder and
...
single items are now supported. Magic Boxes, yeah!
2010-05-04 00:44:05 +02:00
23d7a942ea
Refix the fix
2010-05-03 23:11:48 +01:00
92dff5edb1
Add folder version incrementing to XInventoryService. Fixes offline give
...
for avatar->avatar
2010-05-03 23:11:37 +01:00
deaa79ca9e
Refix the fix
2010-05-03 23:53:49 +02:00
80bf3934af
Add folder version incrementing to XInventoryService. Fixes offline give
...
for avatar->avatar
2010-05-03 23:47:32 +02:00
4df87631ed
Store given items in correct parent folder. Fixes items given to offline avatars
...
not getting lost.
2010-05-03 23:44:23 +02:00
f61b879f2d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-03 21:25:40 +01:00
92561aef8d
Store given items in correct parent folder. Fixes items given to offline avatars
...
not getting lost.
2010-05-03 21:25:02 +01:00
b10811a13b
Assorted bug fixes in hypergrid linking.
2010-05-03 09:50:55 -07:00
9c8d7d34b3
Fix a bug in owner change notification
2010-05-03 04:55:41 +02:00
8766401777
Adapt CM to the new CHANGED_OWNER handling
2010-05-03 04:28:30 +02:00
1494c84f56
Fix a bug in owner change notification
2010-05-03 02:40:52 +01:00
9f8acbfe3e
Merge branch 'master' into careminster-presence-refactor
2010-05-03 01:40:24 +01:00
75063e8f60
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-03 01:31:32 +01:00
d6bfc490f7
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-05-02 20:45:01 -04:00
b836249926
* Untested Suggestion from lkalif to change
...
remoteClient.SendMapBlock(blocks, 0);
to
remoteClient.SendMapBlock(blocks, 2);
in OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
2010-05-02 20:44:34 -04:00
7a8ad1ceb2
Make in-place sale send CHANGED_OWNER again
2010-05-03 01:30:57 +01:00
45301d8a49
Defer sending of CHANGED_OWNER to make it work on rezzed objects and
...
attachments in addition to objects sold in place
2010-05-03 01:14:38 +01:00
175f3f992a
Make the IUserAccountData properly unpack the god mode data, so grid gods
...
work again
2010-05-03 01:50:32 +02:00
af0ffb2a5a
Add URL_REQUEST_* script constants
2010-05-03 00:15:55 +01:00
0fa57cac3f
Fix sensor cone for sensing avatars
2010-05-03 00:54:24 +02:00
7e74291176
Make the IUserAccountData properly unpack the god mode data, so grid gods
...
work again
2010-05-02 23:36:00 +01:00
cbb297bc79
Renamed HGInventoryBroker2 to HGInventoryBroker.
2010-05-02 10:37:57 -07:00
052580ef44
Deleted HGInventoryBroker, so that the new one can take its name.
2010-05-02 10:32:47 -07:00
bd49985afa
Switched everything to XInventory by default. The old Inventory is still there for now, in case bugs pop up with XInventory.
2010-05-02 10:31:35 -07:00
5f6e9e6ab9
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-05-02 08:18:33 -04:00
7ad36d3d75
Adding DebugEvent Trap
...
Adding XMREEvent Trap
trapDebug("Modulename" ,"My data here ", scene);
trapXMRE(int data, string Message, Scene scene);
2010-05-02 08:15:12 -04:00
881fcb7def
Allow retrieval if admin users in scope mode
2010-04-30 23:32:58 +02:00
0c2ab54d41
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-30 21:13:31 +01:00
f1164161b3
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-30 22:22:40 +01:00
f3662e3d15
minor: eliminate more debug Console.WriteLines, convert one to logging instead
2010-04-30 22:22:03 +01:00
d0accc0732
Allow retrieval if admin users in scope mode
2010-04-30 21:13:03 +01:00
7ae55f6248
Fix linking issue introduced in my earlier commit
2010-04-30 20:18:29 +01:00
0a9c98e7c4
Fix linking issue introduced in my earlier commit
2010-04-30 20:18:08 +01:00
177048a651
Fix linking issue introduced in my earlier commit
2010-04-30 20:16:21 +01:00
9bc5098dd8
Merge branch 'master' into careminster-presence-refactor
2010-04-30 20:15:19 +01:00
3e30de7430
Fix linking issue introduced in my earlier commit
2010-04-30 22:35:07 +02:00
23282935f1
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-30 19:29:21 +01:00
5fda81e6bb
* XInventory fairly tested, including for HG. Almost ready to switch.
...
* Removed a few buglets and added better exception handling.
2010-04-30 11:39:02 -07:00
d1fcd22173
Fix a null ref from trying to access a dictionary that was never initialized.
2010-04-30 19:28:44 +01:00
d921329799
take out some debug logging in the sqlite db adaptor
2010-04-30 18:18:21 +01:00
89e79c1133
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-30 17:54:00 +01:00
cc67de5b86
rename SQLiteNG to SQLite and SQLite to SQLiteLegacy
...
this seems the least evil way forward since mono 2.6 and later will see increasing usage, and this only works with what was SQLiteNG
MAC USERS WILL NEED TO CHANGE REFERENCES TO "OpenSim.Data.SQLite.dll" to "OpenSim.Data.SQLiteLegacy.dll" in OpenSim.ini and config-include/StandaloneCommon.ini (if using standalone)
See the OpenSim.ini.example and StandaloneCommon.ini.example files for more details
This commit also temporarily changes unsigned ParentEstateID values in the OpenSim.Data.Tests to signed temporarily, since the new plugin enforces creation of signed fields in the database (which is what the SQL actually specifies). And change data columns in sqlite is a pita.
2010-04-30 17:45:00 +01:00
486ab82c02
Fix some symbol errors
2010-04-30 12:08:37 +01:00
0ea908291d
Fix some symbol errors
2010-04-30 12:08:08 +01:00
10750421a3
Fix some symbol errors
2010-04-30 12:07:47 +01:00
9500ba2ff5
Fix some symbol errors
2010-04-30 12:06:58 +01:00
13960b3b86
Merge branch 'master' into careminster-presence-refactor
2010-04-30 11:49:24 +01:00
7dc5ebc929
Merge branch 'careminster' into careminster-presence-refactor
2010-04-30 11:49:16 +01:00
8b70477556
Merge branch '0.6.9-post-fixes' into careminster
2010-04-30 11:48:57 +01:00
04845c1898
Fix link security issue
2010-04-30 11:48:09 +01:00
4cc06ff993
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-30 11:47:24 +01:00
22b3217113
Fix link security issue
2010-04-30 11:46:50 +01:00
9c79fd6308
Treat a UserLevel of -1 as an unverified account and refer them to their
...
activation email.
2010-04-30 05:33:45 +01:00
638dc8d3c2
Simplified RemoteXInventoryServiceConnector and HGBroker (2) by a lot.
2010-04-29 20:09:11 -07:00
f3c21524be
Fix Av jump motion S/W
2010-04-29 19:41:08 -04:00
08ebcdb0b8
Merge branch 'master' into careminster-presence-refactor
2010-04-29 23:33:26 +01:00
f06772a088
Merge branch 'careminster' into careminster-presence-refactor
2010-04-29 23:33:20 +01:00
6a4fae123a
Started redoing HGInventoryBroker for XInventory and with multi-protocol in mind. Unfinished.
2010-04-29 11:39:13 -07:00
5c23b4aa56
Fix vertical attractor
2010-04-29 13:50:11 -04:00
aba5db9ed4
Merge branch 'minor-stuff'
2010-04-28 19:38:29 +01:00
2c595227b0
Commented verbose debug messages from XInventory handler.
2010-04-28 07:41:16 -07:00
be1141f0f7
Refactoring in Migration.cs: "using()" instead of explicit Dispose()
...
This ensures that 'cmd' gets disposed on errors
2010-04-28 13:40:35 +03:00
b49e9eff56
Fixed comments in Migration.cs: wrong argument order (no change to code)
2010-04-28 13:11:42 +03:00
aa56953411
Compiler.cs contained method GetCompilerOutput which, apparently,
...
was not used, but exactly the same path was calculated inline.
This patch does some minor refactoring by replacing inline path
calculation with GetCompilerOutput. This doesn't actually affect anything,
just minor prettifying of the code
2010-04-28 12:52:36 +03:00
8b75302a1e
Just a bit of spellchecking in the comments
2010-04-28 12:21:39 +03:00
806a2555f5
Spelling in FriendsModule.cs: "filed to load" -> "failed to load"
2010-04-28 11:49:53 +03:00
fb7458be31
Minor spelling corrections in MiniModule: "RetreiveAsset" changed to
...
"RetrieveAsset" and 'm_rootSceene' to m_rootScene'.
2010-04-28 11:47:07 +03:00
423ff3b94b
Removed unused var from InventoryService.cs (-1 warning)
2010-04-28 11:47:03 +03:00
c54bc5094d
Putting it back to protected; Melanie doesn't like it to be public.
2010-04-27 18:52:15 -07:00
044c1cf5f6
Changed GetToken from protected to public. This is not exposed at the interface.
2010-04-27 18:37:34 -07:00
e838776920
* Thanks cmickeyb, for a patch that sanity checks if the response from m_Database.GetAsset(assetID) is null in AssetService.cs
2010-04-27 17:13:54 -07:00
59ac792e44
* Thanks cmickeyb, for a patch that corrects an invalid construction of Primitive.TextureEntry (a "blank" texture should be initialized with UUID.Zero, not null)
2010-04-27 17:11:24 -07:00
3f9d38538e
XInventory connector/handler showing signs of life. Tested, but needs more testing.
2010-04-27 11:01:56 -07:00
8a32ee7dd2
Merge branch 'careminster' into careminster-presence-refactor
2010-04-27 03:58:43 +01:00
89a003c6fc
Merge branch 'master' into careminster-presence-refactor
2010-04-27 03:57:36 +01:00
a92ca3c2c9
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-27 03:49:25 +01:00
76e87181b2
RemoteXInventoryServiceConnector, the plugin region module. Not active in default configs yet.
2010-04-26 20:28:37 -07:00
1e743eab6d
Allow a client to pass a scope id to log into in the login XML / LLSD
2010-04-27 03:48:49 +01:00
edde0be0a0
Fix build break.
2010-04-27 01:11:14 +01:00
bbffe16f13
Merge branch 'master' into careminster-presence-refactor
2010-04-27 00:27:05 +01:00
06661708b4
Add a parameter to prim inventory update to prevent event firing
2010-04-27 02:40:30 +02:00
6928ec0240
Add a parameter to prim inventory update to prevent event firing
2010-04-27 00:25:29 +01:00
31d040dc1e
Better error message.
2010-04-26 17:40:00 -07:00
2ac00b7f96
* Commenting SQLiteNG out of prebuild.xml, because it's making compile fail in Windows. Justin: you forgot to add Mono.Sqlite.dll, and I can't figure out where to grab it from!
...
* IRegionModule.cs wants to be committed too -- EOF.
2010-04-26 14:52:22 -07:00
81ff5eaba0
Make scripted attachment states work. Finally. Also replace two monitor locks
...
with RWLocks, hunting the 10^3 bug. Not successful, but needed to be done anyway
2010-04-25 22:03:35 +02:00
899d521ab4
Use the saved script states
2010-04-24 18:59:34 +02:00
27b3f23ff3
Remove some usings that stopped compilation
2010-04-24 16:53:47 +02:00
71f42f185a
Plumb a data path to initialize an attachment from an alternate source
2010-04-24 16:45:25 +02:00
10e18f465e
minor: eliminate configuration section handling deprecation of OpenSim.DataStore.MonoSqlite.dll, since this hasn't exist for a long, long time
2010-04-23 21:29:09 +01:00
6e99e5b47a
get region prim saving working properly in SQLiteNG
...
it wasn't working because of debug work that I'd forgotton to take out
2010-04-23 20:56:24 +01:00
f313d57fa4
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-23 20:11:26 +01:00
1b488c2581
dispose of the DbCommand used to execute migrations after we've finished with it rather than within the loop
...
disposing of it within the loop causes Mono.Data.Sqlite.dll to get upset, and it's the wrong behaviour anyway
2010-04-23 20:08:24 +01:00
b5ec101cc8
add a comment about deprecating IRegionModule
2010-04-23 12:06:32 -07:00
Melanie