BlueWall
6ec59ee892
Merge branch 'master' of /home/opensim/var/repo/opensim
2011-12-07 07:52:24 -05:00
Justin Clark-Casey (justincc)
e6272b8d56
Stop also adding an ordinary http handler when we set up a poll http handler.
...
It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path.
2011-12-07 12:28:42 +00:00
Melanie
ccba04f345
Fix intersim object give messages
2011-12-07 01:27:52 +01:00
Melanie
f317953290
Fix up intersim give messaging
2011-12-07 01:02:46 +01:00
Melanie
d6486fe14a
Fix task inventory giving
2011-12-07 00:43:59 +01:00
Melanie
62d0a0cdbf
Remove harmless merge artefact
2011-12-06 22:58:00 +01:00
Justin Clark-Casey (justincc)
8e542cfa03
Stop accidentally setting up the UploadTexture caps handler with the same url for all users
...
This meant that if a user exited the region, the UploadTexture handler would be effectively removed for everyone, causing subsequent failures.
This hopefully resolves the recent UploadTexture LLSD problems
This was a regression in 5640f2e (Thu Dec 1 23:24:15 2011 +0000)
2011-12-06 21:42:56 +00:00
Melanie
5490a3e549
Fix phantom and temp flags not taking
2011-12-06 19:44:45 +01:00
Melanie
28da235888
Merge branch 'master' into bigmerge
2011-12-06 19:01:05 +00:00
Justin Clark-Casey (justincc)
8721841fc3
Revert "Stop performing the asset save part of baked texture uploading on the UploadBakedTexture cap asynchronously."
...
This is a possible cause of the dramatic upswing in "Unable to upload... No handler registered for LLSD requests..."
Needs more investigation.
This reverts commit 1854c52ea3
.
2011-12-06 18:37:13 +00:00
Justin Clark-Casey (justincc)
136a6a6e0f
Make "show appearance" a synonym for "appearance show"
2011-12-06 18:36:11 +00:00
Justin Clark-Casey (justincc)
b9a461c5ad
In "appearance show", if a particular avatar is specified, print out texture UUID for each bake type and whether the simulator can find it.
2011-12-06 18:32:27 +00:00
Justin Clark-Casey (justincc)
ec4f217af8
Actually send the avatar data if an individual avatar is specified, rather than accidentally doing nothing
2011-12-06 18:06:29 +00:00
Justin Clark-Casey (justincc)
1b9eb52850
Allow "appearance show" command to take an optional avatar name
2011-12-06 18:03:16 +00:00
Justin Clark-Casey (justincc)
4be85eeaa5
Make it possible to manually send appearance information via the "appearance send" command for a chosen avatar as well as all
2011-12-06 16:42:44 +00:00
Justin Clark-Casey (justincc)
d33d12ba83
Provide feedback as to which avatars are resending appearance informion on "appearance send" console command
2011-12-06 16:07:24 +00:00
Justin Clark-Casey (justincc)
319507f521
Add test for not found response from GetTexture cap handler.
...
Add OpenSim.Region.Capabilities.Handlers.Tests.dll into test suite
2011-12-05 21:04:17 +00:00
Justin Clark-Casey (justincc)
af9ccfa15c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-05 20:50:44 +00:00
Justin Clark-Casey (justincc)
4567555c49
Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.
...
This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation.
This is also required to write regression tests that involve the HTTP layer.
If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
2011-12-05 20:44:20 +00:00
BlueWall
2d3dda6db3
Merge branch 'master' of /home/opensim/var/repo/opensim
2011-12-05 15:29:00 -05:00
Melanie
09c043fe52
Adapt GodsModule to core changes
2011-12-05 21:26:43 +01:00
Melanie
5b07370ec4
Remove erroneous message about hyperlinks when entering an invalid region name
...
in map search.
2011-12-05 21:26:06 +01:00
Melanie
bc17e2e9cf
Merge branch 'master' into bigmerge
2011-12-05 20:32:35 +00:00
Melanie
47d0a50a19
Add the proper result code as per the LL announcement for llTransferLindenDollars
2011-12-05 20:02:27 +01:00
Melanie
e7cb63fcf7
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-12-05 19:01:35 +00:00
Melanie
66f4ce354f
Fix CHANGED_TEXTURE and CHANGED_COLOR.
2011-12-05 19:01:14 +00:00
Justin Clark-Casey (justincc)
37889eb3fa
For the GetTexture capability, if a data range is requested that covers the whole asset length, return HTTP PartialContent instead of NotFound
...
NotFound is obviously wrong, and this change stops viewer 3.2.2 (and v probably earlier) complaining in the log about missing textures that are actually present.
We still return PartialContent even if the range requested is a superset of the data range as per httpd's behaviour
https://issues.apache.org/bugzilla/show_bug.cgi?id=51878
Viewer 3.2.2 and very probably earlier appear happy with this.
Whether fixing this NotFound bug has any practical effect apart from resolve viewer log messages is unknown.
2011-12-05 18:35:03 +00:00
Melanie
6362df1202
Serialize the Volume Detect field
2011-12-05 19:33:25 +01:00
Melanie
1ece4feccd
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2011-12-05 19:08:19 +00:00
Melanie
cc482ee865
Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster into bigmerge
2011-12-05 18:54:31 +00:00
Melanie
2a8a46a32d
Fix CHANGED_TEXTURE and CHANGED_COLOR.
2011-12-05 18:32:40 +01:00
Melanie
5ab536a1e9
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-12-05 17:10:51 +00:00
Melanie
3281b99362
Strip CR from http responses and limit them to 2048 chars
2011-12-05 15:57:47 +01:00
Melanie
b7c9eb4bf7
Don't allow deletion of a terrain from the database unless we have one to replace it with
2011-12-05 15:46:57 +01:00
Melanie
68bdd0b7fe
Fix setting seated avatar position and make llSameGroup work as in SL.
2011-12-05 15:26:49 +01:00
Melanie
35800d6a86
Reinstate setter for OffsetPosition to allow setting the offset by script
...
while seated
2011-12-05 15:26:22 +01:00
Melanie
19d6aa2bc9
Don't allow position update on sitting avatar. Don't bounds check sitting
...
avatars as they will be crossed by the vehicle and not individually
2011-12-04 20:16:07 +01:00
Diva Canto
a2d98c7293
HG: Added HEAD method to Helo service. This is the preferred method, but its wide use will have to wait a few releases. So the sims are still calling GET for now.
2011-12-04 10:10:09 -08:00
Diva Canto
080dfcc9c9
HG: Renamed one method
2011-12-04 08:24:16 -08:00
Melanie
ec8c93aa5e
Implement ChangeInventoryItemFlagsPacket handling
2011-12-04 12:35:01 +01:00
Justin Clark-Casey (justincc)
a82aea53f8
Split up test SceneHelpers to provide an AddChildScenePresence() call
2011-12-03 19:32:59 +00:00
Justin Clark-Casey (justincc)
a4d82895be
Remove T012_TestAddNeighbourRegion() and T013_TestRemoveNeighbourRegion() since they don't do anything useful.
2011-12-03 19:14:37 +00:00
Justin Clark-Casey (justincc)
3852f05e6e
Extend TestCreateChildScenePresence to make assertions both at CreateAgent stage and then at Scene.AddClient()
2011-12-03 19:10:32 +00:00
Justin Clark-Casey (justincc)
4919c60560
Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence()
...
This required an option to be added to NullRegionData via ConnectionString for it to act as a non-static instance, so that regression tests (which only load this class once) don't get hopeless confused and complex to compensate.
Normal standalone operation unaffected.
2011-12-03 18:59:54 +00:00
Justin Clark-Casey (justincc)
ced820bd5e
Improve locking in AgentCircuitManager
2011-12-03 16:19:11 +00:00
Justin Clark-Casey (justincc)
c934901a05
Use GetAgentCircuits() to receive a copy of the AgentCircuitsByUUID dictionary rather than AgentCircuitManager.AgentCircuits directly in "show circuits" to avoid enumeration exceptions
2011-12-03 16:11:47 +00:00
Justin Clark-Casey (justincc)
aac3f2d04e
Add agent circuit number checks to TestCloseAgent()
2011-12-03 16:04:11 +00:00
Justin Clark-Casey (justincc)
aba42d8543
Correct SOP.GetNumberOfSides() to return 8 for meshes rather than 7
...
We are returning the actual number of 'sides', not the maximum index number.
Also minor format corrections.
2011-12-03 15:54:06 +00:00
marc
e75bcd4c59
Workaround for mesh to correct the number of faces in GetNumberOfSides(). Meshs are handeled as sculpts but can have up to 8 faces (SL restriction the collada format can handle even more). The patch enables all LSL function that adressing faces to behave correct. Like llGetNumberOfSides(); llSetLinkPrimitiveParamsFast(); llSetPrimitiveParams(); llSetColor();
...
Signed-off-by: marc <mare@sounddog.net>
2011-12-03 15:49:19 +00:00
BlueWall
6541fc08d4
Merge branch 'master' of /home/opensim/var/repo/opensim
2011-12-02 22:46:37 -05:00