Teravus Ovares (Dan Olivares)
cf61cf7b32
* Make line endings consistant in Meshmerizer.cs
2010-10-09 13:50:53 -04:00
Latif Khalifa
0dd4071156
Fix a typo in previouis commit: start must not pass the end of the file
2010-10-09 18:22:21 +02:00
Teravus Ovares (Dan Olivares)
3454dfbcb3
weird line endings fix commit
2010-10-09 12:07:58 -04:00
Latif Khalifa
5e381ec67c
Return error code instead of the last byte of the file if range is not satisfiable
2010-10-09 18:01:11 +02:00
Latif Khalifa
06d3a529a9
In case when 1 single byte is requested (yes viewer does this)
...
start of the ranges gets clamped with a wrong value. In case of a texture with
601 byte long texture the viewer request range 0-599 first, then 600- in which case
both start and end should be 600.
End can also be 0, valid request for the firt byte of the file is 0-0.
Thanks to Thickbrick for explaining how HTTP range header works.
2010-10-09 17:46:09 +02:00
Melanie
96080dc492
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-09 01:05:05 +01:00
Justin Clark-Casey (justincc)
ed161020e2
minor: remove some mono compiler warnings
2010-10-09 01:46:29 +01:00
Marck
211ea5d521
Limit formatting of local console output to actual logging messages.
...
The formatting of lines with the help of a regular expression match will be done only for output with an explicitly given logging level.
This fixes the issue of colons being added to help texts on the local console.
2010-10-09 00:47:39 +01:00
Melanie
4a57288577
Fix an infinite recursion
2010-10-08 23:23:07 +01:00
Melanie
4a0911bdbd
Guard against locking a nullref to avoid build break
2010-10-08 19:19:07 +01:00
Melanie
5dcbbb726a
Change the order of actions to address a possible nullref
2010-10-08 18:40:13 +01:00
Jonathan Freedman
4adada6fe4
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-07 23:47:39 -04:00
dahlia
9391c3ffee
add a flag in OpenSim.ini.example for enabling/disabling decoded sculpt map caching for meshing
2010-10-07 19:34:46 -07:00
Melanie
9a5d0984a5
Fix autoreturn to not return zero objects
2010-10-07 02:16:36 +01:00
Melanie
abfede7819
Plumb the path for multiple object deletes
2010-10-06 20:00:51 +01:00
Melanie
d45276b3f6
Add and plumb the usetex URL parameter to worldview. Required but not yet
...
functional
2010-10-06 05:44:19 +01:00
Melanie
9a1c8db443
Convert worldview to GET
2010-10-06 05:17:31 +01:00
Melanie
623f57deb5
Change the URL /worldview to /worldview/<region id> to support multiregion
2010-10-06 03:51:55 +01:00
Melanie
752b6a8764
Convert the BMP to a JPEG image and return it. This should be testable.
2010-10-06 03:40:55 +01:00
Melanie
abfcd168fc
Add the parameter plumbing and image generation
2010-10-06 03:32:01 +01:00
Melanie
17316170a5
Add WOrldView request handler and plumbing
2010-10-06 03:03:10 +01:00
Melanie
7d62ab6a9e
Fix incorrect class name
2010-10-06 02:16:42 +01:00
Melanie
ce89f08f6b
Add WorldView module skeleton
2010-10-06 02:06:50 +01:00
Melanie
c97398575c
Convert the map image modules to new style modules
2010-10-06 01:42:18 +01:00
Jonathan Freedman
84cf0ffbf1
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-05 20:06:27 -04:00
Jonathan Freedman
593fc5c87a
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-05 19:45:37 -04:00
Melanie
7e6a047769
Remove defunct sirikata client stack
2010-10-06 00:20:41 +01:00
Melanie
5d61323192
Add the view generating method to the image generator interface
2010-10-05 23:49:21 +01:00
Melanie
b424af6187
Revert an accidental default value change
2010-10-05 23:06:29 +01:00
Melanie
eb491d2c36
Patch to allow other cam angles. Not complete. Thanks, Antont.
2010-10-05 22:56:20 +01:00
Jonathan Freedman
8f1acb890a
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-05 14:17:18 -04:00
Melanie
ba0a19c228
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-05 02:12:35 +01:00
Jeff Ames
bc9f793a92
Formatting cleanup.
2010-10-04 21:28:17 -04:00
BlueWall
eb17d581d3
Make windlight set the default environment on start
2010-10-05 01:54:15 +01:00
Latif Khalifa
cb6e4035c7
Avoid throwing errors when adding existing meshes to the render scene
2010-10-04 06:02:09 +01:00
Diva Canto
37231e0941
Made the home agent handler check for xff if behind a proxy.
2010-10-03 21:21:02 -07:00
Diva Canto
934ae03d44
Made the Gatekeeper proxy-able.
2010-10-03 20:35:26 -07:00
Diva Canto
0772e19af2
Added viewer's channel, mac, and id0 to agent circuit data. Also moved client ip address to agent circuit data, so that it's always there.
2010-10-03 20:01:59 -07:00
Melanie
f89dd85f68
Fix a comment marker
2010-10-04 00:17:48 +01:00
Melanie
766ce9a141
Add linden prim renderer and update libOMV
2010-10-04 00:10:08 +01:00
Jonathan Freedman
e3099d48f9
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-03 18:04:38 -04:00
Jonathan Freedman
69acf9c79b
* additional serveruri cleanup
2010-10-03 18:03:53 -04:00
Melanie
511751a733
I really have to say it again and again: e.Message is NOT enough data for
...
troubleshooting. It MUST be combined with e.StackTrace, or e.ToString() must
be used.
Fix one more instance of that cr.p
2010-10-03 22:36:27 +01:00
Melanie
189cda1c3d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-03 16:51:41 +01:00
Melanie
0b13cfa4dd
Port ExecutingDirectory from omfOS Util class.
2010-10-03 16:50:50 +01:00
Melanie
4f70ac018b
Adapt to core changes
2010-10-03 16:40:11 +01:00
Melanie
27340f616e
Addign the new / renamed files for previous commit
2010-10-03 16:34:55 +01:00
Melanie
ab4be3ffdf
Initial port of the Warp3D map tile renderer
2010-10-03 16:34:17 +01:00
Diva Canto
0133619af2
Attempt at fixing mantis #5057 -- CPU pinned high with HGAssetBroker.
2010-10-02 17:02:02 -07:00
Jonathan Freedman
32ccc7a9d9
* refactor refactor refactor ServerURI 4 lyfe
2010-10-02 19:17:02 -04:00
Melanie
6fc1ceb2ee
So, the client can have an old idea of the object properties for the object when it goes to buy. This can cause a problem in the buy process. Additionally Hazim mentioned that the buy packets are spoofable. The core modules are the crowing glory example of best practice :P, so therefore, setting the example here, Validate Client sent Buy Data. WebAppSecurity 101, Never trust a client. Validate Validate Validate! Or you'll have problems whether intentional or not.
2010-10-02 20:11:43 +01:00
Melanie
87c6386884
Reapplying the parts of the prior revert that were not derived from the
...
original patch
2010-10-02 18:47:26 +01:00
Melanie
b01020b84a
Revert "Forward-port 0.6 fix"
...
This reverts commit 90b51dc7d6
.
2010-10-02 18:45:48 +01:00
Melanie
f220a2c5eb
Replace CalculateMass with a more accurate version, contributed by Ubit.
...
Thank you.
2010-10-02 00:24:16 +01:00
Melanie
2427e16b42
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-01 05:42:42 +01:00
BlueWall
ffc1123ca5
adding -logconfig to Robust.exe
...
Adding -logconfig to Robust.exe. will still process the
-logfile option, as before. No options given, the value
"Robust.log" will be written in the ./bin directory
2010-10-01 05:42:18 +01:00
Master ScienceSim
9c6a591ad0
couple fixes to enable profiles in simian connector
2010-09-30 09:59:53 -07:00
Melanie
eb58d91098
Prevent dropping someone else's attachments
2010-09-30 15:57:52 +01:00
Melanie
90b51dc7d6
Forward-port 0.6 fix
2010-09-30 15:52:33 +01:00
Melanie
29646bcf67
Fix an inventory fetch issue
2010-09-30 02:52:35 +01:00
John Hurliman
08ee7a0e51
Actually log users out (call LogoutAgent) in the SimianPresenceServiceConnector when LoggedOut() is called
2010-09-29 15:14:13 -07:00
John Hurliman
1255c7ceb6
Cleanup: Removed an unreferenced variable from ActivityDetector.cs
2010-09-29 14:39:13 -07:00
John Hurliman
b6e0563ad7
Part two of the previous commit, making IGridUserService.LoggedOut() more flexible without changing current behavior
2010-09-29 14:34:02 -07:00
John Hurliman
9b7c99f0cf
Made IGridUserService.SetLastPosition() more flexible to allow different possible implementations. This doesn't change any behavior or any Robust code, but it simplifies the SimianGrid connector by using the standard OpenSim interface for setting last position now
2010-09-29 14:24:32 -07:00
Melanie
0339d420e7
Restrict top colliders / top scripts to estate managers
2010-09-27 03:45:22 +01:00
Melanie
8e547d3491
Prevent setting arbitrary groups on your objects.
2010-09-27 02:11:55 +01:00
Melanie
c2a4bdb2fe
Fix build break
2010-09-27 01:40:29 +01:00
Melanie
84ab4742c8
Quash the region ID on intersim messages. That prevents people from determining
...
another avatars location
2010-09-27 01:31:17 +01:00
Melanie
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
Melanie
1f7d68e555
Restrict inventory items added in a transaction to folder belonging
...
to the connected client.
2010-09-27 00:30:26 +01:00
Melanie
6f78358b09
When receiving intersim IM, don't let the spoof protection bomb
2010-09-26 23:50:55 +01:00
Melanie
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
Melanie
d0c271adc6
Typo fixes
2010-09-26 18:06:23 +01:00
BlueWall
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
BlueWall
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
Melanie
d8ae287ebf
Prevent spoofing the agent name on text IM
2010-09-25 06:56:08 +01:00
Melanie
3b76d7bbb6
Fix a minor economy issue
2010-09-25 06:09:35 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
b366ad5012
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-25 00:00:00 +01:00
Justin Clark-Casey (justincc)
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
Kevin Cozens
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
Teravus Ovares (Dan Olivares)
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
Teravus Ovares (Dan Olivares)
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
Melanie
2b8c99c2fb
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-21 04:02:50 +01:00
Melanie
14adf90805
Fix a typo
2010-09-21 04:02:34 +01:00
Melanie
10a37f5be4
Refactor script create permission into the perms module
2010-09-21 04:02:28 +01:00
Justin Clark-Casey (justincc)
51207c24a0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-21 01:04:08 +01:00
Justin Clark-Casey (justincc)
192bcab987
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-21 01:01:07 +01:00
Justin Clark-Casey (justincc)
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
Teravus Ovares (Dan Olivares)
27d5976b87
* Tweaked the LocationTests for maximum coverage.
...
* Added more mundane tests.
2010-09-18 03:42:37 -04:00
Teravus Ovares (Dan Olivares)
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
Teravus Ovares (Dan Olivares)
4d83879704
* More Mundane Tests
...
* SL Util tests of AssetType2ContentType and ContentType2AssetType
2010-09-17 23:27:41 -04:00
Justin Clark-Casey (justincc)
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
Marck
7ee0a8d30e
Clarify help text for use of file paths with console command "create region".
2010-09-18 02:30:56 +01:00
Marck
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
b1ab3ea5d9
For all Flotasm group module XMLRPC calls, correct parameter requestingAgentID to RequestingAgentID
...
This was stopping the get group member roles call from working, and may have affected other things
2010-09-17 23:48:44 +01:00
Teravus Ovares (Dan Olivares)
33fbf0e329
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-09-17 18:41:29 -04:00
Teravus Ovares (Dan Olivares)
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
John Hurliman
c08b6c2873
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-17 14:35:35 -07:00
John Hurliman
e603521fd7
Applying the llParseString2List() patch from #5036 that Melanie claims was already applied
2010-09-17 14:32:49 -07:00
Teravus Ovares (Dan Olivares)
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
Melanie
256c8cb62d
Send kill packets for avatars, too
2010-09-17 03:56:31 +01:00
root
7762301cea
Revert "* Changed 11 calls for session info to the more optimized API method"
...
This reverts commit 5dc9ea2f24
.
Also makes online indicators and IM more robust
2010-09-17 01:57:26 +01:00
John Hurliman
b49cb3355f
Fixed a regression in SOG.Copy()
2010-09-16 17:57:00 -07:00
John Hurliman
5321e0e69f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-16 17:31:24 -07:00
John Hurliman
860b2a502f
Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndArray collection
2010-09-16 17:30:46 -07:00
Justin Clark-Casey (justincc)
e3f1533705
Fix build break by replacing Items.LockItemsForWrite() with lock (Items) {}
2010-09-17 01:21:28 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
5b18f8be25
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-17 01:01:12 +01:00
root
670357367e
Removing debug
2010-09-16 23:32:18 +01:00
root
1b2edfe75f
JustinCC is evil. f7b28dd3
broke script persistence. This fixes it.
2010-09-16 23:19:46 +01:00
Justin Clark-Casey (justincc)
d52b2b9ee7
minor: remove some mono compiler warnings
2010-09-16 20:46:24 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
e6bc77d832
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-15 23:03:02 +01:00
Justin Clark-Casey (justincc)
39d27fc879
rename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to improve code readability
2010-09-15 22:29:58 +01:00
Justin Clark-Casey (justincc)
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
Melanie
3275fbec54
Fix the above
2010-09-14 23:06:44 +01:00
Melanie
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
609375bf37
Fix "show threads" to show threads now being managed by OpenSim.Framework.Watchdog
2010-09-14 22:24:11 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
5d48e3c0bb
Revert "Move OpenSimDefaults,ini into config-include in order to put it with all the other default files"
...
This reverts commit c3259e9c26
.
Reverted by agreement.
2010-09-14 03:30:07 +01:00
Justin Clark-Casey (justincc)
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
Melanie
b2e50474dc
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-13 23:35:27 +01:00
Justin Clark-Casey (justincc)
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
Melanie
96a2ce5db0
Add a missing parenthesis
2010-09-13 23:33:55 +01:00
Melanie
0de2f0567d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-13 23:28:36 +01:00
Melanie
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
Melanie
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
Melanie
8febba7717
Make the inimaster option default to OpenSimDefaults.ini.
2010-09-13 23:27:31 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
fbe72e30eb
Improve generic message exception logging. Quieten down complaints about unhandled GenericMessages
2010-09-13 21:52:36 +01:00
Justin Clark-Casey (justincc)
e4858b0eeb
Add client name to packet resend log messages to make them a bit more informative
2010-09-13 21:29:04 +01:00
Justin Clark-Casey (justincc)
7ae9266186
Remove SceneGraph.DetachObject() which was accidentally left around after being migrated to AttachmentsModule
2010-09-13 21:20:31 +01:00
Justin Clark-Casey (justincc)
ae1a0150a1
Rename now protected method SetAttachmentInventoryStatus() to ShowAttachInUserInventory() to match ShowDetachInUserInventory()
2010-09-13 21:15:12 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
ff098ae110
minor: Clean up log messages generated when an item is attached
2010-09-13 20:44:32 +01:00
John Hurliman
5ef2da39d8
* Fixing length calculations for HTTP texture downloads (the end byte is inclusive in Range: headers)
2010-09-13 11:23:45 -07:00
John Hurliman
18a9ac6b39
Fix unit test SceneSetupHelpers to load the mock simulation data store
2010-09-12 15:04:51 -07:00
John Hurliman
c03b24cbfd
Merged
2010-09-12 14:21:51 -07:00
John Hurliman
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
Jeff Ames
f1f0bc23f4
Formatting cleanup.
2010-09-12 13:43:49 -04:00
Jeff Ames
20cd1da6bf
Add copyright headers.
2010-09-12 12:54:31 -04:00
John Hurliman
16d782eaa2
Added a stub for OpenSim.Services.Connectors.Simulation.SimulationDataServiceConnector
2010-09-12 00:30:13 -07:00
John Hurliman
007912d6f4
Shuffling fields and properties around in Scene to make Scene.cs more readable
2010-09-11 23:41:48 -07:00
John Hurliman
e2544584ad
Changed all string references of "IRegionDataStore" to "ISimulationDataStore"
2010-09-11 22:02:34 -07:00
John Hurliman
109b517583
Fixed the naming mess around data connectors for simulation data
2010-09-11 20:43:06 -07:00
John Hurliman
47ac9f97b1
Re-enabled asset last access time logging in MySQL
2010-09-11 18:29:38 -07:00
Melanie
47a5e2633c
Prevent child agents from being blacklisted in the kill record.
2010-09-11 20:24:14 +01:00
Justin Clark-Casey (justincc)
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
randomhuman
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
Justin Clark-Casey (justincc)
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
John Hurliman
b597a295c4
Second pass at cleaning up thread safety in EntityManager and SceneGraph
2010-09-10 12:41:36 -07:00
John Hurliman
dd277a0d02
First pass at cleaning up thread safety in EntityManager and SceneGraph
2010-09-10 12:04:12 -07:00
John Hurliman
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
John Hurliman
8415b98806
Over a dozen thread safety fixes in FriendsModule
2010-09-09 14:45:10 -07:00
John Hurliman
972ef92590
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-08 15:09:34 -07:00
John Hurliman
5dc9ea2f24
* Changed 11 calls for session info to the more optimized API method
2010-09-08 15:08:49 -07:00
Diva Canto
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
Diva Canto
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
Diva Canto
8cc3d60e59
Added constructor that takes an URL to asset and inventory simian connectors.
2010-09-08 14:09:43 -07:00
Diva Canto
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
Diva Canto
904d6b787a
First version of the Hypergrid HELO service that will enable different backends to interoperate.
2010-09-08 09:53:57 -07:00
Justin Clark-Casey (justincc)
b8d14fcc4a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-08 01:05:56 +01:00
John Hurliman
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
John Hurliman
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
John Hurliman
587bab79b4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-07 13:43:52 -07:00
John Hurliman
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
Melanie
b28d1b6ccd
Fix Simian regression
2010-09-07 20:21:05 +01:00
John Hurliman
5ca4c238e0
SimianUserAccountServiceConnector was not initializing the user cache
2010-09-07 11:33:46 -07:00
Melanie
8fda08d858
Make sure unlinked child prims get persisted
2010-09-07 11:48:28 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
84ad9e4d4e
minor: comment out some excessive test logging
2010-09-07 02:05:44 +01:00
Justin Clark-Casey (justincc)
90cd035693
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-07 02:01:38 +01:00
Melanie
99bfb0d2a2
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-07 01:45:08 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
ab875b32c1
Make console backup command do a forced backup rather than non-forced
...
Remove no-arg backup method for simplicity as it only make sense to call non-forced backup internally
2010-09-06 23:12:03 +01:00
Justin Clark-Casey (justincc)
537fefa3f2
extend TestNewSceneObjectLinkPersistence() to check for presence of non-root linked prim
2010-09-06 23:06:23 +01:00
Justin Clark-Casey (justincc)
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
Melanie Thielker
36cb6208b5
Fix yet another cause of "Ghost attachments"
2010-09-06 22:08:15 +01:00
Melanie Thielker
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
Melanie
7f9f9f9246
Fix a handful of copypaste errors
2010-09-05 19:14:45 +01:00
Melanie
1b770d3afc
Change UserAccountService to match
2010-09-05 19:09:30 +01:00
Melanie
4243701d22
Make Simian profiles respect the module chosen in [Profile]
2010-09-05 19:06:50 +01:00
Melanie
55d3c98917
Fix up presence connector in SimianGrid
2010-09-05 18:24:16 +01:00
Melanie
0ca48b2486
Fix up Simian inentory
2010-09-05 18:14:31 +01:00
Melanie
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
Melanie
1238b27d64
And the avatar services :)
2010-09-05 17:53:15 +01:00
Melanie
a407ad38f6
Add the m_Enabled pattern to Simian Auth
2010-09-05 17:44:02 +01:00
Melanie
d9e9c41e13
Add m_Enabled pattern to SimianGridConnector
2010-09-05 17:34:51 +01:00
Melanie
4025b85a07
As an exmple, add the code to disable connectors intot he simian asset
...
connector
2010-09-05 17:24:05 +01:00
Melanie
64ec14c8c4
Add missing IDwellModule interface
2010-09-05 17:08:57 +01:00
Melanie
09c75b30f3
Fix build break
2010-09-05 16:45:24 +01:00
Melanie Thielker
6a0a878f7c
Remove "Dwell" support from core and replace it with calls to methods
...
on IDwellModule
2010-09-05 14:28:33 +01:00
Diva Canto
68f107b27e
Logout the presence if client IP verification fails.
2010-09-04 18:46:27 -07:00
Diva Canto
953a487f5e
One more debug message to track an issue on Danger grid.
2010-09-04 18:09:17 -07:00
Diva Canto
9fd9836841
Make User Agent Service and Login Service separable.
2010-09-04 16:39:03 -07:00
Justin Clark-Casey (justincc)
c0b16f09bf
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-04 01:38:11 +01:00
Justin Clark-Casey (justincc)
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
Diva Canto
8fc68c6d98
Added XFF header processing. Untested, for lack of proxy.
2010-09-03 17:18:53 -07:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
d4b572d2a5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 23:29:59 +01:00
Justin Clark-Casey (justincc)
63617c79d8
minor: remove mono compiler warnings
2010-09-03 23:29:39 +01:00
John Hurliman
1e552e88e8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 14:50:42 -07:00
John Hurliman
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
9b95bd259f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 22:27:01 +01:00
Justin Clark-Casey (justincc)
fe63fad394
minor: remove mono compiler warning
2010-09-03 22:26:15 +01:00
John Hurliman
83f6550bcc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 13:37:30 -07:00
John Hurliman
aadbffffb1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 13:36:59 -07:00
John Hurliman
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
8d2e8b7d5c
minor: remove mono compiler warnings
2010-09-03 21:28:57 +01:00
Justin Clark-Casey (justincc)
71c0fc10df
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-03 21:14:23 +01:00
Micheil Merlin
8daea4d7c0
llRot2Euler Tests
2010-09-03 21:11:13 +01:00
Diva Canto
0a0f38b23c
Last+2 tweak
2010-09-03 10:31:16 -07:00
Diva Canto
a5cce8d6d7
Last+1 tweak.
2010-09-03 10:13:41 -07:00
Diva Canto
5bbf793f9e
One last tweak, hopefully.
2010-09-03 10:01:18 -07:00
Diva Canto
77384eb28b
Another tweak. Sux^2
2010-09-03 09:26:33 -07:00
Diva Canto
85e9160552
More tweaks related to my previous commit. Tweaks sux.
2010-09-03 09:02:08 -07:00
Melanie
18213d26ec
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-03 03:27:47 +01:00
Melanie Thielker
17a26c3701
Fix an issue with rezzing scripted objects.
2010-09-03 03:27:26 +01:00
Diva Canto
21c5377af9
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-09-02 16:36:43 -07:00
Diva Canto
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
Melanie Thielker
1c8bc9b7b6
Remove commented code and the comment, as the change has proven out
2010-09-02 21:02:09 +01:00
Melanie Thielker
7720419fc7
Experimentally comment the sending of unbaked avatars
2010-09-02 20:17:49 +01:00
Melanie Thielker
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
Melanie Thielker
7128e1a4ba
Implement UploadBakedTexture cap
2010-09-02 16:20:44 +01:00
Melanie
bbdf6cab50
Fix cast issue
2010-09-02 00:20:57 +01:00
Melanie
203b7de266
Allow increasing the version in system folders
2010-09-02 00:04:17 +01:00
Melanie
7efe7feef5
Update: Allow the version to increase only
2010-09-02 00:02:07 +01:00
Melanie
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
6cbf66827b
refactor: move SOG.AttachToAgent() into AttachmentsModule
2010-09-01 01:11:52 +01:00
Justin Clark-Casey (justincc)
c947a67b23
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-01 00:17:23 +01:00
Melanie Thielker
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
Justin Clark-Casey (justincc)
01276ef433
refactor: change AttachmentsModule.AttachObject to use sp.GetAttachments rather than filter sp.Attachments list directly
2010-08-31 22:22:45 +01:00
Justin Clark-Casey (justincc)
9c1c378aa1
Add ScenePresence.GetAttachments(uint attachmentPoint)
2010-08-31 22:16:23 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
7b03cb09e4
minor: Add some method doc to BaseHttpServer.HandleRequest()
2010-08-30 22:33:45 +01:00
Justin Clark-Casey (justincc)
dd14c539af
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-30 21:24:08 +01:00
Justin Clark-Casey (justincc)
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
Melanie
eefb207c1b
Fix a casting operation to use ToString()
2010-08-30 02:10:11 +01:00