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
e4bb8dc385
Guard against invalid light color specifiers from the database
2011-01-13 00:19:39 +01:00
Melanie
c271bbcc8a
Preserve the script running flag when copying an object.
2011-01-08 16:44:28 +01:00
Melanie
de4eaab584
Merge branch 'master' into careminster-presence-refactor
2011-01-06 19:08:15 +00: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
Mic Bowman
e0da281e3d
Cleaned up debugging messages in the WebRequest handlers
2011-01-03 17:16:22 -08: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
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
Mic Bowman
b16173e3e8
Drop the static from default wearables. It isn't
...
static.
2010-12-27 12:43:54 -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
2cc07de0ba
Merge branch 'master' into careminster-presence-refactor
2010-12-23 12:08:38 +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
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
b1180a53dd
Merge branch 'master' into careminster-presence-refactor
2010-12-21 20:56:37 +00:00
Mic Bowman
a6a136bd90
Shooting in the dark for solutions to the appearance problem
2010-12-20 14:24:52 -08:00
Melanie
b32dcc6913
Fix notecards that end with an embedded object causing an exception
2010-12-17 22:50:00 +00:00
Melanie
d7622cbedc
Fix notecards that end with an embedded object causing an exception
2010-12-16 21:01:38 +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
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
Melanie
8aa63093b1
Merge branch 'master' into careminster-presence-refactor
2010-12-12 01:20:46 +00:00
Justin Clark-Casey (justincc)
3053f5ba7d
minor: remove some compiler warnings
2010-12-10 03:08:31 +00:00
Melanie
7fef89847c
Merge branch 'master' into careminster-presence-refactor
2010-12-09 02:24:12 +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
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
b1a5c03985
Lock the attachments dict so it doesn't get out of sync when iterating
2010-12-06 17:40:07 +01: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
24af7b8384
Merge branch 'master' into careminster-presence-refactor
2010-12-04 00:09:32 +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
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
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
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
Diva Canto
ca8d015733
Changed the parser for InventoryItem deserialization. Moved some utility functions around.
2010-11-27 11:40:54 -08: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
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
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
57c4def254
Change all restarting to use the restart module. Remove hardcoded behavior
2010-11-25 03:16:52 +00:00
Melanie
6c3eb21440
Merge branch 'master' into careminster-presence-refactor
2010-11-25 03:27:35 +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
Jonathan Freedman
bc51dfc45e
Merge branch 'master-core' into mantis5110
2010-11-23 22:27:54 -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
7796b90ebb
Fix some crashes caused by the addition of the CreatorData column
2010-11-23 14:02:06 +00:00
Melanie
571becefb6
Fix some crashes caused by the addition of the CreatorData column
2010-11-22 23:31:29 +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
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
22ff06ba17
Merge branch 'master' into careminster-presence-refactor
2010-11-22 01:09:26 +00:00
Melanie
164007dd00
Merge branch 'master' into careminster-presence-refactor
2010-11-18 19:06:09 +00: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)
e6eeaaea67
minor: add some method comments
2010-11-17 22:55:06 +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
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
Melanie
ee85a530f6
Merge branch 'master' into careminster-presence-refactor
2010-11-09 22:16:48 +00: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
Jeff Ames
ae9c4a4d11
Formatting cleanup.
2010-11-08 07:48:35 -05:00
Jonathan Freedman
4f40374464
Merge git://github.com/opensim/opensim into mantis5110
2010-11-05 19:10:02 -07: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
5f8ab9f018
Merge branch 'master' into careminster-presence-refactor
2010-11-03 02:34:36 +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
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
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
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
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
63ffdcf53a
Try to not make avatars switch outfits
2010-11-02 19:55:05 +00:00
Jonathan Freedman
95a0ea78f9
Merge branch 'master' into mantis5110
2010-10-30 18:28:07 -04: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
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
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
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
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)
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
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
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
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
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
Master ScienceSim
9cfd3e1d5a
Small cleanup and add more debugging information
2010-10-26 12:54:28 -07: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
7f74dc1b14
Merge branch 'master' into careminster-presence-refactor
2010-10-23 00:21:42 +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
Jonathan Freedman
38e76d71ac
Merge branch 'hg16' into mantis5110
2010-10-22 18:34:50 -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
Master ScienceSim
267f18925d
First attempt to get multiple attachments working to support viewer2.
...
The attachment code appears to work correctly for 1.23 viewers so, in
spite of some big changes in the internal representation, there don't
appear to be regressions. That being said, I still can't get a viewer2
avatar to show correctly.
2010-10-21 16:48:58 -07:00
Melanie
08e14d653e
Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-appearance
2010-10-21 17:09:42 +01:00
Melanie
fc33d569cd
Merge branch 'master' into careminster-presence-refactor
2010-10-21 07:33:01 +01: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
55974df14b
* refactor refactor refactor ServerURI 4 lyfe
2010-10-20 22:21:23 -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
Melanie
bb7a755cba
Merge branch 'master' into careminster-presence-refactor
2010-10-18 20:30:46 +01:00
Jonathan Freedman
4e4fb93fae
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-17 18:45:25 -04: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
455a2ba7de
Merge branch 'master' into careminster-presence-refactor
2010-10-16 02:27:51 +01: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
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
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
Melanie
537905d81b
Add a setter to OldItemID so it can be deserialized
2010-10-13 19:45:55 +01: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
231feab57f
Merge branch 'master' into careminster-presence-refactor
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
2010-10-09 01:07:41 +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
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
8f1acb890a
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-05 14:17:18 -04:00
Melanie
da6816c805
Merge branch 'master' into careminster-presence-refactor
2010-10-04 04:49:54 +01: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
Jonathan Freedman
e3099d48f9
Merge branch 'master' of git://opensimulator.org/git/opensim
2010-10-03 18:04:38 -04:00
Melanie
5910be236f
Merge branch 'master' into careminster-presence-refactor
2010-10-03 16:52:27 +01:00
Melanie
0b13cfa4dd
Port ExecutingDirectory from omfOS Util class.
2010-10-03 16:50:50 +01:00
Jonathan Freedman
32ccc7a9d9
* refactor refactor refactor ServerURI 4 lyfe
2010-10-02 19:17:02 -04:00
Melanie
33bd4fe789
When clearing the addin registry, respect a custom path
2010-09-24 22:00:51 +02:00
Melanie
41847e8fdf
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-21 04:03:40 +01:00