Justin Clark-Casey (justincc)
6ef7ea454c
Remove old 2 year unused linden stack region module shell
2011-01-21 22:48:04 +00:00
Justin Clark-Casey (justincc)
9971fdbcd5
properly format "show throttles" table
2011-01-21 22:31:46 +00:00
Justin Clark-Casey (justincc)
38debbc59f
crudely refactor table generation code for "show queues" and "show throttles"
2011-01-21 00:56:37 +00:00
Justin Clark-Casey (justincc)
c383dbd06d
implement "show throttles" command for showing current agent throttles and the server settings.
...
This is in a very crude state, currently.
The LindenUDPModule was renamed LindenUDPInfoModule and moved to OptionalModules
OptionalModules was given a direct reference to OpenSim.Region.ClientStack.LindenUDP so that it can inspect specific LindenUDP settings without having to generalize those to all client views (some of which may have no concept of the settings involved).
This might be ess messy if OpenSim.Region.ClientStack.LindenUDP were a region module instead, like MXP, IRC and NPC
2011-01-21 00:38:16 +00:00
Justin Clark-Casey (justincc)
58eb6b5fa3
minor: help text adjustment for "show queues"
2011-01-20 23:22:45 +00:00
Justin Clark-Casey (justincc)
df740d8e5c
remove reference to CoreModules from ClientStack.LindenUDP
...
client stack uses modules in the same way that scene does - through their interfaces
2011-01-20 23:21:25 +00:00
Justin Clark-Casey (justincc)
1baf63dbae
Move "show queues" command out of OpenSim.cs and into a separate module.
2011-01-20 22:57:12 +00:00
Justin Clark-Casey (justincc)
f50780f4c2
remove unimplemented "show assets" command
2011-01-20 21:56:48 +00:00
Justin Clark-Casey (justincc)
b0aebc6f3d
minor: make "show info" help slightly clearer
2011-01-20 21:41:48 +00:00
Kitto Flora
b92673c1c9
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-20 06:52:10 +00:00
Kitto Flora
bfa5b7850c
Fix drift of static prim.
2011-01-20 06:51:50 +00:00
Justin Clark-Casey (justincc)
d3dca7d25a
For now, comment out logging messages about IM sending, since these cause high spam for large group messaging
2011-01-19 01:50:02 +00:00
Justin Clark-Casey (justincc)
28fda1cab6
with mic's permission, reduce appearance, baked texture logging verbosity for now
2011-01-19 01:41:32 +00:00
Justin Clark-Casey (justincc)
a42faca5b9
With mic's permission, adjust long call time info messages to 500ms from 200ms
2011-01-19 01:13:10 +00:00
Justin Clark-Casey (justincc)
97c0430093
Downgrade and comment out some other caps messages for now
2011-01-19 01:10:09 +00:00
Justin Clark-Casey (justincc)
7f000ea88e
Correct "show queues" to show queued packet numbers for each client instead of bytes.
...
Byte amounts aren't actually available - this was a misunderstanding of TokenBucket.Content. But raw packet numbers are.
2011-01-19 00:33:25 +00:00
Melanie
f3968c4959
Merge branch 'master' into careminster-presence-refactor
2011-01-18 06:18:10 +00:00
Melanie
9f7b37b37c
Fix build break
2011-01-18 01:48:37 +00:00
Melanie
06e225bc0b
Also fix MySQLXInventoryData
2011-01-18 01:31:14 +00:00
Melanie
6306578fcf
Merge branch 'master' into careminster-presence-refactor
2011-01-18 01:28:50 +00:00
Melanie
ac16a49ca0
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-01-18 01:27:11 +00:00
Diva Canto
f73c90c633
Put the 'new' back to avoid a warning. Yes, we want to hide it.
2011-01-17 17:52:03 -08:00
Diva Canto
a07375a7ae
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-01-17 17:41:06 -08:00
Diva Canto
c98d1cffe2
Removed the call to sceneViewer.Reset upon MakeRoot and ChildAgentUpdate, because Reset hangs for a long time waiting for the lock. That is a problem in itself -- that long holding of the lock by some thread -- but let's just avoid it altogether.
2011-01-17 17:40:48 -08:00
Melanie
75644e0f6e
Prevent activation and deactivation of gestures from clobbering the slam
...
bits
2011-01-18 01:26:42 +00:00
Melanie
31144a62b3
Change gesture activation to not quash any other flags
2011-01-18 01:26:37 +00:00
dahlia
624bf23abb
force objectId to UUID.Zero for non-overridden animations in AvatarAnimation packet
2011-01-17 16:39:53 -08:00
Justin Clark-Casey (justincc)
3083c517a0
minor: resolve some mono compiler warnings
2011-01-18 00:29:10 +00:00
Justin Clark-Casey (justincc)
c544f0d0c5
Prune some of the excess logging for client logins.
...
Didn't touch the appearance related stuff.
2011-01-18 00:25:24 +00:00
Justin Clark-Casey (justincc)
523628dca3
minor: remove mono compiler warnings
2011-01-18 00:14:58 +00:00
Justin Clark-Casey (justincc)
8233ef25ba
Reduce amount of debug lopgging put out by some simiangrid connectors. Please re-enable if needed.
2011-01-18 00:10:34 +00:00
Justin Clark-Casey (justincc)
6e58996b4d
refactor: remove redundant null checks
2011-01-17 23:57:50 +00:00
Melanie
4f8ba53f86
Prevent activation and deactivation of gestures from clobbering the slam
...
bits
2011-01-18 00:55:08 +01:00
Justin Clark-Casey (justincc)
81552099d6
Fix UnackedBytes client stack statistic as seen in "show queues"
...
Bytes were being wrongly added again on a resend
2011-01-17 23:45:25 +00:00
Diva Canto
37837850d3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-01-17 13:12:46 -08:00
dahlia
aecaadd3bd
objectId in AvatarAnimation packet should be UUID.Zero for non-overridden animations
2011-01-17 13:10:09 -08:00
Diva Canto
4bcee1dfb4
Revert "DEBUG DEBUG DEBUG"
...
This reverts commit 59c2cd04ba
.
2011-01-17 13:07:02 -08:00
Diva Canto
59c2cd04ba
DEBUG DEBUG DEBUG
2011-01-17 12:35:19 -08:00
Melanie
ddb4de139c
Change gesture activation to not quash any other flags
2011-01-17 21:22:32 +01:00
Diva Canto
5e35651efc
Protect World Map module, RequestMapItemsAsync, from badly formed URLs.
2011-01-17 11:45:13 -08:00
Diva Canto
479d72ac97
Account for some component along the way lower-casing the HTTP header keys. (XFF header issue)
2011-01-17 11:37:39 -08:00
Diva Canto
0aeb8981b2
Brute force debug for XFF issue
2011-01-17 11:19:20 -08:00
Diva Canto
66f99ae267
More debug messages to help track the XFF header problem.
2011-01-17 11:03:46 -08:00
Melanie
76f39d326e
Add a new ViewObjectInventory permission to decouple viewing from
...
+MOD status
2011-01-14 18:26:41 +01:00
Melanie
30320077a2
Fix slam bits being lost when editing perms in prim inventory
2011-01-14 03:20:47 +00:00
Melanie
a30bbcbb64
Temporarily reinstate prim counting in the update loop to make the production
...
systems run
2011-01-14 04:09:02 +01:00
Melanie
fe2d9be0cf
Implement nonlocal god kicks and freezes
2011-01-14 03:35:45 +01:00
Melanie
139e84c0b2
Fix slam bits being lost when editing perms in prim inventory
2011-01-14 01:01:02 +01:00
Melanie
ddb5f4e44a
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-13 20:01:50 +00:00
Melanie
3fc5b6a8ec
Merge branch 'master' into careminster-presence-refactor
2011-01-13 19:53:44 +00:00
BlueWall
69c8cc787f
Make FireAndForgetWrapper a singleton class
...
Made FireAndForgetWrapper a singleton class to allow us to drop
dependancy on the BclExtras35 library. BclExtras is broken in
Mono 2.8.2 and we used the library in only one function.
2011-01-13 19:52:34 +00:00
Melanie
4eefdd5549
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-13 20:21:53 +01:00
Melanie
69666be28c
Implement kicking, freezing and unfreezing users in the same sim via
...
profile god buttons.
2011-01-13 16:05:17 +01:00
Kitto Flora
c0134710f7
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2011-01-13 04:48:32 +00:00
Kitto Flora
d92069fb8b
Add llLookAt() kinetic. Reduce StandUp +x offset to 0.3M.
2011-01-13 04:44:04 +00:00
Melanie
e4bb8dc385
Guard against invalid light color specifiers from the database
2011-01-13 00:19:39 +01:00
Melanie
705f4e1e4b
Dont' trust the viewer! Fix a permission slam error caused by trusting
...
the viewer too much.
2011-01-12 21:46:49 +00:00
Melanie
914e4b319e
Fix direct item give permissions
2011-01-12 21:39:13 +00:00
Melanie
f75a3ee762
Use ToString() rather than a cast (more robust)
2011-01-12 21:25:51 +00:00
Melanie
7cfe17b5b3
Partial permissions fix for boxed items.
2011-01-12 21:25:38 +00:00
Melanie
dd154f7403
Fix god mode perms adjustment
2011-01-12 21:21:34 +00:00
Melanie
f59b55d930
Dont' trust the viewer! Fix a permission slam error caused by trusting
...
the viewer too much.
2011-01-12 17:40:21 +01:00
Melanie
7f99a8c900
Fix direct item give permissions
2011-01-12 16:20:38 +01:00
Melanie
d8fd777e13
Use ToString() rather than a cast (more robust)
2011-01-11 14:59:55 +01:00
Melanie
2c6a410e90
Partial permissions fix for boxed items.
2011-01-10 22:02:22 +01:00
Melanie
72048169c0
Taint SOGs the right way
2011-01-10 22:02:09 +01:00
Diva Canto
e80bcc0049
Improved debug messages to track what is going on with the XFF header
2011-01-09 16:52:41 -08:00
Diva Canto
0fabe0e5a5
Added more debug messages under the -verbose option.
2011-01-08 16:33:33 -08:00
Diva Canto
35a2961ccd
Added a -v|verbose option to save iar.
2011-01-08 16:17:00 -08:00
Diva Canto
9d9a170571
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-01-08 15:50:25 -08:00
Diva Canto
eab0951a59
Fixes the issue of hung archives. Problem was with SceneObjectSerializer.
...
Also fixes a buglet in scene load xml command, where it was given the wrong argument index for filename.
2011-01-08 15:49:51 -08:00
Mic Bowman
ec22560045
Merge branch 'cmickeyb'
2011-01-08 13:33:52 -08:00
Mic Bowman
df7fb207a8
Moved the map tile processing used by the Simian Grid
...
Frontend into a separate region module. Configuration
settings added to the defaults ini file. Others may find
this useful for pushing map tiles to a separate server.
2011-01-08 13:33:07 -08:00
Melanie
c271bbcc8a
Preserve the script running flag when copying an object.
2011-01-08 16:44:28 +01:00
Melanie
1ab9cd0997
Fix a couple of security issues
2011-01-08 13:51:34 +01:00
Diva Canto
a1c5de0f94
Try to fix a IAR problem reported by nebadon, where save iar seems stuck forever.
2011-01-07 12:32:47 -08:00
Diva Canto
02e661f8dd
Minor additional debug message.
2011-01-07 11:39:22 -08:00
Diva Canto
8c0e156b4d
Make HG map search consistent with new syntax for link-region, i.e. http://foo.org . Old syntax (foo.org) is still supported, but has surprising results when ppl search again, because internally the HG link names start with http.
2011-01-07 11:38:54 -08:00
Diva Canto
c18bcf3d8d
A bit more frugal on the caller side of closing agents, now that the receiving end is async. No need for so much concurrency.
2011-01-07 10:25:49 -08:00
Diva Canto
52f88f5739
Spawn a threadlet upon receiving requests to close agents. The operation may take too long, and we don't need to keep the caller waiting.
2011-01-07 10:04:39 -08:00
Diva Canto
32a3f330ed
Canonicalize URL endings for the UserAgentServiceConnector.
2011-01-06 17:42:16 -08:00
Diva Canto
fda56618e1
Deal with possibly un-initialized scripts in object transfers. Mantis #5310
2011-01-06 16:17:43 -08:00
Diva Canto
81587466e7
Map search: changed the flag sent to the client. It was 2 (???), now it's 0. This makes HG map tiles work on map search -- a longstanding annoyance. My map search tests were all ok, but since I don't understand these flag values, this may break something related to map search.
2011-01-06 12:53:54 -08:00
Diva Canto
21dedb573b
HG map tile fetch: handle cached images appropriately.
2011-01-06 12:48:28 -08:00
Diva Canto
5b43f9cac4
HG bug fix. Must wait for client's UDP contact before getting scene presence.
2011-01-06 12:47:13 -08:00
Melanie
de4eaab584
Merge branch 'master' into careminster-presence-refactor
2011-01-06 19:08:15 +00:00
Melanie
d1b6b4d288
Fix god mode perms adjustment
2011-01-06 19:12:25 +01:00
Mic Bowman
d3ebf64369
Merge branch 'master' into cmickeyb
2011-01-05 15:01:53 -08:00
Mic Bowman
0b44e99730
comment out a couple simian debug messages
2011-01-05 14:51:11 -08:00
Mic Bowman
984a9b4085
Added more performance checks to the HTTP server. Each request
...
coming through the WebUtil fns has a request id in the header
that can match the request to the actual work done by the service
2011-01-05 14:32:00 -08:00
Diva Canto
17ebe8fb77
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-01-05 07:14:45 -08:00
Diva Canto
0c165bc421
Commented a verbose Debug message in LLUDPServer that got uncommented at some point.
2011-01-05 07:14:09 -08:00
Justin Clark-Casey (justincc)
4ac58093bf
Make the default for the very verbose XMLRPC groups debug setting false rather than true!
2011-01-04 23:23:42 +00:00
Kitto Flora
ba7a227763
Revise Materials properties; Fix Double-Click Autopilot; Allow non-script sit positions >= 0.1M; Add llLookAt(); Comment out spammy bad adjacent sim message.
2011-01-04 21:36:09 +00:00
Diva Canto
fbde9b1136
Note to self: try to make only 3 things at the same time.
2011-01-04 11:33:15 -08:00
Diva Canto
db55859125
Guard against null Animator.
2011-01-04 11:30:08 -08:00
Mic Bowman
6a5d52b4c8
removed the early return on agentupdates, this was debugging code
2011-01-04 09:12:32 -08:00
Mic Bowman
e0da281e3d
Cleaned up debugging messages in the WebRequest handlers
2011-01-03 17:16:22 -08:00
Mic Bowman
d3987024d7
Merge branch 'master' into cmickeyb
2011-01-03 17:05:24 -08:00
Melanie
5286198650
Add permissions hooks for object transfers
2011-01-03 19:42:58 +00:00
Melanie
07cc032081
Allow cross-scope friendships to work, and also allow other cross scope name
...
resolution
2011-01-03 19:42:46 +00:00
Melanie
e1664b8d38
Fix child agent scoping
2011-01-03 19:42:26 +00:00
Melanie
c48ddbfef1
Fix scoping for prim region crossings
2011-01-03 19:41:02 +00:00
Melanie
9971766256
Implement Scope ID lookup on GetLandData. Stacked regions were not handled
...
properly
2011-01-03 19:40:55 +00:00
Melanie
e15ab75d62
Add permissions hooks for object transfers
2011-01-03 19:56:56 +01:00
Melanie
5432dfd53a
Allow cross-scope friendships to work, and also allow other cross scope name
...
resolution
2011-01-02 01:29:22 +01:00
Melanie
04e450e2bc
Fix child agent scoping
2010-12-31 16:05:59 +01:00
Melanie
5545b03168
Fix scoping for prim region crossings
2010-12-31 15:53:31 +01:00
Melanie
6820deed34
Implement Scope ID lookup on GetLandData. Stacked regions were not handled
...
properly
2010-12-31 15:45:08 +01:00
Melanie
24a997eb7c
Add MessageKey to section Messaging, a key that prevents injection of
...
IM from external sources
2010-12-30 20:57:56 +01:00
Mic Bowman
df5e4a1e5b
Standardize the way WebRequests are made in the SimulationServiceConnector. Added
...
debugging calls for tracking performance of web requests.
2010-12-29 20:47:51 -08:00
Melanie
98769ed040
Merge branch 'master' into careminster-presence-refactor
2010-12-30 02:31:43 +00:00
Melanie
1f4d0ad460
Fix up a prior fix (refix the fixed fix :)
2010-12-30 02:31:05 +00:00
Melanie
3b50066ceb
Merge branch 'master' into careminster-presence-refactor
2010-12-30 01:40:38 +00:00
Melanie
a32f80b9e3
Implement SendPlacesReply
2010-12-30 01:36:09 +00:00
Melanie
2cb2bff9b2
Implement SendPlacesReply
2010-12-30 00:31:59 +01:00
Melanie
dbaaccf92a
Copying a ref type under lock doesn't dissociate it from the source.
...
Use a new list to do that.
2010-12-29 21:02:45 +01:00
Kitto Flora
88db69e017
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-29 21:18:28 +00:00
Kitto Flora
64209c9be1
Fix av/prim eject problem.
2010-12-29 21:13:49 +00:00
Diva Canto
d42e0c39fc
Bug fix in neighbors: serverURI now always has a trailing '/'... neighbors were not getting notified.
2010-12-29 07:36:39 -08:00
Melanie
dfc0c8dca6
Remove the restriction on communication across scopes. This will allow
...
cross-scope users to IM each other.
2010-12-29 15:13:10 +01:00
Myan Thor
915c0b17b0
fixes a problem with ending slashes in GatekeeperService to verify session-addresses
2010-12-29 06:03:43 -08:00
Mic Bowman
94ed69b1da
Update SimianGridServicesConnector to work more like
...
a connector so we can take advantage of the logic in
RemoteGridServicesConnector.
2010-12-27 17:18:49 -08:00
Diva Canto
6386dfd362
No need for these methods to be virtual now.
2010-12-27 16:26:29 -08:00
Diva Canto
f801d50a8a
WARNING: simulator config var change! This affects only system-facing configs. Nothing to do if you follow the rules of not messing with Grid.ini and GridHypergrid.ini.
...
Change the remote Grid region module so that it takes the network connector as a config variable. This allows the region plugin to be reused for both Robust and Simian network connectors.
2010-12-27 15:25:08 -08:00
Mic Bowman
b16173e3e8
Drop the static from default wearables. It isn't
...
static.
2010-12-27 12:43:54 -08:00
Kitto Flora
61b7ec5fb5
Fixing AbsolutePosition to correct llSensor in vehicles
2010-12-26 22:52:03 +00:00
Melanie
f2dd324bc8
Fix linking link sets to rotated prims.
2010-12-26 20:42:47 +01:00
Melanie
8186bf2525
Remove some code that was meant to fool the viewer into thinking SLT. It never
...
worked and it turned out the issues were really in the backend.
2010-12-26 07:29:23 +01:00
Diva Canto
06077f775f
Fixes mantis #5279
2010-12-25 08:28:42 -08:00
Melanie
b17150c3e8
Fix the corner casse of stack overflow when logging out with attachments
2010-12-25 08:05:42 +01:00
Melanie
0aeafc9919
Fix the recent stack overflow
2010-12-25 07:25:56 +01:00
Diva Canto
b23b29a53e
This fixes mantis #5198 and related. Physics is not my expertise, so I'm not 100% sure of what all the consequences of this change are. Pushing up, so others can take a look.
2010-12-24 16:23:00 -08:00
Melanie
75010e5e1c
Merge branch 'master' into careminster-presence-refactor
2010-12-25 00:04:46 +00:00
Melanie
b16f4024db
Update child prim group positions in moving vehicles
2010-12-24 21:04:10 +01:00
Diva Canto
3eaaaa0d99
One more pass at object inventory. This time, fix SceneObjectPartInventory so that it makes sure that the file is added to Xfer's before it signals the client to come and get it. This allows the simplification of the logic of Xfer's.
2010-12-24 08:50:00 -08:00
Diva Canto
135b012bbd
Hopefully this fixes all prim inventory issues. No more abort, no more keeping track of time. Simply handle the issues, which are: (1) rapid double requests from the viewer for the same file; (2) sometimes the file generation takes too long and the Xfer request arrives at the XferModule before the file name is added.
...
This still has debug messages commented out, in case this needs more debugging. Pushing it so others can test.
2010-12-23 19:31:37 -08:00
Melanie
42d44c00f3
Change the mute list parts of the client interface so that all data is provided
...
to the module
2010-12-24 03:46:57 +01:00
Melanie
2e3d0fb276
Merge branch 'master' into careminster-presence-refactor
2010-12-24 02:23:26 +00:00
Teravus Ovares (Dan Olivares)
d829580e5e
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-12-23 13:17:55 -05:00
Teravus Ovares (Dan Olivares)
c108968020
* Cleanup from a commit a while ago.
2010-12-23 13:17:33 -05:00
Diva Canto
bc67bc0d94
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-23 10:05:45 -08:00
Diva Canto
54418c5e69
Removed unused code -- this was the previous version of UDP texture sending, which now lives entirely in LindenUDP space.
2010-12-23 10:05:08 -08:00
Melanie
70bb542727
Merge branch 'master' into careminster-presence-refactor
2010-12-23 17:20:45 +00:00
Melanie
2cc07de0ba
Merge branch 'master' into careminster-presence-refactor
2010-12-23 12:08:38 +00:00
Melanie
26e601a776
Put back a commented section of code. With some viewers, object inventory
...
transfers just don't start without it. Observed my Nebadon and yours truly.
2010-12-23 11:50:53 +00:00
Melanie
efa8bd8eb3
Revert "reactivating some traces to track a dead thread"
...
This reverts commit d7df871f9f
.
Useless spam nit suitable for debugging anything that is currently brokwn
2010-12-23 11:15:43 +00:00
Teravus Ovares (Dan Olivares)
46db73b62b
* Re-Adding Scene TimeDilation to Object Update Packets.
...
* Added Calculating Time Dilation in the OdePlubin
* When multiple object updates are stuffed into one packet, average the time dilation between them as a compromise.
* Time Dilation on the update is calculated when the EntityUpdate object is created. The pre-calc-ed TD is stored in the Entity update and used when it goes out on the wire. Previously, it was 1.0 all the time. The time dilation is tied to when the update is created, not when the update is sent.
2010-12-23 03:30:09 -05:00
sacha
98f0b4c72a
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-23 08:14:43 +00:00
sacha
d7df871f9f
reactivating some traces to track a dead thread
...
seen @ NT and Otaku
2010-12-23 08:11:52 +00:00
Melanie
d06456c8b2
Merge branch 'master' into careminster-presence-refactor
2010-12-23 02:57:45 +00:00
Diva Canto
862da9a55f
Added a counter to NewFiles in Xfers to account for simultaneous object inventory requests, which apparently are happening and may cause race conditions if the file name is removed after the first transfer.
2010-12-22 17:55:58 -08:00
Melanie
990e73d7cb
Fix a broken format on an error message. Also replace yet another e.Message
...
with e.ToString(). e.Message is USELESS, it doesn't tell us what happened
where, we should use e.ToSTring() everywhere
2010-12-22 17:33:06 +00:00
Melanie
32cc569b00
Fix up some locking issues in task inventory. Don't use any prior versions in production!
2010-12-22 13:45:21 +01:00
Melanie
cf37b3b943
Prevent a null ref when an avatar login doesn't go as planned
2010-12-22 03:25:30 +01:00
Teravus Ovares (Dan Olivares)
25ecd62b1f
* Adds AbortXfer to the ClientAPI mix
...
* Adds an item that checks to see if the top request has been there for longer then 30 seconds without an update and sends an AbortXfer if it encounters one. This allows the client to cancel the Xfer on it's side so you can re-select the prim and get the inventory when it fails the first time.
* Some interesting locking... Using NewFiles to lock the rest of them. We'll see how that goes.
* The goal of this is to ensure that Xfers are restartable when they fail. The client will not do that on it's own.
2010-12-21 19:15:44 -05:00
Melanie
e9382c2939
Merge branch 'master' into careminster-presence-refactor
2010-12-21 23:09:12 +00:00
Melanie
303c02133f
Merge branch 'master' into careminster-presence-refactor
2010-12-21 23:00:01 +00:00
Melanie
1c3e77b728
What is the point of using different types to express the same damn thing?
2010-12-21 22:58:52 +00:00
Melanie
a70b597840
Merge branch 'master' into careminster-presence-refactor
2010-12-21 22:57:31 +00:00
Melanie
19181c019a
Another good catch. Update file name serial.
2010-12-21 22:56:48 +00:00
Melanie
da37ddff9f
Merge branch 'master' into careminster-presence-refactor
2010-12-21 22:50:35 +00:00
Melanie
ec8d1d0131
Added a missed return. Thanks diva!
2010-12-21 22:49:38 +00:00
Melanie
4093e22833
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-21 20:57:52 +00:00
Melanie
b1180a53dd
Merge branch 'master' into careminster-presence-refactor
2010-12-21 20:56:37 +00:00
Melanie
a31b96e1ba
Fix up merge artifacts
2010-12-21 20:54:28 +00:00
Melanie
043dace118
Make prim inventories a bit more sane
2010-12-21 20:49:31 +00:00
Melanie
c9aa420c2d
Restore CM loking after core extract
2010-12-21 20:48:58 +00:00
Melanie
2f84f2171f
Make prim inventories a bit more sane
2010-12-21 20:47:00 +00:00
Mic Bowman
a6a136bd90
Shooting in the dark for solutions to the appearance problem
2010-12-20 14:24:52 -08:00
Kitto Flora
5fccbe21d6
Update materials parameters.
2010-12-20 07:04:35 +00:00
Diva Canto
c082254b9d
Put the coarse location updates back to 50 frames, otherwise the dots on the mini-map come and go noticeably. Also increased the Velocity a bit; I had decreased it to 0.885; now it's 0.9.
2010-12-19 19:29:07 -08:00
Melanie
11eabf0e51
Merge branch 'master' into careminster-presence-refactor
2010-12-20 02:49:31 +00:00
Marck
711283d3ca
More changes to the long help text for console command link-region.
2010-12-20 02:50:19 +01:00
Marck
3b4af8a0dc
Fix osTeleportAgent and osTeleportOwner for the case that GridService is used with a storage provider other than NullRegionData.
2010-12-20 02:09:35 +01:00
Marck
2a40c8511a
Make long help text for new link-region command syntax more explicit.
2010-12-19 22:59:32 +01:00
Mike Rieker
7a78de8105
fix 'system.exception: unknown type in list.size: system.uint32'
2010-12-18 23:29:49 +00:00
Justin Clark-Casey (justincc)
223264047e
uncomment "load iar" help lines which added the --merge option
2010-12-18 00:59:37 +00:00
Justin Clark-Casey (justincc)
bf9555eaee
minor: add [-p|--profile=<url>] to usage line that pops up if save iar console command isn't valid
2010-12-18 00:57:09 +00:00
Justin Clark-Casey (justincc)
ef43f98686
Raise maximum iar version that master can load to 1.x, so that it can load its own iars (oops)
2010-12-18 00:45:56 +00:00
Melanie
a82112a47c
Merge branch 'master' into careminster-presence-refactor
2010-12-17 22:50:25 +00:00
Melanie
b32dcc6913
Fix notecards that end with an embedded object causing an exception
2010-12-17 22:50:00 +00:00
Justin Clark-Casey (justincc)
490d05d212
remove broken and unmaintained subversion serialization module and it's associated libraries and licenses
2010-12-17 23:04:07 +00:00
Justin Clark-Casey (justincc)
3d32f05cde
remove mono compiler warning: if (sop.Color != null) always returns true as sop.Color is a value type.
2010-12-17 22:40:11 +00:00
Justin Clark-Casey (justincc)
3b1c91c24b
remove mono compiler warnings
2010-12-17 22:35:08 +00:00
Justin Clark-Casey (justincc)
0913d43c50
minor: 'debug packet' console command level <= 50 then don't log ImprovedTerseObjectUpdate messages
2010-12-17 22:29:43 +00:00
Melanie
d7622cbedc
Fix notecards that end with an embedded object causing an exception
2010-12-16 21:01:38 +01:00
Melanie
835e4dbc2c
Add locks on m_killRecord without breaking things like justin did
2010-12-16 20:49:40 +01:00
Melanie
aebc011f7b
Remove some spam from FreeSwitchModule
2010-12-16 20:12:18 +01:00
Melanie
4719e925b8
Revert the locking changes in LLCLientView
2010-12-16 20:11:26 +01:00
Justin Clark-Casey (justincc)
0745d65344
Put in locks on m_killRecord to replace changed locks on m_entityUpdates.SyncRoot
...
These locks are necessary to avoid a delete/update race condition for scene objects.
However, since we're now locking on m_killRecord this shouldn't cause delays to m_entityUpdates reprioritization
2010-12-15 23:11:42 +00:00
Melanie
d457b4c4b1
Merge branch 'master' into careminster-presence-refactor
2010-12-15 22:59:52 +00:00
Melanie
62e66b17bc
Make sure the material is set on physical prims
2010-12-15 17:54:57 +01:00
Melanie
ee1e725e39
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-15 08:18:02 +01:00
Melanie
f8beeb1e93
Fix casts in llSetPayPrice
2010-12-15 08:15:12 +01:00
Diva Canto
ed26376ec5
Yet more things out of the main Update thread loop and into threadlets. This time, SendPrimsUpdate. Plus a few more tweaks on triggering actions from the Update loop. #LoginLag.
2010-12-14 20:15:26 -08:00
Diva Canto
74c68474e0
Another attempt at moving heavy computation away from the Update loop. #LoginLag
2010-12-14 18:44:26 -08:00
Diva Canto
e3262ef5ac
Commented out the UpdateLand call from the Update thread loop, because this may be causing the #LoginLag. Attachments taint the prim count. Twice. Each.
2010-12-14 17:50:37 -08:00
Justin Clark-Casey (justincc)
6b135ee371
fix mistake in last change of local.include
2010-12-15 00:14:43 +00:00
Diva Canto
9d0339e8f9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-14 16:04:46 -08:00
Diva Canto
a4309578e2
Another stab at #LoginLag. Looking forward to hear the feedback! This makes updates for self movement as absolute top priority, going in to the unthrottled category. Self only, not other avies.
2010-12-14 16:04:28 -08:00
Melanie
354f568508
Merge branch 'master' into careminster-presence-refactor
2010-12-14 23:58:45 +00:00
Justin Clark-Casey (justincc)
3643be1c97
Rename SceneObjectUserTests to SceneObjectDeRezTests to better reflect its contents
2010-12-14 23:46:02 +00:00
Justin Clark-Casey (justincc)
92727ad596
minor: disable debug logging for previous test
2010-12-14 23:41:36 +00:00
Justin Clark-Casey (justincc)
8a5f9b91de
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-14 23:39:21 +00:00
Justin Clark-Casey (justincc)
81bccd6d13
Start implementing a test for 'share with group' object functionality. Not yet complete.
...
While implementing this, a bug was fixed in scene setup helpers where module RegionLoaded() was called immediately after AddRegion() instead of waiting for all AddRegions() to complete.
Also, XmlRpcGroupsModule non-message functionality will now work without a message transfer module (as indicated in the comments but with a contradictory implementation)
2010-12-14 23:36:34 +00:00
Justin Clark-Casey (justincc)
42c9c30e4c
Add mock group services connector and use this in tests
2010-12-14 22:57:36 +00:00
Justin Clark-Casey (justincc)
c620e4c822
add infrastructure for groups module tests
2010-12-14 22:25:01 +00:00
Diva Canto
ff8ff773e7
Relax a highly constraining lock on m_entityUpdates that may be preventing reprioritizations from actually happening. #LoginLag
2010-12-14 12:58:32 -08:00
Diva Canto
10ae5454cb
Made the map thread request the map items asynchronously, as the name suggested -- but with a cap of 20 async requests max at any given time.
2010-12-14 12:16:51 -08:00
Diva Canto
4357288a94
More on mantis #5270
2010-12-14 11:24:23 -08:00
Tom
5ce296e08d
Workaround to allow llHTTPRequest to POST data to Lighthttpd which doesn't support Expect: 100-Continue
2010-12-14 09:14:34 -08:00
Diva Canto
55e04e6c68
Fixes mantis #5270 -- Map tiles for hyperlinks not showing in world map for grided sims.
2010-12-14 08:11:49 -08:00
Melanie
cb51fc129e
Merge branch 'master' into careminster-presence-refactor
...
Also fix the failure to fire CHANGED_LINK on sit, which is different in our
code.
2010-12-14 12:12:27 +00:00
Melanie
e47cc10674
Null checking ParentGroup is not needed. It can't be null.
2010-12-14 12:07:35 +00:00
Diva Canto
4bdba0a487
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-13 21:36:08 -08:00
Diva Canto
b41164b620
This seems to get rid of the stuck PREJUMP animation, as reported by Justin in -dev. Also in this commit, a slight adjustment to the Velocity of SP -- this makes the avie walking feel less jerky for me. Will wait reports from others.
2010-12-13 21:35:40 -08:00
Justin Clark-Casey (justincc)
e08da02a0f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-14 00:12:17 +00:00
Justin Clark-Casey (justincc)
e62b3dba8a
reinstate IAttachmentsModule.UpdateAttachmentPosition() since this is being used by a 3rd party region module and contains non-obvious attachment specific code
...
There are no functional changes. UpdateAttachmentPosition() is adapted to the new approach of only saving attachment state on logout
2010-12-14 00:11:41 +00:00
Melanie
2a9f095071
Fix a small bug in ban list handling
2010-12-13 22:14:34 +00:00
Melanie
6528fc5c64
Fix a small bug in ban list handling
2010-12-13 22:27:03 +01:00
Melanie
9bd7f3b03a
Revamp the viewer -> banlist packet processing so fix a number of bugs.
...
Remove the too coarse CanEditParcel method in favor of a CanEditParcelProperties
method that takes a GroupPowers argument to specify what action is to be
taken. Also, make the method to set parcel data much more granular. Permissions
in a deeded setting should now work.
2010-12-13 20:35:56 +00:00
Melanie
d6803e6448
Change some lookups in he Land Management module to make group permissions
...
work better. Add a generic group permissions hoot to the scene permissions
system.
2010-12-13 20:28:14 +00:00
Marck
a4588befb7
Changed logging level for message about failure to retrieve a map image from a linked region.
2010-12-13 22:00:34 +01:00
Marck
9a24c0b41c
Show map tile for hyperlinks. Perform Check4096 before adding a hyperlink.
...
Configuration option AssetService in section [GridService] must be set to enable this functionality.
Map tiles do currently not show for hyperlinks set in simulators that are connected to grids, see Mantis #5270 .
2010-12-13 21:20:48 +01:00
Melanie
7538926292
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-13 20:20:02 +00:00
Melanie
d2ff4ebf2d
Merge branch 'master' into careminster-presence-refactor
2010-12-13 20:19:10 +00:00
Diva Canto
6b8d01d8c4
It turns out that the 1/2 sec burst for prims download is not a bug, but a feature of the client. The client sets the throttles in such a way that makes the server behave like that. The same happens in the Linden Grid.
...
Revert "This may have been the biggest, baddest bug in OpenSim ever... confusion between bytes per second and bytes per millisecond."
This reverts commit 870bbcfc6c
.
2010-12-13 11:45:17 -08:00
Melanie
6b374fa547
Revamp the viewer -> banlist packet processing so fix a number of bugs.
...
Remove the too coarse CanEditParcel method in favor of a CanEditParcelProperties
method that takes a GroupPowers argument to specify what action is to be
taken. Also, make the method to set parcel data much more granular. Permissions
in a deeded setting should now work.
2010-12-13 20:19:52 +01:00
Diva Canto
fe6c655f70
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-13 09:43:54 -08:00
Diva Canto
870bbcfc6c
This may have been the biggest, baddest bug in OpenSim ever... confusion between bytes per second and bytes per millisecond.
2010-12-13 09:42:27 -08:00
Melanie
d36b880022
Change some lookups in he Land Management module to make group permissions
...
work better. Add a generic group permissions hoot to the scene permissions
system.
2010-12-13 11:13:34 +01:00
Kitto Flora
9f9af315ec
Correct Sensor axis for unattached daughter prims.
2010-12-12 23:26:58 +00:00
Melanie
d3b081744e
Prevent objects that are worn from ground from vanishing from the scene
2010-12-12 22:12:50 +01:00
Melanie
63353a0687
Fix a perms issue when wearing an object from inworld
2010-12-12 21:24:00 +01:00
Marck
7f0350b988
Trigger event with flag CHANGED_LINK when agent sits on objects that have not a sit target defined. This fixes Mantis #4692 .
2010-12-12 20:12:34 +01:00
Melanie
663a626a6f
Apply the useful part of diva's patch that was skipped
2010-12-12 08:57:26 +00:00
Melanie
28022a9198
Merge branch 'master' into careminster-presence-refactor
2010-12-12 01:22:50 +00:00
Melanie
8aa63093b1
Merge branch 'master' into careminster-presence-refactor
2010-12-12 01:20:46 +00:00
Diva Canto
4d16ecf889
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-11 17:07:08 -08:00
Diva Canto
797ca8d0e7
Fixes the nudge movements!
2010-12-11 17:06:17 -08:00
Kitto Flora
95a915efd8
Fix border fence for physicals. Fix llRotLookAt() for Vehicles.
2010-12-11 21:04:03 +00:00
Marck
69538d14d4
More OSSL function name normalization, this time for osParcelSetDetails.
2010-12-11 11:41:45 +01:00
Diva Canto
c42876df67
Revert "Another stab at mantis #5256"
...
This reverts commit ccb4f958c0
.
2010-12-10 23:32:50 -08:00
Diva Canto
18b10fab60
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-10 23:16:47 -08:00
Diva Canto
ccb4f958c0
Another stab at mantis #5256
2010-12-10 23:16:26 -08:00
Justin Clark-Casey (justincc)
b46de6e025
Remove the restriction that you have to be logged in when loading/saving iars
...
This is pointless as we're supplying the password on the command line
2010-12-11 03:09:00 +00:00
Melanie
711db25dfa
Allow floats in the list for llSetPayPrice and silently convert them to int,
2010-12-11 03:31:57 +01:00
Justin Clark-Casey (justincc)
387f743993
If we're saving an IAR with --profile information, then label this a version 1.0 IAR since it isn't compatible with older OpenSim releases.
2010-12-11 02:18:16 +00:00
Justin Clark-Casey (justincc)
373ef594ba
Drop current OAR version back to 0.5 since these are currently now compatible with older OpenSim versions again.
...
Removed ability to choose 0.4 to avoid having to write code that polices this properly. Please shout on the ml if you really need this.
2010-12-11 01:57:32 +00:00
Marck
b512ecd1dc
Normalization of OSSL function names.
...
Added the following replacement functions for compliance to the OSSL standards stated on the wiki:
osGetTerrainHeight
osSetTerrainHeight
osGetSunParam
osSetSunParam
osSetPenColor
The functions that do not comply to the standard give a warning when used but work normally otherwise.
The graphics primitive drawing command "PenColor" has also been added as well as dynamic texture parameter "bgcolor" as an alternative to "bgcolour".
The following two functions have been renamed because they are not enabled yet aynway:
osWindParamSet => osSetWindParam
osWindParamGet => osGetWindParam
2010-12-10 22:20:35 +01:00
Diva Canto
d8fd917076
Revert "A stab at mantis #5256 . Separate ScenePresence updates from SceneObject updates, and place them in different queues."
...
This reverts commit f84905e294
.
2010-12-10 12:40:12 -08:00
Diva Canto
58b251506c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-10 11:33:09 -08:00
Diva Canto
f84905e294
A stab at mantis #5256 . Separate ScenePresence updates from SceneObject updates, and place them in different queues.
2010-12-10 11:32:46 -08:00
Marck
6f37290f4c
Adjust hypergrid console commands to latest changes.
2010-12-10 17:48:45 +01:00
Justin Clark-Casey (justincc)
a918c8df97
fix the minimap sitting avatar location bug
...
a sitting avatar should have it's offset position added to the scene object, not its absolute position
2010-12-10 03:46:16 +00:00
Justin Clark-Casey (justincc)
3053f5ba7d
minor: remove some compiler warnings
2010-12-10 03:08:31 +00:00
Diva Canto
cefdee8aaf
Normalized ALL URLs with trailing /'s hopefully. Fixed show hyperlinks command. mantis #5259
2010-12-09 16:52:37 -08:00
Diva Canto
baa8ddfd26
Minor bug fixes. Hunting down mantis #5259
2010-12-09 08:28:21 -08:00
Diva Canto
ab980fc927
Fixed wrong comment
2010-12-08 19:47:05 -08:00
Diva Canto
90bcfefe09
Fixed previous compile error -- I haven't pushed the CreatorID in AssetBase yet...
2010-12-08 19:37:35 -08:00
Melanie
7fef89847c
Merge branch 'master' into careminster-presence-refactor
2010-12-09 02:24:12 +00:00
Melanie
d7346dd5ff
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-12-09 01:55:45 +00:00
Diva Canto
1070cffcf9
Added ability for GetTexture to serve multiple formats. The format may come as an extra query parameter in the URL format=<format> (this was tested and working) or it may come in the Accept header (code added, but not tested). The result of the conversion is placed in the asset cache, under the name <uuid>-<format>.
2010-12-08 18:53:15 -08:00
Melanie
4df1d25d23
Plumb a code path for the entity transfer module to ask a destination scene
...
whether or not an agent is allowed there as a root agent.
2010-12-09 01:55:32 +00:00
Melanie
f28dc77ab4
Plumb a code path for the entity transfer module to ask a destination scene
...
whether or not an agent is allowed there as a root agent.
2010-12-09 02:01:41 +01:00
Diva Canto
796216e44f
Added an exception handler on CreateObject handler, just in case there's an exception being thrown that is silently being ignored by the http server. (Trying to catch Melanie's problem with attachments on TPs)
2010-12-07 20:05:53 -08:00
Diva Canto
7cfb3d7e96
Removed extraneous left-/ on /object/ subpath. Bug introduced during region URLs clean up.
2010-12-07 17:17:06 -08:00
Justin Clark-Casey (justincc)
1fa9399ab8
change doc. trivial commit to get panda to rebuild
2010-12-08 00:41:33 +00:00
Melanie
80b84e4bad
Prevent sending of attachment data to any client if the attachment
...
is not actually attached to any avatar. Another stab ad fixing "HUD hair"
2010-12-08 00:08:14 +01:00
Melanie
b9f54fca5d
Allow TPing multiple people in the friends list in one go.
2010-12-07 23:01:42 +01:00
Melanie
549f90c5b5
Update calling card interface
2010-12-07 04:45:28 +01:00
Melanie
a4f7937eb3
Add the interface needed to revive calling cards
2010-12-07 03:08:48 +01:00
Melanie
b325721d6f
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-07 01:07:57 +01:00
Melanie
b960a05e67
Cowardly refuse to keep running when no application plugins are loaded.
...
Prevents empty instances from hanging around when Mono.Addins messes up
2010-12-07 01:07:13 +01:00
Melanie
b1a5c03985
Lock the attachments dict so it doesn't get out of sync when iterating
2010-12-06 17:40:07 +01:00
Diva Canto
72748746d5
Fixed some inconsistency with trailing /. Made debug messages consistent. Changed the stored region names of HG regions. Increased the size of regionName in DB.
2010-12-05 19:43:24 -08:00
Melanie
45314c6622
Merge branch 'master' into careminster-presence-refactor
2010-12-06 02:54:51 +00:00
Jonathan Freedman
45cd2e3ef9
Merge branch 'master-core' into mantis5110
2010-12-05 11:49:15 -08:00
sacha
835103af82
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-04 21:50:48 +00:00
sacha
9b9ce8fb27
add more detail to the log in case of FORM Timeout
...
cause nothing relevant are in the services logs
2010-12-04 21:40:18 +00:00
Melanie
4b979362e9
Add some safeguards: DOn't send someone else's HUDs, don't send deleted prims
...
Removed some unneccessarily wordy core comments
2010-12-04 14:41:57 +01:00
Melanie
96446adfa4
Monitor the UUIDs used to create and update wearable assets. Reject any changed
...
texture that is not present in the user's inventory full perm.
This will prevent "UUID snatching", a copybot-type of attack that can cause
clothing makers to be forced to destroy and replace legit items in order to
invalidate the copies.
2010-12-04 07:06:30 +01:00
Melanie
4ca108f85e
Simplify updating of agent inventory assets. Make newly created asset IDs
...
random rather than using IDs known by the client ahead of time.
2010-12-04 04:50:24 +00:00
Melanie
89fec4ff5b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-12-04 04:25:08 +00:00
Melanie
ea17b262a3
Convert the agent asset transactions module to a new style module.
...
Refactor to remove the property "MyScene" and the pointless circular
refs to the managing classes. Converted the module to a non-shared module.
Reformatted source for 80 columns. Removed the special role the module
had in the old loader.
2010-12-04 04:24:55 +00:00
Melanie
f41dfbabc8
Simplify updating of agent inventory assets. Make newly created asset IDs
...
random rather than using IDs known by the client ahead of time.
2010-12-04 05:01:44 +01:00
Melanie
349767f8a2
Merge branch 'master' into careminster-presence-refactor
2010-12-04 04:25:39 +00:00
Melanie
bab6b6cd87
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-04 04:36:44 +01:00
Melanie
da91a2ab7e
Convert the agent asset transactions module to a new style module.
...
Refactor to remove the property "MyScene" and the pointless circular
refs to the managing classes. Converted the module to a non-shared module.
Reformatted source for 80 columns. Removed the special role the module
had in the old loader.
2010-12-04 04:33:14 +01:00
Justin Clark-Casey (justincc)
7b6b4501b7
minor: add class doc line to older region module example code pointing towards newer
2010-12-04 02:49:41 +00:00
Justin Clark-Casey (justincc)
f268cd7c53
comment out the extension attribute
2010-12-04 02:47:29 +00:00
Justin Clark-Casey (justincc)
57b5263ecf
add bare bones shared example module
2010-12-04 02:46:59 +00:00
Justin Clark-Casey (justincc)
510b55c7f0
refactor some common code in RegionModulesControllerPlugin
...
also some minor doc changes in BareBonesNonSharedModule
2010-12-04 02:38:26 +00:00
Justin Clark-Casey (justincc)
c010491d34
correct the id of the example module
2010-12-04 01:38:32 +00:00
Justin Clark-Casey (justincc)
a06032d96e
Add the most bare bones non-shared region module example. Not active unless the correct line is uncommented.
2010-12-04 01:36:35 +00:00
Justin Clark-Casey (justincc)
0ab774d484
add warning decals and information to RegionModule.cs in probably non-functional OpenSim.Region.Examples.SimpleModule project
2010-12-04 01:06:29 +00:00
Justin Clark-Casey (justincc)
9668fb4e31
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-04 00:57:18 +00:00
Justin Clark-Casey (justincc)
2486d96d06
minor: correction to logging category
2010-12-04 00:56:53 +00:00
Melanie
24af7b8384
Merge branch 'master' into careminster-presence-refactor
2010-12-04 00:09:32 +00:00
Justin Clark-Casey (justincc)
b69c5d6633
minor: change OpenSimBase log messages associated with newer module loader to make the association clear
2010-12-03 23:50:09 +00:00
Mic Bowman
df860516bf
Various bug fixes for appearance handling: more aggressive reset of textures and vparams when appearance is not cached and when wearables change. Send appearance to the viewer with initial data.
...
Cleaned up (and added) debugging.
2010-12-03 23:45:00 +00:00
Melanie
8e3bacc691
When linking something, immediately persist the linked set.
2010-12-03 23:06:44 +01:00
Kitto Flora
bf695cccba
Fix spurious Av move when clothing item worn or removed.
2010-12-03 18:32:58 +00:00
Melanie
60b055de4c
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-03 19:04:59 +01:00
Melanie
4407c4700f
Fix status responses in remote admin
2010-12-03 19:02:42 +01:00
Melanie
8741676bc3
Revert "Revert "Trigger changed event with CHANGED_TELEPORT when teleporting to another region.""
...
This reverts commit 6c01ebb875
.
2010-12-03 18:32:03 +01:00
Melanie
b940925173
Improve health reporting
2010-12-03 07:27:29 +01:00
Melanie
e913e1690e
Fix health reporting. This will now actually monitor the threads properly
...
and not just the http server. It will also restart a dead heartbeat.
2010-12-03 07:16:06 +01:00
Melanie
ce1aedf474
Add a missing interface memeber to the new HG stuff
2010-12-03 07:04:07 +01:00
Melanie
6c01ebb875
Revert "Trigger changed event with CHANGED_TELEPORT when teleporting to another region."
...
This reverts commit 2827deffe8
.
Pulling out a bad core commit that broke attachment teleporting for us
2010-12-03 04:39:51 +01:00
Melanie
342dc532ec
Merge branch 'master' into careminster-presence-refactor
...
Also prevent god takes from ending up in Lost and Found
2010-12-03 02:36:13 +00:00
Melanie
ec01936d38
Change the way sim health reporting reports sim startup
2010-12-03 02:37:08 +01:00
Justin Clark-Casey (justincc)
7e72afcb3e
Only force prim persistence before delete if the prim is the result of an unpersisted delink
...
This considerably improves delete performance for objects with large linksets
2010-12-03 00:12:59 +00:00
Justin Clark-Casey (justincc)
5246d98b8d
Stop LLUDPServer sending updates after object deletes by always queueing deletes
...
If an LL 1.23.5 client (and possibly earlier and later) receives an object update after a kill object packet, it leaves the deleted prim in the scene until client relog
This is possible in LLUDPServer if an object update packet is queued but a kill packet sent immediately.
Beyond invasive tracking of kill sending, most expedient solution is to always queue kills, so that they always arrive after updates.
In tests, this doesn't appear to affect performance.
There is probably still an issue present where an update packet might not be acked and then resent after the kill packet.
2010-12-02 02:01:01 +00:00
Justin Clark-Casey (justincc)
26569a7cd0
minor: add some method doc
2010-12-02 02:01:01 +00:00
Diva Canto
7d24dbca3c
Added some comments. Better than listening to the boring speaker...
2010-12-01 16:01:22 -08:00
Mic Bowman
ab2adaf341
Various bug fixes for appearance handling
2010-11-30 16:20:43 +01:00
Melanie
0218845c2e
Prevent the restart module from barfing if it's not configured
2010-11-30 15:40:50 +01:00
Melanie
b08cc63003
Change inworld restart to use blue boxes rather than notices to match SL
2010-11-29 21:45:03 +01:00
Diva Canto
f3835fe15c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-29 09:58:20 -08:00
Diva Canto
49b59fffee
Fix unit test.
2010-11-29 09:57:41 -08:00
Diva Canto
f86c438653
Preservation of creator information now also working in IARs. Cleaned up usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function.
2010-11-29 08:43:33 -08:00
Melanie
04ce7de5ed
Fix the build break
2010-11-29 01:15:30 +00:00
Melanie
836b73f765
Fix the build break
2010-11-29 01:15:02 +00:00
Melanie
0acfe80f21
Remove the most spammy XML dumps from the FS voice module
2010-11-28 23:37:21 +00:00
Marck
4d104cf6fe
Make gatekeeper's address check case-insensitive.
2010-11-28 23:35:38 +00:00
Melanie
5aeb83125a
Remove the most spammy XML dumps from the FS voice module
2010-11-28 23:30:55 +00:00
Melanie
2bee150aac
Implement health monitoring of the packet receiving and sending threads
2010-11-28 20:45:03 +01:00
Melanie
0f1fc79994
Implement god summons
2010-11-28 20:14:58 +01:00
Diva Canto
ca8d015733
Changed the parser for InventoryItem deserialization. Moved some utility functions around.
2010-11-27 11:40:54 -08:00
Melanie
4765fd9cd0
Remove hard limit on prim owners. The new LibOMV autosplits packets to
...
prevent overflow
2010-11-27 19:31:18 +01:00
Melanie
2412b3cb4a
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-11-27 13:07:23 +01:00
Melanie
0b41606e73
Instrument TI Dictionary to finally find that pesky script-caused deadlock
2010-11-27 13:02:51 +01:00
Marck
d71d4f96e3
Amend GetLinkPrimitiveParams with implementations for PRIM_TEXGEN, PRIM_BUMP_SHINY, PRIM_FULLBRIGHT, and PRIM_GLOW
2010-11-27 10:59:14 +01:00
Marck
947d730b56
Make gatekeeper's address check case-insensitive.
2010-11-27 09:18:39 +01:00
Diva Canto
3292a22558
Creator information preserved upon HG transfers.
2010-11-26 22:06:34 -08:00
Melanie
35c6bba6d7
Merge branch 'master' into careminster-presence-refactor
2010-11-27 01:29:01 +00:00
Melanie
63e2c3b2d6
Reformat an overzealous comment. Remove end of line marks and reference to the
...
Mantis solved, as that isn't needed to understand the code. Reformat the
comment for 80 col screens.
2010-11-27 01:28:02 +00:00
Micheil Merlin
6ed63487d9
llUnsit position fix 4063 (updated 11-20-2010)
2010-11-27 02:05:44 +00:00
Micheil Merlin
a8a8fb6e13
llVecNorm nant test
2010-11-27 01:29:55 +00:00
Justin Clark-Casey (justincc)
e0866faacc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-27 01:27:46 +00:00
Melanie
a1ab2a2244
Merge branch 'master' into careminster-presence-refactor
2010-11-27 01:25:02 +00:00
Mic Bowman
541a7660e0
Refactor appearance and avatar data sending code. Paritioning the routines into "one-to-many" and "many-to-one" makes it possible to call the right function on presence creation (both child and root) and when a child agent is promoted to root. This brings the total number of appearance sends down to one or two on login.
...
Cleaned up the avatar update calls in the groups code. Cleaned up
some commented and debugging code, and a few formating fixes.
2010-11-27 01:14:36 +00:00
Melanie
e05f728b08
Merge branch 'master' into careminster-presence-refactor
2010-11-27 01:08:12 +00:00
Justin Clark-Casey (justincc)
0e311a2104
If we fail to gather asset uuids for a particular asset, log the failing asset id and type
2010-11-27 00:54:09 +00:00
Melanie
385a6c4b34
Convert the scope id in the im session id to a URL variable. Fixes offline
...
group notice attachments not working
2010-11-26 23:20:43 +01:00
Marck
7c02d5cec5
Another attempt at fixing failing test for creator info.
2010-11-26 23:04:31 +01:00
Marck
2827deffe8
Trigger changed event with CHANGED_TELEPORT when teleporting to another region.
2010-11-26 22:46:48 +01:00
Marck
0bc5ffbe96
Fix handling of landmarks for systems with culture settings other than en_US. This fixes Mantis #5177 .
2010-11-26 11:50:51 +01:00
Melanie
cccfd1db34
Add marker files to the restart module so external scripts can be used to
...
kill a process that hasn't restarted properly
2010-11-26 03:21:51 +01:00
Diva Canto
1cbd2842d5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-25 16:27:19 -08:00
Melanie
33c023bf6a
Allow group lookup during tp / login to make restricting parcels to group
...
work.
2010-11-25 21:22:22 +01:00
Melanie
ee9aca9c52
Add the ability for gods to impersonate users. For this, bit 6 needs to be
...
set in the target's UserFlags and the impersonator must have UserLevel 200
or above. The user can then log in using the target's name and their own
password.
2010-11-25 20:34:55 +01:00
Diva Canto
ae4b02e115
WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added capability to preserve creator information on HG asset transfers. Added a new HGAssetService that is intended to be the one outside the firewall. It processes and filters the assets that go out of the grid. Also fixed the normal AssetService to do special things for the main instance (console commands, etc). Moved HGInventoryService to OpenSim.Services.HypergridService. Changed the way the login service gets the ServiceURL configs.
2010-11-25 11:14:16 -08:00
Melanie
2d2098f5da
Export the module interface for restart
2010-11-25 04:06:25 +00:00
Melanie
57c4def254
Change all restarting to use the restart module. Remove hardcoded behavior
2010-11-25 03:16:52 +00:00
Melanie
c14592d4ba
Export the module interface for restart
2010-11-25 04:16:34 +01:00
Melanie
efb03f6f99
Fix a bug caused by leftover code
2010-11-25 03:59:57 +01:00
Melanie
e74b0deb4e
Fix up remote controller.
2010-11-25 03:43:23 +00:00
Melanie
6c3eb21440
Merge branch 'master' into careminster-presence-refactor
2010-11-25 03:27:35 +00:00
Melanie
fb97fe8307
Finish the RestartModule and fix some bugs. Add new console commands:
...
region restart bluebox <msg> <time> ...
region restart notice <msg> <time> ...
region restart abort [<message>]
2010-11-25 02:30:06 +00:00
Melanie
1522567920
Finish the RestartModule and fix some bugs. Add new console commands:
...
region restart bluebox <msg> <time> ...
region restart notice <msg> <time> ...
region restart abort [<message>]
2010-11-25 02:37:50 +01:00
Melanie
eb9d7bff6c
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-11-25 01:25:56 +00:00
Melanie
2c1c04119d
Merge branch 'master' into careminster-presence-refactor
2010-11-25 01:24:32 +00:00
Melanie
6734c9f83a
Implement the restart module
2010-11-25 01:22:05 +00:00
Melanie
e14f449cc2
Adding the skeleton for the restart module
2010-11-24 22:14:53 +00:00
Melanie
b3a71c6df1
Prevent an overlength button label from producing a debug dump and aborting
...
the script.
2010-11-24 18:56:25 +01:00
dahlia
9f29908f66
catch an exception when a mesh asset header cant be decoded
2010-11-24 02:05:41 -08:00
Jonathan Freedman
bc51dfc45e
Merge branch 'master-core' into mantis5110
2010-11-23 22:27:54 -08:00
Melanie
a47fb93b74
Prevent a dump in the llGetLinkKey method when using LINK_ROOT in a single prim
2010-11-23 23:48:52 +01:00
Diva Canto
a4bf6c5343
Attempt at fixing failing test.
2010-11-23 07:44:42 -08:00
Melanie
6557d5f359
Merge branch 'master' into careminster-presence-refactor
2010-11-23 14:05:09 +00:00
Melanie
2527aeb40c
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-11-23 14:03:52 +00:00
Diva Canto
61a49ec4a8
Initialize InventoryItemBase.creatorData properly. Could throw.
2010-11-23 06:36:57 -08:00
Melanie
45b08a9ce3
Fix more potential nullrefs
2010-11-23 14:02:20 +00:00
Melanie
7796b90ebb
Fix some crashes caused by the addition of the CreatorData column
2010-11-23 14:02:06 +00:00
Marck
c68f03a6ff
Fix: Allow use of parameters without specifying a file path with command "save oar"
2010-11-23 11:45:12 +01:00
Marck
ba2bf78dcf
Fix joining land parcels not being stored correctly in SQLite. Thank you to goetz for the initial patch in Mantis #5230 .
2010-11-23 11:45:12 +01:00
Justin Clark-Casey (justincc)
8d79a39d5b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-23 04:27:06 +00:00
Justin Clark-Casey (justincc)
63170fdea7
Only perform the take object permissions check if an object is being attached directly from the scene, not from existing inventory
2010-11-23 04:26:07 +00:00
Melanie
4a54b3318b
Fix more potential nullrefs
2010-11-23 00:31:09 +01:00
Justin Clark-Casey (justincc)
bbc291dfdf
adapt tests to use DeRezObjects() since DeRezObject() has recently disappeared
2010-11-22 23:07:30 +00:00
Justin Clark-Casey (justincc)
34b13a4765
add basic tests to check that under default permissions module owner can delete objects and that non-owners (who are also not administrators, etc.) cannot
2010-11-22 22:54:13 +00:00
Melanie
571becefb6
Fix some crashes caused by the addition of the CreatorData column
2010-11-22 23:31:29 +01:00
Marck
e1c72cedb3
Let CHANGED_SCALE also trigger when editing prims and linksets with the viewer's edit tools.
...
This event used to trigger only when the scale was changed with a script.
2010-11-22 19:38:44 +01:00
Marck
d63965cf94
Let CHANGED_SHAPE trigger. This fixes Mantis #1844 .
2010-11-22 19:38:44 +01:00
Melanie
d2aebbe066
Fox case on a method
2010-11-22 14:27:45 +00:00
Melanie
506192e466
Make an invalud key string in llTextBox and llDialog non fatal to avoid
...
breakinf sloppily made no-mod scripted items.
2010-11-22 15:16:28 +01:00
Melanie
4e0a289a8d
Change FS Voice module to a shared module to avoid gratuitious server handler
...
registrations. Add the missing bits to drive the local connector's HTTP
requests. This makes standalones work.
2010-11-22 14:13:27 +00:00
Melanie
54d1d6d917
Fox case on a method
2010-11-22 14:32:51 +01:00
Melanie
87f30709a2
Merge branch 'master' into careminster-presence-refactor
2010-11-22 14:14:45 +00:00
Marck
8a2c365e5b
Thank you, thomax, for a patch making changed events CHANGED_REGION_RESTART and CHANGED_REGION work.
...
Fixes Mantix #5214 .
2010-11-22 10:39:46 +01:00
Jonathan Freedman
b7f5e82843
Merge branch 'master-core' into mantis5110
2010-11-21 20:01:48 -08:00
Jonathan Freedman
562147475c
Merge https://github.com/opensim/opensim into mantis5110
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2010-11-21 19:51:23 -08:00
Melanie
22ff06ba17
Merge branch 'master' into careminster-presence-refactor
2010-11-22 01:09:26 +00:00
Melanie
8466ada8e0
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-11-22 00:46:37 +00:00
Diva Canto
0fec29c849
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-21 17:19:45 -08:00
Diva Canto
c617d658dd
Added creator info across the board -- TaskInventoryItems and InventoryItems themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being.
...
New migration in inventory table in order to make CreatorID varchar(255).
2010-11-21 17:19:24 -08:00
Melanie
ddf08276f1
Fox the buglets in Freeswitch. Grid mode works now and there is no reason why standalone should not.
2010-11-22 00:46:23 +00:00
Melanie
7e9a3019ac
Fox the buglets in Freeswitch. Grid mode works now and there is no reason why standalone should not.
2010-11-22 00:55:11 +01:00
Melanie
8d7b181b58
Merge branch 'master' into careminster-presence-refactor
2010-11-21 23:47:28 +00:00
Melanie
c85e6bc36d
Add the remote connector for freeswitch config retrieval
2010-11-21 23:42:52 +00:00
Melanie
5f8a0f3d1f
Add the remote connector for freeswitch config retrieval
2010-11-21 23:41:56 +00:00
Melanie
2105842513
Finish the standalone mode freeswitch work and add config examples
2010-11-21 23:24:39 +00:00
Melanie
a7174cecdd
Remove username and password from the publicly accessible FS config
2010-11-21 22:45:04 +00:00
Melanie
6fa24f4671
Convert the Freeswitch module to new style
2010-11-21 22:40:03 +00:00
Melanie
e6c52f38c5
Strip the dialplan and directory methods from the region module
2010-11-21 22:25:50 +00:00
Melanie
2b0ef9ad1d
Implement a method to allow regions to query the gridwide Freeswitch
...
configuration from ROBUST
2010-11-21 22:17:25 +00:00
Diva Canto
af8c8197ab
Updated SQLiteLegacy/SQLiteSimulationData with the same. Is this crap still used?!?
2010-11-21 13:29:20 -08:00
Melanie
ed5f91c638
Move Dialplan and Directory from the region module to the ROBUST server
2010-11-21 21:29:17 +00:00
Melanie
c0ccfeebe7
Start implementing Freeswitch in ROBUST
2010-11-21 21:29:11 +00:00
Diva Canto
51343caeb5
Updated SQLite/SQLiteSimulationData to use SOP.CreatorInformation instead of SOP.CreatorID. Untested, but should work.
2010-11-21 13:27:03 -08:00
Melanie
83a427a8f9
Move Dialplan and Directory from the region module to the ROBUST server
2010-11-21 21:18:03 +00:00
Diva Canto
6a9ae9e7cb
Global creator information working on MySQL DB and on load/save OARs. Creator name properly shown on the viewer as first.last @authority.
...
New option added to save oar -profile=url. Migration on RegionStore making CreatorID be 255 chars.
Moved Handling of user UUID -> name requests to a new module UserManagement/UserManagementModule.
2010-11-21 13:16:52 -08:00
Melanie
1cf8eb8a90
Start implementing Freeswitch in ROBUST
2010-11-21 20:59:01 +00:00
Marck
f1151f20dc
Fix global region coordinates that are delivered by llRequestSimulatorData.
...
Also did some source code clean-up by replacing literals with constants.
2010-11-20 03:03:11 +00:00
Justin Clark-Casey (justincc)
a88bcbb118
Knock V0_2 decals off archive tests since they're misleading
2010-11-20 03:01:47 +00:00
Justin Clark-Casey (justincc)
d7bca3d8e8
Fix unit tests and save problems
...
(note; contrary to previous commits, saving 0.4 OARs is actually broken since serialized objects in inventories are not yet converted properly).
Firstly, if you can save a version 1.0 OAR then you can load it too.
Secondly, closing the save stream even on success before assets/objects are saved is a bad idea
2010-11-20 02:59:21 +00:00
Justin Clark-Casey (justincc)
1087d6042b
correct build break. for some reason, xbuild didn't rebuild test dlls
2010-11-20 02:43:38 +00:00
Justin Clark-Casey (justincc)
f49e32bfaa
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-20 02:34:27 +00:00
Justin Clark-Casey (justincc)
2c7be7130e
Bump oar version to 1.0 from 0.5
...
If oar contents are being changed such that older versions of opensim can't load them, then the major version must be increased
This also locks version parameters to either 1.0 or 0.4, so that arbitrary 'versions' cannot be saved
Also closes save stream properly in the event of an error
Version 1.0 OARs are currently incompatible with OpenSim 0.7.0.2 and earlier. However, you can still save compatible version 0.4 OARs by specifing --version=0 on the save oar command line
e.g. save oar --version=0 oars/test.oar
2010-11-20 02:32:12 +00:00
Melanie
164007dd00
Merge branch 'master' into careminster-presence-refactor
2010-11-18 19:06:09 +00:00
Master ScienceSim
8f1a79420b
Fixed appearance send for avatars with only default textures. This should fix some of the appearance problems on osgrid. Also added a transaction lock on SetAppearance. This won't prevent concurrent access to Appearance but it will at least make sure each update completes.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-18 19:04:50 +00:00
Melanie
f3e4000a55
Send media and other parcel data to client on login. Makes streams visible
...
right away and starts media.
2010-11-18 13:26:35 +01:00
Melanie
47f0468995
Send parcel data upon becoming root. This will make streams play and build
...
flags be set properly
2010-11-18 04:18:43 +01:00
Melanie
095e3aae67
Allow llDialog without any buttons and add the automatic OK button as it is
...
in SL.
2010-11-18 01:11:11 +01:00
Justin Clark-Casey (justincc)
859234f963
small refactor: reuse existing commandLine string rather than calling cmdline.ToString() again
2010-11-17 23:50:23 +00:00
Justin Clark-Casey (justincc)
c072a9cfb3
save all lines to history, not just those which turn out to be valid comands. does not store passwords
...
also, blank lines are not stored to history
this makes it easier to go back and correct a command which was simply mistyped rather than having to type it out again
2010-11-17 23:34:39 +00:00
Justin Clark-Casey (justincc)
af0deff7e9
Make "show queues [full]" behave like "show users [full]"
...
Now, "show queues" only shows root agents. "show queues full" will show child agents as well
2010-11-17 22:55:20 +00:00
Justin Clark-Casey (justincc)
c4f3175e17
add "Unacked bytes" column to "show queues"
...
This should show the number of bytes sent to the client that it has not yet acknowledged.
2010-11-17 22:55:19 +00:00
Justin Clark-Casey (justincc)
2a17c39dfe
Fix "show queues" console command
...
For each agent, this command shows how many packets have been sent/received and how many bytes remain in each of the send queues (resend, land, texture, etc.)
Sometimes useful for diagnostics
2010-11-17 22:55:19 +00:00
Justin Clark-Casey (justincc)
e6eeaaea67
minor: add some method comments
2010-11-17 22:55:06 +00:00
Melanie
3bc9c1adb4
Merge branch 'master' into careminster-presence-refactor
2010-11-17 18:21:35 +00:00
Melanie
0d72d77629
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-11-17 18:20:41 +00:00
Melanie
43c270b536
Fix gesture and viewer preview sounds not playing
2010-11-17 18:20:24 +00:00
Melanie
2e5ae1b013
Fix gesture and viewer preview sounds not playing
2010-11-17 17:54:32 +01:00
Melanie
80d3998001
Recalculate prim counts when a parcel is deeded
2010-11-17 17:54:03 +01:00
Justin Clark-Casey (justincc)
393c9c9046
Add osUnixTimeToTimestamp()
...
This allows an input unix time to be converted to an llGetTimeStamp() format.
Thanks Thomax.
2010-11-17 01:45:47 +00:00
Justin Clark-Casey (justincc)
b38a1594c1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-17 01:28:46 +00:00
Melanie
390c3a3b6f
Prevent leftover attachments from clogging up the pipes
2010-11-16 22:18:35 +00:00
Melanie
0049ec16f5
Prevent leftover attachments from clogging up the pipes
2010-11-16 22:26:07 +01:00
Melanie
c4eb430ad2
Merge branch 'master' into careminster-presence-refactor
2010-11-16 21:15:15 +00:00
Melanie
7bb005b0d1
Change the way attachments are persisted. Editing a worn attachment will now
...
save properly, as will the results of a resizer script working. Attachment
positions are no longer saved on each move, but instead are saved once on
logout. Attachment script states are saved as part of the attachment now
when detaching.
2010-11-16 21:01:56 +00:00
Melanie
d4d45c3acb
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-11-16 20:47:29 +01:00
Melanie
4f15b8d4e6
Change the way attachments are persisted. Editing a worn attachment will now
...
save properly, as will the results of a resizer script working. Attachment
positions are no longer saved on each move, but instead are saved once on
logout. Attachment script states are saved as part of the attachment now
when detaching.
2010-11-16 20:44:39 +01:00
Justin Clark-Casey (justincc)
c5d78c723b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-16 19:18:43 +00:00
Marck
56bd42b438
Fix osTeleportAgent for hypergrid destinations.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-16 15:23:45 +00:00
Marck
50202bab7c
Add osTeleportOwner.
...
This provides the same functionality as osTeleportAgent but without the griefing potential. Region owners need not be concerned about the use of this function because it only allows to do what is already possible with the world map.
The intended use is with HUDs. For example, a list of (hypergrid) destinations could be made available for quick access.
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-16 13:43:27 +00:00
Melanie
e7e3c74fb7
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-11-16 10:22:15 +00:00
Melanie
5329e3b9b7
Can't detach an object from within the script thread because it will throw. Use FireAndForget for that.
2010-11-16 01:36:26 +00:00
Melanie
98ba079e95
Diva needs a spanking! Serializing OldItemID breaks script state persistence in agent inventory.
2010-11-16 01:35:16 +00:00
Melanie
c2ac5dc358
Can't detach an object from within the script thread because it will throw.
...
Use FireAndForget for that.
2010-11-16 01:37:44 +01:00
Melanie
7a9c57a81e
When detaching a scripted item, always consider it modified. Script states
...
will have changed and for real usability, we need to save it. It bloats
assets, but that can't be avoided.
2010-11-16 01:35:45 +01:00
Melanie
0f152bfe8c
Diva needs a spanking! Serializing OldItemID breaks script state
...
persistence in agent inventory.
2010-11-16 01:33:24 +01:00
Marck
98f29a47c0
Do not include hyperlinks in a random region search during a login.
...
Before a random region is chosen, available fallback regions are used for the login.
2010-11-13 00:40:03 +00:00
Justin Clark-Casey (justincc)
1e7334d985
provide avatar name in log if an exception ends up at the top of an async packet processing stack
2010-11-12 23:20:07 +00:00
BlueWall
00b0f521fa
Add PARCEL_DETAILS_ID to LSL
2010-11-12 01:16:14 +00:00
Kitto Flora
b2aeea66e3
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-11-11 04:51:05 +00:00
Kitto Flora
9462a1861b
Fix excessive forward motion and flailing while descending a slope, prevent adding motion while falling from flying.
2010-11-11 04:49:47 +00:00
Melanie
bfc128529c
Prevent teleporting to a region when the egent is banned in all parcels
2010-11-10 16:20:19 +00:00
Melanie
aace455249
Prevent teleporting to a region when the egent is banned in all parcels
2010-11-10 16:22:55 +01:00
Melanie
ff3e466000
Remove a debug spam
2010-11-10 01:17:40 +00:00
Melanie
846198bb9e
Although the Allow Voice setting is per estate rather than per region,
...
apparently it is required in the region handshake to let the client
enable parcel voice controls. So, send it.
2010-11-09 23:55:43 +00:00
Melanie
b68f701c00
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-11-09 23:55:19 +00:00
Melanie
fa64f2e56e
Although the Allow Voice setting is per estate rather than per region,
...
apparently it is required in the region handshake to let the client
enable parcel voice controls. So, send it.
2010-11-09 23:54:08 +00:00
Melanie
ee85a530f6
Merge branch 'master' into careminster-presence-refactor
2010-11-09 22:16:48 +00:00
Melanie
22144eb8f7
Fix parcel bans to work only on the avatars they're supposed to work on instead of pushing all avatars, even the ones that are allowed.
2010-11-09 22:15:59 +00:00
Melanie
d206721e2f
Add option SeeIntoBannedRegion to allow band to act like SL, where you can
...
see in but not enter. Defaults to false, so no change.
2010-11-09 22:41:40 +01:00
Melanie
dfe11566f4
Fix parcel bans to work only on the avatars they're supposed to work on instead of pushing all avatars, even the ones that are allowed.
2010-11-09 20:18:36 +01:00
Melanie
ccfbce3176
Remove "OpenSimulator" from startup message
2010-11-09 16:07:43 +01:00
Melanie
09ea73f7cc
Change "OpenSim" to "Careminster" and remove CM suffix.
2010-11-09 15:33:03 +01:00
Melanie
15da52d73a
Prevent temp-on-rez prims from being persisted
2010-11-08 19:00:03 +01:00
Jeff Ames
ae9c4a4d11
Formatting cleanup.
2010-11-08 07:48:35 -05:00
Melanie
df0787f5cf
Merge branch 'master' into careminster-presence-refactor
2010-11-08 03:08:02 +00:00
Melanie
798abd1508
Reinstate a lost fix
2010-11-08 03:06:58 +00:00
Melanie
8a97d58f09
Merge branch 'master' into careminster-presence-refactor
2010-11-08 03:05:07 +00:00
Melanie
6056ae8d88
Fix merge artefacts
2010-11-08 02:58:33 +00:00
Melanie
18b27408d6
Prevent plants from being treated like dropped attachments and removed
...
from the sim.
2010-11-08 02:39:06 +00:00
Melanie
4f6dd8bda3
Call the cleanup after saving attachment states, so that the attachments
...
don't get killed before they can be saved
2010-11-08 02:38:15 +00:00
Melanie
2f58d56137
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-11-08 02:37:28 +00:00
Melanie Thielker
d8fffd0fb5
Call attachment cleanup when an agent crosses out
2010-11-08 02:37:00 +00:00
Melanie Thielker
2317b6767b
Add a method to delete left over / dropped attachments
2010-11-08 02:36:51 +00:00
Melanie
6585243113
Detach attachments displaced by other attachments
2010-11-08 02:35:47 +00:00
Melanie
5a3cd9f1d0
Decrease min search length to 2 chars for map search.
2010-11-07 16:08:41 +01:00
Jonathan Freedman
4f40374464
Merge git://github.com/opensim/opensim into mantis5110
2010-11-05 19:10:02 -07:00
Melanie
4db60a5a40
Fix the inventory transfer module to not cause duplicated text IMs
2010-11-05 15:24:08 +01:00
Melanie
7844872067
Fix merge artefacts
2010-11-05 14:46:13 +01:00
Melanie
644eb9fd7f
Fix playing sound from HUDs
2010-11-05 13:45:28 +00:00
Melanie
e078c57bf0
Fix attached sounds from HUDs erroneously being delivered to other avatars
2010-11-05 13:39:04 +00:00
Melanie
1c8d19d714
Delete existing presences for a user ID when they log in again.
...
WARNING!!! This changes a default. The old default is to allow multiple
presences, the new default disables this. As the feature currently has no users,
this should not present any difficulty and will alleviate the presence
issues somewhat.
2010-11-05 13:31:45 +00:00
Melanie
ddd3c6824a
Revert "Spin the AddNewClient process off into a new thread to avoid locking up the LLUDPServer (and therefore the entire scene)"
...
This reverts commit 40e05f4109
.
Conflicts:
OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
2010-11-05 14:27:53 +01:00
Melanie
f985775962
Revert "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."
...
This reverts commit 91b1d17e5b
.
Conflicts:
OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2010-11-05 14:27:14 +01:00
Melanie
6bac92db80
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-11-05 13:34:54 +00:00
Melanie
53d64f755a
Merge branch 'master' into careminster-presence-refactor
2010-11-05 13:33:58 +00:00
Melanie
893915ce0b
Fix child prims returning after being unlinked and deleted where the root is
...
not deleted
2010-11-04 21:09:59 +01:00
Melanie
82e534a029
Fix avatar to avatar inventory gives across servers
2010-11-04 19:07:43 +01:00
Melanie
b8924167e0
Fix creation of a duplicate physics actor on chained drag-copy operations,
...
the main cause for "ghost prims"
2010-11-04 10:37:39 +01:00
Melanie
c2bd6ccdb8
Fix playing sound from HUDs
2010-11-03 23:20:30 +01:00
Melanie
5f8ab9f018
Merge branch 'master' into careminster-presence-refactor
2010-11-03 02:34:36 +00:00
Melanie
6c3b7617b0
Add lsClearWindlightScene() to the lightshare module to remove WL settings
...
from a region and allow normal day cycles to be reestablished
2010-11-03 02:31:43 +00:00
Melanie
4ab9d37a8e
When LightShare is enabled, the standard day cycle is bypassed and replaced by
...
midday defaults when no specific LightShare profile is set.
This prevents LightShare info being send out when the region has no LightShare
profile, allowing normal day/night cycles to happen.
2010-11-03 02:04:17 +00:00
Melanie
c25f84e31c
Change the default of the new bind_ip_address RemoteAdmin option to 0.0.0.0
...
so it reflects the prior default. We are not in the habot of changing default
behavior without good reason and making localhost the default would break
most current use cases.
2010-11-03 01:13:01 +00:00
mores
1f77f05f02
Admin Server can now bind to a private ip address
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-03 01:12:48 +00:00
Melanie
636ca6218d
Change the default of the new bind_ip_address RemoteAdmin option to 0.0.0.0
...
so it reflects the prior default. We are not in the habot of changing default
behavior without good reason and making localhost the default would break
most current use cases.
2010-11-03 01:11:04 +00:00
mores
d5d0e81df2
Admin Server can now bind to a private ip address
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-03 01:09:38 +00:00
Melanie
e9ec187746
Merge branch 'master' into careminster-presence-refactor
2010-11-03 00:48:18 +00:00
Melanie
57eabe9d46
Actually calculate the height before setting it, this isn't done automatically
...
on incoming transfers in all cases.
2010-11-03 00:47:22 +00:00
Melanie
7d551e27ca
Trying to prevent a wrong physical actor size
2010-11-03 00:01:47 +00:00
Melanie
797e461ef9
Merge branch 'master' into careminster-presence-refactor
2010-11-02 23:41:13 +00:00
Melanie
d555c373d8
Fix avatar height management
2010-11-02 23:39:45 +00:00
Melanie
26f12f479f
Merge branch 'master' into careminster-presence-refactor
2010-11-02 22:58:33 +00:00
Melanie
43ac44b028
Fix default club feet
2010-11-02 21:41:27 +00:00
Melanie
5eeabb8b4b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-11-02 21:29:02 +00:00
Melanie
78a0ed3ff9
Fix sitting and standing up
2010-11-02 21:28:24 +00:00
Marck
4fdab71c8d
Add support for cross-domain AJAX requests to REST console.
...
Enables RemoteConsole to add the appropriate HTTP header when responding to requests that use Cross-Origin Resource Sharing (CORS with simple requests). The allowed origin is set with configuration option "ConsoleAllowedOrigin" in section [Network]. For a suggestion to make this configuration option more flexible, see the TODO comment in the source code.
The WifiConsole uses this functionality with grid mode.
2010-11-02 14:12:25 -07:00
Marck
4d1f0c5348
Support for CORS with simple requests in BaseHttpServer
2010-11-02 14:11:49 -07:00
Melanie
e327e990f5
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-11-02 19:55:27 +00:00
Melanie
63ffdcf53a
Try to not make avatars switch outfits
2010-11-02 19:55:05 +00:00
Diva Canto
9f5ab3b965
Old deserialization can't deal with commas in flag fields. Making use of -version option on save oar command. Bumped archives version to 0.5; version < 0.5 generates flag fields without commas. Everything else is identical.
2010-11-02 12:05:24 -07:00
dahlia
ed7959ddfb
Thanks Snoopy for a patch that addresses Mantis #0005165 : osSetDynamicTextureURL crashed region server
...
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-11-02 02:35:56 -07:00
Marck
2bce1716af
Fix HypergridLinker.Check4096()
...
Make the optimization with IEnumerable.Except() in Check4096 actually work by providing an appropriate equality definition for GridRegion objects.
2010-11-01 08:01:31 -07:00
Jonathan Freedman
12d61d1ef5
Merge branch 'master' into mantis5110
2010-10-31 20:50:39 -04:00
Diva Canto
f15f0ab59b
Removed a couple of very verbose debug messages.
2010-10-31 12:11:30 -07:00
Jonathan Freedman
0a56cfbfd5
* better semantics for link-region command
...
* actually parse name for new link-region command
2010-10-30 22:51:52 -04:00
Jonathan Freedman
95a0ea78f9
Merge branch 'master' into mantis5110
2010-10-30 18:28:07 -04:00
Diva Canto
48f6d47744
Fixed: ToAvatarAppearance wasn't retrieving the AvatarHeight.
2010-10-30 12:30:03 -07:00
Melanie
623cee1ffc
Move physics actor creation to after SetHeight to try and prevent
...
bowlegginess. Didn't work but is better this way anyway.
2010-10-30 19:17:52 +01:00
Jonathan Freedman
96a29c43b0
Merge branch 'master' into mantis5110
2010-10-30 14:11:02 -04:00
Jonathan Freedman
e371d3208c
Merge branch 'master' into mantis5110
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
2010-10-30 14:10:13 -04:00
Melanie
e98d8d500f
Fix logins and avatar appearance. Contains a Migration. May contain nuts.
...
This will cause visual params to be persisted along with worn items. With
this, alpha and tattoo laters will be saved. Multiple layers MAY work, but
not tested because I don't use Viewer 2.
2010-10-30 19:06:47 +01:00
Teravus Ovares (Dan Olivares)
09bf9d5fca
* AbsolutePosition.Get{} returns incorrect result for child prim so switch to using prim.GetWorldPosition() in the warp renderer.
2010-10-30 02:26:48 -04:00
Jonathan Freedman
9e7d3e0f25
Merge branch 'master' into mantis5110
2010-10-29 23:59:16 -04:00
Jonathan Freedman
c8d65c359f
Merge branch 'master' into mantis5110
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2010-10-29 23:58:14 -04:00
Jonathan Freedman
594f23ff22
Merge branch 'master' into mantis5110
...
Conflicts:
OpenSim/Services/GridService/HypergridLinker.cs
2010-10-29 23:46:53 -04:00
Jonathan Freedman
d219317074
Merge branch 'master' into mantis5110
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2010-10-29 23:12:51 -04:00
Melanie
d0895a4a3a
On first login, Ruth is back now. Strangely, inventory items are created for
...
tattoo and alpha layers. Any change of appearance in the sim makes the green
gnome reappear on next login. Progress of sorts.
2010-10-30 03:28:59 +01:00
Melanie
adef6b04cb
Logins work now, but avatars are green ugly gnomes.
2010-10-30 02:52:59 +01:00
Melanie
ba6f651b06
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-30 02:26:18 +01:00
Justin Clark-Casey (justincc)
f9227977f8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-10-30 03:07:45 +01:00
Justin Clark-Casey (justincc)
45220a6954
minor: remove some old commented out code
2010-10-30 03:01:40 +01:00
Melanie
ff7da2082d
This commit fixes all the appearance related null refs. Still can't log in,
...
client displays a blank error box.
2010-10-30 02:25:25 +01:00
Justin Clark-Casey (justincc)
343c894658
Set async_packet_handling = true by default
...
Setting this to true avoids a 500ms or so client freeze when the LLUDP server thread is taken up with processing a UseCircuitCode packet synchronously.
Extensive testing on Wright Plaza appeared to show no bad effects and this seems to reduce login lag considerably.
Of course, a lot of login lag is still coming from other sources.
2010-10-30 01:35:12 +01:00
Justin Clark-Casey (justincc)
ade71c9ed7
Change level of some logging messages, turning some info into arguably more appropriate debug to reduce console spam when log level is info
2010-10-30 01:32:56 +01:00
Melanie
46362cd1c0
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-30 00:56:58 +01:00
Melanie
7503c4ad61
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-30 00:56:42 +01:00
Melanie
818ed2032a
READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.
...
It contains a major interface version bump and will NOT work with earlier grid
services. This is preliminary work that will lead to layers support.
Rest appearance services are commented out completely, they will have to be
adapted by someone who actually uses them. Remote admin is working, but has
no layers support. There is no layers support in the database. Login likely
won't work. You have been warned.
2010-10-30 00:41:36 +01:00
Justin Clark-Casey (justincc)
09705514ff
tweak a few more scene presence logging messages for consistency
2010-10-29 23:52:25 +01:00
Justin Clark-Casey (justincc)
e66ec432af
Rationalize the logging messages from the merged appearance branch, commenting out most of them as per Mic
2010-10-29 23:45:10 +01:00
Justin Clark-Casey (justincc)
abcde41c0d
Merge branch 'justincc-dev'
2010-10-29 23:15:35 +01:00
Justin Clark-Casey (justincc)
25e19ba7e9
add timing report to CompleteScenePresence for diagnostic purposes
2010-10-29 23:03:11 +01:00
Justin Clark-Casey (justincc)
bcd784b316
for now, comment out some older or redundant log debug lines to make diagnostics easier
2010-10-29 21:49:26 +01:00
Justin Clark-Casey (justincc)
f19816aeb9
Add number of ms it takes to complete UseCircuitCode packet handling to log for diagnostics
2010-10-29 21:38:26 +01:00
Melanie
69c1e0b2f7
Merge branch 'master' into careminster-presence-refactor
2010-10-29 21:22:35 +01:00
Melanie
934e536738
Merge commit 'cmickeyb/dev-appearance'
2010-10-29 21:06:46 +01:00
Master ScienceSim
49fa7e91b9
Clean up some cruft from the last commit. Re-add the initial update
...
send in the scene presence constructor... need to figure this out
later.
2010-10-29 13:45:59 -07:00
Master ScienceSim
f5c9a56c8b
Bunch of fixes that reduce the number of times appearance
...
and avatar data are sent. And the number of times they
are stored.
2010-10-29 13:43:35 -07:00
Melanie
5f4badf9e2
Add my work on top of cmickeyb's
2010-10-29 20:44:29 +01:00
Melanie
05d2302c62
Merge branch 'dev-appearance'
2010-10-29 20:24:14 +01:00
Melanie
e6fe83cd93
Revert "Preliminary work on appearance layers. No user functionality yet."
...
This work conflicts with cmickeyb's more extensive, related work
This reverts commit 9c829c0410
.
2010-10-29 20:17:59 +01:00
Melanie
840b75ca9b
Add my work on top of cmickeyb's
2010-10-29 20:48:37 +02:00
Melanie
9331898c32
Merge branch 'master' into careminster-presence-refactor
2010-10-29 20:40:48 +01:00
Melanie
dbd1a68b58
Fix a LSL issue and a prim naming issue
2010-10-29 20:35:06 +02:00
Melanie
3231602b88
Revert "Preliminary work on appearance layers. No user functionality yet."
...
This reverts commit e6a8d2872c
.
2010-10-29 20:34:53 +02:00
Melanie
9c829c0410
Preliminary work on appearance layers. No user functionality yet.
2010-10-29 18:58:22 +01:00
Melanie
e6a8d2872c
Preliminary work on appearance layers. No user functionality yet.
2010-10-29 18:59:53 +02:00
Marck
7b0d643999
HypergridLinker optimizations and enable use of owner_uuid/EstateOwner with linked regions.
...
* Added check for already occupied region coordinates.
* Optimized Check4096.
2010-10-28 17:21:17 -07:00
Master ScienceSim
68666efd25
Configuration of persistent baked textures and save/send delays.
2010-10-28 12:00:04 -07:00
Master ScienceSim
f2c1d0e34f
Merge branch 'opensim-master' into dev-appearance
2010-10-28 09:09:42 -07:00
Master ScienceSim
0f28fa400d
Added background thread to handle delayed send and save of appearance
...
to accommodate batching of the many updates that happen on login
and teleport.
Fixed handling of the serial property in appearance.
2010-10-28 09:00:39 -07:00
Melanie
a51a545cb9
Fix attached sounds from HUDs erroneously being delivered to other avatars
2010-10-28 13:24:45 +01:00
Jeff Ames
727838f914
Formatting cleanup.
2010-10-28 00:37:32 -04:00
Melanie
05dbe4f2c4
Merge branch 'master' into careminster-presence-refactor
2010-10-27 20:49:27 +01:00
Melanie
1fcac7203d
Prevent nullrefs in scene object deletion. Mantis #5156
2010-10-27 20:47:27 +01:00
dahlia
a4e95c0717
Merge branch 'master' of ssh://MyConnection01/var/git/opensim
2010-10-26 21:20:18 -07:00
dahlia
5968d343bb
Overload Scene.NewUserConnection() to facilitate NPCs and other region specific applications
2010-10-26 21:19:33 -07:00
Jeff Ames
a331fd4e24
Formatting cleanup.
2010-10-27 00:01:03 -04:00
Master ScienceSim
9cfd3e1d5a
Small cleanup and add more debugging information
2010-10-26 12:54:28 -07:00
Master ScienceSim
9132e251aa
Made the check for texture assets asynchronous. This is one part of
...
a bigger clean up that needs to happen around locks on appearance.
2010-10-26 12:53:15 -07:00
Jonathan Freedman
5da2743c37
Merge branch 'master' into mantis5110
2010-10-25 22:27:35 -04:00
Master ScienceSim
6e58c3d563
Half of the compatibility is working. Login into a new region with
...
old data works. Teleport out of a new region with old data works.
Teleport into a new region with old data does not trigger the
necessary rebake.
2010-10-25 14:11:47 -07:00
Mic Bowman
657cceb884
Intermediate commit for backward compatability; does not compile yet
2010-10-25 09:42:28 -07:00
Melanie
3113cc9129
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-10-25 01:24:42 +01:00
Melanie
ac370cf57b
Merge branch 'master' into careminster-presence-refactor
2010-10-25 01:24:30 +01:00
Melanie
cf78f3fae3
Comment repeated add and remove of avatars from the physical scene. It's no
...
longer needed.
2010-10-25 00:53:38 +02:00
Latif Khalifa
c74c1620a1
* Updated libomv to r3461
...
Main reason for upgrade is to revert API change that was introduced in order to support headerless binary LLSD decoding needed for deserialization of the mesh assets, which turned out to be unnecessary as we can transparently decode both kinds.
2010-10-24 23:51:46 +01:00
Melanie
dd7f9ed7bf
Implement llGetLinkNumberOfSides(), needed for 1-script sculptie foot shoe
...
scripts.
2010-10-25 00:33:34 +02:00
Jonathan Freedman
07db35697b
Merge branch 'master' into mantis5110
2010-10-24 15:01:01 -04:00
Jonathan Freedman
6b9660eb96
Merge branch 'master' into mantis5110
2010-10-24 14:51:38 -04:00
Jonathan Freedman
3fe8fc3d51
* throw debug message when no HomeURI is set
2010-10-24 13:32:34 -04:00
Melanie
852c61aaa6
Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCAL
2010-10-24 18:17:21 +01:00
Melanie
61137eac22
Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCAL
2010-10-24 18:19:48 +02:00
Melanie
2f0a3391ee
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-10-24 17:21:16 +02:00
Melanie
5f266fd571
Change the results from llGetPrimitiveParams to be the same as SL for
...
the prim position. This will make attached resizer scripts work like SL.
Existing resizers may be affected adversely.
2010-10-24 17:18:21 +02:00
Diva Canto
627d1a42fe
Added inner exception handling in Shape deserialization processing, so that the whole Shape processing returns a valid Shape object.
2010-10-23 20:39:41 -07:00
Melanie
d0c707209a
Prevent an exception if a string passed into llXorBase64StringsCorrect is not
...
a base 64 string. Return the empty string in this case.
2010-10-23 22:40:56 +01:00
Jonathan Freedman
5ddb8b535e
* a bit of additional debugging:
2010-10-23 00:18:19 -04:00
Melanie
9a78281f82
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-10-23 00:22:23 +01:00
Melanie
7f74dc1b14
Merge branch 'master' into careminster-presence-refactor
2010-10-23 00:21:42 +01:00
Justin Clark-Casey (justincc)
80f90229e5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-10-22 23:56:58 +01:00
Justin Clark-Casey (justincc)
fe8d3d5a2b
Revert "Merge remote branch 'otakup0pe/mantis5110'"
...
This reverts commit 21187f459e
, reversing
changes made to 8f34e46d74
.
2010-10-22 23:52:07 +01:00
Justin Clark-Casey (justincc)
21187f459e
Merge remote branch 'otakup0pe/mantis5110'
2010-10-22 23:35:07 +01:00
Justin Clark-Casey (justincc)
8f34e46d74
Revert "* refactor refactor refactor ServerURI 4 lyfe"
...
This reverts commit 55974df14b
.
2010-10-22 23:35:01 +01:00
Justin Clark-Casey (justincc)
783b1b548f
Revert "* additional serveruri cleanup"
...
This reverts commit 19119d7705
.
2010-10-22 23:34:53 +01:00
Jonathan Freedman
38e76d71ac
Merge branch 'hg16' into mantis5110
2010-10-22 18:34:50 -04:00
Justin Clark-Casey (justincc)
a490b34b6e
Revert "* more url / hg cleanup"
...
This reverts commit 58f75fa19d
.
2010-10-22 23:34:44 +01:00
Justin Clark-Casey (justincc)
cddcb53b17
Revert "* remove some spurious debug info"
...
This reverts commit 017b83d0a3
.
2010-10-22 23:34:37 +01:00
Justin Clark-Casey (justincc)
d58967be58
Fix llParcelMediaCommandList() so that it applies commands only to the parcel that the script is in, not all parcels.
...
Patch from http://opensimulator.org/mantis/view.php?id=2738
Thanks snoopy and fineman.
2010-10-22 18:33:59 -04:00
Justin Clark-Casey (justincc)
6d7ce63085
Allow OARs and IARs to save and load meshes.
...
Save and reload appears okay for the duck mesh at https://collada.org/owl/download.php?sess=0&parent=126&expand=1&order=name&curview=0&binary=1&id=698/
However, one attempt at trying to load a more complicated scene failed (errors on console, only triangles appearing in mesh viewer).
Not sure if this is really and OAR load problem. Needs more investigation.
2010-10-22 18:33:55 -04:00
Justin Clark-Casey (justincc)
a7a8fdc7da
print IAR version number on console when saving
2010-10-22 18:33:52 -04:00
Justin Clark-Casey (justincc)
bdd6857006
Implement guard against trying to load incompatible version IARs
2010-10-22 18:33:47 -04:00
Justin Clark-Casey (justincc)
607c07b4aa
start parsing iar control file
...
This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml
2010-10-22 18:33:41 -04:00
Justin Clark-Casey (justincc)
772dbf59f3
slightly simplify oar control file loading code
2010-10-22 18:33:35 -04:00
Justin Clark-Casey (justincc)
460b9fffe5
write IAR control file first in the archive rather than last
2010-10-22 18:33:32 -04:00
Justin Clark-Casey (justincc)
e06acae965
Allow region modules to know which agents actually receive chat
2010-10-22 18:33:19 -04:00
AdelleF
481a44104e
This fixes a delay in llSetLinkPrimitiveParamsFast
...
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-10-22 18:33:10 -04:00
Melanie
004b395d12
Make SImStatsReporter pick ObjectCapacity striaght out of region info
2010-10-22 18:27:49 -04:00
Melanie
170c5d183b
Remove a bit of dead code relating to ObjectCapacity
2010-10-22 18:27:40 -04:00
Melanie
753137e9ad
Fix the OOB error ( #5102 ). Sorry, my bad.
2010-10-22 18:27:28 -04:00
Melanie
6049e548a5
Skip empty strings in ParseString* functions
2010-10-22 18:27:12 -04:00
Melanie
9fa915bdef
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-10-23 00:20:18 +02:00
Melanie
c3ddf46188
Prevent database lookups on every avatar movement when land is set to group
...
access. Fixes a massive performance degradation.
2010-10-23 00:18:56 +02:00
Melanie
700f4ddea4
Change some exception to use ToString(). e.Message is not sufficient to fix
...
errors. Please don't use e.Message, devs NEED to see the dumps!
2010-10-22 22:55:07 +01:00
Justin Clark-Casey (justincc)
cfbaad3669
Fix llParcelMediaCommandList() so that it applies commands only to the parcel that the script is in, not all parcels.
...
Patch from http://opensimulator.org/mantis/view.php?id=2738
Thanks snoopy and fineman.
2010-10-22 21:28:10 +01:00
Justin Clark-Casey (justincc)
1064e743be
Allow OARs and IARs to save and load meshes.
...
Save and reload appears okay for the duck mesh at https://collada.org/owl/download.php?sess=0&parent=126&expand=1&order=name&curview=0&binary=1&id=698/
However, one attempt at trying to load a more complicated scene failed (errors on console, only triangles appearing in mesh viewer).
Not sure if this is really and OAR load problem. Needs more investigation.
2010-10-22 21:12:22 +01:00
Justin Clark-Casey (justincc)
e6019dd6ac
print IAR version number on console when saving
2010-10-22 19:34:06 +01:00
Justin Clark-Casey (justincc)
7f2d844916
Implement guard against trying to load incompatible version IARs
2010-10-22 19:30:15 +01:00
Justin Clark-Casey (justincc)
199b61f1b2
start parsing iar control file
...
This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml
2010-10-22 19:24:42 +01:00
Justin Clark-Casey (justincc)
a5bb7b8a30
slightly simplify oar control file loading code
2010-10-22 18:47:38 +01:00
Justin Clark-Casey (justincc)
bb28726a8b
write IAR control file first in the archive rather than last
2010-10-22 18:39:40 +01:00
Melanie
301a926015
Change some exception to use ToString(). e.Message is not sufficient to fix
...
errors. Please don't use e.Message, devs NEED to see the dumps!
2010-10-22 13:29:59 +01:00
Jonathan Freedman
d4144bedb8
* change the data exchanged within hypergrid transactions
2010-10-21 23:22:15 -04:00
Justin Clark-Casey (justincc)
e7f184345e
minor: add some text to the oar abort messages on assets timeout to make it clear that the oar will not be usable
2010-10-22 01:52:19 +01:00
Justin Clark-Casey (justincc)
62a0910355
Allow region modules to know which agents actually receive chat
2010-10-22 01:01:56 +01:00
Master ScienceSim
267f18925d
First attempt to get multiple attachments working to support viewer2.
...
The attachment code appears to work correctly for 1.23 viewers so, in
spite of some big changes in the internal representation, there don't
appear to be regressions. That being said, I still can't get a viewer2
avatar to show correctly.
2010-10-21 16:48:58 -07:00
AdelleF
529fb58b7b
This fixes a delay in llSetLinkPrimitiveParamsFast
...
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-10-21 12:56:36 -07:00
Melanie
28c4dd7931
Merge branch 'master' into careminster-presence-refactor
2010-10-21 20:26:29 +01:00
Diva Canto
fe99f194ad
Deleted a verbose and unneeded log message.
2010-10-21 12:00:30 -07:00
Melanie
08e14d653e
Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-appearance
2010-10-21 17:09:42 +01:00
Melanie
bb78f1c05a
Make SImStatsReporter pick ObjectCapacity striaght out of region info
2010-10-21 15:36:32 +01:00
Melanie
338e7481f9
Remove a bit of dead code relating to ObjectCapacity
2010-10-21 13:21:46 +01:00
Melanie
fa7da00cc3
COnvert some funky K&R notation to proper (MS) style
2010-10-21 09:35:33 +01:00
Melanie
01bc4fc9da
Fix the OOB error ( #5102 ). Sorry, my bad.
2010-10-21 09:30:09 +01:00
Melanie
fc33d569cd
Merge branch 'master' into careminster-presence-refactor
2010-10-21 07:33:01 +01:00
Melanie
1f7577b735
Skip empty strings in ParseString* functions
2010-10-21 07:19:10 +01:00
dahlia
f8a47801ee
Merge branch 'master' of ssh://MyConnection01/var/git/opensim
2010-10-20 20:43:08 -07:00
dahlia
9038218c2d
fix combining of multiple physics submeshes
2010-10-20 20:39:05 -07:00
Jonathan Freedman
017b83d0a3
* remove some spurious debug info
...
* The last 4 commits are a patch from otakup0pe that's supposed to make URLs better somehow in an effort to make it easier to do hypergrid (I think).. But as it seems that I'm the only one who was able to apply the patch.. and I looked it over and it doesn't look like it breaks anything via the diffs.. I'll sign off on it.
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-20 22:36:29 -04:00
Jonathan Freedman
58f75fa19d
* more url / hg cleanup
2010-10-20 22:21:45 -04:00
Jonathan Freedman
19119d7705
* additional serveruri cleanup
2010-10-20 22:21:41 -04:00
Jonathan Freedman
55974df14b
* refactor refactor refactor ServerURI 4 lyfe
2010-10-20 22:21:23 -04:00
Jonathan Freedman
335f2ddad2
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-20 20:26:37 -04:00
Master ScienceSim
b1c8d05888
Major refactoring of appearance handling.
...
AvatarService -- add two new methods, GetAppearance and SetAppearance
to get around the lossy encoding in AvatarData. Preseve the old
functions to avoid changing the behavior for ROBUST services.
AvatarAppearance -- major refactor, moved the various encoding
methods used by AgentCircuitData, ClientAgentUpdate and
ScenePresence into one location. Changed initialization.
AvatarAttachments -- added a class specifically to handle
attachments in preparation for additional functionality
that will be needed for viewer 2.
AvatarFactory -- removed a number of unused or methods duplicated
in other locations. Moved in all appearance event handling from
ScenePresence. Required a change to IClientAPI that propogated
throughout all the IClientAPI implementations.
2010-10-20 16:17:54 -07:00
Jonathan Freedman
94684a2251
* remove some spurious debug info
2010-10-20 02:36:59 -04:00
Diva Canto
a7acb650d4
Deleted verbose debug messages that are bringing sims to an halt. Increased the user cache expiration period to 33 hours.
2010-10-19 22:26:07 -07:00
Teravus Ovares (Dan Olivares)
9f975ad5aa
* One more goofy thing. I note that the sculpt texture id is broken out of the ExtraParams data in UploadObjectAsset. At this moment, if you're uploading a Sculpt, make sure to break out the Texture ID into the object data or it might not get applied appropriately.
2010-10-20 01:23:54 -04:00
Jonathan Freedman
087cb951e2
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-20 00:43:29 -04:00
Teravus Ovares (Dan Olivares)
edce4e9c67
* This removes an ugly extraparams hack that I used and makes UploadObjectAsset into a generic linkset upload tool.
2010-10-20 00:40:05 -04:00
Diva Canto
8731c2be11
It looks like Vector3s also got written down in lower case at some point in time. Added code to account for that.
...
17:45:59 - [SceneObjectSerializer]: exception while parsing SitTargetPosition: System.Xml.XmlException: Expecting X tag from namespace , got x and instead Line 1, position 2838.
2010-10-19 15:16:29 -07:00
Diva Canto
8acac3d07f
Another take related to the previous commit.
2010-10-19 15:07:15 -07:00
Diva Canto
3b2d9a9939
Added code to quaternion deserialization to try to cope with an exception seen in Wright Plaza related to SitTargetOrientation.
...
17:23:05 - [SceneObjectSerializer]: exception while parsing SitTargetOrientation: System.Xml.XmlException: Expecting X tag from namespace , got w and instead Line 1, position 30064.
2010-10-19 14:37:03 -07:00
Diva Canto
684449f783
Added TextureAnimation and ParticleSystem to serialization.
2010-10-19 00:04:02 -07:00
Teravus Ovares (Dan Olivares)
b2c1a1c9bd
* This concludes UploadObjectAsset for now until the permissions and physics shape are added to the message serialization.
...
* You should now be able to upload multiple mesh collada mesh objects. They should appear in front of you (or on top of you!) when you upload them.
* Once again, thanks to John Hurliman and Latif Khalifa for insight and smxy for cheering me on :D
2010-10-19 01:53:56 -04:00
Teravus Ovares (Dan Olivares)
158e43d4fd
* Almost complete implementation of UploadObjectAsset cap. all meshes get uploaded but they're improperly positioned/oriented at the moment.
2010-10-18 23:47:35 -04:00
Jonathan Freedman
12128f1917
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-18 23:00:48 -04:00
Justin Clark-Casey (justincc)
37a6be7ca9
Stop the InventoryTransferModule logging every IM notification it receives, even if they are nothing to do with it.
2010-10-19 02:20:47 +01:00
Justin Clark-Casey (justincc)
5dd372edc4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-10-19 02:12:36 +01:00
Justin Clark-Casey (justincc)
99388ce610
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-10-19 02:08:50 +01:00
Justin Clark-Casey (justincc)
478b44f231
Pass in requesting agent ID when GetGroupMembers is called in the XMLRPC groups module
...
This allows the groups xmlrpc server to act appropriately if the requesting agent has permission to see all group members
Not sure why this wasn't being done before...
2010-10-19 02:04:23 +01:00
Justin Clark-Casey (justincc)
b9bef50852
Display more information when xmlrpcgroupsserver comms fails
...
Improve debugging messages
2010-10-19 02:04:14 +01:00
Melanie
43a4b7b735
COmmented the wrong line instead, now I commented them all to be on the safe side
2010-10-19 01:23:25 +01:00
Melanie
8853c21763
COmmented the wrong line instead, now I commented them all to be on the safe side
2010-10-19 01:22:31 +01:00
Melanie
e0a02d6ca3
Merge branch 'master' into careminster-presence-refactor
2010-10-19 00:52:35 +01:00
Melanie
5b29b975ee
Comment a spammy debug message in the serializer
2010-10-19 00:51:04 +01:00
Melanie
7de30cc57b
Change substring matching to prefix matching in region search. This affects
...
both map and login, as they use the same method.
2010-10-18 22:59:00 +01:00
Melanie
ce3594f7f2
Change substring matching to prefix matching in region search. This affects
...
both map and login, as they use the same method.
2010-10-18 22:58:04 +01:00
Melanie
551015db63
Alphabetize results on region search by prefix matching
2010-10-18 20:29:00 +01:00
Melanie
78a6e5489b
Fix merge issues
2010-10-18 20:50:16 +02:00
Melanie
bb7a755cba
Merge branch 'master' into careminster-presence-refactor
2010-10-18 20:30:46 +01:00
Melanie
e48ac93803
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-18 19:08:55 +01:00
Melanie
2be93066da
Bump migration version on LastSeen field so it is actually run
2010-10-18 19:08:26 +01:00
dahlia
e3bd10829f
remove some cruft from last commit
2010-10-18 04:26:23 -07:00
dahlia
7fa3335fd5
initial support for meshies physics. Must set ini option UseMeshiesPhysicsMesh = true to enable. See file OpenSimDefaults.ini for example.
2010-10-18 04:17:36 -07:00
Jonathan Freedman
4e4fb93fae
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-17 18:45:25 -04:00
Diva Canto
6df4ca7de1
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-10-17 10:42:04 -07:00
Diva Canto
7038f2b406
Deleted all [XmlIgnore] from SOP, since those are meaningless now.
2010-10-17 10:41:38 -07:00
Diva Canto
22eff055d4
.NET automagical serialization of SOPs replaced by manual serialization across the board.
2010-10-17 10:35:38 -07:00
BlueWall
06b61b68c7
Adding osFunctions for light projection
...
Set the projection parameters in the host prim ...
osSetProjectionParam(bool Enabled,
key TextureMaskUUID,
float FOV,
float Focus,
float Ambiance);
Set the projection parameters in a target prim ...
osSetProjectionParam(ikey target uuid,
bool Enabled,
key TextureMaskUUID,
float FOV,
float Focus,
float Ambiance);
Threat Level very high
Signed-off-by: Melanie <melanie@t-data.com>
2010-10-17 09:52:12 +01:00
BlueWall
9e421868e3
Add missing check for !_projectionEntry
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-16 20:59:18 -04:00
Melanie
46e5c8e919
Merge branch 'master' into careminster-presence-refactor
2010-10-16 10:52:56 +01:00
Melanie
e6d0fb0b0e
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-10-16 10:51:44 +02:00
Melanie
efc555ca22
Actually set the PrivateBinPath in XEngine so relocating the scripts
...
directory works
2010-10-16 10:50:07 +02:00
Justin Clark-Casey (justincc)
06d37d06e6
Drop max oar loading version back to 0 from 1
2010-10-16 07:25:55 +01:00
Justin Clark-Casey (justincc)
edc31adf95
Rip out version option since it turns out that the changed object serialization format can actually be loaded by older OpenSims after all
...
This bumps the OAR version to 0.4 instead, signalling some change but with backwards compatability... for now.
2010-10-16 07:09:13 +01:00
Justin Clark-Casey (justincc)
e41b23a1a4
change --old-guids switch on the save oar command line to --version=<x>
...
if x is 0, then an old version 0.3 archive is saved. If it is anything else or missing, then a version 1.0 archive is saved
version 1.0 archives cannot be loaded on OpenSim 0.7.0.2 and earlier
also add various informational notices about what version we've saving/loading
2010-10-16 05:38:44 +01:00
Justin Clark-Casey (justincc)
3df8d8ff76
Have OpenSim throw a strop if it tries to load an OAR with a major version that is too high for it to handle
2010-10-16 04:59:51 +01:00
Justin Clark-Casey (justincc)
1bd4219078
save oar control file first rather than in the middle so that it's the first thing we come accross on load
...
this exposes a weekness with using tar where we don't control the order in which files are loaded. can't be helped for now
2010-10-16 03:52:11 +01:00
Justin Clark-Casey (justincc)
fe4e6ff811
Fix test break - TestSerializeXml2() still requires old-guids option
2010-10-16 02:38:46 +01:00
Melanie
455a2ba7de
Merge branch 'master' into careminster-presence-refactor
2010-10-16 02:27:51 +01:00
Diva Canto
1499607215
Made OARs use the new serialization procedure. (TPs/crossings still on the old one) Added an options argument down the pipeline. For the time being it takes --old-guids as an option to produce <Guid> instead of <UUID>.
2010-10-15 17:27:19 -07:00
Diva Canto
e039a8c8c2
UPdated the MySql driver to 6.2.4. Also established a much larger MySqlCommand timeout on fetching prims.
2010-10-15 15:43:06 -07:00
BlueWall
dd1058e6b3
Adding projected light filters to prim propeties
...
Requires the LL Mesh Beta viewer
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-15 09:46:49 -04:00
Latif Khalifa
cd4d7a7c35
A couple of more ways attachment point is sent
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-15 01:56:08 -04:00
Teravus Ovares (Dan Olivares)
0308982c58
one more silly line ending thing.... *If you have problems, fetch the tree and rebase.
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-15 01:45:25 -04:00
dahlia
bcdd03c1cf
more work in progress on mesh physics - still non-functional
2010-10-14 20:25:31 -07:00
dahlia
2d88394cd5
laying some groundwork for mesh physics
2010-10-14 13:10:03 -07:00
Teravus Ovares (Dan Olivares)
486eede9be
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-10-14 12:24:07 -04:00
Teravus Ovares (Dan Olivares)
c148ef25a9
* Replacing Magic numbers with Enums
2010-10-14 12:23:41 -04:00
Latif Khalifa
405935492b
Don't distroy attachments when using viewer 2.1+, strip multiple attachment data
2010-10-14 16:28:51 +01:00
Melanie
ba247f729d
Kill some magic numbers in the mesh upload module and change the mesh asset
...
type from 45 to 49 to match OMV trunk
2010-10-14 16:28:51 +01:00
Diva Canto
41ce392d9b
Added manual xml2 serialization. Rewired only save xml2, not oars yet. Seems to be generating xml's that are successfully parsed. Needs more testing.
2010-10-14 09:05:46 -07:00
Teravus Ovares (Dan Olivares)
05c4e27a30
* A few additional cleanup elements
...
* At this point, I want to make sure to thank the fabulous developers of the LibOpenMetaverse library for tirelessly keeping things updated and hammering away at the protocols and providing excellent tools to figure out where things go wrong.
* Special thanks to John Hurliman and Latif Khalifa for their valuable insight.
2010-10-14 09:57:42 -04:00
Teravus Ovares (Dan Olivares)
6d99f0c627
* Whoops, That was supposed to use the HTTP VERB 'GET' not 'POST'
...
* At this point. Visually, Mesh works OK. Remember peeps, this is still highly experimental from the viewer side as well as the Simulator side. There are known problems with the new beta viewers and attachment breaking so be careful until that's fixed. Additionally there some new properties in the Mesh Viewer that determine physics settings that are non-functional. More work will be done on that.
2010-10-14 09:34:37 -04:00
Teravus Ovares (Dan Olivares)
7e363b79c7
* Tweaked the upload response and now at least uploading the mesh works.
...
* Binary error on downloading the mesh though.. so still not yet working.
2010-10-14 09:24:15 -04:00
Teravus Ovares (Dan Olivares)
9c5f8a6802
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-10-14 03:23:37 -04:00
Teravus Ovares (Dan Olivares)
b4a5ce148c
Rename file + more testing and tweaking
2010-10-14 03:22:44 -04:00
Melanie
6ac6ca057d
Kill some magic numbers in the caps module
2010-10-14 07:28:20 +01:00
Teravus Ovares (Dan Olivares)
3384f643eb
* Partially complete stuff for Mesh support that Melanie wanted to see before it was done.
...
* Shouldn't break the build.
* Doesn't work yet either.
2010-10-14 02:19:42 -04:00
Diva Canto
45e0cdfcad
Added SOP.MediaUrl and Shape.Media to the deserialization
2010-10-13 15:44:25 -07:00
Justin Clark-Casey (justincc)
aa60c4b129
fix build break
2010-10-13 22:18:57 +01:00
Melanie
537905d81b
Add a setter to OldItemID so it can be deserialized
2010-10-13 19:45:55 +01:00
Melanie
bb1e35fbd9
Merge branch 'master' into careminster-presence-refactor
2010-10-13 18:44:58 +01:00
Melanie
eeac2a9e6a
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-13 18:41:52 +01:00
Melanie Thielker
ccd5610997
Correctly update the LastSeen field
2010-10-13 18:41:09 +01:00
Melanie Thielker
01728fb19e
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-10-13 18:40:33 +01:00
Diva Canto
d890390ecf
Comment a debug message so that it doesn't spew the console upon encountering unknown xml elements.
2010-10-13 10:38:34 -07:00
Diva Canto
54a3b8e079
New SOG/SOP parser using XmlTextReader + delegates dictionary. Active for load oar and load xml2, but not for packing objects on crossings/TPs yet.
2010-10-13 08:16:41 -07:00
Melanie
3eb68c319e
change default next owner persm to mod/trans to match SL.
2010-10-13 08:24:18 +02:00
Jonathan Freedman
a2167b0f0d
* more url / hg cleanup
2010-10-11 16:53:00 -04:00
Jonathan Freedman
2654ab6300
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-10 18:06:27 -04:00
Melanie
0806d03780
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-10-10 22:08:54 +01:00
Melanie
cb79e228e4
Merge branch 'master' into careminster-presence-refactor
2010-10-10 22:08:36 +01:00
Melanie
30f926aab6
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-10 22:07:51 +01:00
Melanie
f2febb89fc
Change the part for sound playback to be the root part / object UUID instead
...
of the child prim because using the child prim plain doesn't work.
2010-10-10 22:07:36 +01:00
Melanie
2804c97a39
Change the part for sound playback to be the root part / object UUID instead
...
of the child prim because using the child prim plain doesn't work.
2010-10-10 22:06:47 +01:00
Melanie
c2971a6398
Add group invites to the list of messages that get offlined
2010-10-10 20:15:02 +02:00
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
231feab57f
Merge branch 'master' into careminster-presence-refactor
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
2010-10-09 01:07:41 +01: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
ff49a21eca
Fix a security relevant issue with take / take copy
2010-10-09 01:02:57 +02: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
Melanie
52dd547863
Make SendKillObject send multiple localIDs in one packet. This avoids the
...
halting visual behavior of large group deletes and eliminates the packet flood
2010-10-08 11:31:52 +02: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
ba0afa53d3
Implement rezzing coalesced objects
2010-10-07 05:12:39 +02:00
Melanie
9a5d0984a5
Fix autoreturn to not return zero objects
2010-10-07 02:16:36 +01:00
Melanie
2db0ac74c7
Implement taking of coalesced objects.
...
WARNING!!!!!
You can TAKE them, but you can't REZ them again. Only the first of the contained
objects will rez, the rest is inaccessible until rezzing them is implemented.
Also, rotations are not explicitly stored. This MAY work. Or not.
2010-10-07 01:13:17 +02:00
Melanie
abfede7819
Plumb the path for multiple object deletes
2010-10-06 20:00:51 +01:00
Melanie
42f76773a1
Plumb the path for multiple object deletes
2010-10-06 19:59:30 +02:00
Melanie
ca50f6a82c
Merge branch 'master' into careminster-presence-refactor
2010-10-06 05:45:29 +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
1a47ec082e
Convert worldview to GET
2010-10-06 05:15:47 +02:00
Melanie
b7586806cd
Merge branch 'master' into careminster-presence-refactor
2010-10-06 03:52:57 +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
d8149373c1
Merge branch 'master' into careminster-presence-refactor
2010-10-06 00:27:10 +01: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
e55e93c994
Avoid throwing errors when adding existing meshes to the render scene
2010-10-04 06:02:28 +01:00
Latif Khalifa
cb6e4035c7
Avoid throwing errors when adding existing meshes to the render scene
2010-10-04 06:02:09 +01:00
Melanie
da6816c805
Merge branch 'master' into careminster-presence-refactor
2010-10-04 04:49:54 +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
Melanie
90f9b7b7c4
Fix line endings
2010-10-04 00:37:18 +02:00
Melanie
50b03d08a8
Add linden prim renderer and update libOMV
2010-10-04 00:04:42 +02: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
48988bf4e9
Merge branch 'master' into careminster-presence-refactor
2010-10-03 22:38:32 +01: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
5910be236f
Merge branch 'master' into careminster-presence-refactor
2010-10-03 16:52: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
662976b602
Merge branch 'master' into careminster-presence-refactor
2010-10-02 20:12:36 +01: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
fd56fd2ce8
Merge branch 'master' into careminster-presence-refactor
2010-10-02 19:51: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
b40c91777c
Replace CalculateMass with a more accurate version, contributed by Ubit.
...
Thank you.
2010-10-02 00:19:30 +02:00
Melanie
9f7f266f58
Replace CalculateMass with a better, contributed version
2010-10-02 00:18:52 +02: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
Melanie
7ad1b60eca
Enforce region agent limit as set in estate tools
2010-09-30 20:01:55 +02:00
Master ScienceSim
9c6a591ad0
couple fixes to enable profiles in simian connector
2010-09-30 09:59:53 -07:00
Melanie
521e2c8355
Merge branch 'master' into careminster-presence-refactor
2010-09-30 16:01:45 +01: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
Melanie
ac7a4a7d38
Fix an inventory fetch issue
2010-09-30 02:47:07 +02:00
Melanie
9522881404
Fix a potential key collision
2010-09-30 02:46:47 +02: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
3d75e9addd
Lock the iteration over the inventory items when saving script states
2010-09-28 02:22:32 +02:00
Melanie
841c84831f
Try to prevent threading issues in SP.SetAppearance by locking it
2010-09-27 19:34:16 +02:00
Melanie
5b2aa02fd9
Merge branch 'master' into careminster-presence-refactor
2010-09-27 03:48:15 +01:00
Melanie
0339d420e7
Restrict top colliders / top scripts to estate managers
2010-09-27 03:45:22 +01:00
Melanie
41051b3cc6
Prevent setting arbitrary groups on your objects.
2010-09-27 02:13: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
296cf04ce6
Merge branch 'master' into careminster-presence-refactor
2010-09-27 01:32:06 +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
34e8bf45b6
Restrict inventory items added in a transaction to folder belonging
...
to the connected client.
2010-09-27 00:29:27 +01:00
Melanie
9f17ae580d
Merge branch 'master' into careminster-presence-refactor
2010-09-26 23:57:06 +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
Melanie
aecac9bba9
Typo fixes
2010-09-26 18:05:55 +01:00
Melanie
6f689f591a
Merge Master
2010-09-26 17:56:31 +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
0080f28f1d
Merge branch 'master' into careminster-presence-refactor
2010-09-25 06:57:53 +01:00
Melanie
d8ae287ebf
Prevent spoofing the agent name on text IM
2010-09-25 06:56:08 +01:00
Melanie
4fbdcb95a0
Merge branch 'master' into careminster-presence-refactor
2010-09-25 06:19:26 +01:00
Melanie
3b76d7bbb6
Fix a minor economy issue
2010-09-25 06:09:35 +01:00
Melanie
83b16612ce
Experimental locking of taint processing
2010-09-25 05:57:08 +02: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